Changeset 44359
- Timestamp:
- 12/24/2018 01:28:22 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 19 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/.gitignore
r44285 r44359 22 22 /src/wp-includes/js 23 23 /src/wp-includes/css/dist 24 25 26 27 24 28 25 29 # Files and folders that get created in wp-content -
trunk/Gruntfile.js
r44356 r44359 9 9 SOURCE_DIR = 'src/', 10 10 BUILD_DIR = 'build/', 11 11 12 BANNER_TEXT = '/*! This file is auto-generated */', 12 13 autoprefixer = require( 'autoprefixer' ), … … 25 26 'wp-content/plugins/hello.php', 26 27 'wp-content/plugins/akismet/**' 27 ], 28 cleanFiles = [], 29 changedFiles = { 30 php: [] 31 }; 32 33 buildFiles.forEach( function( buildFile ) { 34 cleanFiles.push( BUILD_DIR + buildFile ); 35 } ); 28 ]; 36 29 37 30 if ( 'watch:phpunit' === grunt.cli.tasks[ 0 ] && ! phpUnitWatchGroup ) { … … 82 75 colors: { 83 76 expand: true, 84 cwd: BUILD_DIR,85 dest: BUILD_DIR,77 cwd: _DIR, 78 dest: _DIR, 86 79 src: [ 87 80 'wp-admin/css/colors/*/colors.css' … … 97 90 files: { 98 91 src: [ 99 BUILD_DIR + 'wp-admin/css/*.min.css',100 BUILD_DIR + 'wp-includes/css/*.min.css',101 BUILD_DIR + 'wp-admin/css/colors/*/*.css'92 _DIR + 'wp-admin/css/*.min.css', 93 _DIR + 'wp-includes/css/*.min.css', 94 _DIR + 'wp-admin/css/colors/*/*.css' 102 95 ] 103 96 } … … 106 99 plugins: [BUILD_DIR + 'wp-content/plugins'], 107 100 themes: [BUILD_DIR + 'wp-content/themes'], 108 all: [ 109 cleanFiles, 110 SOURCE_DIR + 'wp-includes/js/dist', 111 SOURCE_DIR + 'wp-includes/css/dist' 101 files: buildFiles.map( function( file ) { 102 return BUILD_DIR + file; 103 }), 104 css: [ 105 WORKING_DIR + 'wp-admin/css/*.min.css', 106 WORKING_DIR + 'wp-admin/css/*rtl*', 107 WORKING_DIR + 'wp-includes/css/*.min.css', 108 WORKING_DIR + 'wp-includes/css/*rtl*', 109 WORKING_DIR + 'wp-admin/css/colors/**/*.css' 112 110 ], 113 js: [BUILD_DIR + 'wp-admin/js/', BUILD_DIR + 'wp-includes/js/'], 111 js: [ 112 WORKING_DIR + 'wp-admin/js/', 113 WORKING_DIR + 'wp-includes/js/' 114 ], 114 115 dynamic: { 115 116 dot: true, 116 117 expand: true, 117 cwd: BUILD_DIR,118 cwd: _DIR, 118 119 src: [] 119 120 }, … … 126 127 { 127 128 append: 'jQuery.noConflict();', 128 input: './build/wp-includes/js/jquery/jquery.js',129 output: './build/wp-includes/js/jquery/jquery.js'129 wp-includes/js/jquery/jquery.js', 130 wp-includes/js/jquery/jquery.js' 130 131 } 131 132 ] … … 154 155 }, 155 156 { 156 'build/index.php': ['src/_index.php'],157 'build/wp-admin/index.php': ['src/wp-admin/_index.php']157 : ['src/_index.php'], 158 : ['src/wp-admin/_index.php'] 158 159 } 159 160 ] … … 161 162 'npm-packages': { 162 163 files: { 163 'build/wp-includes/js/backbone.js': ['./node_modules/backbone/backbone.js'],164 'build/wp-includes/js/hoverIntent.js': ['./node_modules/jquery-hoverintent/jquery.hoverIntent.js'],165 'build/wp-includes/js/imagesloaded.min.js': ['./node_modules/imagesloaded/imagesloaded.pkgd.min.js'],166 'build/wp-includes/js/jquery/jquery-migrate.js': ['./node_modules/jquery-migrate/dist/jquery-migrate.js'],167 'build/wp-includes/js/jquery/jquery-migrate.min.js': ['./node_modules/jquery-migrate/dist/jquery-migrate.min.js'],168 'build/wp-includes/js/jquery/jquery.form.js': ['./node_modules/jquery-form/src/jquery.form.js'],169 'build/wp-includes/js/jquery/jquery.form.min.js': ['./node_modules/jquery-form/dist/jquery.form.min.js'],170 'build/wp-includes/js/jquery/jquery.js': ['./node_modules/jquery/dist/jquery.min.js'],171 'build/wp-includes/js/masonry.min.js': ['./node_modules/masonry-layout/dist/masonry.pkgd.min.js'],172 'build/wp-includes/js/twemoji.js': ['./node_modules/twemoji/2/twemoji.js'],173 'build/wp-includes/js/underscore.min.js': ['./node_modules/underscore/underscore-min.js']164 ], 165 ], 166 ], 167 ], 168 ], 169 ], 170 ], 171 ], 172 ], 173 ], 174 ] 174 175 } 175 176 }, … … 189 190 '!tinymce/tinymce.js' 190 191 ], 191 dest: 'build/wp-includes/js/'192 dest: wp-includes/js/' 192 193 }, 193 194 { … … 198 199 'iris.min.js' 199 200 ], 200 dest: 'build/wp-admin/js/'201 dest: wp-admin/js/' 201 202 }, 202 203 { … … 206 207 'suggest*' 207 208 ], 208 dest: 'build/wp-includes/js/jquery/'209 dest: wp-includes/js/jquery/' 209 210 } 210 211 ] … … 212 213 'admin-js': { 213 214 files: { 214 'build/wp-admin/js/accordion.js': ['./src/js/_enqueues/lib/accordion.js'],215 'build/wp-admin/js/code-editor.js': ['./src/js/_enqueues/wp/code-editor.js'],216 'build/wp-admin/js/color-picker.js': ['./src/js/_enqueues/lib/color-picker.js'],217 'build/wp-admin/js/comment.js': ['./src/js/_enqueues/admin/comment.js'],218 'build/wp-admin/js/common.js': ['./src/js/_enqueues/admin/common.js'],219 'build/wp-admin/js/custom-background.js': ['./src/js/_enqueues/admin/custom-background.js'],220 'build/wp-admin/js/custom-header.js': ['./src/js/_enqueues/admin/custom-header.js'],221 'build/wp-admin/js/customize-controls.js': ['./src/js/_enqueues/wp/customize/controls.js'],222 'build/wp-admin/js/customize-nav-menus.js': ['./src/js/_enqueues/wp/customize/nav-menus.js'],223 'build/wp-admin/js/customize-widgets.js': ['./src/js/_enqueues/wp/customize/widgets.js'],224 'build/wp-admin/js/dashboard.js': ['./src/js/_enqueues/wp/dashboard.js'],225 'build/wp-admin/js/edit-comments.js': ['./src/js/_enqueues/admin/edit-comments.js'],226 'build/wp-admin/js/editor-expand.js': ['./src/js/_enqueues/wp/editor/dfw.js'],227 'build/wp-admin/js/editor.js': ['./src/js/_enqueues/wp/editor/base.js'],228 'build/wp-admin/js/gallery.js': ['./src/js/_enqueues/lib/gallery.js'],229 'build/wp-admin/js/image-edit.js': ['./src/js/_enqueues/lib/image-edit.js'],230 'build/wp-admin/js/inline-edit-post.js': ['./src/js/_enqueues/admin/inline-edit-post.js'],231 'build/wp-admin/js/inline-edit-tax.js': ['./src/js/_enqueues/admin/inline-edit-tax.js'],232 'build/wp-admin/js/language-chooser.js': ['./src/js/_enqueues/lib/language-chooser.js'],233 'build/wp-admin/js/link.js': ['./src/js/_enqueues/admin/link.js'],234 'build/wp-admin/js/media-gallery.js': ['./src/js/_enqueues/deprecated/media-gallery.js'],235 'build/wp-admin/js/media-upload.js': ['./src/js/_enqueues/admin/media-upload.js'],236 'build/wp-admin/js/media.js': ['./src/js/_enqueues/admin/media.js'],237 'build/wp-admin/js/nav-menu.js': ['./src/js/_enqueues/lib/nav-menu.js'],238 'build/wp-admin/js/password-strength-meter.js': ['./src/js/_enqueues/wp/password-strength-meter.js'],239 'build/wp-admin/js/plugin-install.js': ['./src/js/_enqueues/admin/plugin-install.js'],240 'build/wp-admin/js/post.js': ['./src/js/_enqueues/admin/post.js'],241 'build/wp-admin/js/postbox.js': ['./src/js/_enqueues/admin/postbox.js'],242 'build/wp-admin/js/revisions.js': ['./src/js/_enqueues/wp/revisions.js'],243 'build/wp-admin/js/set-post-thumbnail.js': ['./src/js/_enqueues/admin/set-post-thumbnail.js'],244 'build/wp-admin/js/svg-painter.js': ['./src/js/_enqueues/wp/svg-painter.js'],245 'build/wp-admin/js/tags-box.js': ['./src/js/_enqueues/admin/tags-box.js'],246 'build/wp-admin/js/tags-suggest.js': ['./src/js/_enqueues/admin/tags-suggest.js'],247 'build/wp-admin/js/tags.js': ['./src/js/_enqueues/admin/tags.js'],248 'build/wp-admin/js/theme-plugin-editor.js': ['./src/js/_enqueues/wp/theme-plugin-editor.js'],249 'build/wp-admin/js/theme.js': ['./src/js/_enqueues/wp/theme.js'],250 'build/wp-admin/js/updates.js': ['./src/js/_enqueues/wp/updates.js'],251 'build/wp-admin/js/user-profile.js': ['./src/js/_enqueues/admin/user-profile.js'],252 'build/wp-admin/js/user-suggest.js': ['./src/js/_enqueues/lib/user-suggest.js'],253 'build/wp-admin/js/widgets/custom-html-widgets.js': ['./src/js/_enqueues/wp/widgets/custom-html.js'],254 'build/wp-admin/js/widgets/media-audio-widget.js': ['./src/js/_enqueues/wp/widgets/media-audio.js'],255 'build/wp-admin/js/widgets/media-gallery-widget.js': ['./src/js/_enqueues/wp/widgets/media-gallery.js'],256 'build/wp-admin/js/widgets/media-image-widget.js': ['./src/js/_enqueues/wp/widgets/media-image.js'],257 'build/wp-admin/js/widgets/media-video-widget.js': ['./src/js/_enqueues/wp/widgets/media-video.js'],258 'build/wp-admin/js/widgets/media-widgets.js': ['./src/js/_enqueues/wp/widgets/media.js'],259 'build/wp-admin/js/widgets/text-widgets.js': ['./src/js/_enqueues/wp/widgets/text.js'],260 'build/wp-admin/js/widgets.js': ['./src/js/_enqueues/admin/widgets.js'],261 'build/wp-admin/js/word-count.js': ['./src/js/_enqueues/wp/utils/word-count.js'],262 'build/wp-admin/js/wp-fullscreen-stub.js': ['./src/js/_enqueues/deprecated/fullscreen-stub.js'],263 'build/wp-admin/js/xfn.js': ['./src/js/_enqueues/admin/xfn.js']215 ], 216 ], 217 ], 218 ], 219 ], 220 ], 221 ], 222 ], 223 ], 224 ], 225 ], 226 ], 227 ], 228 ], 229 ], 230 ], 231 ], 232 ], 233 ], 234 ], 235 ], 236 ], 237 ], 238 ], 239 ], 240 ], 241 ], 242 ], 243 ], 244 ], 245 ], 246 ], 247 ], 248 ], 249 ], 250 ], 251 ], 252 ], 253 ], 254 ], 255 ], 256 ], 257 ], 258 ], 259 ], 260 ], 261 ], 262 ], 263 ], 264 ] 264 265 } 265 266 }, 266 267 'includes-js': { 267 268 files: { 268 'build/wp-includes/js/admin-bar.js': ['./src/js/_enqueues/lib/admin-bar.js'],269 'build/wp-includes/js/api-request.js': ['./src/js/_enqueues/wp/api-request.js'],270 'build/wp-includes/js/autosave.js': ['./src/js/_enqueues/wp/autosave.js'],271 'build/wp-includes/js/comment-reply.js': ['./src/js/_enqueues/lib/comment-reply.js'],272 'build/wp-includes/js/customize-base.js': ['./src/js/_enqueues/wp/customize/base.js'],273 'build/wp-includes/js/customize-loader.js': ['./src/js/_enqueues/wp/customize/loader.js'],274 'build/wp-includes/js/customize-models.js': ['./src/js/_enqueues/wp/customize/models.js'],275 'build/wp-includes/js/customize-preview-nav-menus.js': ['./src/js/_enqueues/wp/customize/preview-nav-menus.js'],276 'build/wp-includes/js/customize-preview-widgets.js': ['./src/js/_enqueues/wp/customize/preview-widgets.js'],277 'build/wp-includes/js/customize-preview.js': ['./src/js/_enqueues/wp/customize/preview.js'],278 'build/wp-includes/js/customize-selective-refresh.js': ['./src/js/_enqueues/wp/customize/selective-refresh.js'],279 'build/wp-includes/js/customize-views.js': ['./src/js/_enqueues/wp/customize/views.js'],280 'build/wp-includes/js/heartbeat.js': ['./src/js/_enqueues/wp/heartbeat.js'],281 'build/wp-includes/js/mce-view.js': ['./src/js/_enqueues/wp/mce-view.js'],282 'build/wp-includes/js/media-editor.js': ['./src/js/_enqueues/wp/media/editor.js'],283 'build/wp-includes/js/quicktags.js': ['./src/js/_enqueues/lib/quicktags.js'],284 'build/wp-includes/js/shortcode.js': ['./src/js/_enqueues/wp/shortcode.js'],285 'build/wp-includes/js/utils.js': ['./src/js/_enqueues/lib/cookies.js'],286 'build/wp-includes/js/wp-a11y.js': ['./src/js/_enqueues/wp/a11y.js'],287 'build/wp-includes/js/wp-ajax-response.js': ['./src/js/_enqueues/lib/ajax-response.js'],288 'build/wp-includes/js/wp-api.js': ['./src/js/_enqueues/wp/api.js'],289 'build/wp-includes/js/wp-auth-check.js': ['./src/js/_enqueues/lib/auth-check.js'],290 'build/wp-includes/js/wp-backbone.js': ['./src/js/_enqueues/wp/backbone.js'],291 'build/wp-includes/js/wp-custom-header.js': ['./src/js/_enqueues/wp/custom-header.js'],292 'build/wp-includes/js/wp-embed-template.js': ['./src/js/_enqueues/lib/embed-template.js'],293 'build/wp-includes/js/wp-embed.js': ['./src/js/_enqueues/wp/embed.js'],294 'build/wp-includes/js/wp-emoji-loader.js': ['./src/js/_enqueues/lib/emoji-loader.js'],295 'build/wp-includes/js/wp-emoji.js': ['./src/js/_enqueues/wp/emoji.js'],296 'build/wp-includes/js/wp-list-revisions.js': ['./src/js/_enqueues/lib/list-revisions.js'],297 'build/wp-includes/js/wp-lists.js': ['./src/js/_enqueues/lib/lists.js'],298 'build/wp-includes/js/wp-pointer.js': ['./src/js/_enqueues/lib/pointer.js'],299 'build/wp-includes/js/wp-sanitize.js': ['./src/js/_enqueues/wp/sanitize.js'],300 'build/wp-includes/js/wp-util.js': ['./src/js/_enqueues/wp/util.js'],301 'build/wp-includes/js/wpdialog.js': ['./src/js/_enqueues/lib/dialog.js'],302 'build/wp-includes/js/wplink.js': ['./src/js/_enqueues/lib/link.js'],303 'build/wp-includes/js/zxcvbn-async.js': ['./src/js/_enqueues/lib/zxcvbn-async.js']269 ], 270 ], 271 ], 272 ], 273 ], 274 ], 275 ], 276 ], 277 ], 278 ], 279 ], 280 ], 281 ], 282 ], 283 ], 284 ], 285 ], 286 ], 287 ], 288 ], 289 ], 290 ], 291 ], 292 ], 293 ], 294 ], 295 ], 296 ], 297 ], 298 ], 299 ], 300 ], 301 ], 302 ], 303 ], 304 ] 304 305 } 305 306 }, … … 311 312 }, 312 313 src: SOURCE_DIR + 'wp-admin/css/wp-admin.css', 313 dest: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.css'314 dest: _DIR + 'wp-admin/css/wp-admin-rtl.css' 314 315 }, 315 316 'wp-admin-css-compat-min': { … … 322 323 { 323 324 src: SOURCE_DIR + 'wp-admin/css/wp-admin.css', 324 dest: BUILD_DIR + 'wp-admin/css/wp-admin.min.css'325 dest: _DIR + 'wp-admin/css/wp-admin.min.css' 325 326 }, 326 327 { 327 src: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.css',328 dest: BUILD_DIR + 'wp-admin/css/wp-admin-rtl.min.css'328 src: _DIR + 'wp-admin/css/wp-admin-rtl.css', 329 dest: _DIR + 'wp-admin/css/wp-admin-rtl.min.css' 329 330 } 330 331 ] … … 351 352 expand: true, 352 353 cwd: SOURCE_DIR, 353 dest: BUILD_DIR,354 dest: _DIR, 354 355 src: [] 355 356 }, … … 374 375 expand: true, 375 376 cwd: SOURCE_DIR, 376 dest: BUILD_DIR,377 dest: _DIR, 377 378 ext: '.css', 378 379 src: ['wp-admin/css/colors/*/colors.scss'], … … 389 390 core: { 390 391 expand: true, 391 cwd: BUILD_DIR,392 dest: BUILD_DIR,392 cwd: _DIR, 393 dest: _DIR, 393 394 ext: '.min.css', 394 395 src: [ … … 399 400 ] 400 401 }, 401 dist: {402 expand: true,403 cwd: BUILD_DIR,404 dest: BUILD_DIR,405 ext: '.min.css',406 src: [407 'wp-includes/css/dist/*/*.css'408 ]409 },410 402 rtl: { 411 403 expand: true, 412 cwd: BUILD_DIR,413 dest: BUILD_DIR,404 cwd: _DIR, 405 dest: _DIR, 414 406 ext: '.min.css', 415 407 src: [ … … 421 413 colors: { 422 414 expand: true, 423 cwd: BUILD_DIR,424 dest: BUILD_DIR,415 cwd: _DIR, 416 dest: _DIR, 425 417 ext: '.min.css', 426 418 src: [ … … 485 477 expand: true, 486 478 cwd: SOURCE_DIR, 487 dest: BUILD_DIR,479 dest: _DIR, 488 480 ext: '-rtl.css', 489 481 src: [ … … 499 491 colors: { 500 492 expand: true, 501 cwd: BUILD_DIR,502 dest: BUILD_DIR,493 cwd: _DIR, 494 dest: _DIR, 503 495 ext: '-rtl.css', 504 496 src: [ … … 509 501 expand: true, 510 502 cwd: SOURCE_DIR, 511 dest: BUILD_DIR,503 dest: _DIR, 512 504 ext: '-rtl.css', 513 505 src: [] … … 663 655 core: { 664 656 expand: true, 665 cwd: BUILD_DIR,666 dest: BUILD_DIR,657 cwd: _DIR, 658 dest: _DIR, 667 659 ext: '.min.js', 668 660 src: [ … … 691 683 }, 692 684 expand: true, 693 cwd: BUILD_DIR,694 dest: BUILD_DIR,685 cwd: _DIR, 686 dest: _DIR, 695 687 ext: '.min.js', 696 688 src: ['wp-includes/js/wp-embed.js'] … … 703 695 expand: true, 704 696 cwd: 'node_modules/jquery-ui/ui/', 705 dest: BUILD_DIR + 'wp-includes/js/jquery/ui/',697 dest: _DIR + 'wp-includes/js/jquery/ui/', 706 698 ext: '.min.js', 707 699 src: ['*.js'] 708 700 }, 709 701 imgareaselect: { 710 src: BUILD_DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.js',711 dest: BUILD_DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.min.js'702 src: _DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.js', 703 dest: _DIR + 'wp-includes/js/imgareaselect/jquery.imgareaselect.min.js' 712 704 }, 713 705 dynamic: { 714 706 expand: true, 715 cwd: BUILD_DIR,716 dest: BUILD_DIR,707 cwd: _DIR, 708 dest: _DIR, 717 709 ext: '.min.js', 718 710 src: [] … … 720 712 }, 721 713 webpack: { 722 prod: webpackConfig( { environment: 'production' } ), 723 devProdTarget: webpackConfig( { environment: 'development', forceBuildTarget: 'build/wp-includes' } ), 724 dev: webpackConfig( { environment: 'development' } ), 714 prod: webpackConfig( { environment: 'production', buildTarget: WORKING_DIR } ), 715 dev: webpackConfig( { environment: 'development', buildTarget: WORKING_DIR } ), 725 716 watch: webpackConfig( { environment: 'development', watch: true } ) 726 717 }, … … 730 721 separator: '\n', 731 722 process: function( src, filepath ) { 732 return '// Source: ' + filepath.replace( BUILD_DIR, '' ) + '\n' + src;723 return '// Source: ' + filepath.replace( _DIR, '' ) + '\n' + src; 733 724 } 734 725 }, 735 726 src: [ 736 BUILD_DIR + 'wp-includes/js/tinymce/tinymce.min.js',737 BUILD_DIR + 'wp-includes/js/tinymce/themes/modern/theme.min.js',738 BUILD_DIR + 'wp-includes/js/tinymce/plugins/*/plugin.min.js'727 _DIR + 'wp-includes/js/tinymce/tinymce.min.js', 728 _DIR + 'wp-includes/js/tinymce/themes/modern/theme.min.js', 729 _DIR + 'wp-includes/js/tinymce/plugins/*/plugin.min.js' 739 730 ], 740 dest: BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce.js'731 dest: _DIR + 'wp-includes/js/tinymce/wp-tinymce.js' 741 732 }, 742 733 emoji: { … … 744 735 separator: '\n', 745 736 process: function( src, filepath ) { 746 return '// Source: ' + filepath.replace( BUILD_DIR, '' ) + '\n' + src;737 return '// Source: ' + filepath.replace( _DIR, '' ) + '\n' + src; 747 738 } 748 739 }, 749 740 src: [ 750 BUILD_DIR + 'wp-includes/js/twemoji.min.js',751 BUILD_DIR + 'wp-includes/js/wp-emoji.min.js'741 _DIR + 'wp-includes/js/twemoji.min.js', 742 _DIR + 'wp-includes/js/wp-emoji.min.js' 752 743 ], 753 dest: BUILD_DIR + 'wp-includes/js/wp-emoji-release.min.js'744 dest: _DIR + 'wp-includes/js/wp-emoji-release.min.js' 754 745 } 755 746 }, … … 761 752 }, 762 753 src: '<%= concat.tinymce.dest %>', 763 dest: BUILD_DIR + 'wp-includes/js/tinymce/wp-tinymce.js.gz'754 dest: _DIR + 'wp-includes/js/tinymce/wp-tinymce.js.gz' 764 755 } 765 756 }, … … 962 953 files: { 963 954 src: [ 964 BUILD_DIR + 'wp-{admin,includes}/**/*.js',965 BUILD_DIR + 'wp-content/themes/twenty*/**/*.js',966 '!' + BUILD_DIR + 'wp-includes/js/dist/vendor/*.js'955 _DIR + 'wp-{admin,includes}/**/*.js', 956 _DIR + 'wp-content/themes/twenty*/**/*.js', 957 '!' + 967 958 ] 968 959 } … … 1345 1336 grunt.registerTask( 'build:js', [ 1346 1337 'clean:js', 1338 1347 1339 'webpack:dev', 1348 1340 'copy:js', … … 1354 1346 ] ); 1355 1347 1356 grunt.registerTask( ' copy:all', [1357 'c opy:files',1348 grunt.registerTask( '', [ 1349 'cs', 1358 1350 'copy:wp-admin-css-compat-rtl', 1359 1351 'copy:wp-admin-css-compat-min', 1360 'copy:version',1361 'copy:js'1362 ] );1363 1364 grunt.registerTask( 'build', [1365 'clean:all',1366 'copy:all',1367 'file_append',1368 1352 'cssmin:core', 1369 1353 'colors', … … 1371 1355 'cssmin:rtl', 1372 1356 'cssmin:colors', 1373 'uglify:all', 1374 'build:tinymce', 1375 'concat:emoji', 1376 'includes:emoji', 1377 'includes:embed', 1378 'usebanner', 1379 'webpack:prod', 1380 'webpack:devProdTarget', 1381 'cssmin:dist', 1382 'jsvalidate:build' 1357 'usebanner' 1383 1358 ] ); 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1384 1382 1385 1383 grunt.registerTask( 'prerelease', [ … … 1470 1468 if ( minimatch.match( config.src, relative, {} ) ) { 1471 1469 dest = config.dest + relative; 1472 src = [ path.relative( BUILD_DIR, dest ) ];1470 src = [ path.relative( _DIR, dest ) ]; 1473 1471 files[ dest ] = [ filepath ]; 1474 1472 break; … … 1486 1484 if ( dest && configs.hasOwnProperty( dest ) && configs[ dest ][0] === './' + filepath ) { 1487 1485 files[ dest ] = configs[ dest ]; 1488 src = [ path.relative( BUILD_DIR, dest ) ];1486 src = [ path.relative( _DIR, dest ) ]; 1489 1487 break; 1490 1488 } … … 1524 1522 if ( target === 'js-enqueues' ) { 1525 1523 grunt.config( [ 'uglify', 'dynamic', 'src' ], src ); 1526 grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return BUILD_DIR + dir; } ) );1524 grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return _DIR + dir; } ) ); 1527 1525 } 1528 1526 // For webpack only validate the file, minification is handled by webpack itself. 1529 1527 if ( target === 'js-webpack' ) { 1530 grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return BUILD_DIR + dir; } ) );1528 grunt.config( [ 'jsvalidate', 'dynamic', 'files', 'src' ], src.map( function( dir ) { return _DIR + dir; } ) ); 1531 1529 } 1532 1530 // For css run the rtl task on just the changed file. -
trunk/package-lock.json
r44356 r44359 2509 2509 "browserify-rsa": { 2510 2510 "version": "4.0.1", 2511 "resolved": "http s://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz",2511 "resolved": "http://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", 2512 2512 "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", 2513 2513 "dev": true, … … 2842 2842 "chalk": { 2843 2843 "version": "1.1.3", 2844 "resolved": "http s://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",2844 "resolved": "http://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", 2845 2845 "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", 2846 2846 "requires": { … … 5050 5050 "events": { 5051 5051 "version": "1.1.1", 5052 "resolved": "http s://registry.npmjs.org/events/-/events-1.1.1.tgz",5052 "resolved": "http://registry.npmjs.org/events/-/events-1.1.1.tgz", 5053 5053 "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", 5054 5054 "dev": true … … 11121 11121 "onetime": { 11122 11122 "version": "1.1.0", 11123 "resolved": "http s://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz",11123 "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", 11124 11124 "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", 11125 11125 "dev": true … … 11201 11201 "os-locale": { 11202 11202 "version": "1.4.0", 11203 "resolved": "http ://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz",11203 "resolved": "http://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", 11204 11204 "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", 11205 11205 "dev": true, … … 12998 12998 "regjsgen": { 12999 12999 "version": "0.2.0", 13000 "resolved": "http s://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz",13000 "resolved": "http://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", 13001 13001 "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=" 13002 13002 }, … … 13580 13580 "source-map": { 13581 13581 "version": "0.4.4", 13582 "resolved": "http ://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",13582 "resolved": "http://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz", 13583 13583 "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=", 13584 13584 "dev": true, -
trunk/src/index.php
r43571 r44359 2 2 3 3 /** 4 * Note: this file exists only to remind developers to run WordPress from the5 * build directory.For the real index.php that gets built and boots WordPress,4 * Note: this file exists only to remind developers to 5 * For the real index.php that gets built and boots WordPress, 6 6 * please refer to _index.php. 7 7 */ … … 10 10 if ( ! defined( 'ABSPATH' ) ) { 11 11 define( 'ABSPATH', dirname( __FILE__ ) . '/' ); 12 13 14 15 16 12 17 } 13 18 … … 27 32 // Die with an error message 28 33 $die = sprintf( 29 /* translators: %1$s: WordPress, %2$s: src, %3$s: build */ 30 __( 'You seem to be running %1$s from the %2$s directory. %1$s needs to be built and run from the %3$s directory before we can get started.' ), 31 'WordPress', 32 '<code>src</code>', 33 '<code>build</code>' 34 ) . '</p>'; 35 $die .= '<p>' . sprintf( 36 /* translators: %s: WordPress */ 37 __( 'You can build %s by running:' ), 34 /* translators: %1$s: WordPress */ 35 __( 'You are running %1$s without JavaScript and CSS files. These need to be built.' ), 38 36 'WordPress' 39 37 ) . '</p>'; 40 $die .= '<p><code>npm install && grunt build</code></p>'; 38 39 $die .= '<p>' . __( 'Before running any grunt tasks you need to make sure the dependencies are installed. You can install these by running '); 40 $die .= '<code style="color: green;">npm install</code>.</p>'; 41 42 $die .= '<ul>'; 43 $die .= '<li>' . sprintf( 44 /* translators: %s: WordPress */ 45 __( 'To build %s while developing run:' ), 46 'WordPress' 47 ) . '<br /><br />'; 48 $die .= '<code style="color: green;">grunt build --dev</code></li>'; 49 $die .= '<li>' . sprintf( 50 __( 'To build files automatically when changing the source files run:' ), 51 'WordPress' 52 ) . '<br /><br />'; 53 $die .= '<code style="color: green;">grunt watch</code></li>'; 54 $die .= '<li>' . sprintf( 55 __( 'To create a production build of %s run:' ), 56 'WordPress' 57 ) . '<br /><br />'; 58 $die .= '<code style="color: green;">grunt build</code></li>'; 59 $die .= '</ul>'; 60 61 41 62 $die .= '<p>' . sprintf( 42 63 /* translators: %1$s: NPM URL, %2$s: Grunt URL */ -
trunk/src/wp-admin
-
Property
svn:ignore
set to
js
-
Property
svn:ignore
set to
-
trunk/src/wp-admin/css
-
Property
svn:ignore
set to
*.min.css
*-rtl.css
-
Property
svn:ignore
set to
-
trunk/src/wp-admin/css/colors/blue
-
Property
svn:ignore
set to
*.css
-
Property
svn:ignore
set to
-
trunk/src/wp-admin/css/colors/coffee
-
Property
svn:ignore
set to
*.css
-
Property
svn:ignore
set to
-
trunk/src/wp-admin/css/colors/ectoplasm
-
Property
svn:ignore
set to
*.css
-
Property
svn:ignore
set to
-
trunk/src/wp-admin/css/colors/light
-
Property
svn:ignore
set to
*.css
-
Property
svn:ignore
set to
-
trunk/src/wp-admin/css/colors/midnight
-
Property
svn:ignore
set to
*.css
-
Property
svn:ignore
set to
-
trunk/src/wp-admin/css/colors/ocean
-
Property
svn:ignore
set to
*.css
-
Property
svn:ignore
set to
-
trunk/src/wp-admin/css/colors/sunrise
-
Property
svn:ignore
set to
*.css
-
Property
svn:ignore
set to
-
trunk/src/wp-admin/index.php
r43571 r44359 2 2 3 3 /** 4 * Note: this file exists only to remind developers to run WordPress from the5 * build directory. For the real wp-admin/index.php that gets built and boots6 * the WordPress admin,please refer to wp-admin/_index.php.4 * Note: this file exists only to remind developers to 5 * 6 * please refer to wp-admin/_index.php. 7 7 */ 8 9 10 11 12 8 13 9 14 /** Define ABSPATH as this file's directory */ … … 27 32 // Die with an error message 28 33 $die = sprintf( 29 /* translators: %1$s: WordPress, %2$s: src, %3$s: build */ 30 __( 'You seem to be running %1$s from the %2$s directory. %1$s needs to be built and run from the %3$s directory before we can get started.' ), 31 'WordPress', 32 '<code>src</code>', 33 '<code>build</code>' 34 ) . '</p>'; 35 $die .= '<p>' . sprintf( 36 /* translators: %s: WordPress */ 37 __( 'You can build %s by running:' ), 34 /* translators: %1$s: WordPress */ 35 __( 'You are running %1$s without JavaScript and CSS files. These need to be built.' ), 38 36 'WordPress' 39 37 ) . '</p>'; 40 $die .= '<p><code>npm install && grunt build</code></p>'; 38 39 $die .= '<p>' . __( 'Before running any grunt tasks you need to make sure the dependencies are installed. You can install these by running '); 40 $die .= '<code style="color: green;">npm install</code>.</p>'; 41 42 $die .= '<ul>'; 43 $die .= '<li>' . sprintf( 44 /* translators: %s: WordPress */ 45 __( 'To build %s while developing run:' ), 46 'WordPress' 47 ) . '<br /><br />'; 48 $die .= '<code style="color: green;">grunt build --dev</code></li>'; 49 $die .= '<li>' . sprintf( 50 __( 'To build files automatically when changing the source files run:' ), 51 'WordPress' 52 ) . '<br /><br />'; 53 $die .= '<code style="color: green;">grunt watch</code></li>'; 54 $die .= '<li>' . sprintf( 55 __( 'To create a production build of %s run:' ), 56 'WordPress' 57 ) . '<br /><br />'; 58 $die .= '<code style="color: green;">grunt build</code></li>'; 59 $die .= '</ul>'; 60 61 41 62 $die .= '<p>' . sprintf( 42 63 /* translators: %1$s: NPM URL, %2$s: Grunt URL */ 43 __( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ),44 'https://www.npmjs.com/',45 'https://gruntjs.com/',46 __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' )47 ) . '</p>';64 __( 'This requires <a href="%1$s">NPM</a> and <a href="%2$s">Grunt</a>. <a href="%3$s">Read more about setting up your local development environment</a>.' ), 65 'https://www.npmjs.com/', 66 'https://gruntjs.com/', 67 __( 'https://make.wordpress.org/core/handbook/tutorials/installing-wordpress-locally/' ) 68 ) . '</p>'; 48 69 49 70 wp_die( $die, __( 'WordPress › Error' ) ); -
trunk/src/wp-includes/class-wp-block-parser.php
r44281 r44359 64 64 65 65 function __construct( $name, $attrs, $innerBlocks, $innerHTML, $innerContent ) { 66 $this->blockName 67 $this->attrs 68 $this->innerBlocks 69 $this->innerHTML 66 $this->blockName = $name; 67 $this->attrs = $attrs; 68 $this->innerBlocks = $innerBlocks; 69 $this->innerHTML = $innerHTML; 70 70 $this->innerContent = $innerContent; 71 71 } … … 270 270 if ( 0 === $stack_depth ) { 271 271 if ( isset( $leading_html_start ) ) { 272 $this->output[] = (array) self::freeform( 273 substr( 274 $this->document, 275 $leading_html_start, 276 $start_offset - $leading_html_start 277 ) 278 ); 272 $this->output[] = (array) self::freeform( substr( 273 $this->document, 274 $leading_html_start, 275 $start_offset - $leading_html_start 276 ) ); 279 277 } 280 278 281 279 $this->output[] = (array) new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ); 282 $this->offset 280 $this->offset = $start_offset + $token_length; 283 281 return true; 284 282 } … … 295 293 case 'block-opener': 296 294 // track all newly-opened blocks on the stack 297 array_push( 298 $this->stack, 299 new WP_Block_Parser_Frame( 300 new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ), 301 $start_offset, 302 $token_length, 303 $start_offset + $token_length, 304 $leading_html_start 305 ) 306 ); 295 array_push( $this->stack, new WP_Block_Parser_Frame( 296 new WP_Block_Parser_Block( $block_name, $attrs, array(), '', array() ), 297 $start_offset, 298 $token_length, 299 $start_offset + $token_length, 300 $leading_html_start 301 ) ); 307 302 $this->offset = $start_offset + $token_length; 308 303 return true; … … 335 330 * block and add it as a new innerBlock to the parent 336 331 */ 337 $stack_top 338 $html 339 $stack_top->block->innerHTML 332 $stack_top = array_pop( $this->stack ); 333 $html = substr( $this->document, $stack_top->prev_offset, $start_offset - $stack_top->prev_offset ); 334 $stack_top->block->innerHTML .= $html; 340 335 $stack_top->block->innerContent[] = $html; 341 $stack_top->prev_offset 336 $stack_top->prev_offset = $start_offset + $token_length; 342 337 343 338 $this->add_inner_block( … … 397 392 } 398 393 399 list( $match, $started_at ) = $matches[ 0];394 list( $match, $started_at ) = $matches[]; 400 395 401 396 $length = strlen( $match ); 402 $is_closer = isset( $matches[ 'closer'] ) && -1 !== $matches['closer'][1];403 $is_void = isset( $matches[ 'void'] ) && -1 !== $matches['void'][1];404 $namespace = $matches[ 'namespace'];405 $namespace = ( isset( $namespace ) && -1 !== $namespace[ 1] ) ? $namespace[0] : 'core/';406 $name = $namespace . $matches[ 'name'][0];407 $has_attrs = isset( $matches[ 'attrs'] ) && -1 !== $matches['attrs'][1];397 $is_closer = isset( $matches[]; 398 $is_void = isset( $matches[]; 399 $namespace = $matches[]; 400 $namespace = ( isset( $namespace ) && -1 !== $namespace[] : 'core/'; 401 $name = $namespace . $matches[]; 402 $has_attrs = isset( $matches[]; 408 403 409 404 /* … … 412 407 */ 413 408 $attrs = $has_attrs 414 ? json_decode( $matches[ 'attrs'][0], /* as-associative */ true )409 ? json_decode( $matches[], /* as-associative */ true ) 415 410 : $this->empty_attrs; 416 411 … … 477 472 */ 478 473 function add_inner_block( WP_Block_Parser_Block $block, $token_start, $token_length, $last_offset = null ) { 479 $parent 474 $parent = $this->stack[ count( $this->stack ) - 1 ]; 480 475 $parent->block->innerBlocks[] = (array) $block; 481 $html 476 $html = substr( $this->document, $parent->prev_offset, $token_start - $parent->prev_offset ); 482 477 483 478 if ( ! empty( $html ) ) { 484 $parent->block->innerHTML 479 $parent->block->innerHTML .= $html; 485 480 $parent->block->innerContent[] = $html; 486 481 } 487 482 488 483 $parent->block->innerContent[] = null; 489 $parent->prev_offset 484 $parent->prev_offset = $last_offset ? $last_offset : $token_start + $token_length; 490 485 } 491 486 … … 506 501 507 502 if ( ! empty( $html ) ) { 508 $stack_top->block->innerHTML 503 $stack_top->block->innerHTML .= $html; 509 504 $stack_top->block->innerContent[] = $html; 510 505 } 511 506 512 507 if ( isset( $stack_top->leading_html_start ) ) { 513 $this->output[] = (array) self::freeform( 514 substr( 515 $this->document, 516 $stack_top->leading_html_start, 517 $stack_top->token_start - $stack_top->leading_html_start 518 ) 519 ); 508 $this->output[] = (array) self::freeform( substr( 509 $this->document, 510 $stack_top->leading_html_start, 511 $stack_top->token_start - $stack_top->leading_html_start 512 ) ); 520 513 } 521 514 -
trunk/src/wp-includes/css
- Property svn:ignore
-
old new 1 1 dist 2 2 3
-
- Property svn:ignore
-
trunk/tools/webpack/media.js
r44115 r44359 2 2 3 3 var path = require( 'path' ), 4 admin_files = {}, 5 include_files = {}; 6 7 include_files = { 8 'build/wp-includes/js/media-audiovideo.js': ['./src/js/_enqueues/wp/media/audiovideo.js'], 9 'build/wp-includes/js/media-audiovideo.min.js': ['./src/js/_enqueues/wp/media/audiovideo.js'], 10 'build/wp-includes/js/media-grid.js': ['./src/js/_enqueues/wp/media/grid.js'], 11 'build/wp-includes/js/media-grid.min.js': ['./src/js/_enqueues/wp/media/grid.js'], 12 'build/wp-includes/js/media-models.js': ['./src/js/_enqueues/wp/media/models.js'], 13 'build/wp-includes/js/media-models.min.js': ['./src/js/_enqueues/wp/media/models.js'], 14 'build/wp-includes/js/media-views.js': ['./src/js/_enqueues/wp/media/views.js'], 15 'build/wp-includes/js/media-views.min.js': ['./src/js/_enqueues/wp/media/views.js'], 16 }; 4 admin_files = {}; 17 5 18 6 const baseDir = path.join( __dirname, '../../' ); 19 7 20 module.exports = function( env = { environment: 'production', watch: false } ) { 8 module.exports = function( env = { environment: 'production', watch: false, buildTarget: false } ) { 9 const include_files = { 10 [ env.buildTarget + 'wp-includes/js/media-audiovideo.js' ]: ['./src/js/_enqueues/wp/media/audiovideo.js'], 11 [ env.buildTarget + 'wp-includes/js/media-audiovideo.min.js' ]: ['./src/js/_enqueues/wp/media/audiovideo.js'], 12 [ env.buildTarget + 'wp-includes/js/media-grid.js' ]: ['./src/js/_enqueues/wp/media/grid.js'], 13 [ env.buildTarget + 'wp-includes/js/media-grid.min.js' ]: ['./src/js/_enqueues/wp/media/grid.js'], 14 [ env.buildTarget + 'wp-includes/js/media-models.js' ]: ['./src/js/_enqueues/wp/media/models.js'], 15 [ env.buildTarget + 'wp-includes/js/media-models.min.js' ]: ['./src/js/_enqueues/wp/media/models.js'], 16 [ env.buildTarget + 'wp-includes/js/media-views.js' ]: ['./src/js/_enqueues/wp/media/views.js'], 17 [ env.buildTarget + 'wp-includes/js/media-views.min.js' ]: ['./src/js/_enqueues/wp/media/views.js'], 18 }; 21 19 22 20 const mediaConfig = { -
trunk/tools/webpack/packages.js
r44283 r44359 50 50 } 51 51 52 module.exports = function( env = { environment: 'production', watch: false, forceBuildTarget: false } ) {52 module.exports = function( env = { environment: 'production', watch: false, uildTarget: false } ) { 53 53 const mode = env.environment; 54 54 const suffix = mode === 'production' ? '.min' : ''; 55 const buildTarget = env.forceBuildTarget ? env.forceBuildTarget : ( mode === 'production' ? 'build' : 'src' ) + '/wp-includes'; 55 let buildTarget = env.buildTarget ? env.buildTarget : ( mode === 'production' ? 'build' : 'src' ); 56 buildTarget = buildTarget + '/wp-includes'; 56 57 57 58 const packages = [ … … 166 167 flatten: true, 167 168 transform: ( content ) => { 168 if ( config.mode === 'production' && ! env.forceBuildTarget) {169 if ( ) { 169 170 return postcss( [ 170 171 require( 'cssnano' )( { … … 177 178 178 179 return content; 180 181 182 183 184 185 186 179 187 } 180 188 } ) ); … … 269 277 } 270 278 271 if ( env.forceBuildTarget) {279 if ( ) { 272 280 delete config.devtool; 273 281 config.mode = 'production'; -
trunk/webpack.config.js
r44245 r44359 2 2 const packagesConfig = require( './tools/webpack/packages' ); 3 3 4 module.exports = function( env = { environment: "production", watch: false, forceBuildTarget: false } ) {4 module.exports = function( env = { environment: "production", watch: false, uildTarget: false } ) { 5 5 if ( ! env.watch ) { 6 6 env.watch = false; 7 7 } 8 8 9 if ( ! env. forceBuildTarget ) {10 env. forceBuildTarget = false;9 if ( ! env.uildTarget ) { 10 env.; 11 11 } 12 12
Note: See TracChangeset
for help on using the changeset viewer.