Skip to content
This repository was archived by the owner on Nov 22, 2024. It is now read-only.

Commit e459a18

Browse files
committed
build: update ng-dev and account for ESM-config changes
(cherry picked from commit 66a53a1)
1 parent 8fcc6aa commit e459a18

File tree

12 files changed

+1228
-138
lines changed

12 files changed

+1228
-138
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import { CommitMessageConfig } from '@angular/dev-infra-private/ng-dev/commit-message/config';
2-
import { release } from './release';
1+
import { CommitMessageConfig } from '@angular/dev-infra-private/ng-dev';
2+
import { release } from './release.mjs';
33

44
/**
55
* The configuration for `ng-dev commit-message` commands.

.ng-dev/config.mts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
export { commitMessage } from './commit-message.mjs';
2+
export { github } from './github.mjs';
3+
export { pullRequest } from './pull-request.mjs';
4+
export { format } from './format.mjs';
5+
export { release } from './release.mjs';

.ng-dev/config.ts

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { FormatConfig } from '@angular/dev-infra-private/ng-dev/format/config';
1+
import { FormatConfig } from '@angular/dev-infra-private/ng-dev';
22

33
/**
44
* Configuration for the `ng-dev format` command.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { GithubConfig } from '@angular/dev-infra-private/ng-dev/utils/config';
1+
import { GithubConfig } from '@angular/dev-infra-private/ng-dev';
22

33
/**
44
* Github configuration for the ng-dev command. This repository is

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { PullRequestConfig } from '@angular/dev-infra-private/ng-dev/pr/config';
1+
import { PullRequestConfig } from '@angular/dev-infra-private/ng-dev';
22

33
/**
44
* Configuration for the merge tool in `ng-dev`. This sets up the labels which

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

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { ReleaseConfig } from '@angular/dev-infra-private/ng-dev/release/config';
1+
import { ReleaseConfig } from '@angular/dev-infra-private/ng-dev';
22
import { join } from 'path';
33

44
/** Configuration for the `ng-dev release` command. */
@@ -14,10 +14,16 @@ export const release: ReleaseConfig = {
1414
},
1515
publishRegistry: 'https://wombat-dressing-room.appspot.com',
1616
releasePrLabels: ['action: merge'],
17-
buildPackages: () => {
18-
// The buildTargetPackages function is loaded at runtime as the loading the script causes an
19-
// invocation of bazel.
20-
const { buildTargetPackages } = require(join(__dirname, '../scripts/package-builder.js'));
21-
return buildTargetPackages('dist/release-output', 'Release', /* isRelease */ true);
17+
buildPackages: async () => {
18+
// The buildTargetPackages function is loaded at runtime as the loading the
19+
// script causes an invocation of bazel.
20+
// TODO: Consider converting the package builder to TypeScript.
21+
const packageBuilder = await import('../scripts/package-builder.js');
22+
23+
return packageBuilder.default.buildTargetPackages(
24+
'dist/release-output',
25+
'Release',
26+
/* isRelease */ true,
27+
);
2228
},
2329
};

.ng-dev/tsconfig.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"compilerOptions": {
33
"strict": true,
4-
"target": "es2015",
5-
"module": "commonjs",
4+
"target": "es2020",
5+
"module": "Node16",
66
"noEmit": true,
77
"skipLibCheck": true,
88
"types": []

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
},
2424
"scripts": {
2525
"lint": "eslint --cache --max-warnings=0 \"**/*.ts\"",
26+
"ng-dev": "ts-node --esm --project .ng-dev/tsconfig.json node_modules/@angular/dev-infra-private/ng-dev/bundles/cli.mjs",
2627
"build": "npm run bazel:build",
2728
"bazel:build": "bazel build //modules/...",
2829
"test": "bazel test //modules/...",
@@ -45,7 +46,7 @@
4546
"@angular/compiler": "14.0.0",
4647
"@angular/compiler-cli": "14.0.0",
4748
"@angular/core": "14.0.0",
48-
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#2fe60016e0ce6f1e53d4f5c5a1feb29d64ecd979",
49+
"@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#262cb3bb487e8dddb3c404f4f2c8b34a9a1f14c2",
4950
"@angular/platform-browser": "14.0.0",
5051
"@angular/platform-browser-dynamic": "14.0.0",
5152
"@angular/platform-server": "14.0.0",
@@ -96,7 +97,7 @@
9697
"source-map-support": "^0.5.9",
9798
"terser": "^5.0.0",
9899
"tree-kill": "^1.2.1",
99-
"ts-node": "10.7.0",
100+
"ts-node": "10.8.1",
100101
"tslib": "~2.4.0",
101102
"tsutils": "^3.0.0",
102103
"typescript": "4.7.2",

scripts/package-builder.d.ts

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
/**
2+
* @license
3+
* Copyright Google LLC All Rights Reserved.
4+
*
5+
* Use of this source code is governed by an MIT-style license that can be
6+
* found in the LICENSE file at https://angular.io/license
7+
*/
8+
9+
/** Build the Angular universal release packages/ */
10+
export declare function buildTargetPackages(
11+
destDir,
12+
description,
13+
isRelease = false,
14+
): { name: string; outputPath: string }[];

0 commit comments

Comments
 (0)