Changeset 12574

Timestamp:

03/25/2020 05:52:59 AM (7 years ago)

Author:

imath

Message:

Update Grunt tasks & .gitignore to match BP Blocks needs

• The makepot task is now using the WP CLI wp i18n make-pot command.
• Exclude JavaScript Files generated by Parcel/Babel from jsvalidate, jshint & uglify tasks.
• Add new tasks to build & minify BP Blocks files.

See #8048

Location:

trunk

Files:

• .gitignore (modified) (1 diff)
• .jshintignore (modified) (1 diff)
• Gruntfile.js (modified) (7 diffs)
• composer.json (modified) (1 diff)

trunk/.gitignore

@@ -2 +2 @@
 phpunit.xml
 .idea
+.cache
 
 lib-cov

trunk/.jshintignore

@@ -2 +2 @@
 src/bp-core/js/vendor/**/*
 src/bp-messages/js/autocomplete/*
+
+// Blocks Scripts
+src/**/js/blocks/*.js
+src/**/js/block-components/*.js
+src/**/js/block-components/**/*.js
+src/bp-core/js/block-components.js

trunk/Gruntfile.js

@@ -16 +16 @@
                 BP_JS = [
                         '**/*.js'
+                ],
+
+                BP_EXCLUDED_JS = [
+                        '!**/js/blocks/*.js',
+                        '!**/js/block-components/*.js',
+                        '!**/js/block-components/**/*.js',
+                        '!**/js/block-components.js'
                 ],
 
@@ -165 +172 @@
                         }
                 },
-                makepot: {
-                        target: {
-                                options: {
-                                        cwd: BUILD_DIR,
-                                        domainPath: '.',
-                                        mainFile: 'bp-loader.php',
-                                        potFilename: 'buddypress.pot',
-                                        processPot: function( pot ) {
-                                                pot.headers['report-msgid-bugs-to'] = 'https://buddypress.trac.wordpress.org';
-                                                pot.headers['last-translator'] = 'JOHN JAMES JACOBY <jjj@buddypress.org>';
-                                                pot.headers['language-team'] = 'ENGLISH <jjj@buddypress.org>';
-                                                return pot;
-                                        },
-                                        type: 'wp-plugin'
-                                }
-                        }
-                },
                 imagemin: {
                         core: {
@@ -202 +192 @@
                                                 dot: true,
                                                 expand: true,
-                                                src: ['**', '!**/.{svn,git}/**'].concat( BP_EXCLUDED_MISC )
+                                                src: ['**', '!**/.{svn,git,cache}/**', '!js/**'].concat( BP_EXCLUDED_MISC )
                                         },
                                         {
@@ -246 +236 @@
                                 expand: true,
                                 ext: '.min.js',
-                                src: BP_JS
+                                src: BP_JS.concat( BP_EXCLUDED_JS, BP_EXCLUDED_MISC )
                         }
                 },
@@ -333 +323 @@
                                 cwd: BUILD_DIR,
                                 stdout: false
+                        },
+                        makepot: {
+                                command: 'wp i18n make-pot build build/buddypress.pot --headers=\'{"Project-Id-Version": "BuddyPress", "Report-Msgid-Bugs-To": "https://buddypress.trac.wordpress.org", "Last-Translator": "JOHN JAMES JACOBY <jjj@buddypress.org>", "Language-Team": "ENGLISH <jjj@buddypress.org>"}\'',
+                                stdout: true
+                        },
+                        blocks_src: {
+                                command: 'npm run dev',
+                                cwd: SOURCE_DIR,
+                                stdout: true
+                        },
+                        blocks_build: {
+                                command: 'npm run build',
+                                cwd: SOURCE_DIR,
+                                stdout: true
                         }
                 },
@@ -343 +347 @@
                         build: {
                                 files: {
-                                        src: [BUILD_DIR + '/**/*.js']
+                                        src: [BUILD_DIR + '/**/*.js'].concat( BP_EXCLUDED_JS, BP_EXCLUDED_MISC )
                                 }
                         },
                         src: {
                                 files: {
-                                        src: [SOURCE_DIR + '/**/*.js'].concat( BP_EXCLUDED_MISC )
+                                        src: [SOURCE_DIR + '/**/*.js'].concat( BP_EXCLUDED_JS, BP_EXCLUDED_MISC )
                                 }
                         }
@@ -368 +372 @@
          */
         grunt.registerTask( 'src',     ['checkDependencies', 'jsvalidate:src', 'jshint', 'stylelint', 'sass', 'postcss', 'rtlcss'] );
+        grunt.registerTask( 'makepot', ['exec:makepot'] );
         grunt.registerTask( 'commit',  ['src', 'checktextdomain', 'imagemin', 'phplint', 'exec:phpcompat'] );
         grunt.registerTask( 'bp_rest', [ 'exec:rest_api', 'copy:bp_rest_components', 'copy:bp_rest_core', 'clean:bp_rest' ] );
-        grunt.registerTask( 'build',   ['commit', 'clean:all', 'copy:files', 'uglify', 'jsvalidate:build', 'cssmin', 'bp_rest', 'makepot', 'exec:bpdefault', 'exec:cli'] );
+        grunt.registerTask( 'build',   ['commit', 'clean:all', 'copy:files', 'uglify:core', 'jsvalidate:build', 'exec:blocks_src', 'cssmin', 'bp_rest', 'makepot', 'exec:blocks_build', 'exec:bpdefault', 'exec:cli'] );
         grunt.registerTask( 'release', ['build'] );
 

trunk/composer.json

@@ -32 +32 @@
         },
         "require-dev": {
-                "phpcompatibility/phpcompatibility-wp": "*",
+                "phpcompatibility/phpcompatibility-wp": "*",
                 "dealerdirect/phpcodesniffer-composer-installer": "^0.4.3"
         }