stylex-webpack 0.4.6 → 0.4.7

package/dist/index.js

@@ -5,7 +5,7 @@ var path = require('node:path');
 var process = require('node:process');
 var identity = require('foxts/identity');
 
-var version = "0.4.6";
+var version = "0.4.7";
 
 const PLUGIN_NAME = 'stylex';
 const VIRTUAL_ENTRYPOINT_CSS_PATH = require.resolve('./stylex.css');
@@ -159,31 +159,25 @@ class StyleXPlugin {
                         }
                     }
                 }
+                if (this.loaderOption.nextjsMode && this.loaderOption.nextjsAppRouterMode && isNextJsCompilerName(compiler.name)) {
+                    var _globalThis;
+                    (_globalThis = globalThis).__stylex_nextjs_global_registry__ ?? (_globalThis.__stylex_nextjs_global_registry__ = new Map());
+                    globalThis.__stylex_nextjs_global_registry__.set(compiler.name, this.stylexRules);
+                }
             });
             compilation.hooks.processAssets.tapPromise({
                 name: PLUGIN_NAME,
                 stage: Compilation.PROCESS_ASSETS_STAGE_PRE_PROCESS
             }, async (assets)=>{
-                if (this.loaderOption.nextjsMode && this.loaderOption.nextjsAppRouterMode && isNextJsCompilerName(compiler.name)) {
-                    if (compiler.name === NEXTJS_COMPILER_NAMES.server || compiler.name === NEXTJS_COMPILER_NAMES.edgeServer) {
-                        var _globalThis;
-                        ((_globalThis = globalThis).__stylex_nextjs_global_registry__ ?? (_globalThis.__stylex_nextjs_global_registry__ = new Map())).set(compiler.name, this.stylexRules);
-                        // we don't need to do anything more in server/edge compiler, no CSS generation is needed
-                        return;
-                    }
-                    // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition -- type safe
-                    if (compiler.name === NEXTJS_COMPILER_NAMES.client) {
-                        const globalRegistry = globalThis.__stylex_nextjs_global_registry__;
-                        if (globalRegistry != null) {
-                            // now we merge all collected rules from other compilers
-                            globalRegistry.forEach((rules)=>{
-                                rules.forEach((rule, resourcePath)=>{
-                                    this.stylexRules.set(resourcePath, rule);
-                                });
+                if (this.loaderOption.nextjsMode && this.loaderOption.nextjsAppRouterMode && compiler.name === NEXTJS_COMPILER_NAMES.client) {
+                    const globalRegistry = globalThis.__stylex_nextjs_global_registry__;
+                    if (globalRegistry != null) {
+                        // now we merge all collected rules from other compilers
+                        globalRegistry.forEach((rules)=>{
+                            rules.forEach((rule, resourcePath)=>{
+                                this.stylexRules.set(resourcePath, rule);
                             });
-                        }
-                    } else {
-                        compiler.name;
+                        });
                     }
                 }
                 const stylexCSS = getStyleXRules(this.stylexRules, this.useCSSLayers);

package/dist/stylex-loader.js

@@ -4,6 +4,7 @@ var core = require('@babel/core');
 var stylexBabelPlugin = require('@stylexjs/babel-plugin');
 var guard = require('foxts/guard');
 
+const LOADER_TRANSFORMED_FLAG = '/* [stylex-webpack] stylex-loader transformed */';
 require.resolve('./stylex.css');
 const VIRTUAL_STYLEX_CSS_DUMMY_IMPORT_PATH = require.resolve('./stylex-virtual.css');
 const BUILD_INFO_STYLEX_KEY = '~stylex_webpack_stylex_rules';
@@ -15,6 +16,11 @@ function stringifyRequest(loaderContext, request) {
 const PLUGIN_NAME = 'stylex';
 async function stylexLoader(inputCode, inputSourceMap) {
     const callback = this.async();
+    // bail out early if already transformed
+    // for some reason, a module might be passed to stylex-loader more than once, happened with Next.js App Router
+    if (inputCode.includes(LOADER_TRANSFORMED_FLAG)) {
+        return callback(null, inputCode, inputSourceMap);
+    }
     const { stylexImports, stylexOption } = this.getOptions();
     // bail out early if the input doesn't contain stylex imports
     if (!stylexImports.some((importName)=>inputCode.includes(importName))) {
@@ -56,7 +62,7 @@ async function stylexLoader(inputCode, inputSourceMap) {
             stylex: JSON.stringify(metadata.stylex) // color: #fff is not url safe, let's get through JSON.stringify
         });
         const virtualCssRequest = stringifyRequest(this, `${VIRTUAL_STYLEX_CSS_DUMMY_IMPORT_PATH}?${urlParams.toString()}`);
-        const postfix = `\nimport ${virtualCssRequest};`;
+        const postfix = `\nimport ${virtualCssRequest};\n${LOADER_TRANSFORMED_FLAG}`;
         return callback(null, code + postfix, map ?? undefined);
     } catch (error) {
         return callback(error);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stylex-webpack",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "description": "The another Webpack Plugin for Facebook's StyleX",
   "homepage": "https://github.com/SukkaW/style9-webpack#readme",
   "repository": {
@@ -60,7 +60,7 @@
     "@eslint-sukka/node": "^8.0.2",
     "@rollup/plugin-json": "^6.1.0",
     "@swc-node/register": "^1.11.1",
-    "@swc/core": "^1.15.0",
+    "@swc/core": "^1.15.1",
     "@types/babel__core": "^7.20.5",
     "@types/loader-utils": "^3.0.0",
     "@types/mocha": "^10.0.10",
@@ -79,7 +79,7 @@
     "next": "^15.5.6",
     "postcss": "^8.5.6",
     "premove": "^4.0.0",
-    "rollup": "^4.52.5",
+    "rollup": "^4.53.1",
     "rollup-plugin-copy": "^3.5.0",
     "rollup-plugin-dts": "^6.2.3",
     "rollup-plugin-swc3": "^0.12.1",
@@ -96,6 +96,7 @@
       "eslint>chalk": "npm:picocolors@^1.1.1"
     },
     "onlyBuiltDependencies": [
+      "@swc/core",
       "oxc-resolver"
     ]
   }