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

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

@@ -0,0 +1,36 @@
+import type { Span, Identifier } from '@swc/core';
+export declare const SPECIFY_VAR: string[];
+declare module "@swc/core" {
+    interface Identifier {
+        _xhsScope?: Scope;
+    }
+}
+export declare class Scope {
+    private parentScope;
+    private defines;
+    private access;
+    toString(): string;
+    /**
+     * @returns
+     */
+    anlysis(): {
+        variable: string;
+        span: Span;
+    } | undefined;
+    checkGlobal(key: string): boolean;
+    setAccess(key: string, value: Span): void;
+    setDefines(key: string, value: Span): void;
+    setParentScope(scope: Scope | undefined): void;
+}
+export declare class ScopeManager {
+    private _scopeStack;
+    private _scopeTables;
+    private _stop;
+    stop(): void;
+    enterScope(): void;
+    exitScope(): void;
+    getCurrentScope(): Scope | undefined;
+    pushIdentifier(id: Identifier): void;
+    pushAccess(id: Identifier): void;
+    getDFSScope(): Scope[];
+}

package/dist/webpack-config/loaders/sjs-loader/scope.js

@@ -0,0 +1,122 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ScopeManager = exports.Scope = exports.SPECIFY_VAR = void 0;
+exports.SPECIFY_VAR = ["getDate", "getRegExp", "console"];
+const IDENTIFIER_WHITE_LIST = [
+    "Object", "Boolean", "Array", "String", "Number", "Date", "Map", "Set",
+    "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent", "isNaN", "isFinite", "parseFloat", "parseInt",
+    "Infinity", "NaN", "undefined",
+    "setTimeout", "clearTimeout", "setInterval", "clearInterval",
+    "JSON", "Math",
+    // 模块化
+    "module", "require", "exports",
+    ...exports.SPECIFY_VAR
+];
+// 变量作用域表
+class Scope {
+    constructor() {
+        // 当前作用域定义的变量
+        this.defines = {};
+        // 当前作用域使用的变量
+        this.access = {};
+    }
+    toString() {
+        return `defines: ${Object.keys(this.defines)} access: ${Object.keys(this.access)}`;
+    }
+    /**
+     * @returns
+     */
+    anlysis() {
+        // TODO 优化算法复杂度
+        // 在自身作用域 以及 上级作用域寻找，找到顶层作用域时 则需要看 白名单是否含有
+        for (const variable in this.access) {
+            // 白名单也不包含此变量
+            if (this.checkGlobal(variable) && !IDENTIFIER_WHITE_LIST.includes(variable)) {
+                return { variable, span: this.access[variable] };
+            }
+        }
+        return undefined;
+    }
+    // 检查是否是全局调用
+    checkGlobal(key) {
+        let scope = this;
+        while (scope) {
+            if (!scope.defines[key]) {
+                scope = scope.parentScope;
+                continue;
+            }
+            else {
+                return false;
+            }
+        }
+        return !scope;
+    }
+    setAccess(key, value) {
+        this.access[key] = value;
+    }
+    setDefines(key, value) {
+        this.defines[key] = value;
+    }
+    setParentScope(scope) {
+        this.parentScope = scope;
+    }
+}
+exports.Scope = Scope;
+class ScopeManager {
+    constructor() {
+        // 栈帧
+        this._scopeStack = [];
+        // 栈 深度遍历结果
+        this._scopeTables = [];
+        // 是否停止收集
+        this._stop = false;
+    }
+    // 停止分析
+    stop() {
+        this._stop = true;
+    }
+    enterScope() {
+        if (this._stop)
+            return;
+        this._scopeStack.push(new Scope());
+    }
+    exitScope() {
+        if (this._stop)
+            return;
+        const scope = this._scopeStack.pop();
+        if (scope) {
+            this._scopeTables.push(scope);
+            scope.setParentScope(this.getCurrentScope());
+        }
+    }
+    getCurrentScope() {
+        if (this._stop)
+            return;
+        return this._scopeStack[this._scopeStack.length - 1];
+    }
+    // 记录定义的值
+    pushIdentifier(id) {
+        var _a;
+        if (this._stop)
+            return;
+        if (this.getCurrentScope()) {
+            (_a = this.getCurrentScope()) === null || _a === void 0 ? void 0 : _a.setDefines(id.value, id.span);
+        }
+    }
+    // 记录使用的值
+    pushAccess(id) {
+        if (this._stop)
+            return;
+        const current = this.getCurrentScope();
+        if (current) {
+            current === null || current === void 0 ? void 0 : current.setAccess(id.value, id.span);
+            if (exports.SPECIFY_VAR.includes(id.value)) {
+                id._xhsScope = current;
+            }
+        }
+    }
+    getDFSScope() {
+        return this._scopeTables;
+    }
+}
+exports.ScopeManager = ScopeManager;

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

