@shuvi/toolpack 2.0.0-dev.37 → 2.0.0-dev.39

package/lib/webpack/loaders/shuvi-swc-loader/getLoaderSWCOptions.d.ts

@@ -1,10 +1,16 @@
+import type { EnvConfig, JscConfig, JscTarget, Options, ParserConfig, TransformConfig } from '@swc/types';
 type Obj = Record<string, any>;
 export interface CompilerOptions {
     removeConsole?: boolean;
     useDefineForClassFields?: boolean;
     reactRemoveProperties?: boolean;
     jsxImportSource?: string;
-    jscTarget?: string;
+    jscTarget?: JscTarget;
+    /**
+     * swc `env` options for client build, e.g. `{ targets, mode: 'usage', coreJs }`.
+     * When set, `jscTarget` is ignored because swc does not allow `env` and `jsc.target` together.
+     */
+    env?: EnvConfig;
     emotion?: boolean | {
         sourceMap?: boolean;
         autoLabel?: 'dev-only' | 'always' | 'never';
@@ -43,99 +49,62 @@ export type SWCLoaderOptions = {
     development: boolean;
     minify: boolean | Obj;
     hasReactRefresh: boolean;
-    supportedBrowsers: any[];
+    supportedBrowsers?: string[] | false;
     swcCacheDir: string;
     compiler: CompilerOptions;
 };
-export declare function getParserOptions({ filename, compiler, ...rest }: {
-    filename: string;
-    compiler: Obj;
-}): {
-    syntax: string;
-    dynamicImport: boolean;
-    decorators: boolean;
-    importAssertions: boolean;
+type ShuviParserConfig = ParserConfig & {
+    importAssertions?: boolean;
 };
-export default function getLoaderSWCOptions({ filename, development, isServer, minify, isPageFile, pagePickLoader, hasReactRefresh, compiler, supportedBrowsers, swcCacheDir }: SWCLoaderOptions): {
-    isDevelopment: boolean;
-    jsc: {
-        externalHelpers: boolean;
-        parser: {
-            syntax: string;
-            dynamicImport: boolean;
-            decorators: boolean;
-            importAssertions: boolean;
-        };
-        experimental: {
-            keepImportAssertions: boolean;
-            plugins: any[][];
-            cacheRoot: string;
-        };
-        transform: {
-            legacyDecorator: boolean;
-            decoratorMetadata: boolean;
-            useDefineForClassFields: boolean;
-            react: {
-                importSource: string;
-                runtime: string;
-                pragma: string;
-                pragmaFrag: string;
-                throwIfNamespace: boolean;
-                development: boolean;
-                useBuiltins: boolean;
-                refresh: boolean;
-            };
-            optimizer: {
-                simplify: boolean;
-                globals: {
-                    typeofs: {
-                        window: string;
-                    };
-                    envs: {
-                        NODE_ENV: string;
-                    };
-                };
-            };
-            regenerator: {
-                importPath: string;
-            };
-        };
+interface ShuviTransformConfig extends TransformConfig {
+    regenerator?: {
+        importPath?: string;
     };
-    minify: boolean | Obj;
-    sourceMaps: undefined;
-    isServer: boolean;
-    isPageFile: boolean;
-    pagePickLoader: boolean;
-    cssModuleFlag: string;
-    removeConsole: boolean | undefined;
-    reactRemoveProperties: boolean | undefined;
-    modularizeImports: Record<string, {
-        transform: string;
-        preventFullImport?: boolean;
-        skipDefaultConversion?: boolean;
-    }> | undefined;
-    styledComponents: {
-        displayName: boolean;
-        topLevelImportPaths?: string[];
-        ssr?: boolean;
-        fileName?: boolean;
-        meaninglessFileNames?: string[];
-        minify?: boolean;
-        transpileTemplateLiterals?: boolean;
-        namespace?: string;
-        pure?: boolean;
-        cssProp?: boolean;
-    } | null;
-    emotion: {
-        enabled: boolean;
-        autoLabel: boolean;
-        sourcemap: boolean;
-        labelFormat?: undefined;
-    } | {
-        enabled: boolean;
-        autoLabel: boolean;
-        labelFormat: string | undefined;
-        sourcemap: boolean;
-    } | null;
-};
+}
+interface ShuviJscConfig extends Omit<JscConfig, 'parser' | 'transform'> {
+    parser?: ShuviParserConfig;
+    transform?: ShuviTransformConfig;
+}
+export interface ShuviSWCOptions extends Omit<Options, 'jsc' | 'minify'> {
+    jsc: ShuviJscConfig;
+    minify?: boolean | Obj;
+    isDevelopment?: boolean;
+    isServer?: boolean;
+    isPageFile?: boolean;
+    pagePickLoader?: boolean;
+    cssModuleFlag?: string;
+    removeConsole?: CompilerOptions['removeConsole'];
+    reactRemoveProperties?: CompilerOptions['reactRemoveProperties'];
+    modularizeImports?: CompilerOptions['modularizeImports'];
+    styledComponents?: ReturnType<typeof getStyledComponentsOptions>;
+    emotion?: ReturnType<typeof getEmotionOptions>;
+}
+export declare function getParserOptions({ filename, compiler }: {
+    filename: string;
+    compiler: CompilerOptions;
+}): ShuviParserConfig;
+declare function getStyledComponentsOptions(compiler: CompilerOptions, development: boolean): {
+    displayName: boolean;
+    topLevelImportPaths?: string[];
+    ssr?: boolean;
+    fileName?: boolean;
+    meaninglessFileNames?: string[];
+    minify?: boolean;
+    transpileTemplateLiterals?: boolean;
+    namespace?: string;
+    pure?: boolean;
+    cssProp?: boolean;
+} | null;
+declare function getEmotionOptions(compiler: CompilerOptions, development: boolean): {
+    enabled: boolean;
+    autoLabel: boolean;
+    sourcemap: boolean;
+    labelFormat?: undefined;
+} | {
+    enabled: boolean;
+    autoLabel: boolean;
+    labelFormat: string | undefined;
+    sourcemap: boolean;
+} | null;
+export default function getLoaderSWCOptions({ filename, development, isServer, minify, isPageFile, pagePickLoader, hasReactRefresh, compiler, supportedBrowsers, swcCacheDir }: SWCLoaderOptions): ShuviSWCOptions;
 export {};

package/lib/webpack/loaders/shuvi-swc-loader/getLoaderSWCOptions.js

@@ -1,26 +1,28 @@
 "use strict";
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getParserOptions = getParserOptions;
 exports.default = getLoaderSWCOptions;
-function getParserOptions(_a) {
-    var { filename, compiler } = _a, rest = __rest(_a, ["filename", "compiler"]);
+function getParserOptions({ filename, compiler }) {
     const isTSFile = filename.endsWith('.ts');
     const isTypeScript = isTSFile || filename.endsWith('.tsx');
     const enableDecorators = Boolean(compiler === null || compiler === void 0 ? void 0 : compiler.experimentalDecorators);
-    return Object.assign(Object.assign({}, rest), { syntax: isTypeScript ? 'typescript' : 'ecmascript', dynamicImport: true, decorators: enableDecorators, 
-        // Exclude regular TypeScript files from React transformation to prevent e.g. generic parameters and angle-bracket type assertion from being interpreted as JSX tags.
-        [isTypeScript ? 'tsx' : 'jsx']: !isTSFile, importAssertions: true });
+    // Exclude regular TypeScript files from React transformation to prevent e.g. generic parameters and angle-bracket type assertion from being interpreted as JSX tags.
+    if (isTypeScript) {
+        return {
+            syntax: 'typescript',
+            dynamicImport: true,
+            decorators: enableDecorators,
+            tsx: !isTSFile,
+            importAssertions: true
+        };
+    }
+    return {
+        syntax: 'ecmascript',
+        dynamicImport: true,
+        decorators: enableDecorators,
+        jsx: true,
+        importAssertions: true
+    };
 }
 function getBaseSWCOptions({ filename, isPageFile, pagePickLoader, minify, development, hasReactRefresh, isServer, compiler, swcCacheDir }) {
     var _a, _b;
@@ -132,7 +134,8 @@ function getEmotionOptions(compiler, development) {
     };
 }
 function getLoaderSWCOptions({ filename, development, isServer, minify, isPageFile, pagePickLoader, hasReactRefresh, compiler, supportedBrowsers, swcCacheDir }) {
-    let baseOptions = getBaseSWCOptions({
+    var _a;
+    const baseOptions = getBaseSWCOptions({
         filename,
         isPageFile,
         pagePickLoader,
@@ -152,12 +155,16 @@ function getLoaderSWCOptions({ filename, development, isServer, minify, isPageFi
         };
     }
     else {
-        // Matches default @babel/preset-env behavior
-        baseOptions.jsc.target = (compiler === null || compiler === void 0 ? void 0 : compiler.jscTarget) || 'es5';
-        if (supportedBrowsers && supportedBrowsers.length > 0) {
-            baseOptions.env = {
-                targets: supportedBrowsers
-            };
+        const env = (_a = compiler === null || compiler === void 0 ? void 0 : compiler.env) !== null && _a !== void 0 ? _a : (supportedBrowsers && supportedBrowsers.length > 0
+            ? { targets: supportedBrowsers }
+            : undefined);
+        if (env) {
+            // swc throws "`env` and `jsc.target` cannot be used together"
+            baseOptions.env = env;
+        }
+        else {
+            // Matches default @babel/preset-env behavior
+            baseOptions.jsc.target = (compiler === null || compiler === void 0 ? void 0 : compiler.jscTarget) || 'es5';
         }
     }
     return baseOptions;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "2.0.0-dev.37",
+  "version": "2.0.0-dev.39",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -35,10 +35,11 @@
     "@babel/runtime": "7.12.5",
     "@rspack/cli": "^1.4.2",
     "@rspack/core": "^1.4.2",
-    "@shuvi/compiler": "2.0.0-dev.37",
-    "@shuvi/shared": "2.0.0-dev.37",
-    "@shuvi/utils": "2.0.0-dev.37",
+    "@shuvi/compiler": "2.0.0-dev.39",
+    "@shuvi/shared": "2.0.0-dev.39",
+    "@shuvi/utils": "2.0.0-dev.39",
     "@swc/helpers": "^0.4.37",
+    "@swc/types": "^0.1.23",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",