@shuvi/toolpack 1.0.0-rc.18 → 1.0.0-rc.19

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

@@ -38,8 +38,8 @@ export declare type SWCLoaderOptions = {
     filename: string;
     isServer: boolean;
     isPageFile: boolean;
+    pagePickLoader: boolean;
     development: boolean;
-    keep: string[];
     minify: boolean | Obj;
     hasReactRefresh: boolean;
     supportedBrowsers: any[];
@@ -55,7 +55,7 @@ export declare function getParserOptions({ filename, compiler, ...rest }: {
     decorators: boolean;
     importAssertions: boolean;
 };
-export default function getLoaderSWCOptions({ filename, development, isServer, minify, isPageFile, hasReactRefresh, compiler, supportedBrowsers, swcCacheDir, keep }: SWCLoaderOptions): {
+export default function getLoaderSWCOptions({ filename, development, isServer, minify, isPageFile, pagePickLoader, hasReactRefresh, compiler, supportedBrowsers, swcCacheDir }: SWCLoaderOptions): {
     isDevelopment: boolean;
     jsc: {
         externalHelpers: boolean;
@@ -104,9 +104,7 @@ export default function getLoaderSWCOptions({ filename, development, isServer, m
     sourceMaps: undefined;
     isServer: boolean;
     isPageFile: boolean;
-    shakeExports: {
-        ignore: string[];
-    } | null;
+    pagePickLoader: boolean;
     cssModuleFlag: string;
     removeConsole: boolean | undefined;
     reactRemoveProperties: boolean | undefined;

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

@@ -22,7 +22,7 @@ function getParserOptions(_a) {
         [isTypeScript ? 'tsx' : 'jsx']: !isTSFile, importAssertions: true });
 }
 exports.getParserOptions = getParserOptions;
-function getBaseSWCOptions({ filename, isPageFile, minify, development, hasReactRefresh, isServer, compiler, swcCacheDir, keep }) {
+function getBaseSWCOptions({ filename, isPageFile, pagePickLoader, minify, development, hasReactRefresh, isServer, compiler, swcCacheDir }) {
     var _a, _b;
     const parserConfig = getParserOptions({ filename, compiler });
     const enableDecorators = Boolean(compiler === null || compiler === void 0 ? void 0 : compiler.experimentalDecorators);
@@ -77,7 +77,7 @@ function getBaseSWCOptions({ filename, isPageFile, minify, development, hasReact
         // shuvi specific
         isServer,
         isPageFile,
-        shakeExports: keep.length > 0 ? { ignore: keep } : null,
+        pagePickLoader,
         cssModuleFlag: 'cssmodules',
         // advanced
         removeConsole: compiler === null || compiler === void 0 ? void 0 : compiler.removeConsole,
@@ -131,17 +131,17 @@ function getEmotionOptions(compiler, development) {
         sourcemap: development ? (_a = emotion.sourceMap) !== null && _a !== void 0 ? _a : true : false
     };
 }
-function getLoaderSWCOptions({ filename, development, isServer, minify, isPageFile, hasReactRefresh, compiler, supportedBrowsers, swcCacheDir, keep }) {
+function getLoaderSWCOptions({ filename, development, isServer, minify, isPageFile, pagePickLoader, hasReactRefresh, compiler, supportedBrowsers, swcCacheDir }) {
     let baseOptions = getBaseSWCOptions({
         filename,
         isPageFile,
+        pagePickLoader,
         development,
         isServer,
         minify,
         hasReactRefresh,
         compiler,
-        swcCacheDir,
-        keep
+        swcCacheDir
     });
     if (isServer) {
         baseOptions.env = {

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

@@ -15,28 +15,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.raw = void 0;
 const querystring_1 = __importDefault(require("querystring"));
 const constants_1 = require("@shuvi/shared/lib/constants");
-const escapeRegExp_1 = require("@shuvi/utils/lib/escapeRegExp");
 const compiler_1 = require("@shuvi/compiler");
 const getLoaderSWCOptions_1 = __importDefault(require("./getLoaderSWCOptions"));
-const IS_PAGE_FILE = RegExp((0, escapeRegExp_1.escapeRegExp)(`?${constants_1.ROUTE_RESOURCE_QUERYSTRING}`));
 function loaderTransform(source, inputSourceMap) {
     return __awaiter(this, void 0, void 0, function* () {
         // Make the loader async
         const filename = this.resourcePath;
         let loaderOptions = this.getOptions() || {};
         const { isServer, compiler, supportedBrowsers, swcCacheDir, hasReactRefresh, minify = false } = loaderOptions;
-        const isPageFile = !!(this.resourceQuery && IS_PAGE_FILE.test(this.resourceQuery));
-        let keep = [];
+        let isPageFile = false;
+        let pagePickLoader = false;
         if (this.resourceQuery) {
             const query = querystring_1.default.parse(this.resourceQuery.slice(1));
-            if (query.keep) {
-                if (Array.isArray(query.keep)) {
-                    keep = query.keep;
-                }
-                else {
-                    keep.push(query.keep);
-                }
-            }
+            pagePickLoader = query[constants_1.LOADER_RESOURCE_QUERYSTRING] !== undefined;
+            isPageFile =
+                pagePickLoader || query[constants_1.ROUTE_RESOURCE_QUERYSTRING] !== undefined;
         }
         const isDevelopment = this.mode === 'development';
         const swcOptions = (0, getLoaderSWCOptions_1.default)({
@@ -44,8 +37,8 @@ function loaderTransform(source, inputSourceMap) {
             filename,
             isServer,
             isPageFile,
+            pagePickLoader,
             minify,
-            keep,
             hasReactRefresh: hasReactRefresh !== undefined
                 ? hasReactRefresh
                 : isDevelopment && !isServer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "1.0.0-rc.18",
+  "version": "1.0.0-rc.19",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/shuvijs/shuvi.git",
@@ -20,7 +20,7 @@
     "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@shuvi/compiler": "1.0.0-rc.18",
+    "@shuvi/compiler": "1.0.0-rc.19",
     "@babel/core": "7.12.10",
     "@babel/plugin-proposal-class-properties": "7.12.1",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.10.1",
@@ -35,8 +35,8 @@
     "@babel/preset-typescript": "7.12.7",
     "@babel/runtime": "7.12.5",
     "lightningcss": "1.15.0",
-    "@shuvi/shared": "1.0.0-rc.18",
-    "@shuvi/utils": "1.0.0-rc.18",
+    "@shuvi/shared": "1.0.0-rc.19",
+    "@shuvi/utils": "1.0.0-rc.19",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",