@cley_faye/boilerplate 4.1.0 → 4.2.0

package/README.md

@@ -148,6 +148,7 @@ The webpack options support a host of properties:
 - options: passed as-is to grunt-webpack
 - entry: list of entrypoints. Defaults to using a single entrypoint named
   `webres/<targetname>/js/loader.js`.
+- worker: list of worker entrypoints.
 - externals: record describing external dependencies (dependencies that will not be bundled in the
   bundle).
   Key are the "require" name, value is the  variable that will have to exist at runtime.

package/lib/grunt/reactapp/webpack.d.ts

@@ -21,6 +21,7 @@ export interface WebpackOptions extends BaseOptions {
     mode?: "development" | "production" | "none";
     options?: Record<string, unknown>;
     entry?: Record<string, string>;
+    worker?: Record<string, string>;
     externals?: Record<string, string>;
     output?: {
         path?: string;

package/lib/grunt/reactapp/webpack.js

@@ -134,18 +134,24 @@ const webpackLoadersDefault = (options) => {
 exports.webpackLoadersDefault = webpackLoadersDefault;
 const computeWebpackOutput = (webpackOptions, targetName) => webpackOptions.output ?? {
     chunkFilename: "[name]-[fullhash].js",
-    chunkFormat: "module",
     filename: "[name].js",
-    module: true,
     path: (0, path_1.resolve)("dist", targetName, "js"),
 };
 const lastNamePosition = 2;
 const getHandledFiles = (webpackEntry) => Object.keys(webpackEntry).reduce((acc, cur) => {
-    if (webpackEntry[cur].startsWith("webres")) {
-        const split = webpackEntry[cur].split("/");
+    const value = webpackEntry[cur];
+    const importName = typeof value === "string" ? value : value.import;
+    if (importName.startsWith("webres")) {
+        const split = importName.split("/");
         acc.push(split.slice(lastNamePosition).join("/"));
     }
-    webpackEntry[cur] = (0, path_1.resolve)(webpackEntry[cur]);
+    const goodPath = (0, path_1.resolve)(importName);
+    if (typeof webpackEntry[cur] === "string") {
+        webpackEntry[cur] = goodPath;
+    }
+    else {
+        webpackEntry[cur].import = goodPath;
+    }
     return acc;
 }, []);
 const getOutputToWatch = (webpackOptions, targetName) => {
@@ -194,6 +200,24 @@ const getWebpackPlugins = (webpackOptions) => {
     }
     return plugins;
 };
+const getWebpackEntry = (targetName, entries, workers) => {
+    if (!entries && !workers)
+        return { [targetName]: (0, path_1.join)("webres", targetName, "js", "loader.js") };
+    const res = {};
+    if (entries) {
+        for (const [key, value] of Object.entries(entries))
+            res[key] = value;
+    }
+    if (workers) {
+        for (const [key, value] of Object.entries(workers)) {
+            res[key] = {
+                import: value,
+                chunkLoading: "import-scripts",
+            };
+        }
+    }
+    return res;
+};
 /** Add a webpack task for the reactApp recipe
  *
  * @param gruntConfig - Grunt configuration to add the task to
@@ -207,9 +231,7 @@ const getWebpackPlugins = (webpackOptions) => {
  * This function add "webpack:<targetName>".
  */
 const handle = (gruntConfig, targetName, webpackOptions) => {
-    const webpackEntry = webpackOptions.entry ?? {
-        [targetName]: (0, path_1.join)("webres", targetName, "js", "loader.js"),
-    };
+    const webpackEntry = getWebpackEntry(targetName, webpackOptions.entry, webpackOptions.worker);
     const handledFiles = getHandledFiles(webpackEntry);
     const webpackOutput = computeWebpackOutput(webpackOptions, targetName);
     const webpackLoaders = webpackOptions.loaders ??
@@ -223,18 +245,10 @@ const handle = (gruntConfig, targetName, webpackOptions) => {
     const webpackConfig = {
         devtool: webpackOptions.mode === "development" ? "eval-source-map" : false,
         entry: webpackEntry,
-        experiments: {
-            outputModule: true,
-        },
         externals: webpackOptions.externals,
         mode: webpackOptions.mode,
         module: {
             rules: webpackLoaders,
-            parser: {
-                javascript: {
-                    importMeta: false,
-                },
-            },
         },
         output: webpackOutput,
         plugins: getWebpackPlugins(webpackOptions),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cley_faye/boilerplate",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "Boilerplate code generator for generic projects",
   "repository": {
     "type": "git",