Changeset 8708

Timestamp:

05/01/2019 07:07:48 AM (6 years ago)

Author:

dd32

Message:

Plugin Directory: Fix grunt build for the JS client.

Props ck3lee.
Fixes #4173.

Location:

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins

Files:

• Gruntfile.js (modified) (3 diffs)
• README.md (modified) (1 diff)
• client/modules/api.js (modified) (1 diff)
• package.json (modified) (3 diffs)

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/Gruntfile.js

@@ -116 +116 @@
             options: { signature: false }
         },
-        shell: {
-            build: {
-                command: './node_modules/wpapi/lib/data/update-default-routes-json.js --endpoint=https://wordpress.org/plugins/wp-json --output=./client'
-            }
+        curl: {
+            './client/modules/default-routes.json': 'https://wordpress.org/plugins/wp-json'
         },
         rtlcss: {
@@ -183 +181 @@
         },
         watch: {
+            css: {
+                files: ['**/*.scss', '../wporg/css/**/*scss', 'client/components/**/**.scss'],
+                tasks: ['css']
+            },
+            scripts: {
+                files: ['**/*.jsx'],
+                tasks: ['webpack:build-dev'],
+                options: {
+                  atBegin: true,
+                }
+            },
             eslint: {
                 files: ['<%= eslint.files %>'],
                 tasks: ['eslint']
-            },
-            css: {
-                files: ['**/*.scss', '../wporg/css/**/*scss', 'client/components/**/**.scss'],
-                tasks: ['css']
             }
         }
@@ -201 +206 @@
     grunt.loadNpmTasks('grunt-eslint');
     grunt.loadNpmTasks('grunt-contrib-watch');
-    grunt.loadNpmTasks('grunt-shell');
+    grunt.loadNpmTasks('grunt-curl');
 
     grunt.registerTask('default', ['eslint', 'sass_globbing', 'sass', 'rtlcss:dynamic']);
     grunt.registerTask('css', ['sass_globbing', 'sass', 'postcss', 'rtlcss:dynamic']);
-    grunt.registerTask('build', ['webpack:build', 'css', 'shell:build']);
+    grunt.registerTask('build', ['webpack:build', 'css', 'curl']);
 };

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/README.md

@@ -5 +5 @@
 ```
 npm install
-grunt webpack:watch # Build JS client.
-grunt watch # Run linters, build Sass, etc.
+grunt watch # Run linters, build Sass, JS client, etc.
 ```
 

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/client/modules/api.js

@@ -1 +1 @@
 import WPAPI from 'wpapi';
 
-import routes from 'default-routes.json';
+import routes from './default-routes.json';
 
 /** @type {Object} pluginDirectory Config variable */

sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/package.json

@@ -30 +30 @@
     "grunt-contrib-jshint": "^1.0.0",
     "grunt-contrib-watch": "^1.1.0",
+    "grunt-curl": "^2.5.1",
     "grunt-eslint": "^19.0.0",
     "grunt-postcss": "~0.7.2",
@@ -35 +36 @@
     "grunt-sass": "~3.0.1",
     "grunt-sass-globbing": "^1.5.1",
-    "grunt-shell": "^2.1.0",
     "grunt-webpack": "^1.0.11",
     "history": "^2.0.0",
@@ -59 +59 @@
     "i18n-calypso": "^1.7.0",
     "json-loader": "^0.5.4",
-    "wpapi": "^1.0.0"
+    "wpapi": "^1.2.1"
   }
 }