@dcloudio/uni-cli-shared 3.0.0-4080720251210001 → 3.0.0-5000320260312001

package/dist/vue/parse.js

@@ -3,10 +3,11 @@ 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;
+exports.onVueTemplateCompileLog = exports.parseWxsCode = exports.parseWxsNodes = exports.parseBlockCode = exports.parseVueCode = void 0;
 const compiler_core_1 = require("@vue/compiler-core");
 const magic_string_1 = __importDefault(require("magic-string"));
 const ast_1 = require("../vite/utils/ast");
+const logs_1 = require("../logs");
 const BLOCK_RE = /<\/block>/;
 const WXS_LANG_RE = /lang=["|'](renderjs|wxs|sjs)["|']/;
 const WXS_ATTRS = ['wxs', 'renderjs', 'sjs'];
@@ -110,3 +111,4 @@ function parseWxsNode(code, nodes) {
     });
     return magicString.toString();
 }
+exports.onVueTemplateCompileLog = logs_1.onCompileLog;

package/dist/vue/transforms/index.d.ts

@@ -1,3 +1,4 @@
+export * from './transformLineBreak';
 export * from './transformRef';
 export * from './transformPageHead';
 export * from './transformComponent';

package/dist/vue/transforms/index.js

@@ -20,6 +20,7 @@ const transformTag_1 = require("./transformTag");
 const transformEvent_1 = require("./transformEvent");
 const transformComponent_1 = require("./transformComponent");
 const constants_1 = require("../../mp/constants");
+__exportStar(require("./transformLineBreak"), exports);
 __exportStar(require("./transformRef"), exports);
 __exportStar(require("./transformPageHead"), exports);
 __exportStar(require("./transformComponent"), exports);

package/dist/vue/transforms/transformLineBreak.d.ts

@@ -0,0 +1,2 @@
+import type { NodeTransform } from '@vue/compiler-core';
+export declare const transformLineBreak: NodeTransform;

package/dist/vue/transforms/transformLineBreak.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transformLineBreak = void 0;
+const transformLineBreak = (node, context) => {
+    if (node.type === 2) {
+        const parent = context.parent;
+        if (parent && parent.type === 1 && parent.tag === 'text') {
+            // 解析文本节点转义，暂时仅处理换行
+            node.content = node.content.replace(/[\\]+n/g, function (match) {
+                return JSON.parse(`"${match}"`);
+            });
+        }
+    }
+};
+exports.transformLineBreak = transformLineBreak;

package/dist/vue/transforms/transformTag.d.ts

@@ -1,2 +1,2 @@
-import type { NodeTransform } from '@vue/compiler-core';
+import { type NodeTransform } from '@vue/compiler-core';
 export declare function createTransformTag(opts: Record<string, string>): NodeTransform;

