@dcloudio/uni-cli-shared 3.0.0-alpha-3040120220308001 → 3.0.0-alpha-3040220220310001

package/dist/esbuild.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/hbx/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/json/app/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/json/app/manifest/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/json/app/pages/code.d.ts

@@ -1,3 +1,3 @@
-export declare const polyfillCode = "\nif (typeof Promise !== 'undefined' && !Promise.prototype.finally) {\n  Promise.prototype.finally = function(callback) {\n    const promise = this.constructor\n    return this.then(\n      value => promise.resolve(callback()).then(() => value),\n      reason => promise.resolve(callback()).then(() => {\n        throw reason\n      })\n    )\n  }\n}\n";
+export declare const polyfillCode = "\nif (typeof Promise !== 'undefined' && !Promise.prototype.finally) {\n  Promise.prototype.finally = function(callback) {\n    const promise = this.constructor\n    return this.then(\n      value => promise.resolve(callback()).then(() => value),\n      reason => promise.resolve(callback()).then(() => {\n        throw reason\n      })\n    )\n  }\n}\nif(uni&&uni.base64ToArrayBuffer){\n  ArrayBuffer = uni.base64ToArrayBuffer('').constructor\n}\n";
 export declare const restoreGlobalCode = "\nimport * as vue from 'vue'\nif(uni.restoreGlobal){\n  uni.restoreGlobal(vue,weex,plus,setTimeout,clearTimeout,setInterval,clearInterval)\n}\n";
 export declare const globalCode: string;

package/dist/json/app/pages/code.js

@@ -13,6 +13,9 @@ if (typeof Promise !== 'undefined' && !Promise.prototype.finally) {
     )
   }
 }
+if(uni&&uni.base64ToArrayBuffer){
+  ArrayBuffer = uni.base64ToArrayBuffer('').constructor
+}
 `;
 exports.restoreGlobalCode = `
 import * as vue from 'vue'

package/dist/json/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/json/mp/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/mp/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/vite/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/vite/plugins/cssScoped.js

@@ -8,6 +8,7 @@ const path_1 = __importDefault(require("path"));
 const debug_1 = __importDefault(require("debug"));
 const constants_1 = require("../../constants");
 const preprocess_1 = require("../../preprocess");
+const parse_1 = require("../../vue/parse");
 const debugScoped = (0, debug_1.default)('uni:scoped');
 const SCOPED_RE = /<style\s[^>]*scoped[^>]*>/i;
 function addScoped(code) {
@@ -46,7 +47,8 @@ function uniCssScopedPlugin({ filter } = { filter: () => false }) {
                 if (scoped) {
                     code = addScoped(code);
                 }
-                return code;
+                // 处理 block, wxs 等
+                return (0, parse_1.parseVueCode)(code).code;
             };
         },
     };

package/dist/vite/plugins/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/vite/plugins/vitejs/plugins/asset.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/vite/plugins/vitejs/plugins/css.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/vite/utils/ast.d.ts

@@ -1,5 +1,5 @@
 import type { Literal, BaseNode, Property, Identifier, CallExpression, AssignmentExpression, MemberExpression, MethodDefinition, ExportSpecifier } from 'estree';
-import { Node, ElementNode, DirectiveNode, SimpleExpressionNode } from '@vue/compiler-core';
+import { Node, ElementNode, DirectiveNode, SimpleExpressionNode, AttributeNode } from '@vue/compiler-core';
 export declare const isProperty: (node: BaseNode) => node is Property;
 export declare const isIdentifier: (node: BaseNode) => node is Identifier;
 export declare const isAssignmentExpression: (node: BaseNode) => node is AssignmentExpression;
@@ -13,5 +13,6 @@ export declare function createIdentifier(name: string): Identifier;
 export declare function createCallExpression(callee: unknown, args: unknown[]): CallExpression;
 export declare function parseVue(code: string, errors: SyntaxError[]): import("@vue/compiler-core").RootNode;
 export declare function isElementNode(node: Node): node is ElementNode;
+export declare function isAttributeNode(node: Node): node is AttributeNode;
 export declare function isDirectiveNode(node: Node): node is DirectiveNode;
 export declare function isSimpleExpressionNode(node: Node): node is SimpleExpressionNode;

