piral-cli-webpack5 0.13.7 → 0.14.0-alpha.3154

package/README.md

@@ -68,6 +68,26 @@ module.exports = function(config) {
 };
 ```
 
+Otherwise, you can also use the `extend-config` helper module to get the job done without having to know the internals:
+
+```js
+const extendConfig = require('piral-cli-webpack5/extend-config');
+
+module.exports = extendConfig({
+  checkTypes: true, // not only transpiles TS, but also checks the types
+  noPresets: true, // removes existing presets from Babel
+  rules: [], // adds additional rules
+  removeRules: [], // removes the rules mentioned by their loader name
+  plugins: [], // adds additional plugins
+  removePlugins: [], // removes the plugins mentioned by their class reference
+  fileLoaderOptions: {}, // sets the options for the file loader
+  tsLoaderOptions: {}, // sets the options for the TS loader
+  babelLoaderOptions: {}, // sets the options for the Babel loader
+  cssLoaderOptions: {}, // sets the options for the CSS loader
+  sassLoaderOptions: {}, // sets the options for the SASS loader
+});
+```
+
 ## License
 
 Piral is released using the MIT license. For more information see the [license file](./LICENSE).

package/extend-config.js

@@ -1,14 +1,43 @@
+function changePlugin(config, classRef, cb) {
+  config.module.plugins = config.module.plugins
+    .map((plugin) => {
+      if (plugin instanceof classRef) {
+        return cb(plugin);
+      }
+
+      return plugin;
+    })
+    .filter(Boolean);
+}
+
+function changeRule(config, name, cb) {
+  const loaderPath = require.resolve(name);
+  config.module.rules = config.module.rules
+    .map((rule) => {
+      const uses = rule.use || [];
+
+      if (uses.some((m) => m && (m === loaderPath || (typeof m === 'object' && m.loader === loaderPath)))) {
+        return cb(rule);
+      }
+
+      return rule;
+    })
+    .filter(Boolean);
+}
+
 function changeLoader(config, name, cb) {
-  config.module.rules.forEach((rule) => {
-    (rule.use || [])
-      .filter((m) => m && typeof m === 'object')
-      .forEach((m, i) => {
-        if (m === name) {
-          rule.use[i] = cb({ loader: m });
-        } else if (m.loader === name) {
-          rule.use[i] = cb(m);
-        }
-      });
+  changeRule(config, name, (rule) => {
+    rule.use = rule.use.map((m) => {
+      if (m === loaderPath) {
+        return cb({ loader: m });
+      } else if (m.loader === loaderPath) {
+        return cb(m);
+      } else {
+        return m;
+      }
+    });
+
+    return rule;
   });
 }
 
@@ -63,17 +92,25 @@ module.exports = function (override) {
         );
       }
 
-      if ('change' in override && typeof override.change === 'function') {
-        config = override.change(config);
-      }
-
       if ('rules' in override && Array.isArray(override.rules)) {
         config.module.rules.push(...rules);
       }
 
+      if ('removeRules' in override && Array.isArray(override.removeRules)) {
+        override.removeRules.forEach((rule) => changeRule(config, rule, () => undefined));
+      }
+
       if ('plugins' in override && Array.isArray(override.plugins)) {
         config.plugins.push(...plugins);
       }
+
+      if ('removePlugins' in override && Array.isArray(override.removePlugins)) {
+        override.removePlugins.forEach((plugin) => changePlugin(config, plugin, () => undefined));
+      }
+
+      if ('change' in override && typeof override.change === 'function') {
+        config = override.change(config);
+      }
     }
 
     return config;

package/lib/actions.js

@@ -1,54 +1,20 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildPilet = exports.debugPilet = exports.buildPiral = exports.watchPiral = exports.debugPiral = void 0;
-const webpack_1 = require("./webpack");
+const path_1 = require("path");
 exports.debugPiral = {
-    run(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const bundler = yield webpack_1.callDynamic('debug-piral', args);
-            return bundler;
-        });
-    },
+    path: (0, path_1.resolve)(__dirname, 'webpack', 'piral.js'),
 };
 exports.watchPiral = {
-    run(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const bundler = yield webpack_1.callStatic('debug-mono-piral', args);
-            return bundler;
-        });
-    },
+    path: (0, path_1.resolve)(__dirname, 'webpack', 'piral.js'),
 };
 exports.buildPiral = {
-    run(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const bundler = yield webpack_1.callStatic('build-piral', args);
-            return bundler.bundle;
-        });
-    },
+    path: (0, path_1.resolve)(__dirname, 'webpack', 'piral.js'),
 };
 exports.debugPilet = {
-    run(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const bundler = yield webpack_1.callDynamic('debug-pilet', args);
-            return bundler;
-        });
-    },
+    path: (0, path_1.resolve)(__dirname, 'webpack', 'pilet.js'),
 };
 exports.buildPilet = {
-    run(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const bundler = yield webpack_1.callStatic('build-pilet', args);
-            return bundler.bundle;
-        });
-    },
+    path: (0, path_1.resolve)(__dirname, 'webpack', 'pilet.js'),
 };
 //# sourceMappingURL=actions.js.map

package/lib/actions.js.map

@@ -1 +1 @@
-{"version":3,"file":"actions.js","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAoD;AASvC,QAAA,UAAU,GAAgC;IAC/C,GAAG,CAAC,IAAI;;YACZ,MAAM,OAAO,GAAG,MAAM,qBAAW,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YACvD,OAAO,OAAO,CAAC;QACjB,CAAC;KAAA;CACF,CAAC;AAEW,QAAA,UAAU,GAAgC;IAC/C,GAAG,CAAC,IAAI;;YACZ,MAAM,OAAO,GAAG,MAAM,oBAAU,CAAC,kBAAkB,EAAE,IAAI,CAAC,CAAC;YAC3D,OAAO,OAAO,CAAC;QACjB,CAAC;KAAA;CACF,CAAC;AAEW,QAAA,UAAU,GAAgC;IAC/C,GAAG,CAAC,IAAI;;YACZ,MAAM,OAAO,GAAG,MAAM,oBAAU,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YACtD,OAAO,OAAO,CAAC,MAAM,CAAC;QACxB,CAAC;KAAA;CACF,CAAC;AAEW,QAAA,UAAU,GAAgC;IAC/C,GAAG,CAAC,IAAI;;YACZ,MAAM,OAAO,GAAG,MAAM,qBAAW,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YACvD,OAAO,OAAO,CAAC;QACjB,CAAC;KAAA;CACF,CAAC;AAEW,QAAA,UAAU,GAAgC;IAC/C,GAAG,CAAC,IAAI;;YACZ,MAAM,OAAO,GAAG,MAAM,oBAAU,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;YACtD,OAAO,OAAO,CAAC,MAAM,CAAC;QACxB,CAAC;KAAA;CACF,CAAC"}
+{"version":3,"file":"actions.js","sourceRoot":"","sources":["../src/actions.ts"],"names":[],"mappings":";;;AAAA,+BAA+B;AASlB,QAAA,UAAU,GAAgC;IACrD,IAAI,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC;CAChD,CAAC;AAEW,QAAA,UAAU,GAAgC;IACrD,IAAI,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC;CAChD,CAAC;AAEW,QAAA,UAAU,GAAgC;IACrD,IAAI,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC;CAChD,CAAC;AAEW,QAAA,UAAU,GAAgC;IACrD,IAAI,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC;CAChD,CAAC;AAEW,QAAA,UAAU,GAAgC;IACrD,IAAI,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,SAAS,EAAE,UAAU,CAAC;CAChD,CAAC"}

package/lib/enhancers/html5-entry-webpack-config-enhancer/index.js

@@ -8,17 +8,17 @@ const path_1 = require("path");
 const helpers_1 = require("./helpers");
 const html5EntryWebpackConfigEnhancer = (options) => (compilerOptions) => {
     const entry = compilerOptions.entry;
-    const [template] = helpers_1.getTemplates(entry);
+    const [template] = (0, helpers_1.getTemplates)(entry);
     if (template) {
-        const src = path_1.dirname(template);
-        const templateContent = cheerio_1.load(fs_1.readFileSync(template, 'utf8'));
-        const entries = helpers_1.extractParts(templateContent).map((entry) => path_1.join(src, entry));
+        const src = (0, path_1.dirname)(template);
+        const templateContent = (0, cheerio_1.load)((0, fs_1.readFileSync)(template, 'utf8'));
+        const entries = (0, helpers_1.extractParts)(templateContent).map((entry) => (0, path_1.join)(src, entry));
         const plugins = [
             new HtmlWebpackPlugin(Object.assign(Object.assign({}, options), { templateContent: templateContent.html() })),
         ];
         if (!entries.length)
             throw new Error('Template entries expected to be not empty');
-        helpers_1.setEntries(compilerOptions, template, entries);
+        (0, helpers_1.setEntries)(compilerOptions, template, entries);
         compilerOptions.plugins = [...compilerOptions.plugins, ...plugins];
     }
     return compilerOptions;

package/lib/enhancers/html5-entry-webpack-config-enhancer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/enhancers/html5-entry-webpack-config-enhancer/index.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AAEzD,qCAA+B;AAC/B,2BAAkC;AAClC,+BAAqC;AACrC,uCAAmE;AAI5D,MAAM,+BAA+B,GAAG,CAAC,OAAuC,EAAE,EAAE,CAAC,CAC1F,eAA8B,EAC9B,EAAE;IACF,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC;IACpC,MAAM,CAAC,QAAQ,CAAC,GAAG,sBAAY,CAAC,KAAK,CAAC,CAAC;IAEvC,IAAI,QAAQ,EAAE;QACZ,MAAM,GAAG,GAAG,cAAO,CAAC,QAAQ,CAAC,CAAC;QAC9B,MAAM,eAAe,GAAG,cAAI,CAAC,iBAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAG,sBAAY,CAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAI,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAC/E,MAAM,OAAO,GAAG;YACd,IAAI,iBAAiB,iCAChB,OAAO,KACV,eAAe,EAAE,eAAe,CAAC,IAAI,EAAE,IACvC;SACH,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAElF,oBAAU,CAAC,eAAe,EAAE,QAAQ,EAAE,OAAgC,CAAC,CAAC;QAExE,eAAe,CAAC,OAAO,GAAG,CAAC,GAAG,eAAe,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC;KACpE;IAED,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAzBW,QAAA,+BAA+B,mCAyB1C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/enhancers/html5-entry-webpack-config-enhancer/index.ts"],"names":[],"mappings":";;;AAAA,yDAAyD;AAEzD,qCAA+B;AAC/B,2BAAkC;AAClC,+BAAqC;AACrC,uCAAmE;AAI5D,MAAM,+BAA+B,GAAG,CAAC,OAAuC,EAAE,EAAE,CAAC,CAC1F,eAA8B,EAC9B,EAAE;IACF,MAAM,KAAK,GAAG,eAAe,CAAC,KAAK,CAAC;IACpC,MAAM,CAAC,QAAQ,CAAC,GAAG,IAAA,sBAAY,EAAC,KAAK,CAAC,CAAC;IAEvC,IAAI,QAAQ,EAAE;QACZ,MAAM,GAAG,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAC;QAC9B,MAAM,eAAe,GAAG,IAAA,cAAI,EAAC,IAAA,iBAAY,EAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;QAC7D,MAAM,OAAO,GAAG,IAAA,sBAAY,EAAC,eAAe,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAA,WAAI,EAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;QAC/E,MAAM,OAAO,GAAG;YACd,IAAI,iBAAiB,iCAChB,OAAO,KACV,eAAe,EAAE,eAAe,CAAC,IAAI,EAAE,IACvC;SACH,CAAC;QAEF,IAAI,CAAC,OAAO,CAAC,MAAM;YAAE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;QAElF,IAAA,oBAAU,EAAC,eAAe,EAAE,QAAQ,EAAE,OAAgC,CAAC,CAAC;QAExE,eAAe,CAAC,OAAO,GAAG,CAAC,GAAG,eAAe,CAAC,OAAO,EAAE,GAAG,OAAO,CAAC,CAAC;KACpE;IAED,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAzBW,QAAA,+BAA+B,mCAyB1C"}

package/lib/enhancers/pilet-webpack-config-enhancer/helpers.d.ts

@@ -1,3 +1,9 @@
+import { SharedDependency } from 'piral-cli';
+import { Configuration } from 'webpack';
 export declare function getVariables(name: string, version: string, env: string): Record<string, string>;
 export declare function setEnvironment(variables: Record<string, string>): void;
 export declare function getDefineVariables(variables: Record<string, string>): {};
+export declare function getExternals(piral: string): any[];
+export declare function getDependencies(importmap: Array<SharedDependency>, compilerOptions: Configuration): {};
+export declare function withSetPath(compilerOptions: Configuration): void;
+export declare function withExternals(compilerOptions: Configuration, externals: Array<string>): void;

package/lib/enhancers/pilet-webpack-config-enhancer/helpers.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDefineVariables = exports.setEnvironment = exports.getVariables = void 0;
+exports.withExternals = exports.withSetPath = exports.getDependencies = exports.getExternals = exports.getDefineVariables = exports.setEnvironment = exports.getVariables = void 0;
+const path_1 = require("path");
 function getVariables(name, version, env) {
     return {
         NODE_ENV: env,
@@ -22,4 +23,70 @@ function getDefineVariables(variables) {
     }, {});
 }
 exports.getDefineVariables = getDefineVariables;
+function getExternals(piral) {
+    var _a, _b;
+    const shellPkg = require(`${piral}/package.json`);
+    const piralExternals = (_b = (_a = shellPkg.pilets) === null || _a === void 0 ? void 0 : _a.externals) !== null && _b !== void 0 ? _b : [];
+    return [
+        ...piralExternals,
+        '@dbeining/react-atom',
+        '@libre/atom',
+        'history',
+        'react',
+        'react-dom',
+        'react-router',
+        'react-router-dom',
+        'tslib',
+        'path-to-regexp',
+    ];
+}
+exports.getExternals = getExternals;
+function getDependencies(importmap, compilerOptions) {
+    const dependencies = {};
+    if (typeof compilerOptions.entry === 'object' && compilerOptions.entry) {
+        for (const dep of importmap) {
+            dependencies[dep.id] = dep.ref;
+            compilerOptions.externals[dep.name] = dep.id;
+            if (dep.type === 'local') {
+                compilerOptions.entry[dep.ref.replace(/\.js$/, '')] = dep.entry;
+            }
+        }
+    }
+    return dependencies;
+}
+exports.getDependencies = getDependencies;
+function withSetPath(compilerOptions) {
+    if (typeof compilerOptions.entry === 'object' && compilerOptions.entry) {
+        const setPath = (0, path_1.join)(__dirname, '..', '..', 'set-path');
+        if (Array.isArray(compilerOptions.entry)) {
+            compilerOptions.entry.unshift(setPath);
+        }
+        else {
+            for (const key of Object.keys(compilerOptions.entry)) {
+                const entry = compilerOptions.entry[key];
+                if (Array.isArray(entry)) {
+                    entry.unshift(setPath);
+                }
+            }
+        }
+    }
+}
+exports.withSetPath = withSetPath;
+function withExternals(compilerOptions, externals) {
+    const current = compilerOptions.externals;
+    const newExternals = Array.isArray(current)
+        ? [...current, ...externals]
+        : typeof current === 'string'
+            ? [current, ...externals]
+            : externals;
+    if (newExternals !== externals || typeof compilerOptions.externals !== 'object' || !compilerOptions.externals) {
+        compilerOptions.externals = {};
+    }
+    for (const external of newExternals) {
+        if (typeof external === 'string') {
+            compilerOptions.externals[external] = external;
+        }
+    }
+}
+exports.withExternals = withExternals;
 //# sourceMappingURL=helpers.js.map

package/lib/enhancers/pilet-webpack-config-enhancer/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/enhancers/pilet-webpack-config-enhancer/helpers.ts"],"names":[],"mappings":";;;AAAA,SAAgB,YAAY,CAAC,IAAY,EAAE,OAAe,EAAE,GAAW;IACrE,OAAO;QACL,QAAQ,EAAE,GAAG;QACb,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,YAAY,EAAE;QACrC,eAAe,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACzC,kBAAkB,EAAE,OAAO;QAC3B,eAAe,EAAE,IAAI;KACtB,CAAC;AACJ,CAAC;AARD,oCAQC;AAED,SAAgB,cAAc,CAAC,SAAiC;IAC9D,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;AAC/E,CAAC;AAFD,wCAEC;AAED,SAAgB,kBAAkB,CAAC,SAAiC;IAClE,OAAO,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE;QAC7D,GAAG,CAAC,eAAe,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACnD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AALD,gDAKC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../../../src/enhancers/pilet-webpack-config-enhancer/helpers.ts"],"names":[],"mappings":"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"}

package/lib/enhancers/pilet-webpack-config-enhancer/index.d.ts

@@ -1,9 +1,14 @@
+import type { SharedDependency } from 'piral-cli';
 import { Configuration } from 'webpack';
 export interface PiletWebpackConfigEnhancerOptions {
     /**
      * The name of the pilet.
      */
     name: string;
+    /**
+     * The name of the entry module.
+     */
+    entry: string;
     /**
      * The version of the pilet.
      */
@@ -12,10 +17,14 @@ export interface PiletWebpackConfigEnhancerOptions {
      * The name of the Piral instance / app shell.
      */
     piral: string;
+    /**
+     * The name of the main output file.
+     */
+    filename: string;
     /**
      * The schema version. By default, v1 is used.
      */
-    schema?: 'v0' | 'v1' | 'none';
+    schema?: 'v0' | 'v1' | 'v2' | 'none';
     /**
      * The shared dependencies. By default, these are read from the
      * Piral instance.
@@ -25,5 +34,9 @@ export interface PiletWebpackConfigEnhancerOptions {
      * Additional environment variables to define.
      */
     variables?: Record<string, string>;
+    /**
+     * The shared dependencies to consider.
+     */
+    importmap: Array<SharedDependency>;
 }
-export declare const piletWebpackConfigEnhancer: (options: PiletWebpackConfigEnhancerOptions) => (compilerOptions: Configuration) => Configuration;
+export declare const piletWebpackConfigEnhancer: (details: PiletWebpackConfigEnhancerOptions) => (compiler: Configuration) => Configuration;

package/lib/enhancers/pilet-webpack-config-enhancer/index.js

@@ -1,71 +1,98 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.piletWebpackConfigEnhancer = void 0;
-const path_1 = require("path");
+const SystemJSPublicPathWebpackPlugin = require("systemjs-webpack-interop/SystemJSPublicPathWebpackPlugin");
 const webpack_1 = require("webpack");
 const helpers_1 = require("./helpers");
-function getExternals(piral) {
-    var _a, _b;
-    const shellPkg = require(`${piral}/package.json`);
-    const piralExternals = (_b = (_a = shellPkg.pilets) === null || _a === void 0 ? void 0 : _a.externals) !== null && _b !== void 0 ? _b : [];
-    return [
-        ...piralExternals,
-        '@dbeining/react-atom',
-        '@libre/atom',
-        'history',
-        'react',
-        'react-dom',
-        'react-router',
-        'react-router-dom',
-        'tslib',
-        'path-to-regexp',
-    ];
+function piletVxWebpackConfigEnhancer(options, compiler) {
+    const { variables, externals } = options;
+    (0, helpers_1.withSetPath)(compiler);
+    (0, helpers_1.setEnvironment)(variables);
+    (0, helpers_1.withExternals)(compiler, externals);
+    compiler.plugins.push(new webpack_1.DefinePlugin((0, helpers_1.getDefineVariables)(variables)));
+    return compiler;
 }
-const piletWebpackConfigEnhancer = (options) => (compilerOptions) => {
-    const environment = process.env.NODE_ENV || 'development';
-    const { name, version, piral, externals = getExternals(piral), schema } = options;
+function piletV0WebpackConfigEnhancer(options, compiler) {
+    const { name, variables, externals, file } = options;
     const shortName = name.replace(/\W/gi, '');
     const jsonpFunction = `pr_${shortName}`;
-    const variables = Object.assign(Object.assign({}, helpers_1.getVariables(name, version, environment)), options.variables);
-    const plugins = [new webpack_1.DefinePlugin(helpers_1.getDefineVariables(variables))];
-    if (typeof compilerOptions.entry === 'object' && compilerOptions.entry) {
-        const setPath = path_1.join(__dirname, '..', '..', 'set-path');
-        if (Array.isArray(compilerOptions.entry)) {
-            compilerOptions.entry.unshift(setPath);
-        }
-        else if (Array.isArray(compilerOptions.entry.main)) {
-            compilerOptions.entry.main.unshift(setPath);
-        }
-    }
-    if (schema !== 'none') {
-        const bannerSuffix = schema ? `1(${jsonpFunction})` : `0`;
-        plugins.push(new webpack_1.BannerPlugin({
-            banner: `//@pilet v:${bannerSuffix}`,
-            entryOnly: true,
-            include: /\.js$/,
-            raw: true,
-        }));
-    }
-    helpers_1.setEnvironment(variables);
-    compilerOptions.plugins = [...compilerOptions.plugins, ...plugins];
-    const current = compilerOptions.externals;
-    compilerOptions.output.uniqueName = `${jsonpFunction}`;
-    compilerOptions.output.library = name;
-    if (schema !== 'none') {
-        compilerOptions.output.libraryTarget = 'umd';
-    }
-    if (schema === 'v1') {
-        const reset = `delete window.webpackChunk${jsonpFunction};`;
-        compilerOptions.output.auxiliaryComment = {
-            commonjs2: `\nfunction define(d,k){${reset}(typeof document!=='undefined')&&(document.currentScript.app=k.apply(null,d.map(window.${jsonpFunction})));}define.amd=!0;`,
-        };
+    (0, helpers_1.withSetPath)(compiler);
+    (0, helpers_1.setEnvironment)(variables);
+    (0, helpers_1.withExternals)(compiler, externals);
+    compiler.plugins.push(new webpack_1.DefinePlugin((0, helpers_1.getDefineVariables)(variables)), new webpack_1.BannerPlugin({
+        banner: `//@pilet v:0`,
+        entryOnly: true,
+        include: file,
+        raw: true,
+    }));
+    compiler.output.uniqueName = `${jsonpFunction}`;
+    compiler.output.library = name;
+    compiler.output.libraryTarget = 'umd';
+    return compiler;
+}
+function piletV1WebpackConfigEnhancer(options, compiler) {
+    const { name, variables, externals, file } = options;
+    const shortName = name.replace(/\W/gi, '');
+    const jsonpFunction = `pr_${shortName}`;
+    (0, helpers_1.withSetPath)(compiler);
+    (0, helpers_1.setEnvironment)(variables);
+    (0, helpers_1.withExternals)(compiler, externals);
+    compiler.plugins.push(new webpack_1.DefinePlugin((0, helpers_1.getDefineVariables)(variables)), new webpack_1.BannerPlugin({
+        banner: `//@pilet v:1(${jsonpFunction})`,
+        entryOnly: true,
+        include: file,
+        raw: true,
+    }));
+    compiler.output.uniqueName = `${jsonpFunction}`;
+    compiler.output.library = name;
+    compiler.output.libraryTarget = 'umd';
+    compiler.output.auxiliaryComment = {
+        commonjs2: `\nfunction define(d,k){(typeof document!=='undefined')&&(document.currentScript.app=k.apply(null,d.map(window.${jsonpFunction})));}define.amd=!0;`,
+    };
+    return compiler;
+}
+function piletV2WebpackConfigEnhancer(options, compiler) {
+    const { name, variables, externals, file, importmap } = options;
+    const shortName = name.replace(/\W/gi, '');
+    const jsonpFunction = `pr_${shortName}`;
+    (0, helpers_1.withExternals)(compiler, externals);
+    (0, helpers_1.setEnvironment)(variables);
+    const dependencies = (0, helpers_1.getDependencies)(importmap, compiler);
+    const plugins = [];
+    plugins.push(new webpack_1.DefinePlugin((0, helpers_1.getDefineVariables)(variables)), new webpack_1.BannerPlugin({
+        banner: `//@pilet v:2(webpackChunk${jsonpFunction},${JSON.stringify(dependencies)})`,
+        entryOnly: true,
+        include: file,
+        raw: true,
+    }), new SystemJSPublicPathWebpackPlugin());
+    compiler.plugins = [...compiler.plugins, ...plugins];
+    compiler.module.rules.push({ parser: { system: false } });
+    compiler.output.uniqueName = `${jsonpFunction}`;
+    compiler.output.library = { type: 'system' };
+    return compiler;
+}
+const piletWebpackConfigEnhancer = (details) => (compiler) => {
+    const { piral, externals = (0, helpers_1.getExternals)(piral), schema, importmap } = details;
+    const environment = process.env.NODE_ENV || 'development';
+    const options = {
+        entry: details.entry,
+        externals,
+        file: details.filename,
+        name: details.name,
+        importmap,
+        variables: Object.assign(Object.assign({}, (0, helpers_1.getVariables)(details.name, details.version, environment)), details.variables),
+    };
+    switch (schema) {
+        case 'v0':
+            return piletV0WebpackConfigEnhancer(options, compiler);
+        case 'v1':
+            return piletV1WebpackConfigEnhancer(options, compiler);
+        case 'v2':
+            return piletV2WebpackConfigEnhancer(options, compiler);
+        case 'none':
+        default:
+            return piletVxWebpackConfigEnhancer(options, compiler);
     }
-    compilerOptions.externals = Array.isArray(current)
-        ? [...current, ...externals]
-        : current
-            ? [current, ...externals]
-            : externals;
-    return compilerOptions;
 };
 exports.piletWebpackConfigEnhancer = piletWebpackConfigEnhancer;
 //# sourceMappingURL=index.js.map

