refactor(compiler): switch to acorn

diff --git a/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts b/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
index 0104742922c481de5e6a29d69ef0d7515f6924c4..c3dff886b1b236892811518ac238359b9e1a7ea4 100644 (file)
--- a/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
+++ b/packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
@@ -345,6 +345,6 @@ describe('compiler: expression transform', () => {
   test('should handle parse error', () => {
     const onError = jest.fn()
     parseWithExpressionTransform(`{{ a( }}`, { onError })
-    expect(onError.mock.calls[0][0].message).toMatch(`Expected ')'`)
+    expect(onError.mock.calls[0][0].message).toMatch(`Unexpected token (1:4)`)
   })
 })

diff --git a/packages/compiler-core/package.json b/packages/compiler-core/package.json
index bfefbbae342ddce374bd3f7b4785c782b4cbd9c2..3705931d51e065e3b9711ab16c204a139c619feb 100644 (file)
--- a/packages/compiler-core/package.json
+++ b/packages/compiler-core/package.json
@@ -28,8 +28,8 @@
   },
   "homepage": "https://github.com/vuejs/vue/tree/dev/packages/compiler-core#readme",
   "dependencies": {
+    "acorn": "^7.1.0",
     "estree-walker": "^0.8.1",
-    "meriyah": "^1.7.2",
     "source-map": "^0.7.3"
   }
 }

diff --git a/packages/compiler-core/src/utils.ts b/packages/compiler-core/src/utils.ts
index afd086f0a099a16ddada68de3fab0265b7318998..4562932134773e6a4b99edec0e3f28f87d798c6f 100644 (file)
--- a/packages/compiler-core/src/utils.ts
+++ b/packages/compiler-core/src/utils.ts
@@ -1,19 +1,19 @@
 import { SourceLocation, Position, ElementNode, NodeTypes } from './ast'
-import { parseScript } from 'meriyah'
+import { parse } from 'acorn'
 import { walk } from 'estree-walker'
 
 // cache node requires
 // lazy require dependencies so that they don't end up in rollup's dep graph
 // and thus can be tree-shaken in browser builds.
-let _parseScript: typeof parseScript
+let _parse: typeof parse
 let _walk: typeof walk
 
-export const parseJS: typeof parseScript = (code: string, options: any) => {
+export const parseJS: typeof parse = (code: string, options: any) => {
   assert(
     !__BROWSER__,
     `Expression AST analysis can only be performed in non-browser builds.`
   )
-  const parse = _parseScript || (_parseScript = require('meriyah').parseScript)
+  const parse = _parse || (_parse = require('acorn').parse)
   return parse(code, options)
 }
 

diff --git a/yarn.lock b/yarn.lock
index 1d1f33af31961163b39e6ea4267b7306ba18c6fe..19130d8e70e322130585114c8b1118558e53e5b3 100644 (file)
--- a/yarn.lock
+++ b/yarn.lock
@@ -4780,11 +4780,6 @@ merge2@^1.2.3:
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.4.tgz#c9269589e6885a60cf80605d9522d4b67ca646e3"
   integrity sha512-FYE8xI+6pjFOhokZu0We3S5NKCirLbCzSh2Usf3qEyr4X8U+0jNg9P8RZ4qz+V2UoECLVwSyzU3LxXBaLGtD3A==
 
-meriyah@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/meriyah/-/meriyah-1.7.2.tgz#c47d07d8f1284577658827cd134b180e80ae4bef"
-  integrity sha512-bBXN6hJ9RHA0mEae5O2Ocr6giK0S87nsz/W7tnBRm4kpW04LEEpXSOfwaID9GZgPRVcn3rAHzHHDDD68DLQgWw==
-
 micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"