@compiled/webpack-loader 0.8.5 → 0.8.6

package/dist/utils.js

@@ -1,6 +1,25 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSources = exports.getOptimizeAssetsHook = exports.getAssetSourceContents = exports.setPluginConfiguredOption = void 0;
+/**
+ * Helper function to set plugin configured option on the @compiled/webpack-loader
+ *
+ * @param use
+ * @param pluginName
+ */
+const setOptionOnCompiledWebpackLoader = (use, pluginName) => {
+    if (!use || !Array.isArray(use) || !use.length) {
+        return;
+    }
+    for (const nestedUse of use) {
+        if (typeof nestedUse === 'object' && nestedUse.loader === '@compiled/webpack-loader') {
+            const { options } = nestedUse;
+            if (options !== undefined && typeof options === 'object' && options.extract !== undefined) {
+                options[pluginName] = true;
+            }
+        }
+    }
+};
 /**
  * Sets an option on the plugin config to tell loaders that the plugin has been configured.
  * Bundling will throw if this option is missing (i.e. consumers did not setup correctly).
@@ -10,34 +29,17 @@ exports.getSources = exports.getOptimizeAssetsHook = exports.getAssetSourceConte
  * @returns
  */
 const setPluginConfiguredOption = (rules, pluginName) => {
-    for (const rule of rules) {
-        const use = rule.use;
-        if (!use || typeof use === 'string') {
-            continue;
-        }
-        if (Array.isArray(use)) {
-            if (!use.length) {
-                continue;
-            }
-            for (const nestedUse of use) {
-                if (typeof nestedUse !== 'object' || nestedUse.loader !== '@compiled/webpack-loader') {
-                    continue;
-                }
-                const { options } = nestedUse;
-                if (!options || typeof options !== 'object' || !options.extract) {
-                    continue;
-                }
-                options[pluginName] = true;
+    var _a;
+    for (const r of rules) {
+        const rule = r;
+        const nestedRules = (_a = rule.oneOf) !== null && _a !== void 0 ? _a : rule.rules;
+        if (nestedRules) {
+            for (const nestedRule of nestedRules) {
+                setOptionOnCompiledWebpackLoader(nestedRule.use, pluginName);
             }
         }
         else {
-            if (typeof use === 'object' && use.loader === '@compiled/webpack-loader') {
-                const { options } = use;
-                if (!options || typeof options !== 'object' || !options.extract) {
-                    continue;
-                }
-                options[pluginName] = true;
-            }
+            setOptionOnCompiledWebpackLoader(rule.use, pluginName);
         }
     }
 };

package/dist/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":";;;AAEA;;;;;;;GAOG;AACI,MAAM,yBAAyB,GAAG,CACvC,KAA8B,EAC9B,UAAkB,EACZ,EAAE;IACR,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,GAAG,GAAI,IAAoB,CAAC,GAAG,CAAC;QACtC,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;YACnC,SAAS;SACV;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YACtB,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE;gBACf,SAAS;aACV;YACD,KAAK,MAAM,SAAS,IAAI,GAAG,EAAE;gBAC3B,IAAI,OAAO,SAAS,KAAK,QAAQ,IAAI,SAAS,CAAC,MAAM,KAAK,0BAA0B,EAAE;oBACpF,SAAS;iBACV;gBACD,MAAM,EAAE,OAAO,EAAE,GAAG,SAAS,CAAC;gBAC9B,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;oBAC/D,SAAS;iBACV;gBACD,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;aAC5B;SACF;aAAM;YACL,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,0BAA0B,EAAE;gBACxE,MAAM,EAAE,OAAO,EAAE,GAAG,GAAG,CAAC;gBACxB,IAAI,CAAC,OAAO,IAAI,OAAO,OAAO,KAAK,QAAQ,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE;oBAC/D,SAAS;iBACV;gBACD,OAAO,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;aAC5B;SACF;KACF;AACH,CAAC,CAAC;AAjCW,QAAA,yBAAyB,6BAiCpC;AAEF;;;;;GAKG;AACI,MAAM,sBAAsB,GAAG,CAAC,WAA2B,EAAU,EAAE;IAC5E,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,CAAC;IACpC,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE;QAC9B,OAAO,MAAM,CAAC;KACf;IAED,OAAO,MAAM,CAAC,QAAQ,EAAE,CAAC;AAC3B,CAAC,CAAC;AAPW,QAAA,sBAAsB,0BAOjC;AAEF;;;;;GAKG;AACI,MAAM,qBAAqB,GAAG,CACnC,QAAkB,EAClB,WAA4B,EAC+B,EAAE;IAC7D,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE;IAC5B,iBAAiB;IACjB,QAAQ,CAAC,OAAO;QAChB,iBAAiB;QACjB,OAAO,CAAC,SAAS,CAAC,CAAC;IACrB,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,cAAc;IAClB,iBAAiB;IACjB,WAAW,CAAC,KAAK,CAAC,aAAa;QAC/B,iBAAiB;QACjB,WAAW,CAAC,KAAK,CAAC,cAAc,CAAC;IAEnC,OAAO;QACL,GAAG,EAAE,CAAC,UAAkB,EAAE,QAAqD,EAAE,EAAE;YACjF,cAAc,CAAC,GAAG,CAChB,UAAU;gBACR,CAAC,CAAC,UAAU;gBACZ,CAAC,CAAC;oBACE,IAAI,EAAE,UAAU;oBAChB,KAAK,EAAE,WAAW,CAAC,kCAAkC;iBACtD,EACL,QAAQ,CACT,CAAC;QACJ,CAAC;KACF,CAAC;AACJ,CAAC,CAAC;AA7BW,QAAA,qBAAqB,yBA6BhC;AAEF;;;GAGG;AACI,MAAM,UAAU,GAAG,CAAC,QAAkB,EAAkB,EAAE;IAC/D,MAAM,EAAE,OAAO,EAAE;IACf,iBAAiB;IACjB,QAAQ,CAAC,OAAO;QAChB,iBAAiB;QACjB,EAAE,CAAC;IAEL,OAAO;IACL,iBAAiB;IACjB,OAAO;QACP,iBAAiB;QACjB,OAAO,CAAC,iBAAiB,CAAC,CAC3B,CAAC;AACJ,CAAC,CAAC;AAbW,QAAA,UAAU,cAarB"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@compiled/webpack-loader",
-  "version": "0.8.5",
+  "version": "0.8.6",
   "description": "A familiar and performant compile time CSS-in-JS library for React.",
   "homepage": "https://compiledcssinjs.com/docs/pkg-webpack-loader",
   "bugs": "https://github.com/atlassian-labs/compiled/issues/new?assignees=&labels=bug&template=bug_report.md",
@@ -20,9 +20,9 @@
     "src"
   ],
   "dependencies": {
-    "@babel/core": "^7.17.5",
-    "@compiled/babel-plugin": "^0.14.0",
-    "@compiled/babel-plugin-strip-runtime": "^0.14.0",
+    "@babel/core": "^7.17.8",
+    "@compiled/babel-plugin": "^0.14.1",
+    "@compiled/babel-plugin-strip-runtime": "^0.14.1",
     "@compiled/css": "^0.8.2",
     "@compiled/react": "0.10.4",
     "@compiled/utils": "^0.6.16",

package/src/utils.ts

@@ -1,5 +1,26 @@
 import type { Compilation as CompilationType, Compiler, sources, RuleSetRule } from 'webpack';
 
+/**
+ * Helper function to set plugin configured option on the @compiled/webpack-loader
+ *
+ * @param use
+ * @param pluginName
+ */
+const setOptionOnCompiledWebpackLoader = (use: RuleSetRule['use'], pluginName: string) => {
+  if (!use || !Array.isArray(use) || !use.length) {
+    return;
+  }
+
+  for (const nestedUse of use) {
+    if (typeof nestedUse === 'object' && nestedUse.loader === '@compiled/webpack-loader') {
+      const { options } = nestedUse;
+      if (options !== undefined && typeof options === 'object' && options.extract !== undefined) {
+        options[pluginName] = true;
+      }
+    }
+  }
+};
+
 /**
  * Sets an option on the plugin config to tell loaders that the plugin has been configured.
  * Bundling will throw if this option is missing (i.e. consumers did not setup correctly).
@@ -12,33 +33,15 @@ export const setPluginConfiguredOption = (
   rules: (RuleSetRule | '...')[],
   pluginName: string
 ): void => {
-  for (const rule of rules) {
-    const use = (rule as RuleSetRule).use;
-    if (!use || typeof use === 'string') {
-      continue;
-    }
-    if (Array.isArray(use)) {
-      if (!use.length) {
-        continue;
-      }
-      for (const nestedUse of use) {
-        if (typeof nestedUse !== 'object' || nestedUse.loader !== '@compiled/webpack-loader') {
-          continue;
-        }
-        const { options } = nestedUse;
-        if (!options || typeof options !== 'object' || !options.extract) {
-          continue;
-        }
-        options[pluginName] = true;
+  for (const r of rules) {
+    const rule = r as RuleSetRule;
+    const nestedRules = rule.oneOf ?? rule.rules;
+    if (nestedRules) {
+      for (const nestedRule of nestedRules) {
+        setOptionOnCompiledWebpackLoader(nestedRule.use, pluginName);
       }
     } else {
-      if (typeof use === 'object' && use.loader === '@compiled/webpack-loader') {
-        const { options } = use;
-        if (!options || typeof options !== 'object' || !options.extract) {
-          continue;
-        }
-        options[pluginName] = true;
-      }
+      setOptionOnCompiledWebpackLoader(rule.use, pluginName);
     }
   }
 };