@vue/compiler-core 3.2.15 → 3.2.19

package/dist/compiler-core.cjs.js

@@ -452,21 +452,21 @@ const isMemberExpressionBrowser = (path) => {
     return !currentOpenBracketCount && !currentOpenParensCount;
 };
 const isMemberExpressionNode = (path, context) => {
-    try {
-        let ret = parser.parseExpression(path, {
-            plugins: [...context.expressionPlugins, ...shared.babelParserDefaultPlugins]
-        });
-        if (ret.type === 'TSAsExpression' || ret.type === 'TSTypeAssertion') {
-            ret = ret.expression;
+        try {
+            let ret = parser.parseExpression(path, {
+                plugins: [...context.expressionPlugins, ...shared.babelParserDefaultPlugins]
+            });
+            if (ret.type === 'TSAsExpression' || ret.type === 'TSTypeAssertion') {
+                ret = ret.expression;
+            }
+            return (ret.type === 'MemberExpression' ||
+                ret.type === 'OptionalMemberExpression' ||
+                ret.type === 'Identifier');
         }
-        return (ret.type === 'MemberExpression' ||
-            ret.type === 'OptionalMemberExpression' ||
-            ret.type === 'Identifier');
-    }
-    catch (e) {
-        return false;
-    }
-};
+        catch (e) {
+            return false;
+        }
+    };
 const isMemberExpression = isMemberExpressionNode;
 function getInnerRange(loc, offset, length) {
     const source = loc.source.substr(offset, length);
@@ -2254,7 +2254,7 @@ function createStructuralDirectiveTransform(name, fn) {
 }
 
 const PURE_ANNOTATION = `/*#__PURE__*/`;
-function createCodegenContext(ast, { mode = 'function', prefixIdentifiers = mode === 'module', sourceMap: sourceMap$1 = false, filename = `template.vue.html`, scopeId = null, optimizeImports = false, runtimeGlobalName = `Vue`, runtimeModuleName = `vue`, ssr = false, isTS = false, inSSR = false }) {
+function createCodegenContext(ast, { mode = 'function', prefixIdentifiers = mode === 'module', sourceMap: sourceMap$1 = false, filename = `template.vue.html`, scopeId = null, optimizeImports = false, runtimeGlobalName = `Vue`, runtimeModuleName = `vue`, ssrRuntimeModuleName = 'vue/server-renderer', ssr = false, isTS = false, inSSR = false }) {
     const context = {
         mode,
         prefixIdentifiers,
@@ -2264,6 +2264,7 @@ function createCodegenContext(ast, { mode = 'function', prefixIdentifiers = mode
         optimizeImports,
         runtimeGlobalName,
         runtimeModuleName,
+        ssrRuntimeModuleName,
         ssr,
         isTS,
         inSSR,
@@ -2440,7 +2441,7 @@ function generate(ast, options = {}) {
     };
 }
 function genFunctionPreamble(ast, context) {
-    const { ssr, prefixIdentifiers, push, newline, runtimeModuleName, runtimeGlobalName } = context;
+    const { ssr, prefixIdentifiers, push, newline, runtimeModuleName, runtimeGlobalName, ssrRuntimeModuleName } = context;
     const VueBinding = ssr
         ? `require(${JSON.stringify(runtimeModuleName)})`
         : runtimeGlobalName;
@@ -2480,14 +2481,14 @@ function genFunctionPreamble(ast, context) {
         // ssr guarantees prefixIdentifier: true
         push(`const { ${ast.ssrHelpers
             .map(aliasHelper)
-            .join(', ')} } = require("vue/server-renderer")\n`);
+            .join(', ')} } = require("${ssrRuntimeModuleName}")\n`);
     }
     genHoists(ast.hoists, context);
     newline();
     push(`return `);
 }
 function genModulePreamble(ast, context, genScopeId, inline) {
-    const { push, newline, optimizeImports, runtimeModuleName } = context;
+    const { push, newline, optimizeImports, runtimeModuleName, ssrRuntimeModuleName } = context;
     if (genScopeId && ast.hoists.length) {
         ast.helpers.push(PUSH_SCOPE_ID, POP_SCOPE_ID);
     }
@@ -2515,7 +2516,7 @@ function genModulePreamble(ast, context, genScopeId, inline) {
     if (ast.ssrHelpers && ast.ssrHelpers.length) {
         push(`import { ${ast.ssrHelpers
             .map(s => `${helperNameMap[s]} as _${helperNameMap[s]}`)
-            .join(', ')} } from "@vue/server-renderer"\n`);
+            .join(', ')} } from "${ssrRuntimeModuleName}"\n`);
     }
     if (ast.imports.length) {
         genImports(ast.imports, context);
@@ -3817,7 +3818,9 @@ const transformFor = createStructuralDirectiveTransform('for', (node, dir, conte
                 ? createSimpleExpression(keyProp.value.content, true)
                 : keyProp.exp);
         const keyProperty = keyProp ? createObjectProperty(`key`, keyExp) : null;
-        if (context.prefixIdentifiers && keyProperty) {
+        if (context.prefixIdentifiers &&
+            keyProperty &&
+            keyProp.type !== 6 /* ATTRIBUTE */) {
             // #2085 process :key expression needs to be processed in order for it
             // to behave consistently for <template v-for> and <div v-for>.
             // In the case of `<template v-for>`, the node is discarded and never

package/dist/compiler-core.cjs.prod.js

@@ -451,21 +451,21 @@ const isMemberExpressionBrowser = (path) => {
     return !currentOpenBracketCount && !currentOpenParensCount;
 };
 const isMemberExpressionNode = (path, context) => {
-    try {
-        let ret = parser.parseExpression(path, {
-            plugins: [...context.expressionPlugins, ...shared.babelParserDefaultPlugins]
-        });
-        if (ret.type === 'TSAsExpression' || ret.type === 'TSTypeAssertion') {
-            ret = ret.expression;
+        try {
+            let ret = parser.parseExpression(path, {
+                plugins: [...context.expressionPlugins, ...shared.babelParserDefaultPlugins]
+            });
+            if (ret.type === 'TSAsExpression' || ret.type === 'TSTypeAssertion') {
+                ret = ret.expression;
+            }
+            return (ret.type === 'MemberExpression' ||
+                ret.type === 'OptionalMemberExpression' ||
+                ret.type === 'Identifier');
         }
-        return (ret.type === 'MemberExpression' ||
-            ret.type === 'OptionalMemberExpression' ||
-            ret.type === 'Identifier');
-    }
-    catch (e) {
-        return false;
-    }
-};
+        catch (e) {
+            return false;
+        }
+    };
 const isMemberExpression = isMemberExpressionNode;
 function getInnerRange(loc, offset, length) {
     const source = loc.source.substr(offset, length);
@@ -2205,7 +2205,7 @@ function createStructuralDirectiveTransform(name, fn) {
 }
 
 const PURE_ANNOTATION = `/*#__PURE__*/`;
-function createCodegenContext(ast, { mode = 'function', prefixIdentifiers = mode === 'module', sourceMap: sourceMap$1 = false, filename = `template.vue.html`, scopeId = null, optimizeImports = false, runtimeGlobalName = `Vue`, runtimeModuleName = `vue`, ssr = false, isTS = false, inSSR = false }) {
+function createCodegenContext(ast, { mode = 'function', prefixIdentifiers = mode === 'module', sourceMap: sourceMap$1 = false, filename = `template.vue.html`, scopeId = null, optimizeImports = false, runtimeGlobalName = `Vue`, runtimeModuleName = `vue`, ssrRuntimeModuleName = 'vue/server-renderer', ssr = false, isTS = false, inSSR = false }) {
     const context = {
         mode,
         prefixIdentifiers,
@@ -2215,6 +2215,7 @@ function createCodegenContext(ast, { mode = 'function', prefixIdentifiers = mode
         optimizeImports,
         runtimeGlobalName,
         runtimeModuleName,
+        ssrRuntimeModuleName,
         ssr,
         isTS,
         inSSR,
@@ -2391,7 +2392,7 @@ function generate(ast, options = {}) {
     };
 }
 function genFunctionPreamble(ast, context) {
-    const { ssr, prefixIdentifiers, push, newline, runtimeModuleName, runtimeGlobalName } = context;
+    const { ssr, prefixIdentifiers, push, newline, runtimeModuleName, runtimeGlobalName, ssrRuntimeModuleName } = context;
     const VueBinding = ssr
         ? `require(${JSON.stringify(runtimeModuleName)})`
         : runtimeGlobalName;
@@ -2431,14 +2432,14 @@ function genFunctionPreamble(ast, context) {
         // ssr guarantees prefixIdentifier: true
         push(`const { ${ast.ssrHelpers
             .map(aliasHelper)
-            .join(', ')} } = require("vue/server-renderer")\n`);
+            .join(', ')} } = require("${ssrRuntimeModuleName}")\n`);
     }
     genHoists(ast.hoists, context);
     newline();
     push(`return `);
 }
 function genModulePreamble(ast, context, genScopeId, inline) {
-    const { push, newline, optimizeImports, runtimeModuleName } = context;
+    const { push, newline, optimizeImports, runtimeModuleName, ssrRuntimeModuleName } = context;
     if (genScopeId && ast.hoists.length) {
         ast.helpers.push(PUSH_SCOPE_ID, POP_SCOPE_ID);
     }
@@ -2466,7 +2467,7 @@ function genModulePreamble(ast, context, genScopeId, inline) {
     if (ast.ssrHelpers && ast.ssrHelpers.length) {
         push(`import { ${ast.ssrHelpers
             .map(s => `${helperNameMap[s]} as _${helperNameMap[s]}`)
-            .join(', ')} } from "@vue/server-renderer"\n`);
+            .join(', ')} } from "${ssrRuntimeModuleName}"\n`);
     }
     if (ast.imports.length) {
         genImports(ast.imports, context);
@@ -3736,7 +3737,9 @@ const transformFor = createStructuralDirectiveTransform('for', (node, dir, conte
                 ? createSimpleExpression(keyProp.value.content, true)
                 : keyProp.exp);
         const keyProperty = keyProp ? createObjectProperty(`key`, keyExp) : null;
-        if (context.prefixIdentifiers && keyProperty) {
+        if (context.prefixIdentifiers &&
+            keyProperty &&
+            keyProp.type !== 6 /* ATTRIBUTE */) {
             // #2085 process :key expression needs to be processed in order for it
             // to behave consistently for <template v-for> and <div v-for>.
             // In the case of `<template v-for>`, the node is discarded and never

package/dist/compiler-core.d.ts

@@ -174,6 +174,11 @@ export declare interface CodegenOptions extends SharedTransformCodegenOptions {
      * @default 'vue'
      */
     runtimeModuleName?: string;
+    /**
+     * Customize where to import ssr runtime helpers from/**
+     * @default 'vue/server-renderer'
+     */
+    ssrRuntimeModuleName?: string;
     /**
      * Customize the global variable name of `Vue` to get helpers from
      * in function mode

package/dist/compiler-core.esm-bundler.js

@@ -1,6 +1,5 @@
-import { isString, hyphenate, babelParserDefaultPlugins, extend, isObject, NO, isArray, makeMap, isSymbol, NOOP, EMPTY_OBJ, capitalize, camelize as camelize$1, PatchFlagNames, slotFlagsText, isOn, isReservedProp, toHandlerKey } from '@vue/shared';
+import { isString, hyphenate, NOOP, extend, isObject, NO, isArray, makeMap, isSymbol, EMPTY_OBJ, capitalize, camelize as camelize$1, PatchFlagNames, slotFlagsText, isOn, isReservedProp, toHandlerKey } from '@vue/shared';
 export { generateCodeFrame } from '@vue/shared';
-import { parseExpression } from '@babel/parser';
 
 function defaultOnError(error) {
     throw error;
@@ -447,22 +446,8 @@ const isMemberExpressionBrowser = (path) => {
     }
     return !currentOpenBracketCount && !currentOpenParensCount;
 };
-const isMemberExpressionNode = (path, context) => {
-    try {
-        let ret = parseExpression(path, {
-            plugins: [...context.expressionPlugins, ...babelParserDefaultPlugins]
-        });
-        if (ret.type === 'TSAsExpression' || ret.type === 'TSTypeAssertion') {
-            ret = ret.expression;
-        }
-        return (ret.type === 'MemberExpression' ||
-            ret.type === 'OptionalMemberExpression' ||
-            ret.type === 'Identifier');
-    }
-    catch (e) {
-        return false;
-    }
-};
+const isMemberExpressionNode = NOOP
+    ;
 const isMemberExpression = isMemberExpressionBrowser
     ;
 function getInnerRange(loc, offset, length) {
@@ -2223,7 +2208,7 @@ function createStructuralDirectiveTransform(name, fn) {
 }
 
 const PURE_ANNOTATION = `/*#__PURE__*/`;
-function createCodegenContext(ast, { mode = 'function', prefixIdentifiers = mode === 'module', sourceMap = false, filename = `template.vue.html`, scopeId = null, optimizeImports = false, runtimeGlobalName = `Vue`, runtimeModuleName = `vue`, ssr = false, isTS = false, inSSR = false }) {
+function createCodegenContext(ast, { mode = 'function', prefixIdentifiers = mode === 'module', sourceMap = false, filename = `template.vue.html`, scopeId = null, optimizeImports = false, runtimeGlobalName = `Vue`, runtimeModuleName = `vue`, ssrRuntimeModuleName = 'vue/server-renderer', ssr = false, isTS = false, inSSR = false }) {
     const context = {
         mode,
         prefixIdentifiers,
@@ -2233,6 +2218,7 @@ function createCodegenContext(ast, { mode = 'function', prefixIdentifiers = mode
         optimizeImports,
         runtimeGlobalName,
         runtimeModuleName,
+        ssrRuntimeModuleName,
         ssr,
         isTS,
         inSSR,
@@ -2358,7 +2344,7 @@ function generate(ast, options = {}) {
     };
 }
 function genFunctionPreamble(ast, context) {
-    const { ssr, prefixIdentifiers, push, newline, runtimeModuleName, runtimeGlobalName } = context;
+    const { ssr, prefixIdentifiers, push, newline, runtimeModuleName, runtimeGlobalName, ssrRuntimeModuleName } = context;
     const VueBinding = runtimeGlobalName;
     const aliasHelper = (s) => `${helperNameMap[s]}: _${helperNameMap[s]}`;
     // Generate const declaration for helpers

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-core",
-  "version": "3.2.15",
+  "version": "3.2.19",
   "description": "@vue/compiler-core",
   "main": "index.js",
   "module": "dist/compiler-core.esm-bundler.js",
@@ -32,7 +32,7 @@
   },
   "homepage": "https://github.com/vuejs/vue-next/tree/master/packages/compiler-core#readme",
   "dependencies": {
-    "@vue/shared": "3.2.15",
+    "@vue/shared": "3.2.19",
     "@babel/parser": "^7.15.0",
     "estree-walker": "^2.0.2",
     "source-map": "^0.6.1"