Skip to content
Open
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
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ jobs:
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@7fa1ab52a99168e16ea3722e4b7313839daea490
- name: Install node modules
run: pnpm install --frozen-lockfile
- name: Validate ng-dev config
run: pnpm ng-dev config validate
- name: Checking package externals
run: |
bazel build //:package_externals
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ jobs:
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@7fa1ab52a99168e16ea3722e4b7313839daea490
- name: Install node modules
run: pnpm install --frozen-lockfile
- name: Validate ng-dev config
run: pnpm ng-dev config validate
- name: Checking package externals
run: |
bazel build //:package_externals
Expand Down
10 changes: 6 additions & 4 deletions .ng-dev/caretaker.mts → .ng-dev/caretaker.mjs
Original file line number Diff line number Diff line change
@@ -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 = {
githubQueries: [
{
name: 'Merge Queue',
Expand Down
6 changes: 3 additions & 3 deletions .ng-dev/commit-message.mts → .ng-dev/commit-message.mjs
Original file line number Diff line number Diff line change
@@ -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: 0,
minBodyLengthTypeExcludes: ['docs'],
Expand Down
File renamed without changes.
11 changes: 11 additions & 0 deletions .ng-dev/format.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/**
* Configuration for the `ng-dev format` command.
*
* @type { import("@angular/ng-dev").FormatConfig }
*/
export const format = {
buildifier: true,
prettier: {
matchers: ['**/*.{js,ts,mts,mjs,json}'],
},
};
12 changes: 0 additions & 12 deletions .ng-dev/format.mts

This file was deleted.

12 changes: 12 additions & 0 deletions .ng-dev/github.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* 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 = {
owner: 'angular',
name: 'components',
mainBranchName: 'main',
useNgDevAuthService: true,
};
12 changes: 0 additions & 12 deletions .ng-dev/github.mts

This file was deleted.

10 changes: 5 additions & 5 deletions .ng-dev/pull-request.mts → .ng-dev/pull-request.mjs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import {PullRequestConfig} from '@angular/ng-dev';

/**
* Configuration for the pull request commands in `ng-dev`. This includes the
* setup for the merge command.
* 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 = {
// By default, the merge script merges locally with `git cherry-pick` and autosquash.
// This has the downside of pull requests showing up as `Closed` instead of `Merged`.
// In the components repository, since we don't use fixup or squash commits, we can
Expand Down
20 changes: 13 additions & 7 deletions .ng-dev/release.mts → .ng-dev/release.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,6 @@
* found in the LICENSE file at https://angular.dev/license
*/

import semver from 'semver';
import {ReleaseConfig} from '@angular/ng-dev';
import {assertValidUpdateMigrationCollections} from '../tools/release-checks/check-migration-collections.mjs';
import {assertValidNpmPackageOutput} from '../tools/release-checks/npm-package-output/index.mjs';

/**
* Packages that will be published as part of the project.
*
Expand All @@ -30,8 +25,12 @@ export const releasePackages = [
'material-date-fns-adapter',
];

/** 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 = {
releaseNotes: {
useReleaseTitle: true,
groupOrder: releasePackages,
Expand All @@ -58,6 +57,13 @@ export const release: ReleaseConfig = {
return performNpmReleaseBuild();
},
prereleaseCheck: async (newVersionStr, builtPackagesWithInfo) => {
const semver = await import('semver');
const assertValidUpdateMigrationCollections = await import(
'../tools/release-checks/check-migration-collections.mjs'
);
const assertValidNpmPackageOutput = await import(
'../tools/release-checks/npm-package-output/index.mjs'
);
const newVersion = new semver.SemVer(newVersionStr);

await assertValidUpdateMigrationCollections(newVersion);
Expand Down
11 changes: 0 additions & 11 deletions .ng-dev/tsconfig.json

This file was deleted.

5 changes: 2 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"pnpm": "10.22.0"
},
"scripts": {
"ng-dev": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only node_modules/@angular/ng-dev/bundles/cli.mjs",
"ng-dev:stamp": "pnpm -s ng-dev release build-env-stamp --additional-stamping-script=tools/bazel-additional-stamp.mjs",
"build": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only ./scripts/build-packages-dist-main.mts",
"build-docs-content": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only ./scripts/build-docs-content-main.mts",
Expand Down Expand Up @@ -47,7 +46,7 @@
"integration-tests": "bazel test --test_tag_filters=-linker-integration-test --build_tests_only -- //integration/...",
"test-linker-aot": "bazel test --partial_compilation --test_tag_filters=partial-compilation-integration,-firefox --build_tests_only -- //integration/... //src/...",
"test-linker-jit": "bazel test --partial_compilation --test_tag_filters=partial-compilation-integration,-firefox --build_tests_only --//tools:force_partial_jit_compilation=True -- //integration/... //src/...",
"check-tooling-setup": "pnpm tsc --project tools/tsconfig.json --noEmit && pnpm tsc --project tools/adev-api-extraction/tsconfig.json --noEmit && pnpm tsc --project scripts/tsconfig.json --noEmit && pnpm tsc --project .ng-dev/tsconfig.json --noEmit",
"check-tooling-setup": "pnpm tsc --project tools/tsconfig.json --noEmit && pnpm tsc --project tools/adev-api-extraction/tsconfig.json --noEmit && pnpm tsc --project scripts/tsconfig.json --noEmit && pnpm tsc --project tools/release-checks/tsconfig.json --noEmit",
"tsc": "node ./node_modules/typescript/bin/tsc",
"ci-push-deploy-docs-app": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/docs-deploy/deploy-ci-push.mts",
"ci-docs-monitor-test": "node --no-warnings=ExperimentalWarning --loader ts-node/esm/transpile-only scripts/docs-deploy/monitoring/ci-test.mts",
Expand Down Expand Up @@ -76,7 +75,7 @@
"devDependencies": {
"@angular/compiler-cli": "catalog:",
"@angular/localize": "catalog:",
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#39869500e7723f91e1797f575d663afaff1b97e7",
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#e0bb3b2b000ff0c0c18a2020d5d42371bca51ecf",
"@angular/platform-server": "catalog:",
"@angular/router": "catalog:",
"@babel/core": "^7.16.12",
Expand Down
Loading
Loading