Skip to content

Commit 96d0a11

Browse files
committed
Merge branch 'main' into dev
# Conflicts: # .angular-github/actions/deploy-docs-site/esbuild.conf.js # .angular-github/actions/yarn-install/action.yml # .github/workflows/update-cdk-apis-and-cli-help.yml # packages/compiler/src/ml_parser/ast.ts # packages/compiler/src/ml_parser/lexer.ts # packages/compiler/src/ml_parser/parser.ts # packages/compiler/test/ml_parser/html_parser_spec.ts # packages/compiler/test/ml_parser/lexer_spec.ts
2 parents 22e1a55 + 16fa983 commit 96d0a11

File tree

3,144 files changed

+170824
-167903
lines changed

Some content is hidden

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

3,144 files changed

+170824
-167903
lines changed

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

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
load("@aspect_rules_ts//ts:defs.bzl", rules_js_tsconfig = "ts_config")
2-
load("//tools:defaults.bzl", "esbuild_checked_in")
3-
load("//tools:defaults2.bzl", "ts_project")
1+
load("//tools:defaults.bzl", "esbuild_checked_in", "ts_config", "ts_project")
42

53
package(default_visibility = ["//.github/actions/deploy-docs-site:__subpackages__"])
64

@@ -10,6 +8,7 @@ exports_files([
108

119
esbuild_checked_in(
1210
name = "main",
11+
config = "esbuild.conf.js",
1312
entry_point = ":lib/main.mts",
1413
external = [
1514
"undici",
@@ -22,7 +21,7 @@ esbuild_checked_in(
2221
],
2322
)
2423

25-
rules_js_tsconfig(
24+
ts_config(
2625
name = "tsconfig",
2726
src = "tsconfig.json",
2827
)
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
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.dev/license
7+
*/
8+
9+
module.exports = {
10+
resolveExtensions: ['.mjs', '.js'],
11+
format: 'esm',
12+
banner: {
13+
// Workaround for: https://github.com/evanw/esbuild/issues/946
14+
js: `import {createRequire as __cjsCompatRequire} from 'module';
15+
const require = __cjsCompatRequire(import.meta.url);`,
16+
},
17+
};

0 commit comments

Comments
 (0)