xhs-mp-compiler-cli 1.0.1-beta.1 → 1.0.1-beta.3

package/dist/bin/xhs-mp-cli-build.js

@@ -18,7 +18,6 @@ commander.usage('[options]').option('-vdom, --enableVDom <boolean>', 'vdom 架
 commander.parse(process.argv);
 const mpDir = commander.opts().mpDir ? path_1.default.resolve(commander.opts().mpDir) : process.cwd();
 const platform = commander.opts().platform ? commander.opts().platform : 'xhs';
-const liteCompiler = commander.opts().lite === "true";
 const enableV1 = commander.opts().enableV1 === "true";
 const enableV2 = commander.opts().enableV2 === "true";
 const enableVDom = commander.opts().enableVDom === "true";
@@ -28,7 +27,6 @@ const multiCompiler = (0, index_1.nodeStart)({
     action: 'build',
     platform,
     compressJs,
-    liteCompiler,
     enableSourcemap: false,
     enableV1,
     enableV2,

package/dist/bin/xhs-mp-cli-dev.js

@@ -43,7 +43,6 @@ commander.parse(process.argv);
 const mpDir = commander.opts().mpDir ? path_1.default.resolve(commander.opts().mpDir) : process.cwd();
 const platform = commander.opts().platform ? commander.opts().platform : 'xhs';
 const port = commander.opts().port ? commander.opts().port : 1388;
-const liteCompiler = commander.opts().lite === "true";
 const out = commander.opts().out === "true";
 const enableV1 = commander.opts().enableV1 === "true";
 const enableV2 = commander.opts().enableV2 === "true";
@@ -55,7 +54,6 @@ if (out) {
         action: 'dev',
         platform,
         compressJs: false,
-        liteCompiler,
         enableSourcemap: false,
         enableV1,
         enableV2,
@@ -75,7 +73,6 @@ else {
         platform,
         compressJs: false,
         port,
-        liteCompiler,
         enableSourcemap: true,
         enableV1,
         enableV2,

package/dist/index.js

@@ -13,7 +13,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.utils = exports.nodeStart = void 0;
-const module_alias_1 = __importDefault(require("module-alias"));
 const path_1 = __importDefault(require("path"));
 const webpack_1 = __importDefault(require("webpack"));
 const fs_extra_1 = require("fs-extra");
@@ -24,10 +23,9 @@ const common_1 = require("./utils/common");
 const types_1 = require("./types");
 const projectConfig_1 = require("./utils/projectConfig");
 const transformAppJson_1 = __importDefault(require("./utils/transformAppJson"));
-module_alias_1.default.addAlias('@vue/compiler-core', require.resolve('xhs-mp-compiler-core-fork'));
 // 防御编程
 const handleVersion = (startConfig) => {
-    let { action, enableV1 = true, enableV2 = false, liteCompiler = false, enableVDom = false } = startConfig;
+    let { action, enableV1 = true, enableV2 = false, enableVDom = false } = startConfig;
     // 正式环境必须有v1 并且不允许并行编译
     if (action === 'build') {
         enableV1 = true;
@@ -39,14 +37,13 @@ const handleVersion = (startConfig) => {
     return {
         enableV1,
         enableV2,
-        liteCompiler: enableVDom || liteCompiler, // vdom 架构一定使用 liteCompiler 编译
         enableVDom,
     };
 };
 const start = (startConfig) => __awaiter(void 0, void 0, void 0, function* () {
     const { mpDir, action, callback, platform, extJsonPath, port } = startConfig;
     process.env.__platform = platform;
-    const { enableV1, enableV2, enableVDom, liteCompiler } = handleVersion(startConfig);
+    const { enableV1, enableV2, enableVDom } = handleVersion(startConfig);
     const projectJson = (0, projectConfig_1.getProjectConfig)(mpDir);
     let miniprogramDir = path_1.default.join(mpDir, projectJson.miniprogramRoot || '');
     miniprogramDir = miniprogramDir.endsWith('/') ? miniprogramDir.slice(0, -1) : miniprogramDir;
@@ -61,7 +58,6 @@ const start = (startConfig) => __awaiter(void 0, void 0, void 0, function* () {
         compressJs: false,
         enableSourcemap: true,
         port,
-        liteCompiler,
         enableV1,
         enableV2,
         enableVDom,
@@ -75,8 +71,7 @@ exports.default = start;
 function nodeStart(startConfig) {
     const { mpDir, action, tsConfigPath, platform, extJsonPath, compressJs = false, enableSourcemap = false, } = startConfig;
     process.env.__platform = platform;
-    const { enableV1, enableV2, enableVDom, liteCompiler } = handleVersion(startConfig);
-    process.env.__vdom = String(enableVDom);
+    const { enableV1, enableV2, enableVDom } = handleVersion(startConfig);
     const distDir = startConfig.distDir || path_1.default.join(process.cwd(), 'dist');
     try {
         if ((0, fs_extra_1.existsSync)(distDir)) { // eslint-disable-line
@@ -99,16 +94,17 @@ function nodeStart(startConfig) {
         cacheDirectory: startConfig.cacheDirectory,
         compressJs,
         enableSourcemap,
-        liteCompiler,
         enableV1,
         enableV2,
         enableVDom,
     };
     const webpackConfig = (0, webpack_config_1.default)(config);
-    /* 修改在ide里的node_modules的路径 */
     webpackConfig.forEach(config => {
-        var _a, _b;
+        var _a, _b, _c, _d;
+        /* 修改在ide里的node_modules的路径 */
         (_b = (_a = config.resolve) === null || _a === void 0 ? void 0 : _a.modules) === null || _b === void 0 ? void 0 : _b.push(path_1.default.resolve(__dirname, '../../../'));
+        // cli的node_modules路径
+        (_d = (_c = config.resolve) === null || _c === void 0 ? void 0 : _c.modules) === null || _d === void 0 ? void 0 : _d.push(path_1.default.resolve(__dirname, '../../'));
     });
     return (0, webpack_1.default)(webpackConfig);
 }

package/dist/types/index.d.ts

@@ -78,15 +78,11 @@ export interface CliConfig {
      * 服务端口
      */
     port?: number;
-    /**
-     * 轻量编译器
-     */
-    liteCompiler?: boolean;
     enableV1?: boolean;
     enableV2?: boolean;
     enableVDom?: boolean;
 }
-type CliPick = 'mpDir' | 'distDir' | 'watch' | 'tsConfigPath' | 'extJsonPath' | 'cacheDirectory' | 'compressJs' | 'enableSourcemap' | 'liteCompiler' | 'enableV1' | 'enableV2' | 'enableVDom';
+type CliPick = 'mpDir' | 'distDir' | 'watch' | 'tsConfigPath' | 'extJsonPath' | 'cacheDirectory' | 'compressJs' | 'enableSourcemap' | 'enableV1' | 'enableV2' | 'enableVDom';
 export interface IStart extends Pick<CliConfig, CliPick> {
     /**
      * 调用的能力，dev 还是 build

package/dist/webpack-config/lib/postcssRpx2Vw.d.ts

@@ -5,7 +5,6 @@ interface IPostcssRpx2Vw {
     unitPrecision?: number;
     mediaQuery?: boolean;
 }
-export declare const calcRpx2Vw: (pixels: number, baseWidth?: number, unitPrecision?: number, outputUnit?: string) => string;
 declare const postcssRpx2Vw: ({ outputUnit, baseWidth, unitPrecision, mediaQuery, }: IPostcssRpx2Vw) => {
     postcssPlugin: string;
     Root: (root: Root) => void;

package/dist/webpack-config/lib/postcssRpx2Vw.js

@@ -1,37 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calcRpx2Vw = void 0;
-const toFixed = (number, precision) => {
-    const multiplier = Math.pow(10, (precision + 1));
-    const wholeNumber = Math.floor(number * multiplier);
-    return (Math.round(wholeNumber / 10) * 10) / multiplier;
-};
-const calcRpx2Vw = (pixels, baseWidth = 750, unitPrecision = 5, outputUnit = 'vw') => toFixed((pixels / baseWidth) * 100, unitPrecision) + outputUnit;
-exports.calcRpx2Vw = calcRpx2Vw;
+const postcss_1 = require("postcss");
+const xhs_mp_compiler_utils_1 = require("xhs-mp-compiler-utils");
 const postcssRpx2Vw = ({ outputUnit = 'vw', baseWidth = 750, unitPrecision = 5, mediaQuery = false, }) => {
-    const pxRegex = new RegExp('"[^"]+"|\'[^\']+\'|url\\([^\\)]+\\)|(\\d*\\.?\\d+)rpx', 'ig');
     const replacement = (m, $1) => {
-        if (!$1)
-            return m;
-        const pixels = parseFloat($1);
-        return (0, exports.calcRpx2Vw)(pixels, baseWidth, unitPrecision, outputUnit);
+        return (0, xhs_mp_compiler_utils_1.calcRpx2Vw)($1, baseWidth, unitPrecision, outputUnit);
     };
     return {
         postcssPlugin: 'postcss-rpx-2-vw',
         // https://astexplorer.net/#/2uBU1BLuJ1
         Root: (root) => {
             root.walkRules(rule => {
+                const rpxEntries = [];
                 rule.walkDecls(decl => {
-                    if (decl.value.indexOf('rpx') === -1)
+                    if (!(0, xhs_mp_compiler_utils_1.isRpxValue)(decl.value))
                         return;
-                    decl.value = decl.value.replace(pxRegex, replacement);
+                    rpxEntries.push({ prop: decl.prop, value: decl.value });
+                    decl.value = decl.value.replace(xhs_mp_compiler_utils_1.RPX_REGEX, replacement);
+                });
+                rpxEntries.forEach(decl => {
+                    rule.append(new postcss_1.Declaration({ prop: '--ide-' + decl.prop, value: decl.value }));
                 });
             });
             if (mediaQuery) {
                 root.walkAtRules('media', rule => {
-                    if (rule.params.indexOf('rpx') === -1)
+                    if (!(0, xhs_mp_compiler_utils_1.isRpxValue)(rule.params))
                         return;
-                    rule.params = rule.params.replace(pxRegex, replacement);
+                    rule.params = rule.params.replace(xhs_mp_compiler_utils_1.RPX_REGEX, replacement);
                 });
             }
         },

package/dist/webpack-config/loaders/mini-style-loader.js

@@ -49,9 +49,9 @@ function miniStyleLoader(source) {
             return `export default void 0;`;
         }
         // 判断浏览器环境，注入css添加逻辑
-        return new webpack_sources_1.RawSource(`globalThis.localStorage && globalThis.__XHS_APPEND_CSS(${JSON.stringify(code)});
-export default ${JSON.stringify(shortPath)};
-    `).source();
+        return new webpack_sources_1.RawSource(`globalThis.__XHS_IS_WEBVIEW && globalThis.__XHS_APPEND_CSS(${JSON.stringify(code)});`
+            +
+                `export default ${JSON.stringify(shortPath)};`).source();
     }
     // 压缩css
     minify(source, shortPath)

package/dist/webpack-config/loaders/sjs-loader/index.d.ts

@@ -1 +1,12 @@
-export {};
+import type { Span } from '@swc/core';
+export declare const SJS_HELPER = "_sjs$";
+declare function sjsCompiler(code: any, onRequire: (s: string) => string): {
+    code: string;
+    map: string | undefined;
+    legacyCode: string;
+    errors: {
+        message: string;
+        span: Span;
+    }[];
+};
+export default sjsCompiler;