Make webpack pickup the transpiled code

Yoast · Apr 7, 2022 · 7145cd9 · 7145cd9
1 parent db17bdc
commit 7145cd9
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 32 deletions.
diff --git a/config/grunt/task-config/aliases.yaml b/config/grunt/task-config/aliases.yaml
@@ -27,6 +27,7 @@
 'build:js':
   - 'clean:build-assets-js'
   - 'copy:js-dependencies'
+  - 'shell:build-packages'
   - 'shell:webpack'
 
 # Build CSS for development
@@ -110,6 +111,7 @@ release:
   - 'shell:install-schema-blocks'
 'release:js':
   - 'copy:js-dependencies'
+  - 'shell:build-packages'
   - 'shell:webpack-prod'
 
 # Build CSS for production

diff --git a/config/grunt/task-config/shell.js b/config/grunt/task-config/shell.js
@@ -79,12 +79,17 @@ module.exports = function( grunt ) {
 				callback: throwUncommittedChangesError,
 			},
 		},
+
 		"readme-reset-txt": {
 			command: "git checkout readme.txt",
 			options: {
 				failOnError: false,
 			},
 		},
+
+		"build-packages": {
+			command: "cd packages/js && yarn build",
+		},
 	};
 	/* eslint-enable require-jsdoc */
 };
diff --git a/config/webpack/paths.js b/config/webpack/paths.js
@@ -6,38 +6,38 @@ const cssDistPath = path.resolve( "css", "dist" );
 
 // Output filename: Entry file (relative to jsSrcPath)
 const entry = {
-	"addon-installation": "./packages/js/src/addon-installation.js",
-	"admin-global": "./packages/js/src/admin-global.js",
-	"admin-modules": "./packages/js/src/admin-modules.js",
-	"analysis-worker": "./packages/js/src/analysis-worker.js",
-	"api-client": "./packages/js/src/api-client.js",
-	"block-editor": "./packages/js/src/block-editor.js",
-	"bulk-editor": "./packages/js/src/bulk-editor.js",
-	"schema-blocks": "./packages/js/src/schema-blocks.js",
-	"classic-editor": "./packages/js/src/classic-editor.js",
-	"dashboard-widget": "./packages/js/src/dashboard-widget.js",
-	"dynamic-blocks": "./packages/js/src/dynamic-blocks.js",
-	"edit-page": "./packages/js/src/edit-page.js",
-	"editor-modules": "./packages/js/src/editor-modules.js",
-	elementor: "./packages/js/src/elementor.js",
-	"externals-components": "./packages/js/src/externals/components.js",
-	"externals-contexts": "./packages/js/src/externals/contexts.js",
-	"externals-redux": "./packages/js/src/externals/redux.js",
-	"filter-explanation": "./packages/js/src/filter-explanation.js",
-	"help-scout-beacon": "./packages/js/src/help-scout-beacon.js",
-	"import": "./packages/js/src/import.js",
-	indexation: "./packages/js/src/indexation.js",
-	"installation-success": "./packages/js/src/installation-success.js",
-	"network-admin": "./packages/js/src/network-admin.js",
-	"post-edit": "./packages/js/src/post-edit.js",
-	"quick-edit-handler": "./packages/js/src/quick-edit-handler.js",
-	"reindex-links": "./packages/js/src/reindex-links.js",
-	settings: "./packages/js/src/settings.js",
-	"structured-data-blocks": "./packages/js/src/structured-data-blocks.js",
-	"term-edit": "./packages/js/src/term-edit.js",
-	"used-keywords-assessment": "./packages/js/src/used-keywords-assessment.js",
-	"react-select": "./packages/js/src/externals/react-select.js",
-	workouts: "./packages/js/src/workouts.js",
+	"addon-installation": "./packages/js/build/addon-installation.js",
+	"admin-global": "./packages/js/build/admin-global.js",
+	"admin-modules": "./packages/js/build/admin-modules.js",
+	"analysis-worker": "./packages/js/build/analysis-worker.js",
+	"api-client": "./packages/js/build/api-client.js",
+	"block-editor": "./packages/js/build/block-editor.js",
+	"bulk-editor": "./packages/js/build/bulk-editor.js",
+	"schema-blocks": "./packages/js/build/schema-blocks.js",
+	"classic-editor": "./packages/js/build/classic-editor.js",
+	"dashboard-widget": "./packages/js/build/dashboard-widget.js",
+	"dynamic-blocks": "./packages/js/build/dynamic-blocks.js",
+	"edit-page": "./packages/js/build/edit-page.js",
+	"editor-modules": "./packages/js/build/editor-modules.js",
+	elementor: "./packages/js/build/elementor.js",
+	"externals-components": "./packages/js/build/externals/components.js",
+	"externals-contexts": "./packages/js/build/externals/contexts.js",
+	"externals-redux": "./packages/js/build/externals/redux.js",
+	"filter-explanation": "./packages/js/build/filter-explanation.js",
+	"help-scout-beacon": "./packages/js/build/help-scout-beacon.js",
+	"import": "./packages/js/build/import.js",
+	indexation: "./packages/js/build/indexation.js",
+	"installation-success": "./packages/js/build/installation-success.js",
+	"network-admin": "./packages/js/build/network-admin.js",
+	"post-edit": "./packages/js/build/post-edit.js",
+	"quick-edit-handler": "./packages/js/build/quick-edit-handler.js",
+	"reindex-links": "./packages/js/build/reindex-links.js",
+	settings: "./packages/js/build/settings.js",
+	"structured-data-blocks": "./packages/js/build/structured-data-blocks.js",
+	"term-edit": "./packages/js/build/term-edit.js",
+	"used-keywords-assessment": "./packages/js/build/used-keywords-assessment.js",
+	"react-select": "./packages/js/build/externals/react-select.js",
+	workouts: "./packages/js/build/workouts.js",
 };
 
 /**