Skip to content

Commit

Permalink
build: prep for 18.1
Browse files Browse the repository at this point in the history
* update core version in integration project
* update deps in package.json
* cast project to any to call markDirty that was made internal (microsoft/TypeScript@d12116d#diff-fad6af6557c1406192e30af30e0113a5eb327d60f9e2588bdce6667d619ebd04)
* update versions in WORKSPACE
  • Loading branch information
atscott committed Jul 8, 2024
1 parent 888875f commit 7a23428
Show file tree
Hide file tree
Showing 12 changed files with 8,293 additions and 5,805 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,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=943190807
yarn.lock=-1098466397
package.json=619455070
pnpm-lock.yaml=555137830
yarn.lock=1415603246
package.json=1352810757
pnpm-workspace.yaml=1711114604
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# @generated
# Input hashes for repository rule npm_translate_lock(name = "npm_integration_project", pnpm_lock = "//integration/project:pnpm-lock.yaml").
# This file should be checked into version control along with the pnpm-lock.yaml file.
.npmrc=974837034
integration/project/pnpm-lock.yaml=-1557661325
integration/project/yarn.lock=-1655253005
integration/project/package.json=-2134990152
integration/project/pnpm-lock.yaml=-2108388700
integration/project/yarn.lock=1608320625
integration/project/package.json=239980869
integration/project/pnpm-workspace.yaml=1163575902
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.13.0
18.20.0
5 changes: 2 additions & 3 deletions integration/lsp/ivy_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -282,8 +282,7 @@ export class AppComponent {
}))!;
expect(response).not.toBeNull();
expect(response.signatures.length).toEqual(1);
expect(response.signatures[0].label)
.toContain('(from: number, length?: number | undefined): string');
expect(response.signatures[0].label).toContain('(from: number, length?: number): string');
expect(response.signatures[0].parameters).not.toBeUndefined();
expect(response.activeParameter).toBe(1);

Expand All @@ -292,7 +291,7 @@ export class AppComponent {
const [start, end] = param.label as [number, number];
return label.substring(start, end);
});
expect(paramLabels).toEqual(['from: number', 'length?: number | undefined']);
expect(paramLabels).toEqual(['from: number', 'length?: number']);
});
});

Expand Down
12 changes: 6 additions & 6 deletions integration/project/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@
"name": "angular-ls-integration-test-project",
"private": true,
"dependencies": {
"@angular/common": "17.0.0-next.7",
"@angular/compiler": "17.0.0-next.7",
"@angular/compiler-cli": "17.0.0-next.7",
"@angular/core": "17.0.0-next.7",
"@angular/common": "18.1.0-rc.0",
"@angular/compiler": "18.1.0-rc.0",
"@angular/compiler-cli": "18.1.0-rc.0",
"@angular/core": "18.1.0-rc.0",
"rxjs": "6.6.7",
"zone.js": "0.11.5"
},
"devDependencies": {
"ng-packagr": "^17.0.0-next.2",
"typescript": "~5.2.2"
"ng-packagr": "^18.0.0-next.0",
"typescript": "~5.5.3"
},
"scripts": {
"build": "ng-packagr -p libs/post/ng-package.json -c libs/post/tsconfig.json"
Expand Down
1,721 changes: 902 additions & 819 deletions integration/project/pnpm-lock.yaml

Large diffs are not rendered by default.

1,181 changes: 604 additions & 577 deletions integration/project/yarn.lock

Large diffs are not rendered by default.

5 changes: 3 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,8 +218,8 @@
"test:legacy-syntaxes": "yarn compile:syntaxes-test && yarn build:syntaxes && jasmine dist/syntaxes/test/driver.js"
},
"dependencies": {
"@angular/language-service": "18.1.0-next.4",
"typescript": "5.4.5",
"@angular/language-service": "18.1.0-rc.0",
"typescript": "5.5.3",
"vscode-html-languageservice": "^4.2.5",
"vscode-jsonrpc": "6.0.0",
"vscode-languageclient": "7.0.0",
Expand All @@ -229,6 +229,7 @@
},
"devDependencies": {
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#262cb3bb487e8dddb3c404f4f2c8b34a9a1f14c2",
"@angular/core": "^18.1.0-rc.0",
"@bazel/bazelisk": "1.18.0",
"@bazel/ibazel": "0.16.2",
"@types/jasmine": "3.10.7",
Expand Down
Loading

0 comments on commit 7a23428

Please sign in to comment.