From 19e17a951c3387cbd6a1597e6cd9048a4aad4528 Mon Sep 17 00:00:00 2001 From: Evan You Date: Sun, 9 Apr 2023 16:50:00 +0800 Subject: [PATCH] perf(compiler): use source-map-js --- .../compiler-core/__tests__/compile.spec.ts | 2 +- packages/compiler-core/package.json | 2 +- packages/compiler-core/src/codegen.ts | 2 +- packages/compiler-sfc/__tests__/parse.spec.ts | 2 +- packages/compiler-sfc/package.json | 2 +- packages/compiler-sfc/src/compileScript.ts | 2 +- packages/compiler-sfc/src/compileStyle.ts | 2 +- packages/compiler-sfc/src/compileTemplate.ts | 6 +++++- packages/compiler-sfc/src/parse.ts | 2 +- .../compiler-sfc/src/style/preprocessors.ts | 2 +- packages/template-explorer/package.json | 2 +- packages/template-explorer/src/index.ts | 2 +- packages/vue-compat/package.json | 2 +- pnpm-lock.yaml | 17 +++++++++-------- 14 files changed, 26 insertions(+), 21 deletions(-) diff --git a/packages/compiler-core/__tests__/compile.spec.ts b/packages/compiler-core/__tests__/compile.spec.ts index 33766f71b..dc4f57ad3 100644 --- a/packages/compiler-core/__tests__/compile.spec.ts +++ b/packages/compiler-core/__tests__/compile.spec.ts @@ -1,5 +1,5 @@ import { baseCompile as compile } from '../src' -import { SourceMapConsumer, RawSourceMap } from 'source-map' +import { SourceMapConsumer, RawSourceMap } from 'source-map-js' describe('compiler: integration tests', () => { const source = ` diff --git a/packages/compiler-core/package.json b/packages/compiler-core/package.json index a7c20e8e1..5b4b0da89 100644 --- a/packages/compiler-core/package.json +++ b/packages/compiler-core/package.json @@ -35,7 +35,7 @@ "@babel/parser": "^7.21.3", "@vue/shared": "3.3.0-alpha.9", "estree-walker": "^2.0.2", - "source-map": "^0.6.1" + "source-map-js": "^1.0.2" }, "devDependencies": { "@babel/types": "^7.21.3" diff --git a/packages/compiler-core/src/codegen.ts b/packages/compiler-core/src/codegen.ts index e8da0a4cb..2b88ab0cf 100644 --- a/packages/compiler-core/src/codegen.ts +++ b/packages/compiler-core/src/codegen.ts @@ -28,7 +28,7 @@ import { getVNodeBlockHelper, getVNodeHelper } from './ast' -import { SourceMapGenerator, RawSourceMap } from 'source-map' +import { SourceMapGenerator, RawSourceMap } from 'source-map-js' import { advancePositionWithMutation, assert, diff --git a/packages/compiler-sfc/__tests__/parse.spec.ts b/packages/compiler-sfc/__tests__/parse.spec.ts index 5f1db5e24..c7a17ab17 100644 --- a/packages/compiler-sfc/__tests__/parse.spec.ts +++ b/packages/compiler-sfc/__tests__/parse.spec.ts @@ -1,6 +1,6 @@ import { parse } from '../src' import { baseParse, baseCompile } from '@vue/compiler-core' -import { SourceMapConsumer } from 'source-map' +import { SourceMapConsumer } from 'source-map-js' describe('compiler:sfc', () => { describe('source map', () => { diff --git a/packages/compiler-sfc/package.json b/packages/compiler-sfc/package.json index 8c97d3b3b..d43f0c635 100644 --- a/packages/compiler-sfc/package.json +++ b/packages/compiler-sfc/package.json @@ -41,7 +41,7 @@ "estree-walker": "^2.0.2", "magic-string": "^0.30.0", "postcss": "^8.1.10", - "source-map": "^0.6.1" + "source-map-js": "^1.0.2" }, "devDependencies": { "@babel/types": "^7.21.3", diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts index 35e690bb0..575ce6caa 100644 --- a/packages/compiler-sfc/src/compileScript.ts +++ b/packages/compiler-sfc/src/compileScript.ts @@ -48,7 +48,7 @@ import { TSEnumDeclaration } from '@babel/types' import { walk } from 'estree-walker' -import { RawSourceMap } from 'source-map' +import { RawSourceMap } from 'source-map-js' import { CSS_VARS_HELPER, genCssVarsCode, diff --git a/packages/compiler-sfc/src/compileStyle.ts b/packages/compiler-sfc/src/compileStyle.ts index 188556963..47f90e824 100644 --- a/packages/compiler-sfc/src/compileStyle.ts +++ b/packages/compiler-sfc/src/compileStyle.ts @@ -13,7 +13,7 @@ import { StylePreprocessorResults, PreprocessLang } from './style/preprocessors' -import { RawSourceMap } from 'source-map' +import { RawSourceMap } from 'source-map-js' import { cssVarsPlugin } from './style/cssVars' import postcssModules from 'postcss-modules' diff --git a/packages/compiler-sfc/src/compileTemplate.ts b/packages/compiler-sfc/src/compileTemplate.ts index 9ada0e755..fbd100c97 100644 --- a/packages/compiler-sfc/src/compileTemplate.ts +++ b/packages/compiler-sfc/src/compileTemplate.ts @@ -6,7 +6,11 @@ import { ParserOptions, RootNode } from '@vue/compiler-core' -import { SourceMapConsumer, SourceMapGenerator, RawSourceMap } from 'source-map' +import { + SourceMapConsumer, + SourceMapGenerator, + RawSourceMap +} from 'source-map-js' import { transformAssetUrl, AssetURLOptions, diff --git a/packages/compiler-sfc/src/parse.ts b/packages/compiler-sfc/src/parse.ts index d2b98756c..590a0e61d 100644 --- a/packages/compiler-sfc/src/parse.ts +++ b/packages/compiler-sfc/src/parse.ts @@ -7,7 +7,7 @@ import { BindingMetadata } from '@vue/compiler-core' import * as CompilerDOM from '@vue/compiler-dom' -import { RawSourceMap, SourceMapGenerator } from 'source-map' +import { RawSourceMap, SourceMapGenerator } from 'source-map-js' import { TemplateCompiler } from './compileTemplate' import { parseCssVars } from './style/cssVars' import { createCache } from './cache' diff --git a/packages/compiler-sfc/src/style/preprocessors.ts b/packages/compiler-sfc/src/style/preprocessors.ts index 06122f2e6..96c1153f0 100644 --- a/packages/compiler-sfc/src/style/preprocessors.ts +++ b/packages/compiler-sfc/src/style/preprocessors.ts @@ -1,5 +1,5 @@ import merge from 'merge-source-map' -import { RawSourceMap } from 'source-map' +import { RawSourceMap } from 'source-map-js' import { SFCStyleCompileOptions } from '../compileStyle' import { isFunction } from '@vue/shared' diff --git a/packages/template-explorer/package.json b/packages/template-explorer/package.json index 818523528..b75666ae9 100644 --- a/packages/template-explorer/package.json +++ b/packages/template-explorer/package.json @@ -12,6 +12,6 @@ }, "dependencies": { "monaco-editor": "^0.20.0", - "source-map": "^0.6.1" + "source-map-js": "^1.0.2" } } diff --git a/packages/template-explorer/src/index.ts b/packages/template-explorer/src/index.ts index 3cf9c6b52..bace011ed 100644 --- a/packages/template-explorer/src/index.ts +++ b/packages/template-explorer/src/index.ts @@ -8,7 +8,7 @@ import { ssrMode } from './options' import { toRaw, watchEffect } from '@vue/runtime-dom' -import { SourceMapConsumer } from 'source-map' +import { SourceMapConsumer } from 'source-map-js' import theme from './theme' declare global { diff --git a/packages/vue-compat/package.json b/packages/vue-compat/package.json index 5032c134c..ce29f6a57 100644 --- a/packages/vue-compat/package.json +++ b/packages/vue-compat/package.json @@ -40,7 +40,7 @@ "dependencies": { "@babel/parser": "^7.21.3", "estree-walker": "^2.0.2", - "source-map": "^0.6.1" + "source-map-js": "^1.0.2" }, "peerDependencies": { "vue": "3.3.0-alpha.9" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 43e31dc88..633220967 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -104,12 +104,12 @@ importers: '@babel/types': ^7.21.3 '@vue/shared': 3.3.0-alpha.9 estree-walker: ^2.0.2 - source-map: ^0.6.1 + source-map-js: ^1.0.2 dependencies: '@babel/parser': 7.21.3 '@vue/shared': link:../shared estree-walker: 2.0.2 - source-map: 0.6.1 + source-map-js: 1.0.2 devDependencies: '@babel/types': 7.21.3 @@ -143,7 +143,7 @@ importers: postcss-selector-parser: ^6.0.4 pug: ^3.0.1 sass: ^1.26.9 - source-map: ^0.6.1 + source-map-js: ^1.0.2 dependencies: '@babel/parser': 7.21.3 '@vue/compiler-core': link:../compiler-core @@ -154,7 +154,7 @@ importers: estree-walker: 2.0.2 magic-string: 0.30.0 postcss: 8.4.21 - source-map: 0.6.1 + source-map-js: 1.0.2 devDependencies: '@babel/types': 7.21.3 '@types/estree': 0.0.48 @@ -270,10 +270,10 @@ importers: packages/template-explorer: specifiers: monaco-editor: ^0.20.0 - source-map: ^0.6.1 + source-map-js: ^1.0.2 dependencies: monaco-editor: 0.20.0 - source-map: 0.6.1 + source-map-js: 1.0.2 packages/vue: specifiers: @@ -293,11 +293,11 @@ importers: specifiers: '@babel/parser': ^7.21.3 estree-walker: ^2.0.2 - source-map: ^0.6.1 + source-map-js: ^1.0.2 dependencies: '@babel/parser': 7.21.3 estree-walker: 2.0.2 - source-map: 0.6.1 + source-map-js: 1.0.2 packages: @@ -4910,6 +4910,7 @@ packages: /source-map/0.6.1: resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==} engines: {node: '>=0.10.0'} + dev: true /sourcemap-codec/1.4.8: resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}