piral-cli-webpack5 0.14.18 → 0.14.19-beta.3927

package/lib/plugins/SheetLoader.d.ts

@@ -0,0 +1 @@
+export default function sheetLoader(): string;

package/lib/plugins/SheetLoader.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const loader_utils_1 = require("loader-utils");
+function sheetLoader() {
+    const { cssName, piletName } = (0, loader_utils_1.getOptions)(this);
+    const debug = process.env.NODE_ENV === 'development';
+    return [
+        `var d=document`,
+        `var u=__webpack_public_path__+${JSON.stringify(cssName)}`,
+        `var e=d.createElement("link")`,
+        `e.setAttribute('data-origin', ${JSON.stringify(piletName)})`,
+        `e.type="text/css"`,
+        `e.rel="stylesheet"`,
+        `e.href=${debug ? 'u+"?_="+Math.random()' : 'u'}`,
+        `d.head.appendChild(e)`,
+    ].join(';');
+}
+exports.default = sheetLoader;
+//# sourceMappingURL=SheetLoader.js.map

package/lib/plugins/SheetLoader.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"SheetLoader.js","sourceRoot":"","sources":["../../src/plugins/SheetLoader.ts"],"names":[],"mappings":";;AAAA,+CAA0C;AAE1C,SAAwB,WAAW;IACjC,MAAM,EAAE,OAAO,EAAE,SAAS,EAAE,GAAG,IAAA,yBAAU,EAAC,IAAI,CAAC,CAAC;IAChD,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC;IACrD,OAAO;QACL,gBAAgB;QAChB,iCAAiC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;QAC1D,+BAA+B;QAC/B,iCAAiC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,GAAG;QAC7D,mBAAmB;QACnB,oBAAoB;QACpB,UAAU,KAAK,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,GAAG,EAAE;QACjD,uBAAuB;KACxB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACd,CAAC;AAbD,8BAaC"}

package/lib/plugins/SheetPlugin.d.ts

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

package/lib/plugins/SheetPlugin.js

@@ -1,32 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const webpack_inject_plugin_1 = require("webpack-inject-plugin");
+const path_1 = require("path");
 const webpack_1 = require("webpack");
 const webpack_sources_1 = require("webpack-sources");
