@modern-js/plugin-swc 2.27.0 → 2.28.0

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @modern-js/core
 
+## 2.28.0
+
+### Patch Changes
+
+- Updated dependencies [b7b4d84]
+- Updated dependencies [ac0e99c]
+- Updated dependencies [00b58a7]
+  - @modern-js/builder-plugin-swc@2.28.0
+  - @modern-js/utils@2.28.0
+
 ## 2.27.0
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,5 +1,7 @@
 import type { AppTools, CliPlugin } from '@modern-js/app-tools';
 import { PluginSwcOptions } from '@modern-js/builder-plugin-swc';
+import type { ToolsUserConfig } from '@modern-js/app-tools/src/types/config/tools';
 export declare function factory(name: string, modifySwcOptions: (options: PluginSwcOptions) => PluginSwcOptions): () => CliPlugin<AppTools>;
+export declare function applyBuilderSwcConfig(swc: PluginSwcOptions, esbuild: ToolsUserConfig['esbuild'] | undefined, isSSR: boolean): PluginSwcOptions;
 export declare const swcPlugin: () => CliPlugin<AppTools>;
 export default swcPlugin;

package/dist/index.js

@@ -13,6 +13,9 @@ _export(exports, {
   factory: function() {
     return factory;
   },
+  applyBuilderSwcConfig: function() {
+    return applyBuilderSwcConfig;
+  },
   swcPlugin: function() {
     return swcPlugin;
   },
@@ -47,36 +50,55 @@ function factory(name, modifySwcOptions) {
         const config = api.useResolvedConfigContext();
         const { esbuild, swc = {} } = config.tools;
         const swcOptions = modifySwcOptions(swc);
-        if ((0, _utils.isSSR)(config)) {
-          swcOptions.extensions = {
-            ...swcOptions.extensions || {},
-            loadableComponents: true
-          };
-        }
+        const finalConfig = applyBuilderSwcConfig(swcOptions, esbuild, (0, _utils.isSSR)(config));
         context.builder.addPlugins([
-          (0, _builderpluginswc.builderPluginSwc)(swcOptions)
+          (0, _builderpluginswc.builderPluginSwc)(finalConfig)
         ]);
-        if (esbuild) {
-          if (swc.jsMinify !== false && esbuild.minimize !== false) {
-            _logger.logger.warn("You have enabled both esbuild minimizer and SWC minimizer, which will cause conflicts. Please remove `tools.esbuild` config and only use SWC to minimize your code.");
-          }
-          if (esbuild.loader !== false) {
-            _logger.logger.warn("You have enabled both esbuild loader and SWC loader, which will cause conflicts. Please remove `tools.esbuild` config and only use SWC to transform your code.");
-          }
-        }
       }
     })
   });
 }
+function applyBuilderSwcConfig(swc, esbuild, isSSR) {
+  if (isSSR) {
+    swc = applyConfig(swc, (config) => {
+      config.extensions = {
+        ...config.extensions || {},
+        loadableComponents: true
+      };
+    });
+  }
+  return applyConfig(swc, (config) => {
+    if (esbuild) {
+      if (config.jsMinify !== false && esbuild.minimize !== false) {
+        _logger.logger.warn("You have enabled both esbuild minimizer and SWC minimizer, which will cause conflicts. Please remove `tools.esbuild` config and only use SWC to minimize your code.");
+      }
+      if (esbuild.loader !== false) {
+        _logger.logger.warn("You have enabled both esbuild loader and SWC loader, which will cause conflicts. Please remove `tools.esbuild` config and only use SWC to transform your code.");
+      }
+    }
+  });
+}
 const PLUGIN_NAME = "@modern-js/plugin-swc";
 const swcPlugin = factory(PLUGIN_NAME, (swcOptions) => {
-  swcOptions.extensions = {
-    ...swcOptions.extensions || {},
-    ssrLoaderId: {
-      runtimePackageName: "@modern-js/runtime",
-      functionUseLoaderName: "useLoader"
-    }
-  };
-  return swcOptions;
+  return applyConfig(swcOptions, (swcOptions2) => {
+    swcOptions2.extensions = {
+      ...swcOptions2.extensions || {},
+      ssrLoaderId: {
+        runtimePackageName: "@modern-js/runtime",
+        functionUseLoaderName: "useLoader"
+      }
+    };
+  });
 });
+function applyConfig(rawConfig, handler) {
+  if (typeof rawConfig === "function") {
+    return (config, utils) => {
+      handler(config);
+      return rawConfig(config, utils);
+    };
+  } else {
+    handler(rawConfig);
+    return rawConfig;
+  }
+}
 const _default = swcPlugin;

package/package.json

@@ -14,7 +14,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.27.0",
+  "version": "2.28.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -31,18 +31,18 @@
   },
   "dependencies": {
     "@swc/helpers": "0.5.1",
-    "@modern-js/utils": "2.27.0",
-    "@modern-js/builder-plugin-swc": "2.27.0"
+    "@modern-js/builder-plugin-swc": "2.28.0",
+    "@modern-js/utils": "2.28.0"
   },
   "devDependencies": {
-    "@types/jest": "^29",
     "@types/node": "^14",
+    "@types/jest": "^29",
     "typescript": "^5",
-    "@modern-js/types": "2.27.0",
-    "@modern-js/app-tools": "2.27.0",
-    "@modern-js/builder-shared": "2.27.0",
-    "@scripts/jest-config": "2.27.0",
-    "@scripts/build": "2.27.0"
+    "@modern-js/types": "2.28.0",
+    "@modern-js/app-tools": "2.28.0",
+    "@scripts/jest-config": "2.28.0",
+    "@scripts/build": "2.28.0",
+    "@modern-js/builder-shared": "2.28.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",