package/lib/enhancers/pilet-webpack-config-enhancer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/enhancers/pilet-webpack-config-enhancer/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/enhancers/pilet-webpack-config-enhancer/index.ts"],"names":[],"mappings":"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"}

package/lib/enhancers/piral-instance-webpack-config-enhancer/index.js

@@ -6,9 +6,9 @@ const helpers_1 = require("./helpers");
 const piralInstanceWebpackConfigEnhancer = (options) => (compilerOptions) => {
     const { name, version, externals } = options;
     const environment = process.env.NODE_ENV || 'development';
-    const variables = Object.assign(Object.assign({}, helpers_1.getVariables(name, version, externals, environment)), options.variables);
-    const plugins = [new webpack_1.DefinePlugin(helpers_1.getDefineVariables(variables))];
-    helpers_1.setEnvironment(variables);
+    const variables = Object.assign(Object.assign({}, (0, helpers_1.getVariables)(name, version, externals, environment)), options.variables);
+    const plugins = [new webpack_1.DefinePlugin((0, helpers_1.getDefineVariables)(variables))];
+    (0, helpers_1.setEnvironment)(variables);
     compilerOptions.plugins = [...(compilerOptions.plugins || []), ...plugins];
     return compilerOptions;
 };

package/lib/enhancers/piral-instance-webpack-config-enhancer/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/enhancers/piral-instance-webpack-config-enhancer/index.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AACtD,uCAA6E;AAStE,MAAM,kCAAkC,GAAG,CAAC,OAA0C,EAAE,EAAE,CAAC,CAChG,eAA8B,EAC9B,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,CAAC;IAC1D,MAAM,SAAS,mCACV,sBAAY,CAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC,GACnD,OAAO,CAAC,SAAS,CACrB,CAAC;IAEF,MAAM,OAAO,GAAG,CAAC,IAAI,sBAAY,CAAC,4BAAkB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAElE,wBAAc,CAAC,SAAS,CAAC,CAAC;IAE1B,eAAe,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC;IAE3E,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAjBW,QAAA,kCAAkC,sCAiB7C"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/enhancers/piral-instance-webpack-config-enhancer/index.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AACtD,uCAA6E;AAStE,MAAM,kCAAkC,GAAG,CAAC,OAA0C,EAAE,EAAE,CAAC,CAChG,eAA8B,EAC9B,EAAE;IACF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,OAAO,CAAC;IAC7C,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa,CAAC;IAC1D,MAAM,SAAS,mCACV,IAAA,sBAAY,EAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC,GACnD,OAAO,CAAC,SAAS,CACrB,CAAC;IAEF,MAAM,OAAO,GAAG,CAAC,IAAI,sBAAY,CAAC,IAAA,4BAAkB,EAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IAElE,IAAA,wBAAc,EAAC,SAAS,CAAC,CAAC;IAE1B,eAAe,CAAC,OAAO,GAAG,CAAC,GAAG,CAAC,eAAe,CAAC,OAAO,IAAI,EAAE,CAAC,EAAE,GAAG,OAAO,CAAC,CAAC;IAE3E,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AAjBW,QAAA,kCAAkC,sCAiB7C"}

