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

package/lib/utils/bundleRequire.js

@@ -130,7 +130,7 @@ function bundleRequire(filepath, options = {}) {
             }
             return mod;
         });
-        const result = yield (0, esbuild_1.build)(Object.assign(Object.assign({}, options.esbuildOptions), { entryPoints: [filepath], absWorkingDir: cwd, outfile, format: 'cjs', platform: 'node', sourcemap: 'inline', bundle: true, metafile: true, write: true, watch: false, plugins: [
+        const result = yield (0, esbuild_1.build)(Object.assign(Object.assign({}, options.esbuildOptions), { entryPoints: [filepath], absWorkingDir: cwd, outfile, format: 'cjs', target: 'es6', platform: 'node', sourcemap: 'inline', bundle: true, metafile: true, write: true, watch: false, plugins: [
                 ...(((_b = options.esbuildOptions) === null || _b === void 0 ? void 0 : _b.plugins) || []),
                 (0, exports.externalPlugin)({
                     external: options.external

package/lib/webpack/config/base.d.ts

@@ -7,7 +7,7 @@ export interface BaseOptions {
     projectRoot: string;
     outputDir: string;
     cacheDir: string;
-    include: string[];
+    include: (string | RegExp)[];
     typescript?: {
         useTypeScript: boolean;
         typeScriptPath?: string;
@@ -20,8 +20,8 @@ export interface BaseOptions {
     env?: {
         [x: string]: string | undefined;
     };
-    parcelCss?: boolean;
+    lightningCss?: boolean;
     compiler?: CompilerOptions;
 }
 export { WebpackChain };
-export declare function baseWebpackChain({ dev, outputDir, parcelCss, compiler, projectRoot, include, typescript, name, publicPath, env, cacheDir }: BaseOptions): WebpackChain;
+export declare function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot, include, typescript, name, publicPath, env, cacheDir }: BaseOptions): WebpackChain;

package/lib/webpack/config/base.js

@@ -35,7 +35,6 @@ const webpack_1 = __importDefault(require("webpack"));
 const path = __importStar(require("path"));
 const constants_1 = require("@shuvi/shared/lib/constants");
 const fix_watching_plugin_1 = __importDefault(require("../plugins/fix-watching-plugin"));
-const constants_2 = require("../../constants");
 const crypto = __importStar(require("crypto"));
 const jsconfig_paths_plugin_1 = __importDefault(require("../plugins/jsconfig-paths-plugin"));
 const support_ts_extension_resolver_plugin_1 = __importDefault(require("../plugins/support-ts-extension-resolver-plugin"));
@@ -60,7 +59,7 @@ const terserOptions = {
         ascii_only: true
     }
 };
-function baseWebpackChain({ dev, outputDir, parcelCss, compiler, projectRoot, include, typescript, name, publicPath = '/', env = {}, cacheDir }) {
+function baseWebpackChain({ dev, outputDir, lightningCss, compiler, projectRoot, include, typescript, name, publicPath = '/', env = {}, cacheDir }) {
     var _a;
     const config = new webpack_chain_1.default();
     config.mode(dev ? 'development' : 'production');
@@ -119,8 +118,8 @@ function baseWebpackChain({ dev, outputDir, parcelCss, compiler, projectRoot, in
         config.optimization.minimizer('cssMinimizer').use(css_minimizer_webpack_plugin_1.default, [
             {
                 // @ts-ignore
-                minify: parcelCss
-                    ? css_minimizer_webpack_plugin_1.default.parcelCssMinify
+                minify: lightningCss
+                    ? css_minimizer_webpack_plugin_1.default.lightningCssMinify
                     : css_minimizer_webpack_plugin_1.default.cssnanoMinify
             }
         ]);
@@ -138,7 +137,7 @@ function baseWebpackChain({ dev, outputDir, parcelCss, compiler, projectRoot, in
     config.resolve.alias.set('@swc/helpers', path.dirname(require.resolve(`@swc/helpers/package.json`)));
     config.resolveLoader.merge({
         alias: [
-            'parcel-css-loader',
+            'lightningcss-loader',
             'shuvi-swc-loader',
             'route-component-loader'
         ].reduce((alias, loader) => {
@@ -157,7 +156,7 @@ function baseWebpackChain({ dev, outputDir, parcelCss, compiler, projectRoot, in
     mainRule
         .oneOf('js')
         .test(/\.(tsx|ts|js|cjs|mjs|jsx)$/)
-        .include.merge([...include, ...constants_2.AppSourceRegexs])
+        .include.merge([...include])
         .end()
         .use('shuvi-swc-loader')
         .loader('@shuvi/shuvi-swc-loader')

package/lib/webpack/config/browser.js

@@ -207,7 +207,7 @@ function createBrowserWebpackChain(options) {
     return (0, style_1.withStyle)(chain, {
         extractCss: !dev,
         publicPath,
-        parcelCss: options.parcelCss,
+        lightningCss: options.lightningCss,
         filename: 'static/css/[contenthash:8].css',
         chunkFilename: 'static/css/[contenthash:8].chunk.css'
     });

package/lib/webpack/config/node.js

@@ -37,7 +37,7 @@ function createNodeWebpackChain(options) {
     ]);
     return (0, style_1.withStyle)(chain, {
         ssr: true,
-        parcelCss: options.parcelCss,
+        lightningCss: options.lightningCss,
         filename: 'static/css/[contenthash:8].css',
         chunkFilename: 'static/css/[contenthash:8].chunk.css'
     });

package/lib/webpack/config/parts/external.d.ts

@@ -1,5 +1,5 @@
 import { ExternalsFunction } from '../../types';
 export declare function nodeExternals({ projectRoot, include }: {
-    include: string[];
+    include: (string | RegExp)[];
     projectRoot: string;
 }): ExternalsFunction;

package/lib/webpack/config/parts/external.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nodeExternals = void 0;
-// import resolve from "resolve";
-const constants_1 = require("../../../constants");
 function match(value, tests) {
     let matched = false;
     for (let index = 0; index < tests.length; index++) {
@@ -31,17 +29,12 @@ function nodeExternals({ projectRoot, include }) {
             return next(null, `commonjs ${request}`);
         }
         const notExternalModules = [];
-        const externalModules = [
-            /platform-shared[/\\](esm|lib)[/\\]shared[/\\]shuvi-singleton-runtimeConfig/
-        ];
+        const externalModules = [];
         // make sure we don't externalize anything that is
         // supposed to be transpiled
         if (match(request, include)) {
             return transpiled();
         }
-        if (match(request, constants_1.AppSourceRegexs)) {
-            return transpiled();
-        }
         if (match(request, notExternalModules)) {
             return transpiled();
         }

package/lib/webpack/config/parts/style.d.ts

@@ -6,7 +6,7 @@ interface StyleOptions {
     extractCss?: boolean;
     sourceMap?: boolean;
     ssr?: boolean;
-    parcelCss?: boolean;
+    lightningCss?: boolean;
 }
-export declare function withStyle(chain: Config, { extractCss, sourceMap, ssr, publicPath, parcelCss, filename, chunkFilename }: StyleOptions): Config;
+export declare function withStyle(chain: Config, { extractCss, sourceMap, ssr, publicPath, lightningCss, filename, chunkFilename }: StyleOptions): Config;
 export {};

package/lib/webpack/config/parts/style.js

@@ -33,39 +33,48 @@ const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plug
 const loaderUtils = __importStar(require("loader-utils"));
 const path = __importStar(require("path"));
 const helpers_1 = require("./helpers");
-function getCSSModuleLocalIdent(context, localIdentName, localName, options) {
-    // Use the filename or folder name, based on some uses the index.js / index.module.(css|scss|sass) project style
-    const fileNameOrFolder = context.resourcePath.match(/index\.module\.(css|scss|sass)$/)
+const regexLikeIndexModule = /(?<!pages[\\/])index\.(scss|sass|css)$/;
+function getCSSModuleLocalIdent(context, _, exportName, options) {
+    const relativePath = path
+        .relative(context.rootContext, context.resourcePath)
+        .replace(/\\+/g, '/');
+    // Generate a more meaningful name (parent folder) when the user names the
+    // file `index.css`.
+    const fileNameOrFolder = regexLikeIndexModule.test(relativePath)
         ? '[folder]'
         : '[name]';
-    // Create a hash based on a the file location and class name. Will be unique across a project, and close to globally unique.
-    const hash = loaderUtils.getHashDigest(
-    // @ts-ignore
-    path.posix.relative(context.rootContext, context.resourcePath) + localName, 'md5', 'base64', 5);
-    // Use loaderUtils to find the file or folder name
-    const className = loaderUtils.interpolateName(context, fileNameOrFolder + '_' + localName + '__' + hash, options);
-    // remove the .module that appears in every classname when based on the file.
-    return className.replace('.module_', '_');
+    // Generate a hash to make the class name unique.
+    const hash = loaderUtils.getHashDigest(Buffer.from(`filePath:${relativePath}#className:${exportName}`), 'md5', 'base64', 5);
+    // Have webpack interpolate the `[folder]` or `[name]` to its real value.
+    return (loaderUtils
+        .interpolateName(context, fileNameOrFolder + '_' + exportName + '__' + hash, options)
+        // Replace invalid symbols with underscores instead of escaping
+        // https://mathiasbynens.be/notes/css-escapes#identifiers-strings
+        .replace(/[^a-zA-Z0-9-_]/g, '_')
+        // "they cannot start with a digit, two hyphens, or a hyphen followed by a digit [sic]"
+        // https://www.w3.org/TR/CSS21/syndata.html#characters
+        .replace(/^(\d|--|-\d)/, '__$1'));
 }
 // style files regexes
 const cssRegex = /\.css$/;
 const cssModuleQueryRegex = /cssmodules/;
 const sassRegex = /\.(scss|sass)$/;
-function ssrCssRule({ test, resourceQuery, scss, parcelCss }) {
+function ssrCssRule({ test, resourceQuery, scss, lightningCss }) {
     const rule = new Rule_1.default();
     rule.test(test);
     if (resourceQuery) {
         rule.resourceQuery(resourceQuery);
     }
-    if (parcelCss) {
+    if (lightningCss) {
         rule
-            .use('parcel-css-loader')
-            .loader('@shuvi/parcel-css-loader')
+            .use('lightningcss-loader')
+            .loader('@shuvi/lightningcss-loader')
             .options({
             sourceMap: false,
             importLoaders: scss ? 1 : 0,
             esModule: true,
             modules: {
+                getLocalIdent: () => '[name]_[local]__[hash]',
                 exportOnlyLocals: true
             }
         });
@@ -97,7 +106,7 @@ function ssrCssRule({ test, resourceQuery, scss, parcelCss }) {
     }
     return rule;
 }
-function cssRule({ publicPath, test, resourceQuery, cssModule, parcelCss, extractCss, sourceMap, scss }) {
+function cssRule({ publicPath, test, resourceQuery, cssModule, lightningCss, extractCss, sourceMap, scss }) {
     const rule = new Rule_1.default();
     rule.test(test);
     if (resourceQuery) {
@@ -138,12 +147,15 @@ function cssRule({ publicPath, test, resourceQuery, cssModule, parcelCss, extrac
             esModule: true
         });
     }
-    if (parcelCss) {
+    if (lightningCss) {
         rule
-            .use('parcel-css-loader')
-            .loader('@shuvi/parcel-css-loader')
+            .use('lightningcss-loader')
+            .loader('@shuvi/lightningcss-loader')
             .options(Object.assign({ sourceMap, importLoaders: scss ? 2 : 1, esModule: true }, (cssModule && {
-            modules: {}
+            modules: {
+                getLocalIdent: () => '[name]_[local]__[hash]',
+                exportOnlyLocals: false
+            }
         })));
     }
     else {
@@ -152,8 +164,8 @@ function cssRule({ publicPath, test, resourceQuery, cssModule, parcelCss, extrac
             .loader(require.resolve('css-loader'))
             .options(Object.assign({ sourceMap, importLoaders: scss ? 2 : 1, esModule: true }, (cssModule && {
             modules: {
-                getLocalIdent: getCSSModuleLocalIdent
-                // exportOnlyLocals: true,
+                getLocalIdent: getCSSModuleLocalIdent,
+                exportOnlyLocals: false
             }
         })));
         rule
@@ -189,7 +201,7 @@ function cssRule({ publicPath, test, resourceQuery, cssModule, parcelCss, extrac
     }
     return rule;
 }
-function withStyle(chain, { extractCss, sourceMap, ssr, publicPath, parcelCss, filename, chunkFilename }) {
+function withStyle(chain, { extractCss, sourceMap, ssr, publicPath, lightningCss, filename, chunkFilename }) {
     const oneOfs = chain.module.rule('main').oneOfs;
     if (ssr) {
         oneOfs.set('css-module', 
@@ -198,7 +210,7 @@ function withStyle(chain, { extractCss, sourceMap, ssr, publicPath, parcelCss, f
             test: cssRegex,
             resourceQuery: cssModuleQueryRegex,
             scss: false,
-            parcelCss
+            lightningCss
         }).after('js'));
         oneOfs.set('scss-module', 
         // @ts-ignore
@@ -206,8 +218,9 @@ function withStyle(chain, { extractCss, sourceMap, ssr, publicPath, parcelCss, f
             test: sassRegex,
             resourceQuery: cssModuleQueryRegex,
             scss: true,
-            parcelCss
+            lightningCss
         }).after('css-module'));
+        // ignore noraml css module
         const ignoreRule = new Rule_1.default();
         ignoreRule
             .test([cssRegex, sassRegex])
@@ -233,7 +246,7 @@ function withStyle(chain, { extractCss, sourceMap, ssr, publicPath, parcelCss, f
         test: cssRegex,
         resourceQuery: cssModuleQueryRegex,
         cssModule: true,
-        parcelCss,
+        lightningCss,
         scss: false,
         extractCss,
         sourceMap,
@@ -244,7 +257,7 @@ function withStyle(chain, { extractCss, sourceMap, ssr, publicPath, parcelCss, f
     cssRule({
         test: cssRegex,
         cssModule: false,
-        parcelCss,
+        lightningCss,
         scss: false,
         extractCss,
         sourceMap,
@@ -256,7 +269,7 @@ function withStyle(chain, { extractCss, sourceMap, ssr, publicPath, parcelCss, f
         test: sassRegex,
         resourceQuery: cssModuleQueryRegex,
         cssModule: true,
-        parcelCss,
+        lightningCss,
         scss: true,
         extractCss,
         sourceMap,
@@ -267,7 +280,7 @@ function withStyle(chain, { extractCss, sourceMap, ssr, publicPath, parcelCss, f
     cssRule({
         test: sassRegex,
         cssModule: false,
-        parcelCss,
+        lightningCss,
         scss: true,
         extractCss,
         sourceMap,

package/lib/webpack/loaders/{parcel-css-loader → lightningcss-loader}/index.js

@@ -38,10 +38,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.raw = void 0;
 const path = __importStar(require("path"));
 const browserslist_1 = __importDefault(require("browserslist"));
-const css_1 = require("@parcel/css");
+const lightningcss_1 = require("lightningcss");
 const CssSyntaxError_1 = __importDefault(require("./CssSyntaxError"));
 const utils_1 = require("./utils");
-const browsersTargets = (0, css_1.browserslistToTargets)((0, browserslist_1.default)('last 1 major versions'));
+const browsersTargets = (0, lightningcss_1.browserslistToTargets)((0, browserslist_1.default)('last 1 major versions'));
 function loader(content, map) {
     return __awaiter(this, void 0, void 0, function* () {
         const rawOptions = this.getOptions();
@@ -67,14 +67,14 @@ function loader(content, map) {
         const isSupportDataURL = options.esModule &&
             this._compiler &&
             Boolean('fsStartTime' in this._compiler);
-        const needToUseIcssPlugin = (0, utils_1.shouldUseIcssPlugin)(options);
-        let ParcelCssRes;
+        const cssModule = (0, utils_1.getCssModuleOptions)(options);
+        let LightningCssRes;
         try {
-            ParcelCssRes = (0, css_1.transform)({
+            LightningCssRes = (0, lightningcss_1.transform)({
                 filename: path.relative(this.rootContext, this.resourcePath),
                 code: content instanceof Buffer ? content : Buffer.from(content),
                 // minify: this.mode === 'production',
-                cssModules: needToUseIcssPlugin,
+                cssModules: cssModule,
                 analyzeDependencies: true,
                 sourceMap: options.sourceMap,
                 drafts: {
@@ -85,7 +85,7 @@ function loader(content, map) {
                 targets: browsersTargets
             });
             if (options.sourceMap && map) {
-                ParcelCssRes.map = (0, utils_1.normalizeSourceMap)(map, this.resourcePath);
+                LightningCssRes.map = (0, utils_1.normalizeSourceMap)(map, this.resourcePath);
             }
         }
         catch (error) {
@@ -95,15 +95,15 @@ function loader(content, map) {
             }
             return;
         }
-        const { dependencies = [] } = ParcelCssRes;
-        const parcelImportsMap = new Map();
-        const parcelUrlsMap = new Map();
+        const { dependencies = [] } = LightningCssRes;
+        const lightningImportsMap = new Map();
+        const lightningUrlsMap = new Map();
         const icssMap = new Map();
-        const parcelReplacementsMap = new Map();
-        const parcelImports = [];
-        const parcelApis = [];
-        const parcelReplacements = [];
-        const parcelExports = [];
+        const lightningReplacementsMap = new Map();
+        const lightningImports = [];
+        const lightningApis = [];
+        const lightningReplacements = [];
+        const lightningExports = [];
         let hasUrlImportHelper = false;
         for (let index = 0; index < dependencies.length; index++) {
             const dep = dependencies[index];
@@ -152,7 +152,7 @@ function loader(content, map) {
                     url = resolvedUrl;
                 }
                 if (!requestable) {
-                    parcelApis.push({
+                    lightningApis.push({
                         url,
                         layer: undefined,
                         supports,
@@ -162,19 +162,19 @@ function loader(content, map) {
                     continue;
                 }
                 url = prefix ? `${prefix}!${url}` : url;
-                let importName = parcelImportsMap.get(url);
+                let importName = lightningImportsMap.get(url);
                 if (!importName) {
-                    const { size } = parcelImportsMap;
+                    const { size } = lightningImportsMap;
                     importName = `___CSS_LOADER_AT_RULE_IMPORT_${size}___`;
-                    parcelImportsMap.set(url, importName);
-                    parcelImports.push({
+                    lightningImportsMap.set(url, importName);
+                    lightningImports.push({
                         type: 'rule_import',
                         importName,
                         url: (0, utils_1.stringifyRequest)(this, (0, utils_1.combineRequests)((0, utils_1.getPreRequester)(this)(options.importLoaders), url)),
                         index: size
                     });
                 }
-                parcelApis.push({
+                lightningApis.push({
                     importName,
                     layer: undefined,
                     supports,
@@ -191,9 +191,9 @@ function loader(content, map) {
                 // console.log("-> url6 6", url, requestable, needResolve);
                 // Do not traverse inside `url`
                 if (!requestable && !needResolve) {
-                    if (!parcelReplacementsMap.get(url)) {
-                        parcelReplacementsMap.set(url, placeholder);
-                        parcelReplacements.push({
+                    if (!lightningReplacementsMap.get(url)) {
+                        lightningReplacementsMap.set(url, placeholder);
+                        lightningReplacements.push({
                             placeholder,
                             replacementName: url,
                             hash: undefined,
@@ -230,7 +230,7 @@ function loader(content, map) {
                     }
                 }
                 if (!hasUrlImportHelper) {
-                    parcelImports.push({
+                    lightningImports.push({
                         type: 'get_url_import',
                         importName: '___CSS_LOADER_GET_URL_IMPORT___',
                         url: (0, utils_1.stringifyRequest)(this, require.resolve('./runtime/getUrl.js')),
@@ -239,17 +239,17 @@ function loader(content, map) {
                     hasUrlImportHelper = true;
                 }
                 url = prefix ? `${prefix}!${url}` : url;
-                let importName = parcelUrlsMap.get(url);
+                let importName = lightningUrlsMap.get(url);
                 if (!importName) {
-                    importName = `___CSS_LOADER_URL_IMPORT_${parcelUrlsMap.size}___`;
-                    parcelUrlsMap.set(url, importName);
-                    parcelImports.push({
+                    importName = `___CSS_LOADER_URL_IMPORT_${lightningUrlsMap.size}___`;
+                    lightningUrlsMap.set(url, importName);
+                    lightningImports.push({
                         // type: 'url',
                         importName,
                         url: (0, utils_1.stringifyRequest)(this, url),
                         index
                     });
-                    parcelReplacements.push({
+                    lightningReplacements.push({
                         placeholder,
                         replacementName: `___CSS_LOADER_URL_REPLACEMENT_${index}___`,
                         importName,
@@ -260,7 +260,7 @@ function loader(content, map) {
                 }
             }
         }
-        if (ParcelCssRes.exports) {
+        if (LightningCssRes.exports) {
             const resolver = this.getResolve({
                 dependencyType: 'icss',
                 conditionNames: ['style'],
@@ -269,9 +269,9 @@ function loader(content, map) {
                 mainFiles: ['index', '...'],
                 preferRelative: true
             });
-            const exportKeys = Object.keys(ParcelCssRes.exports);
+            const exportKeys = Object.keys(LightningCssRes.exports);
             for (const exportKey of exportKeys) {
-                const exportItem = ParcelCssRes.exports[exportKey];
+                const exportItem = LightningCssRes.exports[exportKey];
                 const { name, composes } = exportItem;
                 let value = name;
                 for (const compose of composes) {
@@ -301,17 +301,17 @@ function loader(content, map) {
                             const index = icssMap.size;
                             importName = `___CSS_LOADER_ICSS_IMPORT_${index}___`;
                             icssMap.set(url, importName);
-                            parcelImports.push({
+                            lightningImports.push({
                                 type: 'icss_import',
                                 importName,
                                 url: (0, utils_1.stringifyRequest)(this, (0, utils_1.combineRequests)((0, utils_1.getPreRequester)(this)(options.importLoaders), url)),
                                 icss: true,
                                 index
                             });
-                            parcelApis.push({ importName, dedupe: true, index });
+                            lightningApis.push({ importName, dedupe: true, index });
                         }
-                        const replacementName = `___REPLACEMENT_${parcelReplacements.length}_${importName}`;
-                        parcelReplacements.push({
+                        const replacementName = `___REPLACEMENT_${lightningReplacements.length}_${importName}`;
+                        lightningReplacements.push({
                             localName: compose.name,
                             replacementName,
                             importName
@@ -319,39 +319,39 @@ function loader(content, map) {
                         value += ` ${replacementName}`;
                     }
                 }
-                parcelExports.push({
+                lightningExports.push({
                     name: exportKey,
                     value
                 });
             }
         }
         if (options.modules.exportOnlyLocals !== true) {
-            parcelImports.unshift({
+            lightningImports.unshift({
                 type: 'api_import',
                 importName: '___CSS_LOADER_API_IMPORT___',
                 url: (0, utils_1.stringifyRequest)(this, require.resolve('./runtime/api'))
             });
             if (options.sourceMap) {
-                parcelImports.unshift({
+                lightningImports.unshift({
                     importName: '___CSS_LOADER_API_SOURCEMAP_IMPORT___',
                     url: (0, utils_1.stringifyRequest)(this, require.resolve('./runtime/sourceMaps'))
                 });
             }
             else {
-                parcelImports.unshift({
+                lightningImports.unshift({
                     importName: '___CSS_LOADER_API_NO_SOURCEMAP_IMPORT___',
                     url: (0, utils_1.stringifyRequest)(this, require.resolve('./runtime/noSourceMaps'))
                 });
             }
         }
-        parcelImportsMap.clear();
-        parcelUrlsMap.clear();
+        lightningImportsMap.clear();
+        lightningUrlsMap.clear();
         icssMap.clear();
-        parcelReplacementsMap.clear();
-        const importCode = (0, utils_1.getImportCode)(parcelImports, options);
+        lightningReplacementsMap.clear();
+        const importCode = (0, utils_1.getImportCode)(lightningImports, options);
         let moduleCode;
         try {
-            moduleCode = (0, utils_1.getParcelCssModuleCode)(ParcelCssRes, parcelApis, parcelReplacements, options, this);
+            moduleCode = (0, utils_1.getLightningCssModuleCode)(LightningCssRes, lightningApis, lightningReplacements, options, this);
         }
         catch (error) {
             if (callback) {
@@ -359,7 +359,7 @@ function loader(content, map) {
             }
             return;
         }
-        const exportCode = (0, utils_1.getExportCode)(parcelExports, parcelReplacements, needToUseIcssPlugin, options);
+        const exportCode = (0, utils_1.getExportCode)(lightningExports, lightningReplacements, cssModule, options);
         const resultCode = `${importCode}${moduleCode}${exportCode}`;
         if (callback) {
             callback(null, resultCode);

package/lib/webpack/loaders/{parcel-css-loader → lightningcss-loader}/utils.d.ts

@@ -7,7 +7,10 @@ export function normalizeOptions(rawOptions: any, loaderContext: any): {
     esModule: any;
     exportType: any;
 };
-export function shouldUseIcssPlugin(options: any): boolean;
+export function getCssModuleOptions(options: any): boolean | {
+    pattern: any;
+    dashedIdents: boolean;
+};
 export function normalizeUrl(url: any, isStringValue: any): any;
 export function requestify(url: any, rootContext: any, needToResolveURL?: boolean): any;
 export function normalizeSourceMap(map: any, resourcePath: any): any;
@@ -16,7 +19,7 @@ export function getPreRequester({ loaders, loaderIndex }: {
     loaderIndex: any;
 }): (number: any) => any;
 export function getImportCode(imports: any, options: any): string;
-export function getParcelCssModuleCode(result: any, api: any, replacements: any, options: any, loaderContext: any): string;
+export function getLightningCssModuleCode(result: any, api: any, replacements: any, options: any, loaderContext: any): string;
 export function getExportCode(exports: any, replacements: any, icssPluginUsed: any, options: any): string;
 export function resolveRequests(resolve: any, context: any, possibleRequests: any): Promise<any>;
 export function isURLRequestable(url: any, options?: {}): {

package/lib/webpack/loaders/{parcel-css-loader → lightningcss-loader}/utils.js

@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDataUrl = exports.stringifyRequest = exports.combineRequests = exports.isURLRequestable = exports.resolveRequests = exports.getExportCode = exports.getParcelCssModuleCode = exports.getImportCode = exports.getPreRequester = exports.normalizeSourceMap = exports.requestify = exports.normalizeUrl = exports.shouldUseIcssPlugin = exports.normalizeOptions = void 0;
+exports.isDataUrl = exports.stringifyRequest = exports.combineRequests = exports.isURLRequestable = exports.resolveRequests = exports.getExportCode = exports.getLightningCssModuleCode = exports.getImportCode = exports.getPreRequester = exports.normalizeSourceMap = exports.requestify = exports.normalizeUrl = exports.getCssModuleOptions = exports.normalizeOptions = void 0;
 /*
   MIT License http://www.opensource.org/licenses/mit-license.php
   Author Tobias Koppers @sokra
@@ -535,10 +535,19 @@ function normalizeOptions(rawOptions, loaderContext) {
     };
 }
 exports.normalizeOptions = normalizeOptions;
-function shouldUseIcssPlugin(options) {
+function getCssModuleOptions(options) {
+    if (typeof options.modules === 'object') {
+        const modules = options.modules;
+        return {
+            pattern: modules.getLocalIdent
+                ? modules.getLocalIdent()
+                : '[local]_[hash]',
+            dashedIdents: Boolean(modules.dashedIdents)
+        };
+    }
     return Boolean(options.modules);
 }
-exports.shouldUseIcssPlugin = shouldUseIcssPlugin;
+exports.getCssModuleOptions = getCssModuleOptions;
 const ABSOLUTE_SCHEME = /^[a-z0-9+\-.]+:/i;
 function getURLType(source) {
     if (source[0] === '/') {
@@ -626,7 +635,7 @@ function getImportCode(imports, options) {
     return code ? `// Imports\n${code}` : '';
 }
 exports.getImportCode = getImportCode;
-function normalizeParcelCssSourceMapForRuntime(map, loaderContext) {
+function normalizeLightningCssSourceMapForRuntime(map, loaderContext) {
     let resultMap = null;
     if (map instanceof Buffer) {
         resultMap = JSON.parse(map.toString());
@@ -676,14 +685,14 @@ function printParams(media, dedupe, supports, layer) {
     }
     return result;
 }
-function getParcelCssModuleCode(result, api, replacements, options, loaderContext) {
+function getLightningCssModuleCode(result, api, replacements, options, loaderContext) {
     if (options.modules.exportOnlyLocals === true) {
         return '';
     }
     let sourceMapValue = '';
     if (options.sourceMap) {
         const sourceMap = result.map;
-        sourceMapValue = `,${normalizeParcelCssSourceMapForRuntime(sourceMap, loaderContext)}`;
+        sourceMapValue = `,${normalizeLightningCssSourceMapForRuntime(sourceMap, loaderContext)}`;
     }
     let code = JSON.stringify(result.code.toString());
     let beforeCode = `var ___CSS_LOADER_EXPORT___ = ___CSS_LOADER_API_IMPORT___(${options.sourceMap
@@ -732,13 +741,13 @@ function getParcelCssModuleCode(result, api, replacements, options, loaderContex
     // 5 - layer
     return `${beforeCode}// Module\n___CSS_LOADER_EXPORT___.push([module.id, ${code}, ""${sourceMapValue}]);\n`;
 }
-exports.getParcelCssModuleCode = getParcelCssModuleCode;
+exports.getLightningCssModuleCode = getLightningCssModuleCode;
 function dashesCamelCase(str) {
     return str.replace(/-+(\w)/g, (match, firstLetter) => firstLetter.toUpperCase());
 }
 function getExportCode(exports, replacements, icssPluginUsed, options) {
     let code = '// Exports\n';
-    if (icssPluginUsed) {
+    if (Boolean(icssPluginUsed)) {
         let localsCode = '';
         const addExportToLocalsCode = (names, value) => {
             const normalizedNames = Array.isArray(names)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shuvi/toolpack",
-  "version": "1.0.0-rc.16",
+  "version": "1.0.0-rc.18",
   "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.16",
+    "@shuvi/compiler": "1.0.0-rc.18",
     "@babel/core": "7.12.10",
     "@babel/plugin-proposal-class-properties": "7.12.1",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.10.1",
@@ -34,9 +34,9 @@
     "@babel/preset-react": "7.10.1",
     "@babel/preset-typescript": "7.12.7",
     "@babel/runtime": "7.12.5",
-    "@parcel/css": "1.2.0",
-    "@shuvi/shared": "1.0.0-rc.16",
-    "@shuvi/utils": "1.0.0-rc.16",
+    "lightningcss": "1.15.0",
+    "@shuvi/shared": "1.0.0-rc.18",
+    "@shuvi/utils": "1.0.0-rc.18",
     "babel-loader": "8.2.2",
     "babel-plugin-syntax-jsx": "6.18.0",
     "babel-plugin-transform-define": "2.0.0",
@@ -46,7 +46,7 @@
     "cross-spawn": "7.0.3",
     "crypto-browserify": "3.12.0",
     "css-loader": "5.0.1",
-    "css-minimizer-webpack-plugin": "3.4.1",
+    "css-minimizer-webpack-plugin": "4.1.0",
     "es-module-lexer": "0.10.5",
     "esbuild": "0.14.38",
     "esbuild-loader": "2.19.0",

package/lib/constants.d.ts

@@ -1 +0,0 @@
-export declare const AppSourceRegexs: RegExp[];

package/lib/constants.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppSourceRegexs = void 0;
-exports.AppSourceRegexs = [
-    /([/\\]shuvi-app[/\\])|([/\\]\.shuvi[/\\])/
-];