package/dist/vite/utils/ast.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isSimpleExpressionNode = exports.isDirectiveNode = exports.isElementNode = exports.parseVue = exports.createCallExpression = exports.createIdentifier = exports.createLiteral = exports.isReference = exports.isExportSpecifier = exports.isMethodDefinition = exports.isMemberExpression = exports.isCallExpression = exports.isAssignmentExpression = exports.isIdentifier = exports.isProperty = void 0;
+exports.isSimpleExpressionNode = exports.isDirectiveNode = exports.isAttributeNode = exports.isElementNode = exports.parseVue = exports.createCallExpression = exports.createIdentifier = exports.createLiteral = exports.isReference = exports.isExportSpecifier = exports.isMethodDefinition = exports.isMemberExpression = exports.isCallExpression = exports.isAssignmentExpression = exports.isIdentifier = exports.isProperty = void 0;
 const compiler_dom_1 = require("@vue/compiler-dom");
 const isProperty = (node) => node.type === 'Property';
 exports.isProperty = isProperty;
@@ -75,6 +75,10 @@ function isElementNode(node) {
     return node.type === 1 /* ELEMENT */;
 }
 exports.isElementNode = isElementNode;
+function isAttributeNode(node) {
+    return node.type === 6 /* ATTRIBUTE */;
+}
+exports.isAttributeNode = isAttributeNode;
 function isDirectiveNode(node) {
     return node.type === 7 /* DIRECTIVE */;
 }

package/dist/vite/utils/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/vue/index.d.ts

@@ -1,4 +1,5 @@
 export * from './transforms';
 export * from './utils';
+export * from './parse';
 export { transformUniH5Jsx } from './babel';
 export { isExternalUrl } from './transforms/templateUtils';

package/dist/vue/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -13,6 +17,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isExternalUrl = exports.transformUniH5Jsx = void 0;
 __exportStar(require("./transforms"), exports);
 __exportStar(require("./utils"), exports);
+__exportStar(require("./parse"), exports);
 var babel_1 = require("./babel");
 Object.defineProperty(exports, "transformUniH5Jsx", { enumerable: true, get: function () { return babel_1.transformUniH5Jsx; } });
 var templateUtils_1 = require("./transforms/templateUtils");

package/dist/vue/parse.d.ts

@@ -0,0 +1,13 @@
+import { ElementNode, RootNode } from '@vue/compiler-core';
+export declare function parseVueCode(code: string, isNVue?: boolean): {
+    code: string;
+    files?: undefined;
+    errors?: undefined;
+} | {
+    code: string;
+    files: string[];
+    errors: SyntaxError[];
+};
+export declare function parseBlockCode(ast: RootNode, code: string): string;
+export declare function parseWxsNodes(ast: RootNode): ElementNode[];
+export declare function parseWxsCode(wxsNodes: ElementNode[], code: string): string;

package/dist/vue/parse.js

