diff --git a/package.json b/package.json index d50b9ac5a..53fbb2030 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,7 @@ "@typescript-eslint/visitor-keys": "5.39.0", "acorn": "8.8.0", "acorn-jsx": "5.3.2", - "angular-estree-parser": "2.5.1", + "angular-estree-parser": "3.0.3", "angular-html-parser": "2.0.0", "camelcase": "7.0.0", "chalk": "5.0.1", diff --git a/scripts/build/config.mjs b/scripts/build/config.mjs index d9b1e24d5..863cb1efe 100644 --- a/scripts/build/config.mjs +++ b/scripts/build/config.mjs @@ -131,13 +131,14 @@ const pluginFiles = [ "src/language-js/parse/meriyah.js", { input: "src/language-js/parse/angular.js", - replaceModule: [ - { - module: "*", - find: 'require("@angular/compiler/src/', - replacement: 'require("@angular/compiler/esm2015/src/', - }, - ], + replaceModule: ["ast.js", "lexer.js", "parser.js"].map((file) => ({ + module: require.resolve( + `@angular/compiler/src/expression_parser/${file}` + ), + path: require.resolve( + `@angular/compiler/esm2015/src/expression_parser/${file}` + ), + })), }, { input: "src/language-css/parser-postcss.js", diff --git a/yarn.lock b/yarn.lock index 849165663..e608208df 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1715,15 +1715,15 @@ __metadata: languageName: node linkType: hard -"angular-estree-parser@npm:2.5.1": - version: 2.5.1 - resolution: "angular-estree-parser@npm:2.5.1" +"angular-estree-parser@npm:3.0.3": + version: 3.0.3 + resolution: "angular-estree-parser@npm:3.0.3" dependencies: - lines-and-columns: ^1.1.6 - tslib: ^2.0.3 + lines-and-columns: ^2.0.3 + tslib: ^2.4.0 peerDependencies: "@angular/compiler": ^9.1.0 || ^10.0.0 || ^11.0.0 || ^12.0.0 - checksum: 31fbe19756d4dbf5019be841bce54a0d32d044bc3be3f456bb83b20834a368e047250e00ea9aa50e2a40a4c934246d9e3abb0a884b0be9f5fb086e57227e27c0 + checksum: bdcadb3e9cde9bfbfc826bfaca8d30c218c45f00c3271f33484a0bc8c05e86d2ce91e84c1eca7ef289a57a350e16f5ab0ffcb508ec2825a9339d0ccc9d37ccaf languageName: node linkType: hard @@ -5490,7 +5490,7 @@ __metadata: languageName: node linkType: hard -"lines-and-columns@npm:2.0.3": +"lines-and-columns@npm:2.0.3, lines-and-columns@npm:^2.0.3": version: 2.0.3 resolution: "lines-and-columns@npm:2.0.3" checksum: 5955363dfd7d3d7c476d002eb47944dbe0310d57959e2112dce004c0dc76cecfd479cf8c098fd479ff344acdf04ee0e82b455462a26492231ac152f6c48d17a1 @@ -6611,7 +6611,7 @@ __metadata: "@typescript-eslint/visitor-keys": 5.39.0 acorn: 8.8.0 acorn-jsx: 5.3.2 - angular-estree-parser: 2.5.1 + angular-estree-parser: 3.0.3 angular-html-parser: 2.0.0 benchmark: 2.1.4 browserslist-to-esbuild: 1.2.0 @@ -7874,7 +7874,7 @@ __metadata: languageName: node linkType: hard -"tslib@npm:2.4.0, tslib@npm:^2.0.3, tslib@npm:^2.2.0": +"tslib@npm:2.4.0, tslib@npm:^2.2.0, tslib@npm:^2.4.0": version: 2.4.0 resolution: "tslib@npm:2.4.0" checksum: 8c4aa6a3c5a754bf76aefc38026134180c053b7bd2f81338cb5e5ebf96fefa0f417bff221592bf801077f5bf990562f6264fecbc42cd3309b33872cb6fc3b113