@modern-js/plugin-swc 2.22.0 → 2.23.0

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @modern-js/core
 
+## 2.23.0
+
+### Minor Changes
+
+- b185fdf: refactor: merge the swc plugin
+  refactor: 合并 swc 插件
+
+### Patch Changes
+
+- 7e6fb5f: chore: publishConfig add provenance config
+
+  chore: publishConfig 增加 provenance 配置
+
+- c3216b5: chore: split the scheme into the plugin
+
+  chore: 拆分 scheme 到插件内部
+
+- Updated dependencies [7e6fb5f]
+- Updated dependencies [a7a7ad7]
+- Updated dependencies [6dec7c2]
+- Updated dependencies [c3216b5]
+- Updated dependencies [b185fdf]
+  - @modern-js/builder-plugin-swc@2.23.0
+  - @modern-js/utils@2.23.0
+
+## 2.22.1
+
+### Patch Changes
+
+- Updated dependencies [e2848a2]
+- Updated dependencies [d4045ed]
+- Updated dependencies [1f02cd2]
+  - @modern-js/utils@2.22.1
+  - @modern-js/builder-plugin-swc@2.22.1
+
 ## 2.22.0
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,3 +1,5 @@
 import type { AppTools, CliPlugin } from '@modern-js/app-tools';
+import { PluginSwcOptions } from '@modern-js/builder-plugin-swc';
+export declare function factory(name: string, modifySwcOptions: (options: PluginSwcOptions) => PluginSwcOptions): () => CliPlugin<AppTools>;
 declare const _default: () => CliPlugin<AppTools>;
 export default _default;

package/dist/index.js

@@ -1,30 +1,58 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.factory = void 0;
 const utils_1 = require("@modern-js/utils");
 const builder_plugin_swc_1 = require("@modern-js/builder-plugin-swc");
 const logger_1 = require("@modern-js/utils/logger");
-exports.default = () => ({
-    name: '@modern-js/plugin-swc',
-    setup: api => ({
-        validateSchema() {
-            return utils_1.PLUGIN_SCHEMAS['@modern-js/plugin-swc'];
-        },
-        prepare() {
-            const context = api.useAppContext();
-            if (!context.builder) {
-                return;
-            }
-            const config = api.useResolvedConfigContext();
-            const { esbuild, swc = {} } = config.tools;
-            context.builder.addPlugins([(0, builder_plugin_swc_1.builderPluginSwc)(swc)]);
-            if (esbuild) {
-                if (swc.jsMinify !== false && esbuild.minimize !== false) {
-                    logger_1.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.');
+function factory(name, modifySwcOptions) {
+    return () => ({
+        name,
+        setup: api => ({
+            validateSchema() {
+                return [
+                    {
+                        target: 'tools.swc',
+                        schema: { typeof: ['object'] },
+                    },
+                ];
+            },
+            prepare() {
+                const context = api.useAppContext();
+                if (!context.builder) {
+                    return;
+                }
+                const config = api.useResolvedConfigContext();
+                const { esbuild, swc = {} } = config.tools;
+                const swcOptions = modifySwcOptions(swc);
+                // common configuration
+                if ((0, utils_1.isSSR)(config)) {
+                    swcOptions.extensions = {
+                        ...(swcOptions.extensions || {}),
+                        loadableComponents: true,
+                    };
                 }
-                if (esbuild.loader !== false) {
-                    logger_1.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.');
+                context.builder.addPlugins([(0, builder_plugin_swc_1.builderPluginSwc)(swcOptions)]);
+                if (esbuild) {
+                    if (swc.jsMinify !== false && esbuild.minimize !== false) {
+                        logger_1.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_1.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.');
+                    }
                 }
-            }
+            },
+        }),
+    });
+}
+exports.factory = factory;
+const PLUGIN_NAME = '@modern-js/plugin-swc';
+exports.default = factory(PLUGIN_NAME, swcOptions => {
+    swcOptions.extensions = {
+        ...(swcOptions.extensions || {}),
+        ssrLoaderId: {
+            runtimePackageName: '@modern-js/runtime',
+            functionUseLoaderName: 'useLoader',
         },
-    }),
+    };
+    return swcOptions;
 });

package/package.json

@@ -14,7 +14,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.22.0",
+  "version": "2.23.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.js",
@@ -30,23 +30,23 @@
     }
   },
   "dependencies": {
-    "@modern-js/builder-plugin-swc": "2.22.0",
-    "@modern-js/utils": "2.22.0"
+    "@modern-js/builder-plugin-swc": "2.23.0",
+    "@modern-js/utils": "2.23.0"
   },
   "devDependencies": {
     "@types/jest": "^29",
     "@types/node": "^14",
     "typescript": "^5",
-    "@modern-js/app-tools": "2.22.0",
-    "@modern-js/builder-shared": "2.22.0",
-    "@modern-js/babel-preset-app": "2.22.0",
-    "@modern-js/types": "2.22.0",
-    "@scripts/jest-config": "2.22.0",
-    "@scripts/build": "2.22.0"
+    "@modern-js/app-tools": "2.23.0",
+    "@modern-js/builder-shared": "2.23.0",
+    "@modern-js/types": "2.23.0",
+    "@scripts/build": "2.23.0",
+    "@scripts/jest-config": "2.23.0"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
-    "access": "public"
+    "access": "public",
+    "provenance": true
   },
   "scripts": {
     "new": "modern-lib new",