Merge branch 'main' into fix-7276

.github/contributing.md

@@ -261,7 +261,7 @@ import { h } from '@vue/runtime-core'
 This is made possible via several configurations:
 
 - For TypeScript, `compilerOptions.paths` in `tsconfig.json`
-- Vitest and Rollup share the sae set of aliases from `scripts/aliases.js`
+- Vitest and Rollup share the same set of aliases from `scripts/aliases.js`
 - For plain Node.js, they are linked using [PNPM Workspaces](https://pnpm.io/workspaces).
 
 ### Package Dependencies
@@ -330,4 +330,4 @@ Funds donated via Patreon go directly to support Evan You's full-time work on Vu
 
 Thank you to all the people who have already contributed to Vue.js!
 
-<a href="https://github.com/vuejs/vue/graphs/contributors"><img src="https://opencollective.com/vuejs/contributors.svg?width=890" /></a>
+<a href="https://github.com/vuejs/core/graphs/contributors"><img src="https://opencollective.com/vuejs/contributors.svg?width=890" /></a>

BACKERS.md

@@ -4,6 +4,6 @@ Vue.js is an MIT-licensed open source project with its ongoing development made
 
 <p align="center">
   <a target="_blank" href="https://sponsors.vuejs.org/backers.svg">
-    <img alt="sponsors" src="https://sponsors.vuejs.org/backers.svg">
+    <img alt="sponsors" src="https://sponsors.vuejs.org/backers.svg?v1">
   </a>
 </p>

package.json

@@ -1,7 +1,7 @@
 {
   "private": true,
-  "version": "3.3.0-beta.1",
-  "packageManager": "pnpm@7.26.0",
+  "version": "3.3.4",
+  "packageManager": "pnpm@8.6.2",
   "type": "module",
   "scripts": {
     "dev": "node scripts/dev.js",
@@ -35,7 +35,7 @@
     "build-runtime-esm": "node scripts/build.js runtime reactivity shared -af esm-bundler && node scripts/build.js vue -f esm-bundler-runtime && node scripts/build.js vue -f esm-browser-runtime",
     "build-ssr-esm": "node scripts/build.js compiler-sfc server-renderer -f esm-browser",
     "build-sfc-playground-self": "cd packages/sfc-playground && npm run build",
-    "preinstall": "node ./scripts/preinstall.js",
+    "preinstall": "npx only-allow pnpm",
     "postinstall": "simple-git-hooks"
   },
   "simple-git-hooks": {
@@ -57,7 +57,6 @@
   "devDependencies": {
     "@babel/parser": "^7.21.3",
     "@babel/types": "^7.21.3",
-    "@esbuild-plugins/node-modules-polyfill": "^0.2.2",
     "@rollup/plugin-alias": "^4.0.3",
     "@rollup/plugin-commonjs": "^24.0.1",
     "@rollup/plugin-json": "^6.0.0",
@@ -73,6 +72,7 @@
     "conventional-changelog-cli": "^2.0.31",
     "enquirer": "^2.3.2",
     "esbuild": "^0.17.4",
+    "esbuild-plugin-polyfill-node": "^0.2.0",
     "eslint": "^8.33.0",
     "eslint-plugin-jest": "^27.2.1",
     "estree-walker": "^2.0.2",
@@ -87,7 +87,7 @@
     "prettier": "^2.7.1",
     "pug": "^3.0.1",
     "puppeteer": "~19.6.0",
-    "rollup": "^3.20.2",
+    "rollup": "^3.26.0",
     "rollup-plugin-dts": "^5.3.0",
     "rollup-plugin-esbuild": "^5.0.0",
     "rollup-plugin-polyfill-node": "^0.12.0",
@@ -97,7 +97,7 @@
     "terser": "^5.15.1",
     "todomvc-app-css": "^2.3.0",
     "tslib": "^2.5.0",
-    "typescript": "^5.0.0",
+    "typescript": "^5.1.6",
     "vite": "^4.3.0",
     "vitest": "^0.30.1"
   }

packages/compiler-core/__tests__/parse.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import { ParserOptions } from '../src/options'
 import { baseParse, TextModes } from '../src/parse'
 import { ErrorCodes } from '../src/errors'
@@ -11,7 +10,8 @@ import {
   Position,
   TextNode,
   InterpolationNode,
-  ConstantTypes
+  ConstantTypes,
+  DirectiveNode
 } from '../src/ast'
 
 describe('compiler: parse', () => {
@@ -1164,6 +1164,34 @@ describe('compiler: parse', () => {
       })
     })
 
+    // #3494
+    test('directive argument edge case', () => {
+      const ast = baseParse('<div v-slot:slot />')
+      const directive = (ast.children[0] as ElementNode)
+        .props[0] as DirectiveNode
+      expect(directive.arg).toMatchObject({
+        loc: {
+          start: { offset: 12, line: 1, column: 13 },
+          end: { offset: 16, line: 1, column: 17 },
+          source: 'slot'
+        }
+      })
+    })
+
+    // https://github.com/vuejs/language-tools/issues/2710
+    test('directive argument edge case (2)', () => {
+      const ast = baseParse('<div #item.item />')
+      const directive = (ast.children[0] as ElementNode)
+        .props[0] as DirectiveNode
+      expect(directive.arg).toMatchObject({
+        loc: {
+          start: { offset: 6, line: 1, column: 7 },
+          end: { offset: 15, line: 1, column: 16 },
+          source: 'item.item'
+        }
+      })
+    })
+
     test('directive with dynamic argument', () => {
       const ast = baseParse('<div v-on:[event]/>')
       const directive = (ast.children[0] as ElementNode).props[0]

packages/compiler-core/__tests__/transform.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import { baseParse } from '../src/parse'
 import { transform, NodeTransform } from '../src/transform'
 import {

packages/compiler-core/__tests__/transforms/transformElement.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import {
   CompilerOptions,
   baseParse as parse,

packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import {
   baseParse as parse,
   transform,
@@ -431,6 +430,16 @@ describe('compiler: expression transform', () => {
     })
   })
 
+  // #8295
+  test('should treat floating point number literals as constant', () => {
+    const node = parseWithExpressionTransform(
+      `{{ [1, 2.1] }}`
+    ) as InterpolationNode
+    expect(node.content).toMatchObject({
+      constType: ConstantTypes.CAN_STRINGIFY
+    })
+  })
+
   describe('ES Proposals support', () => {
     test('bigInt', () => {
       const node = parseWithExpressionTransform(

packages/compiler-core/__tests__/transforms/transformSlotOutlet.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import {
   CompilerOptions,
   baseParse as parse,

packages/compiler-core/__tests__/transforms/vBind.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import {
   baseParse as parse,
   transform,

packages/compiler-core/__tests__/transforms/vFor.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import { baseParse as parse } from '../../src/parse'
 import { transform } from '../../src/transform'
 import { transformIf } from '../../src/transforms/vIf'

packages/compiler-core/__tests__/transforms/vIf.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import { baseParse as parse } from '../../src/parse'
 import { transform } from '../../src/transform'
 import { transformIf } from '../../src/transforms/vIf'

packages/compiler-core/__tests__/transforms/vModel.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import {
   baseParse as parse,
   transform,

packages/compiler-core/__tests__/transforms/vOn.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import {
   baseParse as parse,
   CompilerOptions,

packages/compiler-core/__tests__/transforms/vSlot.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import {
   CompilerOptions,
   baseParse as parse,

packages/compiler-core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-core",
-  "version": "3.3.0-beta.1",
+  "version": "3.3.4",
   "description": "@vue/compiler-core",
   "main": "index.js",
   "module": "dist/compiler-core.esm-bundler.js",
@@ -33,7 +33,7 @@
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme",
   "dependencies": {
     "@babel/parser": "^7.21.3",
-    "@vue/shared": "3.3.0-beta.1",
+    "@vue/shared": "3.3.4",
     "estree-walker": "^2.0.2",
     "source-map-js": "^1.0.2"
   },

packages/compiler-core/src/babelUtils.ts

@@ -32,7 +32,7 @@ export function walkIdentifiers(
     root.body[0].type === 'ExpressionStatement' &&
     root.body[0].expression
 
-  ;(walk as any)(root, {
+  walk(root, {
     enter(node: Node & { scopeIds?: Set<string> }, parent: Node | undefined) {
       parent && parentStack.push(parent)
       if (

packages/compiler-core/src/parse.ts

@@ -817,7 +817,10 @@ function parseAttribute(
 
     if (match[2]) {
       const isSlot = dirName === 'slot'
-      const startOffset = name.lastIndexOf(match[2])
+      const startOffset = name.lastIndexOf(
+        match[2],
+        name.length - (match[3]?.length || 0)
+      )
       const loc = getSelection(
         context,
         getNewPosition(context, start, startOffset),

packages/compiler-core/src/transforms/transformExpression.ts

@@ -25,7 +25,7 @@ import {
 } from '../babelUtils'
 import { advancePositionWithClone, isSimpleIdentifier } from '../utils'
 import {
-  isGloballyWhitelisted,
+  isGloballyAllowed,
   makeMap,
   hasOwn,
   isString,
@@ -45,6 +45,10 @@ import { BindingTypes } from '../options'
 
 const isLiteralWhitelisted = /*#__PURE__*/ makeMap('true,false,null,this')
 
+// a heuristic safeguard to bail constant expressions on presence of
+// likely function invocation and member access
+const constantBailRE = /\w\s*\(|\.[^\d]/
+
 export const transformExpression: NodeTransform = (node, context) => {
   if (node.type === NodeTypes.INTERPOLATION) {
     node.content = processExpression(
@@ -217,11 +221,11 @@ export function processExpression(
   // fast path if expression is a simple identifier.
   const rawExp = node.content
   // bail constant on parens (function invocation) and dot (member access)
-  const bailConstant = rawExp.indexOf(`(`) > -1 || rawExp.indexOf('.') > 0
+  const bailConstant = constantBailRE.test(rawExp)
 
   if (isSimpleIdentifier(rawExp)) {
     const isScopeVarReference = context.identifiers[rawExp]
-    const isAllowedGlobal = isGloballyWhitelisted(rawExp)
+    const isAllowedGlobal = isGloballyAllowed(rawExp)
     const isLiteral = isLiteralWhitelisted(rawExp)
     if (!asParams && !isScopeVarReference && !isAllowedGlobal && !isLiteral) {
       // const bindings exposed from setup can be skipped for patching but
@@ -354,7 +358,7 @@ export function processExpression(
 
 function canPrefix(id: Identifier) {
   // skip whitelisted globals
-  if (isGloballyWhitelisted(id.name)) {
+  if (isGloballyAllowed(id.name)) {
     return false
   }
   // special case for webpack compilation

packages/compiler-dom/__tests__/transforms/Transition.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import { compile } from '../../src'
 
 describe('Transition multi children warnings', () => {

packages/compiler-dom/__tests__/transforms/vHtml.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import {
   baseParse as parse,
   transform,

packages/compiler-dom/__tests__/transforms/vModel.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import {
   baseParse as parse,
   transform,

packages/compiler-dom/__tests__/transforms/vShow.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import {
   baseParse as parse,
   transform,

packages/compiler-dom/__tests__/transforms/vText.spec.ts

@@ -1,4 +1,3 @@
-import { vi } from 'vitest'
 import {
   baseParse as parse,
   transform,

packages/compiler-dom/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-dom",
-  "version": "3.3.0-beta.1",
+  "version": "3.3.4",
   "description": "@vue/compiler-dom",
   "main": "index.js",
   "module": "dist/compiler-dom.esm-bundler.js",
@@ -37,7 +37,7 @@
   },
   "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-dom#readme",
   "dependencies": {
-    "@vue/shared": "3.3.0-beta.1",
-    "@vue/compiler-core": "3.3.0-beta.1"
+    "@vue/shared": "3.3.4",
+    "@vue/compiler-core": "3.3.4"
   }
 }

packages/compiler-dom/src/decodeHtmlBrowser.ts

@@ -8,9 +8,9 @@ export function decodeHtmlBrowser(raw: string, asAttr = false): string {
   }
   if (asAttr) {
     decoder.innerHTML = `<div foo="${raw.replace(/"/g, '&quot;')}">`
-    return decoder.children[0].getAttribute('foo') as string
+    return decoder.children[0].getAttribute('foo')!
   } else {
     decoder.innerHTML = raw
-    return decoder.textContent as string
+    return decoder.textContent!
   }
 }

packages/compiler-dom/src/transforms/ignoreSideEffectTags.ts

@@ -7,9 +7,13 @@ export const ignoreSideEffectTags: NodeTransform = (node, context) => {
     node.tagType === ElementTypes.ELEMENT &&
     (node.tag === 'script' || node.tag === 'style')
   ) {
-    context.onError(
-      createDOMCompilerError(DOMErrorCodes.X_IGNORED_SIDE_EFFECT_TAG, node.loc)
-    )
+    __DEV__ &&
+      context.onError(
+        createDOMCompilerError(
+          DOMErrorCodes.X_IGNORED_SIDE_EFFECT_TAG,
+          node.loc
+        )
+      )
     context.removeNode()
   }
 }