@@ -0,0 +1,2 @@
+import type { JscTarget, Program } from '@swc/core';
+export declare const transform: (code: string, plugin?: ((m: Program) => Program) | undefined, target?: JscTarget, minify?: boolean) => import("@swc/core").Output;

package/dist/webpack-config/loaders/sjs-loader/tranform.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transform = void 0;
+const core_1 = require("@swc/core");
+const transform = (code, plugin, target = 'esnext', minify = false) => (0, core_1.transformSync)(code, {
+    swcrc: false,
+    configFile: false,
+    minify,
+    sourceMaps: false,
+    jsc: {
+        preserveAllComments: true,
+        target,
+        // minify: false,
+        externalHelpers: false,
+        parser: {
+            syntax: "ecmascript",
+            jsx: false,
+            dynamicImport: false,
+            privateMethod: false,
+            functionBind: false,
+            classPrivateProperty: false,
+            exportDefaultFrom: false,
+            exportNamespaceFrom: false,
+            decorators: false,
+            decoratorsBeforeExport: false,
+            importMeta: false,
+        },
+    },
+    plugin,
+});
+exports.transform = transform;

package/dist/webpack-config/presets/prod.js

@@ -7,6 +7,7 @@ const const_1 = __importDefault(require("../lib/const"));
 // import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer'
 const getProdConfig = (chain, options) => {
     chain.mode('production');
+    chain.devtool(false);
     if (!options.noJs) {
         // 生产环境使用 babel-loader
         chain.module
@@ -40,13 +41,10 @@ const getProdConfig = (chain, options) => {
             .options({
             sourceType: 'unambiguous',
             presets: [
-                [
-                    require.resolve('@babel/preset-typescript'),
-                    {
+                [require.resolve('@babel/preset-typescript'), {
                         allExtensions: true,
                         isTSX: true,
-                    },
-                ],
+                    }],
                 [
                     require.resolve('@babel/preset-env'),
                     {

package/dist/webpack-config/presets/render/RenderChunkPlugin.d.ts

@@ -1,9 +1,5 @@
 import { Compiler } from 'webpack';
 declare class RenderChunkPlugin {
-    enableVDom?: boolean;
-    constructor(options: {
-        enableVDom?: boolean;
-    });
     apply(compiler: Compiler): void;
 }
 export default RenderChunkPlugin;

package/dist/webpack-config/presets/render/RenderChunkPlugin.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const webpack_1 = require("webpack");
 const webpack_sources_1 = require("webpack-sources");
-const runtimeName = 'runtime.render.js';
 const injectCSS = `
+globalThis.__XHS_IS_WEBVIEW = (globalThis.localStorage && document && document.getElementsByTagName)
 globalThis.__XHS_APPEND_CSS = function(cssText){
+    if (!globalThis.__XHS_IS_WEBVIEW) return;
     var headTags = document.getElementsByTagName('head')
     var head = document.head || (headTags && headTags[0])
     var cssTextNode = document.createTextNode(String(cssText))
@@ -15,36 +16,20 @@ globalThis.__XHS_APPEND_CSS = function(cssText){
 `;
 // 注入css跟webpack runtime
 class RenderChunkPlugin {
-    constructor(options) {
-        this.enableVDom = options.enableVDom;
-    }
     apply(compiler) {
         compiler.hooks.compilation.tap(RenderChunkPlugin.name, compilation => {
             compilation.hooks.processAssets.tap({
                 name: RenderChunkPlugin.name,
                 stage: webpack_1.Compilation.PROCESS_ASSETS_STAGE_ADDITIONS,
             }, (assets) => {
-                var _a, _b, _c;
-                let injectCode = "";
-                if (this.enableVDom) {
-                    // 向前兼容旧架构
-                    injectCode = injectCSS;
-                }
-                else {
-                    const runtimeCode = (_a = compilation.getAsset(runtimeName)) === null || _a === void 0 ? void 0 : _a.source.source();
-                    // 注入css逻辑
-                    injectCode = `
-                            ${injectCSS}
-                            if (!globalThis.__XHS_RUNTIME_REGISTERED__) {
-                                globalThis.__XHS_RUNTIME_REGISTERED__ = true;
-                                ${runtimeCode}
-                            };`;
-                }
+                var _a, _b;
+                // 注入css逻辑
+                const injectCode = injectCSS;
                 // @ts-ignore
                 const appJSON = compiler.xhsData.appJSON;
                 const pathMap = [
-                    (_b = appJSON.pages) === null || _b === void 0 ? void 0 : _b.map(({ path }) => path),
-                    (_c = appJSON.subPackages) === null || _c === void 0 ? void 0 : _c.map(sub => { var _a; return (_a = sub.pages) === null || _a === void 0 ? void 0 : _a.map(({ path }) => path); })
+                    (_a = appJSON.pages) === null || _a === void 0 ? void 0 : _a.map(({ path }) => path),
+                    (_b = appJSON.subPackages) === null || _b === void 0 ? void 0 : _b.map(sub => { var _a; return (_a = sub.pages) === null || _a === void 0 ? void 0 : _a.map(({ path }) => path); })
                 ].flat(4).filter(Boolean)
                     .reduce((ac, path) => {
                     ac[`v1/${path}.render.js`] = true;

package/dist/webpack-config/presets/render/SjsEntryPlugin.js

@@ -1,14 +1,37 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs_extra_1 = __importDefault(require("fs-extra"));
 const glob_1 = __importDefault(require("glob"));
+const path_1 = __importDefault(require("path"));
 const webpack_sources_1 = require("webpack-sources");
 const webpack_1 = require("webpack");
-// @ts-ignore
-const sjs_loader_1 = __importDefault(require("../../loaders/sjs-loader"));
+const index_1 = __importStar(require("../../loaders/sjs-loader/index"));
 const common_1 = require("../../../utils/common");
 function formatSJSPath(i) {
     if (/\.(sjs|wxs)$/.test(i)) {
@@ -51,7 +74,8 @@ class SjsEntryPlugin {
             this.subPackageRoots.forEach(root => {
                 this.subPackagePaths.has(root) || this.subPackagePaths.set(root, []);
             });
-            const relativePaths = glob_1.default.sync('**/*.sjs', { cwd: miniprogramDir });
+            const relativePaths = glob_1.default.sync('**/*.sjs', { cwd: miniprogramDir })
+                .concat(glob_1.default.sync('**/*.wxs', { cwd: miniprogramDir }));
             relativePaths.forEach(relativePath => {
                 var _a;
                 const sjsAbsPath = (0, common_1.unixJoin)(miniprogramDir, relativePath);
@@ -79,6 +103,7 @@ class SjsEntryPlugin {
         });
     }
     makeSjsFileContent(compilation, chunkName, sjsFiles = [], sjsModuleName, pkgRoot) {
+        var _a;
         const sjsModules = [];
         // 用于去除重复引入
         const sjsPathCache = new Set();
@@ -94,23 +119,34 @@ class SjsEntryPlugin {
                 continue;
             }
             const sjsAbsPath = formatSJSPath(sjsPath);
-            let content = fs_extra_1.default.readFileSync(sjsAbsPath, 'utf8');
-            content = sjs_loader_1.default.call(compilation, content, sjsAbsPath, this.miniprogramDir, requirePath => {
-                requirePath = (0, common_1.toUnixPath)(requirePath);
-                const relativePath = requirePath.replace(`${this.miniprogramDir}/`, '');
+            const content = fs_extra_1.default.readFileSync(sjsAbsPath, 'utf8');
+            const result = index_1.default.call(compilation, content, requirePath => {
+                const realPath = (0, common_1.unixResolve)(path_1.default.dirname(sjsAbsPath), requirePath);
+                const relativePath = (0, common_1.getShortPath)(this.miniprogramDir, realPath);
                 /**
                  * 不是当前分包的 sjs 文件不处理
                  */
                 if (pkgRoot && !relativePath.startsWith(pkgRoot)) {
-                    throw new webpack_1.WebpackError(`[SJS 文件编译错误] ${sjsAbsPath}，请检测引入路径是否正确或符合分包规则！`);
+                    throw new Error(`require(${JSON.stringify(requirePath)})，请检测引入路径是否正确或符合分包规则！`);
                 }
-                sjsFiles.push(requirePath);
+                if (!fs_extra_1.default.existsSync(realPath)) {
+                    throw new Error(`require(${JSON.stringify(requirePath)}) file does not exist`);
+                }
+                sjsFiles.push(realPath);
+                return relativePath;
             });
-            sjsModules.push(`'${sjsPath.replace(`${this.miniprogramDir}/`, '')}': \`${content}\``);
+            if ((_a = result.errors) === null || _a === void 0 ? void 0 : _a.length) {
+                throw new webpack_1.WebpackError(`[SJS 文件编译错误] ${sjsAbsPath}\n${result.errors.map(i => i.message).join("\n")}`);
+            }
+            const moduleName = (0, common_1.getShortPath)(this.miniprogramDir, sjsAbsPath);
+            // 老版本兼容代码
+            sjsModules.push(`"${moduleName}": ${JSON.stringify(result.legacyCode)}`);
+            // 模块化代码
+            sjsModules.push(`".sjs#${moduleName}": function(exports,require,module,${index_1.SJS_HELPER}){${(result.code)};return module;}`);
             // 处理后的加入缓存
             sjsPathCache.add(sjsPath);
         }
-        const source = new webpack_sources_1.ConcatSource(`globalThis['${sjsModuleName}'] = {`, `${sjsModules.join(',')}`, '}');
+        const source = new webpack_sources_1.ConcatSource(`globalThis['${sjsModuleName}'] = {`, `${sjsModules.join(',\n')}`, '}');
         if (this.enableV1) {
             // @ts-ignore
             compilation.assets[`v1/${chunkName}`] = source;

package/dist/webpack-config/presets/render/index.js

@@ -3,12 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const webpack_1 = __importDefault(require("webpack"));
-const VueLoaderPlugin_1 = __importDefault(require("../../plugins/VueLoaderPlugin"));
 const XhsMpJsonPlugin_1 = __importDefault(require("../../plugins/XhsMpJsonPlugin"));
 const RenderEntryPlugin_1 = __importDefault(require("./RenderEntryPlugin"));
 const ComponentEntryPlugin_1 = __importDefault(require("./ComponentEntryPlugin"));
-const XhsMpErrorTransformPlugin_1 = __importDefault(require("../../plugins/XhsMpErrorTransformPlugin"));
 const css_1 = __importDefault(require("../../lib/css"));
 const types_1 = require("../../../types");
 const getMlSuffixName_1 = __importDefault(require("../../../utils/getMlSuffixName"));
@@ -26,41 +23,22 @@ const getBaseConfig = (chain, options) => {
             path: options.distDir,
             filename: '[name].render.js',
             globalObject: 'globalThis',
+            uniqueName: 'MpRender',
         },
         module: {
             rule: {
-                ml: !options.liteCompiler
-                    ? {
-                        test: mlReg,
-                        use: {
-                            'vue-loader': {
-                                loader: require.resolve('vue-loader'),
-                                // 资源路径由组件层处理
-                                options: {
-                                    transformAssetUrls: { tags: {} },
-                                    compilerOptions: {
-                                        isCustomElement: tag => ['xhs-page', 'xhs-template'].includes(tag),
-                                    },
-                                },
-                            },
-                            'ml-loader': {
-                                loader: require.resolve('../../loaders/ml-loader'),
-                                options,
-                            },
-                        },
-                    }
-                    : {
-                        test: mlReg,
-                        use: {
-                            'ml-loader': {
-                                loader: require.resolve('xhs-mp-compiler-ml-loader'),
-                                options: {
-                                    removeComentNode: isProd,
-                                    vdom: enableVDom,
-                                },
+                ml: {
+                    test: mlReg,
+                    use: {
+                        'ml-loader': {
+                            loader: require.resolve('xhs-mp-compiler-ml-loader'),
+                            options: {
+                                removeComentNode: isProd,
+                                vdom: enableVDom,
                             },
                         },
                     },
+                },
                 [(0, getCssSuffixName_1.default)()]: {
                     test: cssReg,
                     use: (0, css_1.default)(options, [
@@ -78,22 +56,7 @@ const getBaseConfig = (chain, options) => {
     // 渲染层
     chain.plugin('XhsMpEntryPlugin').use(RenderEntryPlugin_1.default, [{ enableV1, enableV2 }]);
     chain.plugin('SjsEntryPlugin').use(SjsEntryPlugin_1.default, [{ miniprogramDir, enableV1, enableV2 }]);
-    if (!options.liteCompiler) {
-        chain.plugin('vue').use(VueLoaderPlugin_1.default);
-        chain.plugin('XhsMpErrorTransformPlugin').use(XhsMpErrorTransformPlugin_1.default);
-        chain.plugin('DefinePlugin').use(webpack_1.default.DefinePlugin, [
-            {
-                __VUE_PROD_DEVTOOLS__: JSON.stringify(false),
-                __VUE_OPTIONS_API__: JSON.stringify(true),
-            },
-        ]);
-    }
-    if (!enableVDom) {
-        // 抽取runtime
-        chain.optimization.runtimeChunk({
-            name: 'runtime', // runtime.render.js
-        });
-    }
-    chain.plugin("RenderChunkPlugin").use(RenderChunkPlugin_1.default, [{ enableVDom }]);
+    // 公共模块
+    chain.plugin("RenderChunkPlugin").use(RenderChunkPlugin_1.default);
 };
 exports.default = getBaseConfig;

package/dist/webpack-config/presets/service/XhsMpServiceChunkPlugin.js

@@ -16,8 +16,8 @@ class XhsMpServiceChunkPlugin {
                 // 当没有引用相同 js 场景时， commonChunk 将是 undefined
                 const commonSource = ((_c = compilation.getAsset('service-common.js')) === null || _c === void 0 ? void 0 : _c.source) || '';
                 runtimeCode = `
-          if (!globalThis.__XHS_RUNTIME_REGISTERED__) {
-            globalThis.__XHS_RUNTIME_REGISTERED__ = true;
+          if (!globalThis.__XHS_SERVICE_RUNTIME_REGISTERED__) {
+            globalThis.__XHS_SERVICE_RUNTIME_REGISTERED__ = true;
             ${runtimeCode}
           }`;
                 // 独立分包加入 runtimeChunk

package/dist/webpack-config/presets/service/index.js

@@ -13,6 +13,7 @@ const presetService = (chain, options) => {
         output: {
             path: options.distDir,
             globalObject: 'globalThis',
+            uniqueName: 'MpService',
         },
     });
     chain.plugin('ServiceEntryPlugin').use(ServiceEntryPlugin_1.default);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "xhs-mp-compiler-cli",
-  "version": "1.0.1-beta.1",
+  "version": "1.0.1-beta.2",
   "description": "xhs mp command tool.",
   "preferGlobal": true,
   "category": "esm",
@@ -33,9 +33,9 @@
     "@swc/core": "^1.3.74",
     "@swc/helpers": "^0.5.1",
     "@vue/babel-preset-jsx": "^1.2.4",
-    "xhs-mp-compiler-core-fork": "1.0.1-beta.1",
-    "xhs-mp-compiler-ml-loader": "1.0.1-beta.1",
-    "xhs-mp-compiler-utils": "1.0.1-beta.1",
+    "xhs-mp-compiler-core-fork": "1.0.1-beta.2",
+    "xhs-mp-compiler-ml-loader": "1.0.1-beta.2",
+    "xhs-mp-compiler-utils": "1.0.1-beta.2",
     "babel-loader": "^8.2.2",
     "babel-plugin-istanbul": "^6.0.0",
     "babel-preset-minify": "^0.4.3",

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

@@ -1,3 +0,0 @@
-import { LoaderContext } from 'webpack';
-declare function mlLoader(this: LoaderContext<{}>, source: string): Promise<void>;
-export default mlLoader;

package/dist/webpack-config/loaders/ml-loader/index.js

@@ -1,66 +0,0 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const fs_extra_1 = __importDefault(require("fs-extra"));
-const ml2vue_1 = __importDefault(require("./ml2vue"));
-const getCssSuffixName_1 = __importDefault(require("../../../utils/getCssSuffixName"));
-const getMlSuffixName_1 = __importDefault(require("../../../utils/getMlSuffixName"));
-const common_1 = require("../../../utils/common");
-const isCustomComponents = (filePath) => {
-    try {
-        const json = JSON.parse(fs_extra_1.default.readFileSync(`${filePath}.json`, 'utf-8'));
-        return json.component;
-    }
-    catch (error) {
-        return false;
-    }
-};
-function mlLoader(source) {
-    return __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
-        const callback = this.async();
-        try {
-            const { resourcePath, _compiler, resourceQuery } = this;
-            // @ts-ignore
-            const xhsData = (_compiler === null || _compiler === void 0 ? void 0 : _compiler.xhsData) || {};
-            const shortPath = (0, common_1.getShortPath)(xhsData.miniprogramDir, resourcePath);
-            const styleIsolation = (_d = (_c = (_b = (_a = xhsData.appJSON) === null || _a === void 0 ? void 0 : _a.componentsMap) === null || _b === void 0 ? void 0 : _b[shortPath]) === null || _c === void 0 ? void 0 : _c.styleIsolation) !== null && _d !== void 0 ? _d : null;
-            const componentIndex = styleIsolation === 'shared' ? 0 : (_h = (_g = (_f = (_e = xhsData.appJSON) === null || _e === void 0 ? void 0 : _e.componentsMap) === null || _f === void 0 ? void 0 : _f[shortPath]) === null || _g === void 0 ? void 0 : _g.index) !== null && _h !== void 0 ? _h : null;
-            const reg = new RegExp(`.${(0, getMlSuffixName_1.default)()}$`);
-            const filePath = (0, common_1.toUnixPath)(resourcePath.replace(reg, ''));
-            // 收集 imports / includes
-            const importMap = {};
-            const includeMap = {};
-            // 收集 sjs module name
-            const sjsScopeNames = [];
-            const res = yield (0, ml2vue_1.default)(this, xhsData.miniprogramDir, source, shortPath, filePath, importMap, includeMap, isCustomComponents(filePath), componentIndex, resourceQuery, sjsScopeNames);
-            if (fs_extra_1.default.existsSync(`${filePath}.${(0, getCssSuffixName_1.default)()}`)) {
-                this.addDependency(`${filePath}.${(0, getCssSuffixName_1.default)()}`);
-            }
-            // fse.writeFileSync(`${__dirname}/.testTemp.vue`, res)
-            // if (/catchTapTest/g.test(res)) {
-            //   fse.writeFileSync(`${__dirname}/.testTemp.vue`, res)
-            // }
-            // if (res.includes('include')) {
-            // fse.writeFileSync(`${__dirname}/.testTemp.vue`, res)
-            // debugger
-            // }
-            callback(null, res);
-        }
-        catch (error) {
-            callback(error);
-        }
-    });
-}
-exports.default = mlLoader;

package/dist/webpack-config/loaders/ml-loader/ml2vue/generator.d.ts

@@ -1,2 +0,0 @@
-declare const HTMLGenerator: (item: any, parent: any, eachFn: any) => any;
-export default HTMLGenerator;