@genesislcap/webpack-builder 14.62.1 → 14.62.2-alpha-39ca39f.0

package/dist/config/federation.js

@@ -51,7 +51,7 @@ const getFederationPlugins = (federatedIndexPresent, rootElement, options, pkg)
     ? [
         new html_webpack_plugin_1.default({
             title: `${pkg.description} (Federated)`,
-            template: (0, node_path_1.resolve)(__dirname, '../../public/info.ejs'),
+            template: (0, node_path_1.resolve)(__dirname, '../../public/info.html'),
             filename: rootElement ? 'info.html' : 'index.html',
             inject: false,
             // Passing arbitrary data to the template for display

package/dist/config/plugins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugins.d.ts","sourceRoot":"","sources":["../../src/config/plugins.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAK3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAgB7C,eAAO,MAAM,OAAO,QAAS,YAAY,KAAG,aAAa,CAAC,SAAS,CAgElE,CAAC"}
+{"version":3,"file":"plugins.d.ts","sourceRoot":"","sources":["../../src/config/plugins.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAK3D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAqB7C,eAAO,MAAM,OAAO,QAAS,YAAY,KAAG,aAAa,CAAC,SAAS,CAwElE,CAAC"}

package/dist/config/plugins.js

@@ -15,25 +15,38 @@ const webpackbar_1 = tslib_1.__importDefault(require("webpackbar"));
 const workbox_webpack_plugin_1 = require("workbox-webpack-plugin");
 const federation_1 = require("./federation");
 const getTemplate = (cwd) => {
-    const templateApp = (0, node_path_1.resolve)(cwd, 'public/index.ejs');
-    const templateDefault = (0, node_path_1.resolve)(__dirname, '../public/index.ejs');
-    const template = (0, node_fs_1.existsSync)(templateApp) ? templateApp : templateDefault;
-    console.log(`Using index template: ${template}`);
-    return template;
+    let selectedTemplate = (0, node_path_1.resolve)(__dirname, '../public/index.html');
+    const templateApp = (0, node_path_1.resolve)(cwd, 'index.html');
+    const templateAppPublic = (0, node_path_1.resolve)(cwd, 'public/index.ejs');
+    if ((0, node_fs_1.existsSync)(templateApp)) {
+        selectedTemplate = templateApp;
+    }
+    else if ((0, node_fs_1.existsSync)(templateAppPublic)) {
+        selectedTemplate = templateAppPublic;
+    }
+    console.log(`Using index template: ${selectedTemplate}`);
+    return `!!handlebars-loader!${selectedTemplate}`;
 };
 const plugins = (ctx) => {
     const { cli: { isAnalyze }, dirs: { cwd }, config: { serviceWorker, pwa, federation, app: { rootElement }, http, env, }, pkg, } = ctx;
     const federatedIndexPresent = (0, federation_1.federatedIndexExists)();
     const moduleFederationOptions = (0, federation_1.resolveFederationOptions)(federation, pkg);
     const define = (0, build_kit_1.resolveDefineConfig)(env, http);
+    const appPublic = (0, node_path_1.resolve)(cwd, 'public');
+    console.log('--webpack builder -- resolving app public', appPublic);
+    console.log('--webpack builder -- app public exists?', (0, node_fs_1.existsSync)(appPublic));
     return [
-        new copy_webpack_plugin_1.default({
-            patterns: [
-                {
-                    from: (0, node_path_1.resolve)(__dirname, '../../public'),
-                },
-            ],
-        }),
+        (0, node_fs_1.existsSync)(appPublic) &&
+            new copy_webpack_plugin_1.default({
+                patterns: [
+                    // {
+                    //   from: resolve(__dirname, '../../public'),
+                    // },
+                    {
+                        from: (0, node_path_1.resolve)(cwd, 'public'),
+                    },
+                ],
+            }),
         new webpack_1.DefinePlugin(define),
         new webpackbar_1.default(),
         new mini_css_extract_plugin_1.default(),

package/dist/config/rules/fileRules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fileRules.d.ts","sourceRoot":"","sources":["../../../src/config/rules/fileRules.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;CAiBxB,CAAC"}
+{"version":3,"file":"fileRules.d.ts","sourceRoot":"","sources":["../../../src/config/rules/fileRules.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;CAoBxB,CAAC"}

package/dist/config/rules/fileRules.js

@@ -12,6 +12,9 @@ exports.appFileRules = {
     html: () => ({
         test: /\.html$/,
         use: [
+            // {
+            //   loader: 'handlebars-loader',
+            // },
             {
                 loader: 'html-loader',
             },

package/dist/public/{index.ejs → index.html}

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <title>{{htmlWebpackPlugin.options.title}}</title>
     <style>
       html,
       body {
@@ -18,6 +18,9 @@
     </style>
   </head>
   <body>
-    <<%= htmlWebpackPlugin.options.customElementTagName %>></<%= htmlWebpackPlugin.options.customElementTagName %>>
+    <{{htmlWebpackPlugin.options.customElementTagName}}></{{htmlWebpackPlugin.options.customElementTagName}}>
+    {{#if insertEntryPoint}}
+    <script type="module" src="/src/index.ts"></script>
+    {{/if}}
   </body>
 </html>

package/dist/public/{info.ejs → info.html}

@@ -2,12 +2,12 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <title>{{htmlWebpackPlugin.options.title}}</title>
   </head>
   <body>
-    <h1><%= htmlWebpackPlugin.options.title %></h1>
+    <h1>{{htmlWebpackPlugin.options.title}}</h1>
     <h3>Module Federation Details</h3>
-    <pre><%= htmlWebpackPlugin.options.moduleFederationDetails %></pre>
+    <pre>{{htmlWebpackPlugin.options.moduleFederationDetails}}</pre>
     Read about <a href="https://webpack.js.org/concepts/module-federation/" target="_blank">Module Federation</a> in Webpack 5.
   </body>
-</html>
+</html>

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@genesislcap/webpack-builder",
   "description": "Webpack builder",
-  "version": "14.62.1",
+  "version": "14.62.2-alpha-39ca39f.0",
   "license": "SEE LICENSE IN license.txt",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -12,13 +12,14 @@
     "dev": "tsc -b ./tsconfig.json -w"
   },
   "dependencies": {
-    "@genesislcap/build-kit": "14.62.1",
+    "@genesislcap/build-kit": "14.62.2-alpha-39ca39f.0",
     "@module-federation/dashboard-plugin": "2.6.5",
     "@pixability-ui/federated-types": "^0.2.0",
     "camel-case": "^4.1.2",
     "consola": "^3.0.2",
     "copy-webpack-plugin": "^11.0.0",
     "css-loader": "^6.6.0",
+    "handlebars-loader": "^1.7.3",
     "html-loader": "^3.1.0",
     "html-webpack-plugin": "^5.3.1",
     "mini-css-extract-plugin": "^2.5.3",
@@ -53,5 +54,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "07db799664062919182c7c29fefab54b9c94fcfe"
+  "gitHead": "9faeaf6754a5eba4ef5f9f01452ec421d8846105"
 }

package/public/{index.ejs → index.html}

@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8"/>
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <title>{{htmlWebpackPlugin.options.title}}</title>
     <style>
       html,
       body {
@@ -18,6 +18,9 @@
     </style>
   </head>
   <body>
-    <<%= htmlWebpackPlugin.options.customElementTagName %>></<%= htmlWebpackPlugin.options.customElementTagName %>>
+    <{{htmlWebpackPlugin.options.customElementTagName}}></{{htmlWebpackPlugin.options.customElementTagName}}>
+    {{#if insertEntryPoint}}
+    <script type="module" src="/src/index.ts"></script>
+    {{/if}}
   </body>
 </html>

package/public/{info.ejs → info.html}

@@ -2,12 +2,12 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title><%= htmlWebpackPlugin.options.title %></title>
+    <title>{{htmlWebpackPlugin.options.title}}</title>
   </head>
   <body>
-    <h1><%= htmlWebpackPlugin.options.title %></h1>
+    <h1>{{htmlWebpackPlugin.options.title}}</h1>
     <h3>Module Federation Details</h3>
-    <pre><%= htmlWebpackPlugin.options.moduleFederationDetails %></pre>
+    <pre>{{htmlWebpackPlugin.options.moduleFederationDetails}}</pre>
     Read about <a href="https://webpack.js.org/concepts/module-federation/" target="_blank">Module Federation</a> in Webpack 5.
   </body>
-</html>
+</html>

package/src/config/federation.ts

@@ -74,7 +74,7 @@ export const getFederationPlugins = (
     ? [
         new HtmlWebpackPlugin({
           title: `${pkg.description} (Federated)`,
-          template: resolve(__dirname, '../../public/info.ejs'),
+          template: resolve(__dirname, '../../public/info.html'),
           filename: rootElement ? 'info.html' : 'index.html',
           inject: false,
           // Passing arbitrary data to the template for display

package/src/config/plugins.ts

@@ -14,11 +14,16 @@ import { InjectManifest } from 'workbox-webpack-plugin';
 import { getFederationPlugins, federatedIndexExists, resolveFederationOptions } from './federation';
 
 const getTemplate = (cwd) => {
-  const templateApp = resolve(cwd, 'public/index.ejs');
-  const templateDefault = resolve(__dirname, '../public/index.ejs');
-  const template = existsSync(templateApp) ? templateApp : templateDefault;
-  console.log(`Using index template: ${template}`);
-  return template;
+  let selectedTemplate = resolve(__dirname, '../public/index.html');
+  const templateApp = resolve(cwd, 'index.html');
+  const templateAppPublic = resolve(cwd, 'public/index.ejs');
+  if (existsSync(templateApp)) {
+    selectedTemplate = templateApp;
+  } else if (existsSync(templateAppPublic)) {
+    selectedTemplate = templateAppPublic;
+  }
+  console.log(`Using index template: ${selectedTemplate}`);
+  return `!!handlebars-loader!${selectedTemplate}`;
 };
 
 export const plugins = (ctx: BuildContext): Configuration['plugins'] => {
@@ -40,14 +45,22 @@ export const plugins = (ctx: BuildContext): Configuration['plugins'] => {
   const moduleFederationOptions = resolveFederationOptions(federation, pkg);
   const define = resolveDefineConfig(env, http);
 
+  const appPublic = resolve(cwd, 'public');
+  console.log('--webpack builder -- resolving app public', appPublic);
+  console.log('--webpack builder -- app public exists?', existsSync(appPublic));
+
   return [
-    new CopyPlugin({
-      patterns: [
-        {
-          from: resolve(__dirname, '../../public'),
-        },
-      ],
-    }),
+    existsSync(appPublic) &&
+      new CopyPlugin({
+        patterns: [
+          // {
+          //   from: resolve(__dirname, '../../public'),
+          // },
+          {
+            from: resolve(cwd, 'public'),
+          },
+        ],
+      }),
     new DefinePlugin(define),
     new WebpackBar(),
     new MiniCssExtractPlugin(),

package/src/config/rules/fileRules.ts

@@ -10,6 +10,9 @@ export const appFileRules = {
   html: () => ({
     test: /\.html$/,
     use: [
+      // {
+      //   loader: 'handlebars-loader',
+      // },
       {
         loader: 'html-loader',
       },