Skip to content

Commit 4ff7a30

Browse files
authored
build: update ng-dev and account for ESM changes (#1701)
1 parent 7d904ca commit 4ff7a30

File tree

9 files changed

+849
-726
lines changed

9 files changed

+849
-726
lines changed

.ng-dev/config.mts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import {format} from './format.mjs';
2+
import {github} from './github.mjs';
3+
import {pullRequest} from './pull-request.mjs';
4+
5+
export {format, github, pullRequest};

.ng-dev/config.ts

Lines changed: 0 additions & 9 deletions
This file was deleted.
File renamed without changes.
File renamed without changes.

.ng-dev/pullRequest.ts renamed to .ng-dev/pull-request.mts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,8 @@ export const pullRequest: PullRequestConfig = {
1111
// use the Github API merge strategy. That way we ensure that PRs show up as `Merged`.
1212
githubApiMerge: {
1313
default: 'squash',
14-
labels: [
15-
{pattern: 'preserve commits', method: 'rebase'},
16-
],
14+
labels: [{pattern: 'preserve commits', method: 'rebase'}],
1715
},
1816
mergeReadyLabel: 'action: merge',
19-
commitMessageFixupLabel: 'commit message fixup'
17+
commitMessageFixupLabel: 'commit message fixup',
2018
};

.ng-dev/tsconfig.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"compilerOptions": {
3+
"strict": true,
4+
"target": "es2020",
5+
"module": "Node16",
6+
"esModuleInterop": true,
7+
"noEmit": true,
8+
"skipLibCheck": true,
9+
"types": []
10+
}
11+
}

package.json

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@
200200
],
201201
"main": "./dist/client/extension",
202202
"scripts": {
203+
"ng-dev": "ts-node --esm --project .ng-dev/tsconfig.json node_modules/@angular/dev-infra-private/ng-dev/bundles/cli.mjs",
203204
"compile": "tsc -b server/banner.tsconfig.json && tsc -b && node esbuild.js",
204205
"compile:test": "tsc -b test.tsconfig.json",
205206
"compile:integration": "tsc -b integration && yarn --cwd integration/project build",
@@ -216,14 +217,14 @@
216217
},
217218
"dependencies": {
218219
"@angular/language-service": "14.1.0-next.0",
219-
"typescript": "4.5.4",
220+
"typescript": "4.7.4",
220221
"vscode-jsonrpc": "6.0.0",
221222
"vscode-languageclient": "7.0.0",
222223
"vscode-languageserver": "7.0.0",
223224
"vscode-uri": "3.0.3"
224225
},
225226
"devDependencies": {
226-
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#ce1d7f6c62ff0f9569791d78920c3628c56b4574",
227+
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#262cb3bb487e8dddb3c404f4f2c8b34a9a1f14c2",
227228
"@types/jasmine": "3.10.6",
228229
"@types/node": "14.18.16",
229230
"@types/vscode": "1.67.0",
@@ -232,7 +233,7 @@
232233
"jasmine": "3.99.0",
233234
"prettier": "2.6.2",
234235
"tslint": "6.1.3",
235-
"ts-node": "^10.0.0",
236+
"ts-node": "^10.8.1",
236237
"tslint-eslint-rules": "5.4.0",
237238
"vsce": "1.100.1",
238239
"vscode-languageserver-protocol": "3.16.0",

scripts/lint.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22

33
set -ex -o pipefail
44

5+
yarn tsc --project .ng-dev/tsconfig.json
6+
57
yarn tslint --project client/tsconfig.json
68
yarn tslint --project server/tsconfig.json
79
yarn tslint --project server/src/tests/tsconfig.json

0 commit comments

Comments
 (0)