From f349af7b65b9f8605d8b7bafcc06c25ab1f2daf0 Mon Sep 17 00:00:00 2001 From: Evan You Date: Thu, 15 Aug 2024 10:16:32 +0800 Subject: [PATCH] fix(build): revert entities to 4.5 to avoid runtime resolution errors close #11603 --- .github/renovate.json5 | 4 ++++ packages/compiler-core/package.json | 2 +- packages/compiler-core/src/parser.ts | 2 +- packages/compiler-core/src/tokenizer.ts | 2 +- pnpm-lock.yaml | 10 ++-------- rollup.config.js | 2 +- 6 files changed, 10 insertions(+), 12 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 9c0458702..e9724bb5a 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -54,5 +54,9 @@ // pinned // https://github.com/vuejs/core/commit/a012e39b373f1b6918e5c89856e8f902e1bfa14d '@rollup/plugin-replace', + + // pinned, 5.0+ has exports issues + // https://github.com/vuejs/core/issues/11603 + 'entities', ], } diff --git a/packages/compiler-core/package.json b/packages/compiler-core/package.json index 611d2df00..53223367a 100644 --- a/packages/compiler-core/package.json +++ b/packages/compiler-core/package.json @@ -48,7 +48,7 @@ "dependencies": { "@babel/parser": "catalog:", "@vue/shared": "workspace:*", - "entities": "^5.0.0", + "entities": "^4.5.0", "estree-walker": "catalog:", "source-map-js": "catalog:" }, diff --git a/packages/compiler-core/src/parser.ts b/packages/compiler-core/src/parser.ts index 55487e12b..cac943dd6 100644 --- a/packages/compiler-core/src/parser.ts +++ b/packages/compiler-core/src/parser.ts @@ -44,7 +44,7 @@ import { isSimpleIdentifier, isStaticArgOf, } from './utils' -import { decodeHTML } from 'entities/dist/decode.js' +import { decodeHTML } from 'entities/lib/decode.js' import { type ParserOptions as BabelOptions, parse, diff --git a/packages/compiler-core/src/tokenizer.ts b/packages/compiler-core/src/tokenizer.ts index 72f548fa2..561a84b5f 100644 --- a/packages/compiler-core/src/tokenizer.ts +++ b/packages/compiler-core/src/tokenizer.ts @@ -36,7 +36,7 @@ import { EntityDecoder, fromCodePoint, htmlDecodeTree, -} from 'entities/dist/decode.js' +} from 'entities/lib/decode.js' export enum ParseMode { BASE, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d12dc453c..5bd490104 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -183,8 +183,8 @@ importers: specifier: workspace:* version: link:../shared entities: - specifier: ^5.0.0 - version: 5.0.0 + specifier: ^4.5.0 + version: 4.5.0 estree-walker: specifier: 'catalog:' version: 2.0.2 @@ -1903,10 +1903,6 @@ packages: resolution: {integrity: sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==} engines: {node: '>=0.12'} - entities@5.0.0: - resolution: {integrity: sha512-BeJFvFRJddxobhvEdm5GqHzRV/X+ACeuw0/BuuxsCh1EUZcAIz8+kYmBp/LrQuloy6K1f3a0M7+IhmZ7QnkISA==} - engines: {node: '>=0.12'} - env-paths@2.2.1: resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==} engines: {node: '>=6'} @@ -5021,8 +5017,6 @@ snapshots: entities@4.5.0: {} - entities@5.0.0: {} - env-paths@2.2.1: {} environment@1.1.0: {} diff --git a/rollup.config.js b/rollup.config.js index a7afed7ec..ff0da3488 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -253,7 +253,7 @@ function createConfig(format, output, plugins = []) { 'source-map-js', '@babel/parser', 'estree-walker', - 'entities/dist/decode.js', + 'entities/lib/decode.js', ] if (isGlobalBuild || isBrowserESMBuild || isCompatPackage) {