feature allow defining module scripts through project config decouple…

…d from blocks

packages/toolkit/config/webpack.config.js

@@ -6,6 +6,7 @@ const {
 	getTenUpScriptsConfig,
 	getTenUpScriptsPackageBuildConfig,
 } = require('../utils');
+const { getModuleBuildFiles } = require('../utils/config');
 
 const {
 	getEntryPoints,
@@ -25,6 +26,7 @@ const projectConfig = getTenUpScriptsConfig();
 const packageConfig = getTenUpScriptsPackageBuildConfig();
 const { source, main } = packageConfig;
 const buildFiles = getBuildFiles();
+const moduleBuildFiles = getModuleBuildFiles();
 
 // assume it's a package if there's source and main
 const isPackage = typeof source !== 'undefined' && typeof main !== 'undefined';
@@ -44,6 +46,7 @@ const config = {
 	projectConfig,
 	packageConfig,
 	buildFiles,
+	moduleBuildFiles,
 	isPackage,
 	mode,
 	isProduction,
@@ -95,7 +98,12 @@ const moduleConfig = {
 			...baseConfig.output.library,
 			type: 'module',
 		},
-		filename: 'blocks/[name].js',
+		filename: (pathData) => {
+			const isBlockAsset =
+				moduleBuildFiles[pathData.chunk.name].match(/\/blocks?\//) ||
+				moduleBuildFiles[pathData.chunk.name].match(/\\blocks?\\/);
+			return isBlockAsset ? projectConfig.filenames.block : projectConfig.filenames.js;
+		},
 	},
 };
 

packages/toolkit/config/webpack/entry.js

@@ -12,6 +12,7 @@ module.exports = ({
 	projectConfig: { devServer, paths, useBlockAssets, filenames },
 	packageConfig: { packageType, source, main, umd, libraryName },
 	buildFiles,
+	moduleBuildFiles,
 }) => {
 	let additionalEntrypoints = {};
 	if (useBlockAssets) {
@@ -105,7 +106,8 @@ module.exports = ({
 	}
 
 	if (buildType === 'module') {
-		return additionalEntrypoints;
+		Object.assign(moduleBuildFiles, additionalEntrypoints);
+		return moduleBuildFiles;
 	}
 
 	// merge the new entrypoints with the existing ones

packages/toolkit/utils/config.js

@@ -124,6 +124,7 @@ const getDefaultConfig = () => {
 
 	return {
 		entry: require(buildFilesPath),
+		moduleEntry: {},
 		filenames: require(filenamesPath),
 		paths: require(pathsPath),
 		wordpress: wpMode !== 'false',
@@ -295,6 +296,22 @@ const getBuildFiles = () => {
 	return entries;
 };
 
+const getModuleBuildFiles = () => {
+	const { moduleEntry } = getTenUpScriptsConfig();
+
+	const entries = {};
+
+	Object.keys(moduleEntry).forEach((key) => {
+		const filePath = path.resolve(process.cwd(), moduleEntry[key]);
+
+		if (fileExists(filePath)) {
+			entries[key] = filePath;
+		}
+	});
+
+	return entries;
+};
+
 module.exports = {
 	hasBabelConfig,
 	getJestOverrideConfigFile,
@@ -303,6 +320,7 @@ module.exports = {
 	hasPostCSSConfig,
 	hasStylelintConfig,
 	getBuildFiles,
+	getModuleBuildFiles,
 	hasEslintignoreConfig,
 	hasEslintConfig,
 	getTenUpScriptsConfig,

projects/10up-theme/assets/js/frontend/frontend-module.js

@@ -0,0 +1,12 @@
+import { store } from '@wordpress/interactivity';
+
+const { state } = store('frontend', {
+	state: {
+		isExpanded: false,
+	},
+	actions: {
+		toggleExpanded() {
+			state.isExpanded = !state.isExpanded;
+		},
+	},
+});

projects/10up-theme/package.json

@@ -46,6 +46,9 @@
       "styleguide-style": "./assets/css/styleguide/styleguide.css",
       "core-block-overrides": "./includes/core-block-overrides.js",
       "test-style": "./assets/css/frontend/testing.scss"
-    }
+    },
+	"moduleEntry": {
+		"frontend-module": "./assets/js/frontend/frontend-module.js"
+	}
   }
 }