diff --git a/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= b/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= index 0b1fcfe4d4..b1e8c830d9 100755 --- a/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= +++ b/.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU= @@ -1,7 +1,7 @@ # Input hashes for repository rule npm_translate_lock(name = "npm", pnpm_lock = "//:pnpm-lock.yaml"). # This file should be checked into version control along with the pnpm-lock.yaml file. .npmrc=974837034 -pnpm-lock.yaml=-1547217849 -yarn.lock=1378739518 -package.json=-817439735 +pnpm-lock.yaml=-788183804 +yarn.lock=1782215124 +package.json=1628153514 pnpm-workspace.yaml=1711114604 diff --git a/CHANGELOG.md b/CHANGELOG.md index 0a819b499a..8c73e6a4ce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,12 @@ +# 17.0.0 +This release upgrades `@angular/language-service` to v17.0.0-rc.3. + +* fix(syntaxes): Support scss for inline styles (#1951) +* fix(syntaxes): Support multiline block expressions +* feat: Complete inside @switch (https://github.com/angular/angular/pull/52153) +* fix: correct incomplete escaping (https://github.com/angular/angular/pull/51557) +* fix: fix Autocomplete block keywords in more cases (https://github.com/angular/angular/pull/52198) + # 17.0.0-next.2 This release upgrades `@angular/language-service` to v17.0.0-next.8. @@ -12,6 +21,7 @@ This release upgrades `@angular/language-service` to v17.0.0-next.6. * feat(syntaxes): Add support for block syntaxes * fix(client): fix detection of Angular context after string interpolation +* feat: Enable go to definition of styleUrl (https://github.com/angular/angular/pull/51746) # 16.2.0 This release upgrades the `@angular/language-service` to v16.2.8 diff --git a/WORKSPACE b/WORKSPACE index 4b039e7cb9..c78d448123 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -20,7 +20,12 @@ http_archive( load("@aspect_rules_ts//ts:repositories.bzl", "rules_ts_dependencies") -rules_ts_dependencies(ts_version_from = "//:package.json") +# TODO: should use version from package.json but this version isn't yet supported by aspect/rules_ts +# rules_ts_dependencies(ts_version_from = "//:package.json") +rules_ts_dependencies( + ts_version = "5.2.2", + ts_integrity = "sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==", +) http_archive( name = "aspect_rules_jasmine", diff --git a/package.json b/package.json index bddfefea52..6a8ac7bb1b 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "ng-template", "displayName": "Angular Language Service", "description": "Editor services for Angular templates", - "version": "17.0.0-next.2", + "version": "17.0.0", "publisher": "Angular", "icon": "angular.png", "license": "MIT", @@ -222,8 +222,8 @@ "test:legacy-syntaxes": "yarn compile:syntaxes-test && yarn build:syntaxes && jasmine dist/syntaxes/test/driver.js" }, "dependencies": { - "@angular/language-service": "17.0.0-next.8", - "typescript": "5.1.3", + "@angular/language-service": "17.0.0-rc.3", + "typescript": "5.2.2", "vscode-html-languageservice": "^4.2.5", "vscode-jsonrpc": "6.0.0", "vscode-languageclient": "7.0.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 53d1aeb7f7..b579a9526b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -5,7 +5,7 @@ importers: .: specifiers: '@angular/dev-infra-private': https://github.com/angular/dev-infra-private-builds.git#262cb3bb487e8dddb3c404f4f2c8b34a9a1f14c2 - '@angular/language-service': 17.0.0-next.8 + '@angular/language-service': 17.0.0-rc.3 '@bazel/bazelisk': 1.18.0 '@bazel/ibazel': 0.16.2 '@types/jasmine': 3.10.7 @@ -20,7 +20,7 @@ importers: ts-node: ^10.8.1 tslint: 6.1.3 tslint-eslint-rules: 5.4.0 - typescript: 5.1.3 + typescript: 5.2.2 vsce: 1.100.1 vscode-html-languageservice: ^4.2.5 vscode-jsonrpc: 6.0.0 @@ -33,8 +33,8 @@ importers: vscode-tmgrammar-test: 0.0.11 vscode-uri: 3.0.7 dependencies: - '@angular/language-service': 17.0.0-next.8 - typescript: 5.1.3 + '@angular/language-service': 17.0.0-rc.3 + typescript: 5.2.2 vscode-html-languageservice: 4.2.5 vscode-jsonrpc: 6.0.0 vscode-languageclient: 7.0.0 @@ -54,9 +54,9 @@ importers: jasmine: 3.99.0 prettier: 2.7.1 rxjs: 6.6.7 - ts-node: 10.8.1_52y5362fy2azxpyiwxmtqv4czq - tslint: 6.1.3_typescript@5.1.3 - tslint-eslint-rules: 5.4.0_v77tbgw3dfhzsf27t2jcxvdkzm + ts-node: 10.8.1_gdgjdslvhsjuq6mrp6mrw5fafa + tslint: 6.1.3_typescript@5.2.2 + tslint-eslint-rules: 5.4.0_jadg37i5x46wmfbuc7e7odtkgu vsce: 1.100.1 vscode-languageserver-protocol: 3.16.0 vscode-languageserver-types: 3.16.0 @@ -243,9 +243,9 @@ packages: tslib: 2.4.0 dev: true - /@angular/language-service/17.0.0-next.8: - resolution: {integrity: sha512-c/Dk6OwV1UQd6a51WzYhPlsbg+lLi/YjZsWtSyvp3Q5lQp5I1q2lZfXSPrzGgJ7S0Fhrge69wcno4UWvWkrS9g==} - engines: {node: '>=18.13.0'} + /@angular/language-service/17.0.0-rc.3: + resolution: {integrity: sha512-F2LZUr9Kpeuz8Lqnm/KHxJMWX51+f2DzIPBNOVkNdgcTyQGXlQdJJBznpQ2QwaRaNP30Oz6/hOyAy95SKaVKSg==} + engines: {node: ^18.13.0 || >=20.9.0} dev: false /@assemblyscript/loader/0.10.1: @@ -7511,7 +7511,7 @@ packages: resolution: {integrity: sha512-0z3j8R7MCjy10kc/g+qg7Ln3alJTodw9aDuVWZa3uiWqfuBMKeAeP2ocWcxoyM3D73yz3Jt/Pu4qPr4wHSdB/Q==} dev: true - /ts-node/10.8.1_52y5362fy2azxpyiwxmtqv4czq: + /ts-node/10.8.1_gdgjdslvhsjuq6mrp6mrw5fafa: resolution: {integrity: sha512-Wwsnao4DQoJsN034wePSg5nZiw4YKXf56mPIAeD6wVmiv+RytNSWqc2f3fKvcUoV+Yn2+yocD71VOfQHbmVX4g==} hasBin: true peerDependencies: @@ -7537,7 +7537,7 @@ packages: create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 5.1.3 + typescript: 5.2.2 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true @@ -7554,7 +7554,7 @@ packages: resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==} dev: true - /tslint-eslint-rules/5.4.0_v77tbgw3dfhzsf27t2jcxvdkzm: + /tslint-eslint-rules/5.4.0_jadg37i5x46wmfbuc7e7odtkgu: resolution: {integrity: sha512-WlSXE+J2vY/VPgIcqQuijMQiel+UtmXS+4nvK4ZzlDiqBfXse8FAvkNnTcYhnQyOTW5KFM+uRRGXxYhFpuBc6w==} peerDependencies: tslint: ^5.0.0 @@ -7562,12 +7562,12 @@ packages: dependencies: doctrine: 0.7.2 tslib: 1.9.0 - tslint: 6.1.3_typescript@5.1.3 - tsutils: 3.21.0_typescript@5.1.3 - typescript: 5.1.3 + tslint: 6.1.3_typescript@5.2.2 + tsutils: 3.21.0_typescript@5.2.2 + typescript: 5.2.2 dev: true - /tslint/6.1.3_typescript@5.1.3: + /tslint/6.1.3_typescript@5.2.2: resolution: {integrity: sha512-IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg==} engines: {node: '>=4.8.0'} deprecated: TSLint has been deprecated in favor of ESLint. Please see https://github.com/palantir/tslint/issues/4534 for more information. @@ -7587,17 +7587,17 @@ packages: resolve: 1.22.0 semver: 5.7.1 tslib: 1.14.1 - tsutils: 2.29.0_typescript@5.1.3 - typescript: 5.1.3 + tsutils: 2.29.0_typescript@5.2.2 + typescript: 5.2.2 dev: true - /tsutils/2.29.0_typescript@5.1.3: + /tsutils/2.29.0_typescript@5.2.2: resolution: {integrity: sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==} peerDependencies: typescript: '>=2.1.0 || >=2.1.0-dev || >=2.2.0-dev || >=2.3.0-dev || >=2.4.0-dev || >=2.5.0-dev || >=2.6.0-dev || >=2.7.0-dev || >=2.8.0-dev || >=2.9.0-dev || >= 3.0.0-dev || >= 3.1.0-dev' dependencies: tslib: 1.14.1 - typescript: 5.1.3 + typescript: 5.2.2 dev: true /tsutils/3.21.0_typescript@4.7.4: @@ -7610,14 +7610,14 @@ packages: typescript: 4.7.4 dev: true - /tsutils/3.21.0_typescript@5.1.3: + /tsutils/3.21.0_typescript@5.2.2: resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==} engines: {node: '>= 6'} peerDependencies: typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta' dependencies: tslib: 1.14.1 - typescript: 5.1.3 + typescript: 5.2.2 dev: true /tunnel-agent/0.6.0: @@ -7672,8 +7672,8 @@ packages: hasBin: true dev: true - /typescript/5.1.3: - resolution: {integrity: sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw==} + /typescript/5.2.2: + resolution: {integrity: sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==} engines: {node: '>=14.17'} hasBin: true diff --git a/server/package.json b/server/package.json index f2c8848002..13326e27b1 100644 --- a/server/package.json +++ b/server/package.json @@ -15,7 +15,7 @@ "ngserver": "./bin/ngserver" }, "dependencies": { - "@angular/language-service": "17.0.0-next.8", + "@angular/language-service": "17.0.0-rc.3", "vscode-html-languageservice": "^4.2.5", "vscode-jsonrpc": "6.0.0", "vscode-languageserver": "7.0.0", diff --git a/yarn.lock b/yarn.lock index 37a0b1693b..6cc9b5697d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -158,10 +158,10 @@ uuid "^8.3.2" yargs "^17.0.0" -"@angular/language-service@17.0.0-next.8": - version "17.0.0-next.8" - resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-17.0.0-next.8.tgz#1366bd68bcd3dfe4d315636b31b54bf06adf85e5" - integrity sha512-c/Dk6OwV1UQd6a51WzYhPlsbg+lLi/YjZsWtSyvp3Q5lQp5I1q2lZfXSPrzGgJ7S0Fhrge69wcno4UWvWkrS9g== +"@angular/language-service@17.0.0-rc.3": + version "17.0.0-rc.3" + resolved "https://registry.yarnpkg.com/@angular/language-service/-/language-service-17.0.0-rc.3.tgz#1594166701ab88ac45a9f67a2b5a9129e04694d5" + integrity sha512-F2LZUr9Kpeuz8Lqnm/KHxJMWX51+f2DzIPBNOVkNdgcTyQGXlQdJJBznpQ2QwaRaNP30Oz6/hOyAy95SKaVKSg== "@assemblyscript/loader@^0.10.1": version "0.10.1" @@ -7396,10 +7396,10 @@ typed-rest-client@^1.8.4: tunnel "0.0.6" underscore "^1.12.1" -typescript@5.1.3: - version "5.1.3" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.1.3.tgz#8d84219244a6b40b6fb2b33cc1c062f715b9e826" - integrity sha512-XH627E9vkeqhlZFQuL+UsyAXEnibT0kWR2FWONlr4sTjvxyJYnyefgrkyECLzM5NenmKzRAy2rR/OlYLA1HkZw== +typescript@5.2.2: + version "5.2.2" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78" + integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w== typescript@~4.6.3: version "4.6.4"