@cocreate/webpack 1.8.0 → 1.11.0

package/CONTRIBUTING.md

@@ -13,7 +13,7 @@ Fork the [project on Github](https://github.com/CoCreate-app/CoCreate-webpack) a
 ```
 git clone https://github.com/contributor/CoCreate-webpack.git
 cd CoCreate-webpack
-git remote add upstream https://github.com/CoCreate-app/CoCreate-webpack.git
+git remote add upstream https://gitlab.com/cocreatejs/CoCreate-webpack.git
 ```
 
 ## Create a Topic Branch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocreate/webpack",
-  "version": "1.8.0",
+  "version": "1.11.0",
   "description": "A Webpack integration tool for CoCreate applications, enabling file watching, automated chunking, lazy loading, and file uploading. It leverages CoCreate.config for streamlined project builds and development workflows.",
   "keywords": [
     "webpack",
@@ -27,7 +27,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/CoCreate-app/CoCreate-webpack.git"
+    "url": "git+https://gitlab.com/cocreatejs/CoCreate-webpack.git"
   },
   "author": "CoCreate LLC",
   "license": "MIT",
@@ -41,7 +41,7 @@
   },
   "main": "./src/index.js",
   "dependencies": {
-    "@cocreate/cli": "^1.60.0",
+    "@cocreate/cli": "^1.64.0",
     "css-loader": "^7.1.4",
     "esbuild": "^0.25.12",
     "esbuild-loader": "^4.5.0",

package/src/index.js

@@ -75,7 +75,17 @@ class ModuleGenerator {
 
                 let entryContent = `import { dependency, lazyLoad } from '@cocreate/lazy-loader';\n\n`;
 
-                const pluginsObj = CoCreateConfig.plugins || {};
+                const pluginsObj = Object.fromEntries(
+                    Object.entries(CoCreateConfig.plugins || {})
+                        .filter(([, pluginInfo]) =>
+                            pluginInfo && typeof pluginInfo === "object" &&
+                            (pluginInfo.js !== undefined || pluginInfo.css !== undefined)
+                        )
+                        .map(([pluginName, pluginInfo]) => [pluginName, {
+                            ...(pluginInfo.js !== undefined ? { js: pluginInfo.js } : {}),
+                            ...(pluginInfo.css !== undefined ? { css: pluginInfo.css } : {})
+                        }])
+                );
                 entryContent += `if (typeof window !== 'undefined') {\n`;
                 entryContent += `    window.CoCreateConfig = window.CoCreateConfig || {};\n`;
                 entryContent += `    window.CoCreateConfig.plugins = Object.assign(\n`;
@@ -85,19 +95,24 @@ class ModuleGenerator {
                 entryContent += `    );\n`;
                 entryContent += `}\n\n`;
 
-                const modulesObj = CoCreateConfig.modules || {};
-                Object.entries(modulesObj).forEach(([moduleName, moduleInfo]) => {
-                    if (typeof moduleInfo !== "object" || moduleInfo === null) return;
-                    if (!moduleInfo.import) return;
-
-                    if (moduleInfo.selector) {
-                        const sanitizedSelector = moduleInfo.selector.replaceAll("'", '"');
-                        entryContent += `lazyLoad('${moduleName}', '${sanitizedSelector}', () => import(/*webpackChunkName: "${moduleName}-chunk"*/ '${moduleInfo.import}'));\n`;
-                    } else {
-                        entryContent += `dependency('${moduleName}', import(/*webpackChunkName: "${moduleName}-chunk"*/ '${moduleInfo.import}'));\n`;
-                    }
-                });
-
+                const appendImports = (entries) => {
+                    Object.entries(entries || {}).forEach(([name, info]) => {
+                        if (typeof info !== "object" || info === null || !info.import) return;
+
+                        const importPath = JSON.stringify(info.import);
+                        const chunkName = name.replace(/[^A-Za-z0-9_-]/g, "-");
+                        const importExpression = `import(/* webpackChunkName: "${chunkName}" */ ${importPath})`;
+                        if (info.selector) {
+                            entryContent += `lazyLoad(${JSON.stringify(name)}, ${JSON.stringify(info.selector)}, () => ${importExpression});\n`;
+                        } else {
+                            entryContent += `dependency(${JSON.stringify(name)}, ${importExpression});\n`;
+                        }
+                    });
+                };
+
+                appendImports(CoCreateConfig.plugins);
+                appendImports(CoCreateConfig.modules);
+
                 fs.writeFile(entryOutputPath, entryContent, "utf8", (err) => {
                     if (err) {
                         console.error(`[@cocreate/webpack] Error writing ${entryOutputPath}:`, err);
@@ -166,4 +181,4 @@ module.exports = {
     FileUploader, 
     SymlinkCreator, 
     UnicodeLoader: path.resolve(__dirname, 'replace-unicode.js') 
-};
+};