-function sheetLoader(cssName, name) {
-    return () => {
-        const debug = process.env.NODE_ENV === 'development';
-        return [
-            `var d=document`,
-            `var u=__webpack_public_path__+${JSON.stringify(cssName)}`,
-            `var e=d.createElement("link")`,
-            `e.setAttribute('data-origin', ${JSON.stringify(name)})`,
-            `e.type="text/css"`,
-            `e.rel="stylesheet"`,
-            `e.href=${debug ? 'u+"?_="+Math.random()' : 'u'}`,
-            `d.head.appendChild(e)`,
-        ].join(';');
-    };
-}
-class SheetPlugin extends webpack_inject_plugin_1.default {
-    constructor(cssName, name, entryName) {
-        super(sheetLoader(cssName, name), {
-            entryName,
-        });
+class SheetPlugin {
+    constructor(cssName, piletName, entryName) {
         this.cssName = cssName;
+        this.entryName = entryName;
+        this.loaderPath = (0, path_1.resolve)(__dirname, `SheetLoader?cssName=${cssName}&piletName=${piletName}!`);
     }
     apply(compiler) {
-        super.apply(compiler);
+        const { entry } = compiler.options;
+        entry[this.entryName].import = [this.loaderPath, ...entry[this.entryName].import];
         compiler.hooks.compilation.tap('SheetPlugin', (compilation) => {
             if (!compilation.compiler.parentCompilation) {
                 compilation.hooks.processAssets.tap({

package/lib/plugins/SheetPlugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"SheetPlugin.js","sourceRoot":"","sources":["../../src/plugins/SheetPlugin.ts"],"names":[],"mappings":";;AAAA,iEAAiD;AACjD,qCAAsC;AACtC,qDAA4C;AAE5C,SAAS,WAAW,CAAC,OAAe,EAAE,IAAY;IAChD,OAAO,GAAG,EAAE;QACV,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,KAAK,aAAa,CAAC;QACrD,OAAO;YACL,gBAAgB;YAChB,iCAAiC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE;YAC1D,+BAA+B;YAC/B,iCAAiC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG;YACxD,mBAAmB;YACnB,oBAAoB;YACpB,UAAU,KAAK,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,GAAG,EAAE;YACjD,uBAAuB;SACxB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACd,CAAC,CAAC;AACJ,CAAC;AAED,MAAqB,WAAY,SAAQ,+BAAY;IACnD,YAAoB,OAAe,EAAE,IAAY,EAAE,SAAiB;QAClE,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE;YAChC,SAAS;SACV,CAAC,CAAC;QAHe,YAAO,GAAP,OAAO,CAAQ;IAInC,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAEtB,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,WAAwB,EAAE,EAAE;YACzE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,iBAAiB,EAAE;gBAC3C,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CACjC;oBACE,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,qBAAW,CAAC,8BAA8B;iBAClD,EACD,CAAC,MAAM,EAAE,EAAE;oBACT,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;wBACzB,MAAM,MAAM,GAAG,IAAI,2BAAS,CAAC,EAAE,CAAC,CAAC;wBACjC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;qBAC7C;gBACH,CAAC,CACF,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA3BD,8BA2BC"}
+{"version":3,"file":"SheetPlugin.js","sourceRoot":"","sources":["../../src/plugins/SheetPlugin.ts"],"names":[],"mappings":";;AAAA,+BAA+B;AAC/B,qCAAsC;AACtC,qDAA4C;AAE5C,MAAqB,WAAW;IAG9B,YAAoB,OAAe,EAAE,SAAiB,EAAU,SAAiB;QAA7D,YAAO,GAAP,OAAO,CAAQ;QAA6B,cAAS,GAAT,SAAS,CAAQ;QAC/E,IAAI,CAAC,UAAU,GAAG,IAAA,cAAO,EAAC,SAAS,EAAE,uBAAuB,OAAO,cAAc,SAAS,GAAG,CAAC,CAAC;IACjG,CAAC;IAED,KAAK,CAAC,QAAQ;QACZ,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,CAAC,OAAO,CAAC;QAEnC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,UAAU,EAAE,GAAG,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC;QAElF,QAAQ,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,WAAwB,EAAE,EAAE;YACzE,IAAI,CAAC,WAAW,CAAC,QAAQ,CAAC,iBAAiB,EAAE;gBAC3C,WAAW,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CACjC;oBACE,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,qBAAW,CAAC,8BAA8B;iBAClD,EACD,CAAC,MAAM,EAAE,EAAE;oBACT,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE;wBACzB,MAAM,MAAM,GAAG,IAAI,2BAAS,CAAC,EAAE,CAAC,CAAC;wBACjC,WAAW,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;qBAC7C;gBACH,CAAC,CACF,CAAC;aACH;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AA7BD,8BA6BC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "piral-cli-webpack5",
-  "version": "0.14.18",
+  "version": "0.14.19-beta.3927",
   "description": "Provides debug and build capabilities for pilets and Piral instances using Webpack v5.",
   "keywords": [
     "piral-cli",
@@ -48,7 +48,7 @@
     "@types/node": "^13.9.0",
     "@types/terser-webpack-plugin": "^5.0.0",
     "@types/yargs": "^15.0.4",
-    "piral-cli": "^0.14.18",
+    "piral-cli": "0.14.19-beta.3927",
     "strip-ansi": "^3.0.0",
     "typescript": "^4.0.2"
   },
@@ -74,8 +74,7 @@
     "systemjs-webpack-interop": "^2.3.7",
     "terser-webpack-plugin": "^5.0.0",
     "ts-loader": "^8.0.6",
-    "webpack": "^5.1.3",
-    "webpack-inject-plugin": "^1.5.5"
+    "webpack": "^5.1.3"
   },
-  "gitHead": "ba8e17c27b8854890fda9499e1107587e641e9b5"
+  "gitHead": "32fdd3a819e4397c2fa853d9c9e637153a7c44ea"
 }

package/src/plugins/SheetLoader.ts

@@ -0,0 +1,16 @@
+import { getOptions } from 'loader-utils';
+
+export default function sheetLoader() {
+  const { cssName, piletName } = getOptions(this);
+  const debug = process.env.NODE_ENV === 'development';
+  return [
+    `var d=document`,
+    `var u=__webpack_public_path__+${JSON.stringify(cssName)}`,
+    `var e=d.createElement("link")`,
+    `e.setAttribute('data-origin', ${JSON.stringify(piletName)})`,
+    `e.type="text/css"`,
+    `e.rel="stylesheet"`,
+    `e.href=${debug ? 'u+"?_="+Math.random()' : 'u'}`,
+    `d.head.appendChild(e)`,
+  ].join(';');
+}

package/src/plugins/SheetPlugin.ts

@@ -1,32 +1,18 @@
-import InjectPlugin from 'webpack-inject-plugin';
+import { resolve } from 'path';
 import { Compilation } from 'webpack';
 import { RawSource } from 'webpack-sources';
 
-function sheetLoader(cssName: string, name: string) {
-  return () => {
-    const debug = process.env.NODE_ENV === 'development';
-    return [
-      `var d=document`,
-      `var u=__webpack_public_path__+${JSON.stringify(cssName)}`,
-      `var e=d.createElement("link")`,
-      `e.setAttribute('data-origin', ${JSON.stringify(name)})`,
-      `e.type="text/css"`,
-      `e.rel="stylesheet"`,
-      `e.href=${debug ? 'u+"?_="+Math.random()' : 'u'}`,
-      `d.head.appendChild(e)`,
-    ].join(';');
-  };
-}
+export default class SheetPlugin {
+  private loaderPath: string;
 
-export default class SheetPlugin extends InjectPlugin {
-  constructor(private cssName: string, name: string, entryName: string) {
-    super(sheetLoader(cssName, name), {
-      entryName,
-    });
+  constructor(private cssName: string, piletName: string, private entryName: string) {
+    this.loaderPath = resolve(__dirname, `SheetLoader?cssName=${cssName}&piletName=${piletName}!`);
   }
 
   apply(compiler) {
-    super.apply(compiler);
+    const { entry } = compiler.options;
+
+    entry[this.entryName].import = [this.loaderPath, ...entry[this.entryName].import];
 
     compiler.hooks.compilation.tap('SheetPlugin', (compilation: Compilation) => {
       if (!compilation.compiler.parentCompilation) {