@@ -0,0 +1,111 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseWxsCode = exports.parseWxsNodes = exports.parseBlockCode = exports.parseVueCode = void 0;
+const magic_string_1 = __importDefault(require("magic-string"));
+const ast_1 = require("../vite/utils/ast");
+const BLOCK_RE = /<\/block>/;
+const WXS_LANG_RE = /lang=["|'](renderjs|wxs)["|']/;
+const WXS_ATTRS = ['wxs', 'renderjs'];
+function parseVueCode(code, isNVue = false) {
+    const hasBlock = BLOCK_RE.test(code);
+    const hasWxs = WXS_LANG_RE.test(code);
+    if (!hasBlock && !hasWxs) {
+        return { code };
+    }
+    const errors = [];
+    const files = [];
+    let ast = (0, ast_1.parseVue)(code, errors);
+    if (hasBlock) {
+        code = parseBlockCode(ast, code);
+        // 重新解析新的 code
+        ast = (0, ast_1.parseVue)(code, errors);
+    }
+    if (!isNVue && hasWxs) {
+        const wxsNodes = parseWxsNodes(ast);
+        code = parseWxsCode(wxsNodes, code);
+        // add watch
+        for (const wxsNode of wxsNodes) {
+            const srcProp = wxsNode.props.find((prop) => prop.type === 6 /* ATTRIBUTE */ && prop.name === 'src');
+            if (srcProp && srcProp.value) {
+                files.push(srcProp.value.content);
+            }
+        }
+    }
+    return { code, files, errors };
+}
+exports.parseVueCode = parseVueCode;
+function traverseChildren({ children }, blockNodes) {
+    children.forEach((node) => traverseNode(node, blockNodes));
+}
+function traverseNode(node, blockNodes) {
+    if ((0, ast_1.isElementNode)(node) && node.tag === 'block') {
+        blockNodes.push(node);
+    }
+    if (node.type === 10 /* IF_BRANCH */ ||
+        node.type === 11 /* FOR */ ||
+        node.type === 1 /* ELEMENT */ ||
+        node.type === 0 /* ROOT */) {
+        traverseChildren(node, blockNodes);
+    }
+}
+function parseBlockCode(ast, code) {
+    const blockNodes = [];
+    traverseNode(ast, blockNodes);
+    if (blockNodes.length) {
+        return parseBlockNode(code, blockNodes);
+    }
+    return code;
+}
+exports.parseBlockCode = parseBlockCode;
+const BLOCK_END_LEN = '</block>'.length;
+const BLOCK_START_LEN = '<block'.length;
+function parseBlockNode(code, blocks) {
+    const magicString = new magic_string_1.default(code);
+    blocks.forEach(({ loc }) => {
+        const startOffset = loc.start.offset;
+        const endOffset = loc.end.offset;
+        magicString.overwrite(startOffset, startOffset + BLOCK_START_LEN, '<template');
+        magicString.overwrite(endOffset - BLOCK_END_LEN, endOffset, '</template>');
+    });
+    return magicString.toString();
+}
+function parseWxsNodes(ast) {
+    return ast.children.filter((node) => node.type === 1 /* ELEMENT */ &&
+        node.tag === 'script' &&
+        node.props.find((prop) => prop.name === 'lang' &&
+            prop.type === 6 /* ATTRIBUTE */ &&
+            prop.value &&
+            WXS_ATTRS.includes(prop.value.content)));
+}
+exports.parseWxsNodes = parseWxsNodes;
+function parseWxsCode(wxsNodes, code) {
+    if (wxsNodes.length) {
+        code = parseWxsNode(code, wxsNodes);
+    }
+    return code;
+}
+exports.parseWxsCode = parseWxsCode;
+const SCRIPT_END_LEN = '</script>'.length;
+const SCRIPT_START_LEN = '<script'.length;
+function parseWxsNode(code, nodes) {
+    const magicString = new magic_string_1.default(code);
+    nodes.forEach(({ loc, props }) => {
+        const langAttr = props.find((prop) => prop.name === 'lang');
+        const moduleAttr = props.find((prop) => prop.name === 'module');
+        const startOffset = loc.start.offset;
+        const endOffset = loc.end.offset;
+        const lang = langAttr.value.content;
+        const langStartOffset = langAttr.loc.start.offset;
+        magicString.overwrite(startOffset, startOffset + SCRIPT_START_LEN, '<' + lang); // <renderjs or <wxs
+        magicString.overwrite(langStartOffset, langStartOffset + ('lang="' + lang + '"').length, ''); // remove lang="renderjs" or lang="wxs"
+        magicString.overwrite(endOffset - SCRIPT_END_LEN, endOffset, '</' + lang + '>'); //</renderjs> or </wxs>
+        if (moduleAttr) {
+            const moduleStartOffset = moduleAttr.loc.start.offset;
+            magicString.overwrite(moduleStartOffset, moduleStartOffset + 'module'.length, 'name'); // module="echarts" => name="echarts"
+        }
+    });
+    return magicString.toString();
+}

package/dist/vue/transforms/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dcloudio/uni-cli-shared",
-  "version": "3.0.0-alpha-3040120220308001",
+  "version": "3.0.0-alpha-3040220220310001",
   "description": "@dcloudio/uni-cli-shared",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,8 +21,8 @@
     "@babel/core": "^7.17.2",
     "@babel/parser": "^7.16.4",
     "@babel/types": "^7.16.8",
-    "@dcloudio/uni-i18n": "3.0.0-alpha-3040120220308001",
-    "@dcloudio/uni-shared": "3.0.0-alpha-3040120220308001",
+    "@dcloudio/uni-i18n": "3.0.0-alpha-3040220220310001",
+    "@dcloudio/uni-shared": "3.0.0-alpha-3040220220310001",
     "@rollup/pluginutils": "^4.1.2",
     "@vue/compiler-core": "3.2.31",
     "@vue/compiler-dom": "3.2.31",