Skip to content

build: update ng-dev and account for ESM changes #1701

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 22, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .ng-dev/config.mts
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import {format} from './format.mjs';
import {github} from './github.mjs';
import {pullRequest} from './pull-request.mjs';

export {format, github, pullRequest};
9 changes: 0 additions & 9 deletions .ng-dev/config.ts

This file was deleted.

File renamed without changes.
File renamed without changes.
6 changes: 2 additions & 4 deletions .ng-dev/pullRequest.ts → .ng-dev/pull-request.mts
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,8 @@ export const pullRequest: PullRequestConfig = {
// use the Github API merge strategy. That way we ensure that PRs show up as `Merged`.
githubApiMerge: {
default: 'squash',
labels: [
{pattern: 'preserve commits', method: 'rebase'},
],
labels: [{pattern: 'preserve commits', method: 'rebase'}],
},
mergeReadyLabel: 'action: merge',
commitMessageFixupLabel: 'commit message fixup'
commitMessageFixupLabel: 'commit message fixup',
};
11 changes: 11 additions & 0 deletions .ng-dev/tsconfig.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"compilerOptions": {
"strict": true,
"target": "es2020",
"module": "Node16",
"esModuleInterop": true,
"noEmit": true,
"skipLibCheck": true,
"types": []
}
}
7 changes: 4 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@
],
"main": "./dist/client/extension",
"scripts": {
"ng-dev": "ts-node --esm --project .ng-dev/tsconfig.json node_modules/@angular/dev-infra-private/ng-dev/bundles/cli.mjs",
"compile": "tsc -b server/banner.tsconfig.json && tsc -b && node esbuild.js",
"compile:test": "tsc -b test.tsconfig.json",
"compile:integration": "tsc -b integration && yarn --cwd integration/project build",
Expand All @@ -216,14 +217,14 @@
},
"dependencies": {
"@angular/language-service": "14.1.0-next.0",
"typescript": "4.5.4",
"typescript": "4.7.4",
"vscode-jsonrpc": "6.0.0",
"vscode-languageclient": "7.0.0",
"vscode-languageserver": "7.0.0",
"vscode-uri": "3.0.3"
},
"devDependencies": {
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#ce1d7f6c62ff0f9569791d78920c3628c56b4574",
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#262cb3bb487e8dddb3c404f4f2c8b34a9a1f14c2",
"@types/jasmine": "3.10.6",
"@types/node": "14.18.16",
"@types/vscode": "1.67.0",
Expand All @@ -232,7 +233,7 @@
"jasmine": "3.99.0",
"prettier": "2.6.2",
"tslint": "6.1.3",
"ts-node": "^10.0.0",
"ts-node": "^10.8.1",
"tslint-eslint-rules": "5.4.0",
"vsce": "1.100.1",
"vscode-languageserver-protocol": "3.16.0",
Expand Down
2 changes: 2 additions & 0 deletions scripts/lint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

set -ex -o pipefail

yarn tsc --project .ng-dev/tsconfig.json

yarn tslint --project client/tsconfig.json
yarn tslint --project server/tsconfig.json
yarn tslint --project server/src/tests/tsconfig.json
Expand Down
Loading