Skip to content

Commit a1ceed4

Browse files
Revert "build: use mjs files for ng-dev configuration (#32309)" (#32464)
This reverts commit 8e8314c.
1 parent c097570 commit a1ceed4

File tree

15 files changed

+57
-62
lines changed

15 files changed

+57
-62
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,6 @@ jobs:
2424
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@95e3a0ede6dfa1aedd34b03918ad72b18f87e5ae
2525
- name: Install node modules
2626
run: pnpm install --frozen-lockfile
27-
- name: Validate ng-dev config
28-
run: pnpm ng-dev config validate
2927
- name: Checking package externals
3028
run: |
3129
bazel build //:package_externals

.github/workflows/pr.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@ jobs:
2222
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@95e3a0ede6dfa1aedd34b03918ad72b18f87e5ae
2323
- name: Install node modules
2424
run: pnpm install --frozen-lockfile
25-
- name: Validate ng-dev config
26-
run: pnpm ng-dev config validate
2725
- name: Checking package externals
2826
run: |
2927
bazel build //:package_externals

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1-
/**
2-
* The configuration for `ng-dev caretaker` commands.
3-
*
4-
* @type { import("@angular/ng-dev").CaretakerConfig }
5-
*/
6-
export const caretaker = {
1+
import {CaretakerConfig} from '@angular/ng-dev';
2+
3+
/** The configuration for `ng-dev caretaker` commands. */
4+
export const caretaker: CaretakerConfig = {
75
githubQueries: [
86
{
97
name: 'Merge Queue',

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

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+
13
/**
24
* The configuration for `ng-dev commit-message` commands.
3-
*
4-
* @type { import("@angular/ng-dev").CommitMessageConfig }
55
*/
6-
export const commitMessage = {
6+
export const commitMessage: CommitMessageConfig = {
77
maxLineLength: Infinity,
88
minBodyLength: 0,
99
minBodyLengthTypeExcludes: ['docs'],
File renamed without changes.

.ng-dev/format.mjs

Lines changed: 0 additions & 11 deletions
This file was deleted.

.ng-dev/format.mts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import {FormatConfig} from '@angular/ng-dev';
2+
3+
/**
4+
* Configuration for the ng-dev format command. We currently only use the buildifier
5+
* formatter that is responsible for formatting Bazel build and `.bzl` files.
6+
*/
7+
export const format: FormatConfig = {
8+
buildifier: true,
9+
prettier: {
10+
matchers: ['**/*.{js,ts,mts,mjs,json}'],
11+
},
12+
};

.ng-dev/github.mjs

Lines changed: 0 additions & 12 deletions
This file was deleted.

.ng-dev/github.mts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import {GithubConfig} from '@angular/ng-dev';
2+
3+
/**
4+
* Github configuration for the ng-dev command. This repository is
5+
* uses as remote for the merge script.
6+
*/
7+
export const github: GithubConfig = {
8+
owner: 'angular',
9+
name: 'components',
10+
mainBranchName: 'main',
11+
useNgDevAuthService: true,
12+
};

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1+
import {PullRequestConfig} from '@angular/ng-dev';
2+
13
/**
2-
* Configuration for the merge tool in `ng-dev`. This sets up the labels which
3-
* are respected by the merge script (e.g. the target labels).
4-
*
5-
* @type { import("@angular/ng-dev").PullRequestConfig }
4+
* Configuration for the pull request commands in `ng-dev`. This includes the
5+
* setup for the merge command.
66
*/
7-
export const pullRequest = {
7+
export const pullRequest: PullRequestConfig = {
88
// By default, the merge script merges locally with `git cherry-pick` and autosquash.
99
// This has the downside of pull requests showing up as `Closed` instead of `Merged`.
1010
// In the components repository, since we don't use fixup or squash commits, we can

0 commit comments

Comments
 (0)