package/lib/helpers.d.ts

@@ -1,3 +1,3 @@
 import { Configuration } from 'webpack';
-import { DefaultConfiguration } from './configs/common';
+import { DefaultConfiguration } from './webpack/common';
 export declare function extendConfig([webPackConfig, enhancer]: DefaultConfiguration, otherConfigPath: string, overrides?: Configuration): Configuration;

package/lib/helpers.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extendConfig = void 0;
 const fs_1 = require("fs");
 function extendConfig([webPackConfig, enhancer], otherConfigPath, overrides = {}) {
-    if (fs_1.existsSync(otherConfigPath)) {
+    if ((0, fs_1.existsSync)(otherConfigPath)) {
         const otherConfig = require(otherConfigPath);
         if (typeof otherConfig === 'function') {
             webPackConfig = otherConfig(webPackConfig);

package/lib/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAIhC,SAAgB,YAAY,CAC1B,CAAC,aAAa,EAAE,QAAQ,CAAuB,EAC/C,eAAuB,EACvB,YAA2B,EAAE;IAE7B,IAAI,eAAU,CAAC,eAAe,CAAC,EAAE;QAC/B,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QAE7C,IAAI,OAAO,WAAW,KAAK,UAAU,EAAE;YACrC,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;SAC5C;aAAM,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YAC1C,OAAO,QAAQ,+CACV,aAAa,GACb,WAAW,GACX,SAAS,EACZ,CAAC;SACJ;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,sCAAsC,eAAe,cAAc,CAAC,CAAC;SACnF;KACF;IAED,OAAO,QAAQ,iCACV,aAAa,GACb,SAAS,EACZ,CAAC;AACL,CAAC;AAzBD,oCAyBC"}
+{"version":3,"file":"helpers.js","sourceRoot":"","sources":["../src/helpers.ts"],"names":[],"mappings":";;;AAAA,2BAAgC;AAIhC,SAAgB,YAAY,CAC1B,CAAC,aAAa,EAAE,QAAQ,CAAuB,EAC/C,eAAuB,EACvB,YAA2B,EAAE;IAE7B,IAAI,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE;QAC/B,MAAM,WAAW,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC;QAE7C,IAAI,OAAO,WAAW,KAAK,UAAU,EAAE;YACrC,aAAa,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC;SAC5C;aAAM,IAAI,OAAO,WAAW,KAAK,QAAQ,EAAE;YAC1C,OAAO,QAAQ,+CACV,aAAa,GACb,WAAW,GACX,SAAS,EACZ,CAAC;SACJ;aAAM;YACL,OAAO,CAAC,IAAI,CAAC,sCAAsC,eAAe,cAAc,CAAC,CAAC;SACnF;KACF;IAED,OAAO,QAAQ,iCACV,aAAa,GACb,SAAS,EACZ,CAAC;AACL,CAAC;AAzBD,oCAyBC"}

package/lib/index.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const actions = require("./actions");
 const plugin = (cli) => {
-    cli.withBundler('webpack', actions);
+    cli.withBundler('webpack5', actions);
 };
 module.exports = plugin;
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,qCAAqC;AAGrC,MAAM,MAAM,GAAc,CAAC,GAAG,EAAE,EAAE;IAChC,GAAG,CAAC,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;AACtC,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,qCAAqC;AAGrC,MAAM,MAAM,GAAc,CAAC,GAAG,EAAE,EAAE;IAChC,GAAG,CAAC,WAAW,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;AACvC,CAAC,CAAC;AAEF,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC"}

package/lib/{configs → plugins}/SheetPlugin.d.ts

@@ -1,4 +1,6 @@
 import InjectPlugin from 'webpack-inject-plugin';
 export default class SheetPlugin extends InjectPlugin {
-    constructor(cssName: string);
+    private cssName;
+    constructor(cssName: string, name: string);
+    apply(compiler: any): void;
 }