Skip to content

Commit 7d6235f

Browse files
josephperrottAndrewKushnir
josephperrott
authored and
AndrewKushnir
committed
build: use mjs files for ng-dev configuration
In preperation for ng-dev requiring mjs files for configuration, switch over our usage
1 parent 0835bd8 commit 7d6235f

File tree

8 files changed

+26
-29
lines changed

8 files changed

+26
-29
lines changed

.ng-dev/caretaker.mts renamed to .ng-dev/caretaker.mjs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import {CaretakerConfig} from '@angular/ng-dev';
2-
3-
/** The configuration for `ng-dev caretaker` commands. */
4-
export const caretaker: CaretakerConfig = {
1+
/**
2+
* The configuration for `ng-dev caretaker` commands.
3+
*
4+
* @type { import("@angular/ng-dev").CaretakerConfig }
5+
*/
6+
export const caretaker = {
57
g3SyncConfigPath: './.ng-dev/google-sync-config.json',
68
githubQueries: [
79
{

.ng-dev/commit-message.mts renamed to .ng-dev/commit-message.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import {CommitMessageConfig} from '@angular/ng-dev';
2-
31
/**
42
* The configuration for `ng-dev commit-message` commands.
3+
*
4+
* @type { import("@angular/ng-dev").CommitMessageConfig }
55
*/
6-
export const commitMessage: CommitMessageConfig = {
6+
export const commitMessage = {
77
maxLineLength: Infinity,
88
minBodyLength: 20,
99
minBodyLengthTypeExcludes: ['docs'],

.ng-dev/config.mts renamed to .ng-dev/config.mjs

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,4 @@ import {github} from './github.mjs';
55
import {pullRequest} from './pull-request.mjs';
66
import {release} from './release.mjs';
77

8-
export {
9-
commitMessage,
10-
format,
11-
github,
12-
pullRequest,
13-
caretaker,
14-
release,
15-
};
8+
export {commitMessage, format, github, pullRequest, caretaker, release};

.ng-dev/format.mts renamed to .ng-dev/format.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import {FormatConfig} from '@angular/ng-dev';
2-
31
/**
42
* Configuration for the `ng-dev format` command.
3+
*
4+
* @type { import("@angular/ng-dev").FormatConfig }
55
*/
6-
export const format: FormatConfig = {
6+
export const format = {
77
'prettier': {
88
'matchers': [
99
'**/*.md',

.ng-dev/github.mts renamed to .ng-dev/github.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import {GithubConfig} from '@angular/ng-dev';
2-
31
/**
42
* Github configuration for the `ng-dev` command. This repository is used as
53
* remote for the merge script and other utilities like `ng-dev pr rebase`.
4+
*
5+
* @type { import("@angular/ng-dev").GithubConfig }
66
*/
7-
export const github: GithubConfig = {
7+
export const github = {
88
owner: 'angular',
99
name: 'angular',
1010
mainBranchName: 'main',

.ng-dev/pull-request.mts renamed to .ng-dev/pull-request.mjs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import {PullRequestConfig} from '@angular/ng-dev';
2-
31
/**
42
* Configuration for the merge tool in `ng-dev`. This sets up the labels which
53
* are respected by the merge script (e.g. the target labels).
4+
*
5+
* @type { import("@angular/ng-dev").PullRequestConfig }
66
*/
7-
export const pullRequest: PullRequestConfig = {
7+
export const pullRequest = {
88
githubApiMerge: {
99
default: 'auto',
1010
labels: [{pattern: 'merge: squash commits', method: 'squash'}],

.ng-dev/release.mts renamed to .ng-dev/release.mjs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
import {ReleaseConfig} from '@angular/ng-dev';
2-
3-
/** Configuration for the `ng-dev release` command. */
4-
export const release: ReleaseConfig = {
1+
/**
2+
* Configuration for the `ng-dev release` command.
3+
*
4+
* @type { import("@angular/ng-dev").ReleaseConfig }
5+
*/
6+
export const release = {
57
publishRegistry: 'https://wombat-dressing-room.appspot.com',
68
representativeNpmPackage: '@angular/core',
79
npmPackages: [

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
"symbol-extractor:check": "node tools/symbol-extractor/run_all_symbols_extractor_tests.js test",
3232
"symbol-extractor:update": "node tools/symbol-extractor/run_all_symbols_extractor_tests.js accept",
3333
"ts-circular-deps:check": "pnpm -s ng-dev ts-circular-deps check --config ./packages/circular-deps-test.conf.js",
34-
"check-tooling-setup": "tsc --project .ng-dev/tsconfig.json && tsc --project scripts/tsconfig.json",
34+
"check-tooling-setup": "tsc --project scripts/tsconfig.json",
3535
"devtools:devserver": "ibazel run //devtools/src:devserver",
3636
"devtools:test:e2e": "cypress run --project ./devtools/cypress",
3737
"devtools:e2e:open": "cypress open --project ./devtools/cypress",

0 commit comments

Comments
 (0)