package/dist/vue/transforms/transformTag.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createTransformTag = void 0;
+const compiler_core_1 = require("@vue/compiler-core");
 const ast_1 = require("../../vite/utils/ast");
 function createTransformTag(opts) {
     return function transformTag(node, context) {
@@ -12,6 +13,10 @@ function createTransformTag(opts) {
         if (!newTag) {
             return;
         }
+        // TODO: 临时 dom2 硬编码处理 tagType，待后续优化
+        if (process.env.UNI_APP_X_DOM2 === 'true' && oldTag === 'cover-view') {
+            node.tagType = compiler_core_1.ElementTypes.ELEMENT;
+        }
         node.tag = newTag;
     };
 }

package/dist/vue/transforms/x/transformMPBuiltInTag.js

@@ -69,13 +69,13 @@ function createMPBuiltInTagTransform(options) {
         if (options.propRename && node.tag in options.propRename) {
             const propMap = options.propRename[node.tag];
             node.props.forEach((prop) => {
-                if (prop.type === compiler_core_1.NodeTypes.ATTRIBUTE) {
+                if ((0, vite_1.isAttributeNode)(prop)) {
                     const propName = (0, shared_1.camelize)(prop.name);
                     if (propName in propMap && propMap[propName]) {
                         (0, utils_1.renameProp)(propMap[propName], prop);
                     }
                 }
-                else if (prop.type === compiler_core_1.NodeTypes.DIRECTIVE) {
+                else if ((0, vite_1.isDirectiveNode)(prop)) {
                     if (!prop.rawName || !prop.arg || !(0, compiler_core_1.isStaticExp)(prop.arg)) {
                         return;
                     }

package/dist/vue/utils.js

@@ -178,7 +178,14 @@ function advancePositionWithMutation(pos, source, numberOfCharacters = source.le
 exports.advancePositionWithMutation = advancePositionWithMutation;
 function createResolveStaticAsset(inputDir) {
     return function resolveStaticAsset(relativePath, context, options) {
-        const newRelativePath = (0, utils_1.normalizePath)(path_1.default.relative(inputDir, path_1.default.resolve(path_1.default.dirname(context.filename), relativePath)));
+        let filename = context.filename;
+        if (!filename && context.options?.filename) {
+            filename = context.options.filename;
+        }
+        if (!filename) {
+            return relativePath;
+        }
+        const newRelativePath = (0, utils_1.normalizePath)(path_1.default.relative(inputDir, path_1.default.resolve(path_1.default.dirname(filename), relativePath)));
         if (options.base) {
             // explicit base - directly rewrite relative urls into absolute url
             // to avoid generating extra imports

package/lib/@vue/compiler-core/dist/compiler-core.cjs.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var shared = require('@vue/shared');
-var decode_js = require('entities/lib/decode.js');
+var decode_js = require('entities/decode');
 var parser = require('@babel/parser');
 var estreeWalker = require('estree-walker');
 var sourceMapJs = require('source-map-js');
@@ -374,6 +374,12 @@ function convertToBlock(node, { helper, removeHelper, inSSR }) {
   }
 }
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 const defaultDelimitersOpen = new Uint8Array([123, 123]);
 const defaultDelimitersClose = new Uint8Array([125, 125]);
 function isTagStartChar(c) {
@@ -424,31 +430,32 @@ class Tokenizer {
     this.stack = stack;
     this.cbs = cbs;
     /** The current state the tokenizer is in. */
-    this.state = 1;
+    __publicField(this, "state", 1);
     /** The read buffer. */
-    this.buffer = "";
+    __publicField(this, "buffer", "");
     /** The beginning of the section that is currently being read. */
-    this.sectionStart = 0;
+    __publicField(this, "sectionStart", 0);
     /** The index within the buffer that we are currently looking at. */
-    this.index = 0;
+    __publicField(this, "index", 0);
     /** The start of the last entity. */
-    this.entityStart = 0;
+    __publicField(this, "entityStart", 0);
     /** Some behavior, eg. when decoding entities, is done while we are in another state. This keeps track of the other state type. */
-    this.baseState = 1;
+    __publicField(this, "baseState", 1);
     /** For special parsing behavior inside of script and style tags. */
-    this.inRCDATA = false;
+    __publicField(this, "inRCDATA", false);
     /** For disabling RCDATA tags handling */
-    this.inXML = false;
+    __publicField(this, "inXML", false);
     /** For disabling interpolation parsing in v-pre */
-    this.inVPre = false;
+    __publicField(this, "inVPre", false);
     /** Record newline positions for fast line / column calculation */
-    this.newlines = [];
-    this.mode = 0;
-    this.delimiterOpen = defaultDelimitersOpen;
-    this.delimiterClose = defaultDelimitersClose;
-    this.delimiterIndex = -1;
-    this.currentSequence = void 0;
-    this.sequenceIndex = 0;
+    __publicField(this, "newlines", []);
+    __publicField(this, "entityDecoder");
+    __publicField(this, "mode", 0);
+    __publicField(this, "delimiterOpen", defaultDelimitersOpen);
+    __publicField(this, "delimiterClose", defaultDelimitersClose);
+    __publicField(this, "delimiterIndex", -1);
+    __publicField(this, "currentSequence");
+    __publicField(this, "sequenceIndex", 0);
     {
       this.entityDecoder = new decode_js.EntityDecoder(
         decode_js.htmlDecodeTree,
@@ -1715,7 +1722,7 @@ function isReferenced(node, parent, grandparent) {
       if (parent.key === node) {
         return !!parent.computed;
       }
-      return !grandparent || grandparent.type !== "ObjectPattern";
+      return true;
     case "ClassProperty":
       if (parent.key === node) {
         return !!parent.computed;
@@ -1746,9 +1753,6 @@ function isReferenced(node, parent, grandparent) {
     case "ExportDefaultSpecifier":
       return false;
     case "ExportSpecifier":
-      if (grandparent == null ? void 0 : grandparent.source) {
-        return false;
-      }
       return parent.local === node;
     case "ImportDefaultSpecifier":
     case "ImportNamespaceSpecifier":
@@ -2530,6 +2534,7 @@ function onText(content, start, end) {
   }
 }
 function onCloseTag(el, end, isImplied = false) {
+  var _a;
   if (isImplied) {
     setLocEnd(el.loc, backTrack(end, 60));
   } else {
@@ -2554,6 +2559,13 @@ function onCloseTag(el, end, isImplied = false) {
       el.tagType = 3;
     } else if (isComponent(el)) {
       el.tagType = 1;
+      const importSources = (_a = currentOptions.bindingMetadata) == null ? void 0 : _a.__importSources;
+      if (importSources) {
+        const source = importSources[tag] || importSources[shared.capitalize(shared.camelize(tag))] || importSources[shared.camelize(tag)] || importSources[shared.capitalize(tag)];
+        if (source) {
+          el.importSource = source;
+        }
+      }
     }
   }
   if (!tokenizer.inRCDATA) {
@@ -3120,6 +3132,8 @@ function createTransformContext(root, {
   transformHoist = null,
   isBuiltInComponent = shared.NOOP,
   isCustomElement = shared.NOOP,
+  // fixed by xxxxxx
+  isEasyComponent = shared.NOOP,
   expressionPlugins = [],
   scopeId = null,
   slotted = true,
@@ -3147,6 +3161,8 @@ function createTransformContext(root, {
     transformHoist,
     isBuiltInComponent,
     isCustomElement,
+    // fixed by xxxxxx
+    isEasyComponent,
     expressionPlugins,
     scopeId,
     slotted,
@@ -5312,7 +5328,9 @@ function resolveComponentType(node, context, ssr = false) {
       context.helper(builtIn);
     return builtIn;
   }
-  {
+  const isEasyComponent = context.isEasyComponent;
+  const isEasyCom = isEasyComponent && isEasyComponent(tag);
+  if (!isEasyCom) {
     const fromSetup = resolveSetupReference(tag, context);
     if (fromSetup) {
       return fromSetup;
@@ -5325,7 +5343,8 @@ function resolveComponentType(node, context, ssr = false) {
       }
     }
   }
-  if (context.selfName && shared.capitalize(shared.camelize(tag)) === context.selfName) {
+  if (// fixed by xxxxxx
+  !isEasyCom && context.selfName && shared.capitalize(shared.camelize(tag)) === context.selfName) {
     context.helper(RESOLVE_COMPONENT);
     context.components.add(tag + `__self`);
     return toValidAssetId(tag, `component`);

package/lib/@vue/compiler-core/dist/compiler-core.cjs.prod.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var shared = require('@vue/shared');
-var decode_js = require('entities/lib/decode.js');
+var decode_js = require('entities/decode');
 var parser = require('@babel/parser');
 var estreeWalker = require('estree-walker');
 var sourceMapJs = require('source-map-js');
@@ -374,6 +374,12 @@ function convertToBlock(node, { helper, removeHelper, inSSR }) {
   }
 }
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 const defaultDelimitersOpen = new Uint8Array([123, 123]);
 const defaultDelimitersClose = new Uint8Array([125, 125]);
 function isTagStartChar(c) {
@@ -424,31 +430,32 @@ class Tokenizer {
     this.stack = stack;
     this.cbs = cbs;
     /** The current state the tokenizer is in. */
-    this.state = 1;
+    __publicField(this, "state", 1);
     /** The read buffer. */
-    this.buffer = "";
+    __publicField(this, "buffer", "");
     /** The beginning of the section that is currently being read. */
-    this.sectionStart = 0;
+    __publicField(this, "sectionStart", 0);
     /** The index within the buffer that we are currently looking at. */
-    this.index = 0;
+    __publicField(this, "index", 0);
     /** The start of the last entity. */
-    this.entityStart = 0;
+    __publicField(this, "entityStart", 0);
     /** Some behavior, eg. when decoding entities, is done while we are in another state. This keeps track of the other state type. */
-    this.baseState = 1;
+    __publicField(this, "baseState", 1);
     /** For special parsing behavior inside of script and style tags. */
-    this.inRCDATA = false;
+    __publicField(this, "inRCDATA", false);
     /** For disabling RCDATA tags handling */
-    this.inXML = false;
+    __publicField(this, "inXML", false);
     /** For disabling interpolation parsing in v-pre */
-    this.inVPre = false;
+    __publicField(this, "inVPre", false);
     /** Record newline positions for fast line / column calculation */
-    this.newlines = [];
-    this.mode = 0;
-    this.delimiterOpen = defaultDelimitersOpen;
-    this.delimiterClose = defaultDelimitersClose;
-    this.delimiterIndex = -1;
-    this.currentSequence = void 0;
-    this.sequenceIndex = 0;
+    __publicField(this, "newlines", []);
+    __publicField(this, "entityDecoder");
+    __publicField(this, "mode", 0);
+    __publicField(this, "delimiterOpen", defaultDelimitersOpen);
+    __publicField(this, "delimiterClose", defaultDelimitersClose);
+    __publicField(this, "delimiterIndex", -1);
+    __publicField(this, "currentSequence");
+    __publicField(this, "sequenceIndex", 0);
     {
       this.entityDecoder = new decode_js.EntityDecoder(
         decode_js.htmlDecodeTree,
@@ -1711,7 +1718,7 @@ function isReferenced(node, parent, grandparent) {
       if (parent.key === node) {
         return !!parent.computed;
       }
-      return !grandparent || grandparent.type !== "ObjectPattern";
+      return true;
     case "ClassProperty":
       if (parent.key === node) {
         return !!parent.computed;
@@ -1742,9 +1749,6 @@ function isReferenced(node, parent, grandparent) {
     case "ExportDefaultSpecifier":
       return false;
     case "ExportSpecifier":
-      if (grandparent == null ? void 0 : grandparent.source) {
-        return false;
-      }
       return parent.local === node;
     case "ImportDefaultSpecifier":
     case "ImportNamespaceSpecifier":
@@ -2526,6 +2530,7 @@ function onText(content, start, end) {
   }
 }
 function onCloseTag(el, end, isImplied = false) {
+  var _a;
   if (isImplied) {
     setLocEnd(el.loc, backTrack(end, 60));
   } else {
@@ -2550,6 +2555,13 @@ function onCloseTag(el, end, isImplied = false) {
       el.tagType = 3;
     } else if (isComponent(el)) {
       el.tagType = 1;
+      const importSources = (_a = currentOptions.bindingMetadata) == null ? void 0 : _a.__importSources;
+      if (importSources) {
+        const source = importSources[tag] || importSources[shared.capitalize(shared.camelize(tag))] || importSources[shared.camelize(tag)] || importSources[shared.capitalize(tag)];
+        if (source) {
+          el.importSource = source;
+        }
+      }
     }
   }
   if (!tokenizer.inRCDATA) {
@@ -3079,6 +3091,8 @@ function createTransformContext(root, {
   transformHoist = null,
   isBuiltInComponent = shared.NOOP,
   isCustomElement = shared.NOOP,
+  // fixed by xxxxxx
+  isEasyComponent = shared.NOOP,
   expressionPlugins = [],
   scopeId = null,
   slotted = true,
@@ -3106,6 +3120,8 @@ function createTransformContext(root, {
     transformHoist,
     isBuiltInComponent,
     isCustomElement,
+    // fixed by xxxxxx
+    isEasyComponent,
     expressionPlugins,
     scopeId,
     slotted,
@@ -5217,7 +5233,9 @@ function resolveComponentType(node, context, ssr = false) {
       context.helper(builtIn);
     return builtIn;
   }
-  {
+  const isEasyComponent = context.isEasyComponent;
+  const isEasyCom = isEasyComponent && isEasyComponent(tag);
+  if (!isEasyCom) {
     const fromSetup = resolveSetupReference(tag, context);
     if (fromSetup) {
       return fromSetup;
@@ -5230,7 +5248,8 @@ function resolveComponentType(node, context, ssr = false) {
       }
     }
   }
-  if (context.selfName && shared.capitalize(shared.camelize(tag)) === context.selfName) {
+  if (// fixed by xxxxxx
+  !isEasyCom && context.selfName && shared.capitalize(shared.camelize(tag)) === context.selfName) {
     context.helper(RESOLVE_COMPONENT);
     context.components.add(tag + `__self`);
     return toValidAssetId(tag, `component`);

package/lib/@vue/compiler-core/dist/compiler-core.esm-bundler.js

@@ -3,7 +3,7 @@
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
-import { isString, NOOP, isObject, NO, extend, isSymbol, isArray, capitalize, camelize, EMPTY_OBJ, PatchFlagNames, slotFlagsText, isOn, isBuiltInDirective, isReservedProp, toHandlerKey } from '@vue/shared';
+import { isString, NOOP, isObject, extend, NO, capitalize, camelize, isSymbol, isArray, EMPTY_OBJ, PatchFlagNames, slotFlagsText, isOn, isBuiltInDirective, isReservedProp, toHandlerKey } from '@vue/shared';
 export { generateCodeFrame } from '@vue/shared';
 import { parseExpression } from '@babel/parser';
 
@@ -368,6 +368,12 @@ function convertToBlock(node, { helper, removeHelper, inSSR }) {
   }
 }
 
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
 const defaultDelimitersOpen = new Uint8Array([123, 123]);
 const defaultDelimitersClose = new Uint8Array([125, 125]);
 function isTagStartChar(c) {
@@ -418,31 +424,32 @@ class Tokenizer {
     this.stack = stack;
     this.cbs = cbs;
     /** The current state the tokenizer is in. */
-    this.state = 1;
+    __publicField(this, "state", 1);
     /** The read buffer. */
-    this.buffer = "";
+    __publicField(this, "buffer", "");
     /** The beginning of the section that is currently being read. */
-    this.sectionStart = 0;
+    __publicField(this, "sectionStart", 0);
     /** The index within the buffer that we are currently looking at. */
-    this.index = 0;
+    __publicField(this, "index", 0);
     /** The start of the last entity. */
-    this.entityStart = 0;
+    __publicField(this, "entityStart", 0);
     /** Some behavior, eg. when decoding entities, is done while we are in another state. This keeps track of the other state type. */
-    this.baseState = 1;
+    __publicField(this, "baseState", 1);
     /** For special parsing behavior inside of script and style tags. */
-    this.inRCDATA = false;
+    __publicField(this, "inRCDATA", false);
     /** For disabling RCDATA tags handling */
-    this.inXML = false;
+    __publicField(this, "inXML", false);
     /** For disabling interpolation parsing in v-pre */
-    this.inVPre = false;
+    __publicField(this, "inVPre", false);
     /** Record newline positions for fast line / column calculation */
-    this.newlines = [];
-    this.mode = 0;
-    this.delimiterOpen = defaultDelimitersOpen;
-    this.delimiterClose = defaultDelimitersClose;
-    this.delimiterIndex = -1;
-    this.currentSequence = void 0;
-    this.sequenceIndex = 0;
+    __publicField(this, "newlines", []);
+    __publicField(this, "entityDecoder");
+    __publicField(this, "mode", 0);
+    __publicField(this, "delimiterOpen", defaultDelimitersOpen);
+    __publicField(this, "delimiterClose", defaultDelimitersClose);
+    __publicField(this, "delimiterIndex", -1);
+    __publicField(this, "currentSequence");
+    __publicField(this, "sequenceIndex", 0);
   }
   get inSFCRoot() {
     return this.mode === 2 && this.stack.length === 0;
@@ -2296,6 +2303,7 @@ function onText(content, start, end) {
   }
 }
 function onCloseTag(el, end, isImplied = false) {
+  var _a;
   if (isImplied) {
     setLocEnd(el.loc, backTrack(end, 60));
   } else {
@@ -2320,6 +2328,13 @@ function onCloseTag(el, end, isImplied = false) {
       el.tagType = 3;
     } else if (isComponent(el)) {
       el.tagType = 1;
+      const importSources = (_a = currentOptions.bindingMetadata) == null ? void 0 : _a.__importSources;
+      if (importSources) {
+        const source = importSources[tag] || importSources[capitalize(camelize(tag))] || importSources[camelize(tag)] || importSources[capitalize(tag)];
+        if (source) {
+          el.importSource = source;
+        }
+      }
     }
   }
   if (!tokenizer.inRCDATA) {
@@ -2865,6 +2880,8 @@ function createTransformContext(root, {
   transformHoist = null,
   isBuiltInComponent = NOOP,
   isCustomElement = NOOP,
+  // fixed by xxxxxx
+  isEasyComponent = NOOP,
   expressionPlugins = [],
   scopeId = null,
   slotted = true,
@@ -2892,6 +2909,8 @@ function createTransformContext(root, {
     transformHoist,
     isBuiltInComponent,
     isCustomElement,
+    // fixed by xxxxxx
+    isEasyComponent,
     expressionPlugins,
     scopeId,
     slotted,
@@ -4628,6 +4647,8 @@ function resolveComponentType(node, context, ssr = false) {
       context.helper(builtIn);
     return builtIn;
   }
+  const isEasyComponent = context.isEasyComponent;
+  isEasyComponent && isEasyComponent(tag);
   context.helper(RESOLVE_COMPONENT);
   context.components.add(tag);
   return toValidAssetId(tag, `component`);
@@ -5387,8 +5408,7 @@ const transformModel = (dir, node, context) => {
     context.onError(createCompilerError(44, exp.loc));
     return createTransformProps();
   }
-  const maybeRef = false;
-  if (!expString.trim() || !isMemberExpression(expString) && !maybeRef) {
+  if (!expString.trim() || !isMemberExpression(expString) && true) {
     context.onError(
       createCompilerError(42, exp.loc)
     );