diff --git a/.ng-dev/caretaker.mts b/.ng-dev/caretaker.mjs similarity index 74% rename from .ng-dev/caretaker.mts rename to .ng-dev/caretaker.mjs index f4404dd9356..72f80486244 100644 --- a/.ng-dev/caretaker.mts +++ b/.ng-dev/caretaker.mjs @@ -1,7 +1,9 @@ -import {CaretakerConfig} from '@angular/ng-dev'; - -/** The configuration for `ng-dev caretaker` commands. */ -export const caretaker: CaretakerConfig = { +/** + * The configuration for `ng-dev caretaker` commands. + * + * @type { import("@angular/ng-dev").CaretakerConfig } + */ +export const caretaker = { g3SyncConfigPath: './.ng-dev/google-sync-config.json', githubQueries: [ { diff --git a/.ng-dev/commit-message.mts b/.ng-dev/commit-message.mjs similarity index 87% rename from .ng-dev/commit-message.mts rename to .ng-dev/commit-message.mjs index 479a4e128cf..71f349e2b07 100644 --- a/.ng-dev/commit-message.mts +++ b/.ng-dev/commit-message.mjs @@ -1,9 +1,9 @@ -import {CommitMessageConfig} from '@angular/ng-dev'; - /** * The configuration for `ng-dev commit-message` commands. + * + * @type { import("@angular/ng-dev").CommitMessageConfig } */ -export const commitMessage: CommitMessageConfig = { +export const commitMessage = { maxLineLength: Infinity, minBodyLength: 20, minBodyLengthTypeExcludes: ['docs'], diff --git a/.ng-dev/config.mts b/.ng-dev/config.mjs similarity index 74% rename from .ng-dev/config.mts rename to .ng-dev/config.mjs index c94eca1dd62..2199c8134c7 100644 --- a/.ng-dev/config.mts +++ b/.ng-dev/config.mjs @@ -5,11 +5,4 @@ import {github} from './github.mjs'; import {pullRequest} from './pull-request.mjs'; import {release} from './release.mjs'; -export { - commitMessage, - format, - github, - pullRequest, - caretaker, - release, -}; +export {commitMessage, format, github, pullRequest, caretaker, release}; diff --git a/.ng-dev/format.mts b/.ng-dev/format.mjs similarity index 93% rename from .ng-dev/format.mts rename to .ng-dev/format.mjs index 24d54053207..53074fadc2a 100644 --- a/.ng-dev/format.mts +++ b/.ng-dev/format.mjs @@ -1,9 +1,9 @@ -import {FormatConfig} from '@angular/ng-dev'; - /** * Configuration for the `ng-dev format` command. + * + * @type { import("@angular/ng-dev").FormatConfig } */ -export const format: FormatConfig = { +export const format = { 'prettier': { 'matchers': [ '**/*.md', diff --git a/.ng-dev/github.mts b/.ng-dev/github.mjs similarity index 75% rename from .ng-dev/github.mts rename to .ng-dev/github.mjs index d77ca110bb3..c1403ae90a3 100644 --- a/.ng-dev/github.mts +++ b/.ng-dev/github.mjs @@ -1,10 +1,10 @@ -import {GithubConfig} from '@angular/ng-dev'; - /** * Github configuration for the `ng-dev` command. This repository is used as * remote for the merge script and other utilities like `ng-dev pr rebase`. + * + * @type { import("@angular/ng-dev").GithubConfig } */ -export const github: GithubConfig = { +export const github = { owner: 'angular', name: 'angular', mainBranchName: 'main', diff --git a/.ng-dev/pull-request.mts b/.ng-dev/pull-request.mjs similarity index 91% rename from .ng-dev/pull-request.mts rename to .ng-dev/pull-request.mjs index ca0357361df..44167fdd3e9 100644 --- a/.ng-dev/pull-request.mts +++ b/.ng-dev/pull-request.mjs @@ -1,10 +1,10 @@ -import {PullRequestConfig} from '@angular/ng-dev'; - /** * Configuration for the merge tool in `ng-dev`. This sets up the labels which * are respected by the merge script (e.g. the target labels). + * + * @type { import("@angular/ng-dev").PullRequestConfig } */ -export const pullRequest: PullRequestConfig = { +export const pullRequest = { githubApiMerge: { default: 'auto', labels: [{pattern: 'merge: squash commits', method: 'squash'}], diff --git a/.ng-dev/release.mts b/.ng-dev/release.mjs similarity index 89% rename from .ng-dev/release.mts rename to .ng-dev/release.mjs index 36b59035b19..974cc5df8fc 100644 --- a/.ng-dev/release.mts +++ b/.ng-dev/release.mjs @@ -1,7 +1,9 @@ -import {ReleaseConfig} from '@angular/ng-dev'; - -/** Configuration for the `ng-dev release` command. */ -export const release: ReleaseConfig = { +/** + * Configuration for the `ng-dev release` command. + * + * @type { import("@angular/ng-dev").ReleaseConfig } + */ +export const release = { publishRegistry: 'https://wombat-dressing-room.appspot.com', representativeNpmPackage: '@angular/core', npmPackages: [ diff --git a/package.json b/package.json index 7f3be21c5d8..b506b3dfcb4 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "symbol-extractor:check": "node tools/symbol-extractor/run_all_symbols_extractor_tests.js test", "symbol-extractor:update": "node tools/symbol-extractor/run_all_symbols_extractor_tests.js accept", "ts-circular-deps:check": "pnpm -s ng-dev ts-circular-deps check --config ./packages/circular-deps-test.conf.js", - "check-tooling-setup": "tsc --project .ng-dev/tsconfig.json && tsc --project scripts/tsconfig.json", + "check-tooling-setup": "tsc --project scripts/tsconfig.json", "devtools:devserver": "ibazel run //devtools/src:devserver", "devtools:test:e2e": "cypress run --project ./devtools/cypress", "devtools:e2e:open": "cypress open --project ./devtools/cypress",