Skip to content

Commit 39262ad

Browse files
fiskerfisker
committed
Merge branch 'main' into dev
# Conflicts: # .angular-github/actions/deploy-docs-site/lib/BUILD.bazel # .angular-github/actions/deploy-docs-site/lib/credential.mts # .angular-github/actions/deploy-docs-site/lib/credential.ts # .angular-github/actions/deploy-docs-site/lib/deploy.mts # .angular-github/actions/deploy-docs-site/lib/deploy.ts # .angular-github/actions/deploy-docs-site/lib/deployments.mts # .angular-github/actions/deploy-docs-site/lib/deployments.ts # .angular-github/actions/deploy-docs-site/lib/main.mts # .angular-github/actions/deploy-docs-site/lib/main.ts # .angular-github/actions/deploy-docs-site/package.json # .angular-github/workflows/update-cli-help.yml # .github/actions/deploy-docs-site/lib/credential.ts # .github/actions/deploy-docs-site/lib/deploy.ts # .github/actions/deploy-docs-site/lib/deployments.ts # .github/actions/deploy-docs-site/lib/main.ts # .github/actions/deploy-docs-site/package.json # packages/compiler/src/ml_parser/parser.ts # packages/package.json
2 parents c15a381 + d3e9ca1 commit 39262ad

File tree

2,261 files changed

+101862
-28749
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,261 files changed

+101862
-28749
lines changed

‎.angular-github/actions/deploy-docs-site/BUILD.bazel

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,41 @@
1+
load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
12
load("//tools:defaults.bzl", "esbuild_checked_in")
3+
load("//tools:defaults2.bzl", "ts_project")
4+
5+
package(default_visibility = ["//.github/actions/deploy-docs-site:__subpackages__"])
26

37
exports_files([
48
"tsconfig.json",
59
])
610

711
esbuild_checked_in(
812
name = "main",
9-
entry_point = "//.github/actions/deploy-docs-site/lib:main.ts",
13+
entry_point = ":lib/main.mts",
1014
external = [
1115
"undici",
1216
],
1317
platform = "node",
14-
target = "node14",
18+
target = "node20",
19+
deps = [
20+
":lib",
21+
],
22+
)
23+
24+
rules_js_tsconfig(
25+
name = "tsconfig",
26+
src = "tsconfig.json",
27+
)
28+
29+
ts_project(
30+
name = "lib",
31+
srcs = glob(["lib/*.mts"]),
32+
tsconfig = ":tsconfig",
1533
deps = [
16-
"//.github/actions/deploy-docs-site/lib",
34+
"//:node_modules/@actions/core",
35+
"//:node_modules/@actions/github",
36+
"//:node_modules/@angular/ng-dev",
37+
"//:node_modules/@types/node",
38+
"//:node_modules/@types/tmp",
39+
"//:node_modules/tmp",
1740
],
1841
)

‎.angular-github/actions/deploy-docs-site/lib/BUILD.bazel

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

‎.angular-github/actions/deploy-docs-site/lib/credential.ts renamed to ‎.angular-github/actions/deploy-docs-site/lib/credential.mts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {fileSync} from 'tmp';
2-
import {writeSync} from 'fs';
2+
import {writeSync} from 'node:fs';
33
import {getInput, setSecret} from '@actions/core';
44

55
let credentialFilePath: undefined | string;

‎.angular-github/actions/deploy-docs-site/lib/deploy.ts renamed to ‎.angular-github/actions/deploy-docs-site/lib/deploy.mts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import {cp, mkdtemp, readFile, rm, writeFile} from 'fs/promises';
2-
import {Deployment} from './deployments';
3-
import {join} from 'path';
1+
import {cp, mkdtemp, readFile, rm, writeFile} from 'node:fs/promises';
2+
import {Deployment} from './deployments.mjs';
3+
import {join} from 'node:path';
44

5-
import {tmpdir} from 'os';
6-
import {spawnSync} from 'child_process';
7-
import {getCredentialFilePath} from './credential';
5+
import {tmpdir} from 'node:os';
6+
import {spawnSync} from 'node:child_process';
7+
import {getCredentialFilePath} from './credential.mjs';
88

99
export async function deployToFirebase(
1010
deployment: Deployment,

‎.angular-github/actions/deploy-docs-site/lib/deployments.ts renamed to ‎.angular-github/actions/deploy-docs-site/lib/deployments.mts

File renamed without changes.

‎.angular-github/actions/deploy-docs-site/lib/main.ts renamed to ‎.angular-github/actions/deploy-docs-site/lib/main.mts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
import {getInput, setFailed} from '@actions/core';
22
import {context} from '@actions/github';
3-
import {deployToFirebase, setupRedirect} from './deploy';
4-
import {getDeployments} from './deployments';
3+
import {deployToFirebase, setupRedirect} from './deploy.mjs';
4+
import {getDeployments} from './deployments.mjs';
55
import {AuthenticatedGitClient, GithubConfig, setConfig} from '@angular/ng-dev';
6-
import {githubReleaseTrainReadToken} from './credential';
6+
import {githubReleaseTrainReadToken} from './credential.mjs';
77

88
const refMatcher = /refs\/heads\/(.*)/;
99

1010
async function deployDocs() {
1111
setConfig({
12-
github: <GithubConfig>{
12+
github: {
1313
mainBranchName: 'main',
1414
name: 'angular',
1515
owner: 'angular',
16-
},
16+
} as GithubConfig,
1717
});
1818

1919
AuthenticatedGitClient.configure(githubReleaseTrainReadToken);

0 commit comments

Comments
 (0)