with-zephyr 0.0.0-canary.4 → 0.0.0-canary.5

package/dist/index.js

@@ -48139,20 +48139,15 @@ const BUNDLER_CONFIGS = {
         plugin: 'zephyr-rsbuild-plugin',
         importName: 'withZephyr',
         patterns: [
-            {
-                type: 'zephyr-rsbuild-plugin-exists',
-                matcher: /zephyrRSbuildPlugin/,
-                transform: 'skipAlreadyWrapped'
-            },
             {
                 type: 'define-config',
                 matcher: /defineConfig\s*\(\s*\{/,
-                transform: 'addZephyrRSbuildPlugin'
+                transform: 'addToPluginsArray'
             },
             {
                 type: 'plugins-array',
                 matcher: /plugins\s*:\s*\[/,
-                transform: 'addZephyrRSbuildPlugin'
+                transform: 'addToPluginsArray'
             }
         ]
     },
@@ -48165,25 +48160,27 @@ const BUNDLER_CONFIGS = {
         plugin: 'zephyr-rsbuild-plugin',
         importName: 'withZephyr',
         patterns: [
-            {
-                type: 'zephyr-rsbuild-plugin-exists',
-                matcher: /zephyrRSbuildPlugin/,
-                transform: 'skipAlreadyWrapped'
-            },
             {
                 type: 'define-config',
                 matcher: /defineConfig\s*\(\s*\{/,
-                transform: 'addZephyrRSbuildPlugin'
+                transform: 'addToPluginsArray'
             },
             {
                 type: 'plugins-array',
                 matcher: /plugins\s*:\s*\[/,
-                transform: 'addZephyrRSbuildPlugin'
+                transform: 'addToPluginsArray'
             }
         ]
     }
 };
 function detectPackageManager(directory = process.cwd()) {
+    if (process.env.npm_config_user_agent) {
+        const userAgent = process.env.npm_config_user_agent.toLowerCase();
+        if (userAgent.includes('pnpm')) return 'pnpm';
+        if (userAgent.includes('yarn')) return 'yarn';
+        if (userAgent.includes('bun')) return 'bun';
+        if (userAgent.includes('npm')) return 'npm';
+    }
     const lockFiles = {
         'pnpm-lock.yaml': 'pnpm',
         'yarn.lock': 'yarn',
@@ -48216,12 +48213,6 @@ function detectPackageManager(directory = process.cwd()) {
             if (fs_0.existsSync(path_0.join(rootDir, 'lerna.json')) || fs_0.existsSync(path_0.join(rootDir, 'yarn.lock')) && rootDir === directory) return 'yarn';
         }
     } catch  {}
-    if (process.env.npm_config_user_agent) {
-        const userAgent = process.env.npm_config_user_agent.toLowerCase();
-        if (userAgent.includes('pnpm')) return 'pnpm';
-        if (userAgent.includes('yarn')) return 'yarn';
-        if (userAgent.includes('bun')) return 'bun';
-    }
     return 'npm';
 }
 function isPackageInstalled(packageName, directory = process.cwd()) {
@@ -48348,7 +48339,7 @@ function addZephyrRequire(ast, pluginName, importName) {
         });
     }
 }
-function transformers_hasZephyrPlugin(ast) {
+function hasZephyrPlugin(ast) {
     let hasPlugin = false;
     (0, traverse_lib["default"])(ast, {
         CallExpression (path) {
@@ -48498,100 +48489,6 @@ function wrapExportedFunction(ast) {
         }
     });
 }
-function addZephyrRSbuildPlugin(ast) {
-    let hasWithZephyrImport = false;
-    (0, traverse_lib["default"])(ast, {
-        ImportDeclaration (path) {
-            if ('zephyr-rspack-plugin' === path.node.source.value) {
-                const specifiers = path.node.specifiers;
-                for (const spec of specifiers)if (types_lib.isImportSpecifier(spec) && types_lib.isIdentifier(spec.imported, {
-                    name: 'withZephyr'
-                })) hasWithZephyrImport = true;
-            }
-        }
-    });
-    if (!hasWithZephyrImport) {
-        const importDeclaration = types_lib.importDeclaration([
-            types_lib.importSpecifier(types_lib.identifier('withZephyr'), types_lib.identifier('withZephyr'))
-        ], types_lib.stringLiteral('zephyr-rspack-plugin'));
-        (0, traverse_lib["default"])(ast, {
-            Program (path) {
-                const firstImportIndex = path.node.body.findIndex((node)=>types_lib.isImportDeclaration(node));
-                if (firstImportIndex >= 0) path.node.body.splice(firstImportIndex + 1, 0, importDeclaration);
-                else path.node.body.unshift(importDeclaration);
-                path.stop();
-            }
-        });
-    }
-    let hasZephyrPlugin = false;
-    (0, traverse_lib["default"])(ast, {
-        VariableDeclarator (path) {
-            if (types_lib.isIdentifier(path.node.id, {
-                name: 'zephyrRSbuildPlugin'
-            })) hasZephyrPlugin = true;
-        }
-    });
-    if (!hasZephyrPlugin) {
-        const zephyrPluginFunction = types_lib.variableDeclaration('const', [
-            types_lib.variableDeclarator(types_lib.identifier('zephyrRSbuildPlugin'), types_lib.arrowFunctionExpression([], types_lib.objectExpression([
-                types_lib.objectProperty(types_lib.identifier('name'), types_lib.stringLiteral('zephyr-rsbuild-plugin')),
-                types_lib.objectMethod('method', types_lib.identifier('setup'), [
-                    types_lib.identifier('api')
-                ], types_lib.blockStatement([
-                    types_lib.expressionStatement(types_lib.callExpression(types_lib.memberExpression(types_lib.identifier('api'), types_lib.identifier('modifyRspackConfig')), [
-                        types_lib.arrowFunctionExpression([
-                            types_lib.identifier('config')
-                        ], types_lib.blockStatement([
-                            types_lib.variableDeclaration('const', [
-                                types_lib.variableDeclarator(types_lib.identifier('zephyrConfig'), types_lib.awaitExpression(types_lib.callExpression(types_lib.callExpression(types_lib.identifier('withZephyr'), []), [
-                                    types_lib.identifier('config')
-                                ])))
-                            ]),
-                            types_lib.expressionStatement(types_lib.assignmentExpression('=', types_lib.identifier('config'), types_lib.identifier('zephyrConfig')))
-                        ]), true)
-                    ]))
-                ]))
-            ])))
-        ]);
-        (0, traverse_lib["default"])(ast, {
-            Program (path) {
-                let insertIndex = 0;
-                for(let i = 0; i < path.node.body.length; i++)if (types_lib.isImportDeclaration(path.node.body[i])) insertIndex = i + 1;
-                else break;
-                path.node.body.splice(insertIndex, 0, zephyrPluginFunction);
-                path.stop();
-            }
-        });
-        let hasRsbuildPluginImport = false;
-        (0, traverse_lib["default"])(ast, {
-            ImportDeclaration (path) {
-                if ('@rsbuild/core' === path.node.source.value) {
-                    const specifiers = path.node.specifiers;
-                    for (const spec of specifiers)if (types_lib.isImportSpecifier(spec) && types_lib.isIdentifier(spec.imported, {
-                        name: 'RsbuildPlugin'
-                    })) hasRsbuildPluginImport = true;
-                    if (!hasRsbuildPluginImport) specifiers.push(types_lib.importSpecifier(types_lib.identifier('RsbuildPlugin'), types_lib.identifier('RsbuildPlugin')));
-                }
-            }
-        });
-    }
-    (0, traverse_lib["default"])(ast, {
-        ObjectProperty (path) {
-            if (types_lib.isIdentifier(path.node.key, {
-                name: 'plugins'
-            }) && types_lib.isArrayExpression(path.node.value)) {
-                let hasZephyrInPlugins = false;
-                for (const element of path.node.value.elements)if (types_lib.isCallExpression(element) && types_lib.isIdentifier(element.callee, {
-                    name: 'zephyrRSbuildPlugin'
-                })) {
-                    hasZephyrInPlugins = true;
-                    break;
-                }
-                if (!hasZephyrInPlugins) path.node.value.elements.push(types_lib.callExpression(types_lib.identifier('zephyrRSbuildPlugin'), []));
-            }
-        }
-    });
-}
 const TRANSFORMERS = {
     addToComposePlugins: addToComposePlugins,
     addToPluginsArray: addToPluginsArray,
@@ -48605,8 +48502,7 @@ const TRANSFORMERS = {
     wrapModuleExports: wrapModuleExports,
     wrapExportDefault: wrapExportDefault,
     skipAlreadyWrapped: skipAlreadyWrapped,
-    wrapExportedFunction: wrapExportedFunction,
-    addZephyrRSbuildPlugin: addZephyrRSbuildPlugin
+    wrapExportedFunction: wrapExportedFunction
 };
 function normalizePathForOutput(filePath) {
     return filePath.replace(/\\/g, '/');
@@ -48656,7 +48552,7 @@ function checkHasZephyr(filePath, config) {
         }
         {
             const ast = parseFile(filePath);
-            return transformers_hasZephyrPlugin(ast);
+            return hasZephyrPlugin(ast);
         }
     } catch (error) {
         console.warn(source.yellow(`Warning: Could not parse ${normalizePathForOutput(filePath)}: ${error.message}`));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "with-zephyr",
-  "version": "0.0.0-canary.4",
+  "version": "0.0.0-canary.5",
   "description": "A codemod to automatically add withZephyr plugin to bundler configurations",
   "main": "dist/index.js",
   "repository": {
@@ -38,7 +38,7 @@
     "@types/node": "^24.5.2",
     "@rslib/core": "^0.13.3",
     "typescript": "^5.9.2",
-    "zephyr-rsbuild-plugin": "0.0.0-canary.4"
+    "zephyr-rsbuild-plugin": "0.0.0-canary.5"
   },
   "keywords": [
     "zephyr",

package/dist/zephyr-manifest.json

@@ -1,6 +0,0 @@
-{
-  "version": "1.0.0",
-  "timestamp": "2025-10-06T11:26:33.932Z",
-  "dependencies": {},
-  "zeVars": {}
-}