Skip to content

Commit 3fe432c

Browse files
committed
refactor: update code to integrate universal repo
This commit updates the moved universal code into the cli pipeline
1 parent 8fe8cdf commit 3fe432c

File tree

238 files changed

+2052
-6001
lines changed

Some content is hidden

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

238 files changed

+2052
-6001
lines changed

.bazelignore

+1-8
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.git
22
dist
33
node_modules
4-
<<<<<<< HEAD
54
packages/angular/cli/node_modules
65
packages/angular/create/node_modules
76
packages/angular/pwa/node_modules
7+
packages/angular/ssr/node_modules
88
packages/angular_devkit/architect/node_modules
99
packages/angular_devkit/architect_cli/node_modules
1010
packages/angular_devkit/build_angular/node_modules
@@ -14,10 +14,3 @@ packages/angular_devkit/schematics/node_modules
1414
packages/angular_devkit/schematics_cli/node_modules
1515
packages/ngtools/webpack/node_modules
1616
packages/schematics/angular/node_modules
17-
=======
18-
integration/common-engine/dist
19-
integration/common-engine/node_modules
20-
integration/express-engine-ivy/node_modules
21-
integration/express-engine-hybrid/node_modules
22-
integration/express-engine-standalone/node_modules
23-
>>>>>>> universal/move-to-cli

.github/CODEOWNERS

-13
This file was deleted.

.github/ISSUE_TEMPLATE/Bug.md

-67
This file was deleted.

.github/ISSUE_TEMPLATE/Feature_Request.md

-26
This file was deleted.

.github/ISSUE_TEMPLATE/Proposal.md

-12
This file was deleted.

.github/PULL_REQUEST_TEMPLATE/Improvement.md

-33
This file was deleted.

.github/PULL_REQUEST_TEMPLATE/New_Feature.md

-27
This file was deleted.

.github/workflows/dev-infra.yml

-8
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,13 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
16-
<<<<<<< HEAD
1716
- uses: angular/dev-infra/github-actions/commit-message-based-labels@9931e1a8d1b62fcd2267e89f9993a494856cc1cd
18-
=======
19-
- uses: angular/dev-infra/github-actions/commit-message-based-labels@4c89724c21753ec52cf0618f03d0a6f9936211f9
20-
>>>>>>> universal/move-to-cli
2117
with:
2218
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
2319
post_approval_changes:
2420
runs-on: ubuntu-latest
2521
steps:
2622
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
27-
<<<<<<< HEAD
2823
- uses: angular/dev-infra/github-actions/post-approval-changes@9931e1a8d1b62fcd2267e89f9993a494856cc1cd
29-
=======
30-
- uses: angular/dev-infra/github-actions/post-approval-changes@4c89724c21753ec52cf0618f03d0a6f9936211f9
31-
>>>>>>> universal/move-to-cli
3224
with:
3325
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

.github/workflows/scorecard.yml

-17
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,8 @@ on:
88
workflow_dispatch:
99

1010
# Declare default permissions as read only.
11-
<<<<<<< HEAD
1211
permissions:
1312
contents: read
14-
=======
15-
permissions: read-all
16-
>>>>>>> universal/move-to-cli
1713

1814
jobs:
1915
analysis:
@@ -24,14 +20,9 @@ jobs:
2420
contents: read
2521
# Needed to upload the results to code-scanning dashboard.
2622
security-events: write
27-
<<<<<<< HEAD
2823
# Needed to publish results
2924
id-token: write
3025

31-
=======
32-
# Needed for signing and publishing of results for the badge.
33-
id-token: write
34-
>>>>>>> universal/move-to-cli
3526
steps:
3627
- name: 'Checkout code'
3728
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -43,10 +34,6 @@ jobs:
4334
with:
4435
results_file: results.sarif
4536
results_format: sarif
46-
<<<<<<< HEAD
47-
=======
48-
repo_token: ${{ secrets.GITHUB_TOKEN }}
49-
>>>>>>> universal/move-to-cli
5037
publish_results: true
5138

5239
# Upload the results as artifacts.
@@ -59,10 +46,6 @@ jobs:
5946

6047
# Upload the results to GitHub's code scanning dashboard.
6148
- name: 'Upload to code-scanning'
62-
<<<<<<< HEAD
6349
uses: github/codeql-action/upload-sarif@a09933a12a80f87b87005513f0abb1494c27a716 # v2.21.4
64-
=======
65-
uses: github/codeql-action/upload-sarif@f6e388ebf0efc915c6c5b165b019ee61a6746a38 # v2.20.1
66-
>>>>>>> universal/move-to-cli
6750
with:
6851
sarif_file: results.sarif

.monorepo.json

+10
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,16 @@
2828
"section": "Schematics",
2929
"snapshotRepo": "angular/angular-pwa-builds"
3030
},
31+
"@angular/ssr": {
32+
"name": "Angular SSR",
33+
"links": [
34+
{
35+
"label": "README",
36+
"url": "/packages/angular/ssr/README.md"
37+
}
38+
],
39+
"snapshotRepo": "angular/angular-ssr-builds"
40+
},
3141
"@angular-devkit/architect": {
3242
"name": "Architect",
3343
"links": [

BUILD.bazel

+10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
# found in the LICENSE file at https://angular.io/license
55
load("@bazel_skylib//rules:common_settings.bzl", "bool_flag")
66
load("@build_bazel_rules_nodejs//:index.bzl", "copy_to_bin")
7+
load("@npm//@bazel/concatjs:index.bzl", "ts_config")
78

89
package(default_visibility = ["//visibility:public"])
910

@@ -13,6 +14,7 @@ exports_files([
1314
"LICENSE",
1415
"tsconfig.json",
1516
"tsconfig-test.json",
17+
"tsconfig-build-ng.json",
1618
"tsconfig-build.json",
1719
"package.json",
1820
])
@@ -56,3 +58,11 @@ config_setting(
5658
":enable_snapshot_repo_deps": "true",
5759
},
5860
)
61+
62+
ts_config(
63+
name = "tsconfig-build-ng",
64+
src = "tsconfig-build-ng.json",
65+
deps = [
66+
":tsconfig.json",
67+
],
68+
)

CONTRIBUTING.md

+1
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,7 @@ The following is the list of supported scopes:
214214
* **@angular/cli**
215215
* **@angular/create**
216216
* **@angular/pwa**
217+
* **@angular/ssr**
217218
* **@angular-devkit/architect**
218219
* **@angular-devkit/architect-cli**
219220
* **@angular-devkit/build-angular**

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ This is a monorepo which contains many tools and packages:
158158

159159
| Project | Package | Version | Links |
160160
|---|---|---|---|
161+
**Angular SSR** | [`@angular/ssr`](https://npmjs.com/package/@angular/ssr) | [![latest](https://img.shields.io/npm/v/%40angular%2Fssr/latest.svg)](https://npmjs.com/package/@angular/ssr) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular/ssr/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-ssr-builds)
161162
**Architect** | [`@angular-devkit/architect`](https://npmjs.com/package/@angular-devkit/architect) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Farchitect/latest.svg)](https://npmjs.com/package/@angular-devkit/architect) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/architect/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-architect-builds)
162163
**Build Angular** | [`@angular-devkit/build-angular`](https://npmjs.com/package/@angular-devkit/build-angular) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-angular/latest.svg)](https://npmjs.com/package/@angular-devkit/build-angular) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/build_angular/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-angular-builds)
163164
**Build Webpack** | [`@angular-devkit/build-webpack`](https://npmjs.com/package/@angular-devkit/build-webpack) | [![latest](https://img.shields.io/npm/v/%40angular-devkit%2Fbuild-webpack/latest.svg)](https://npmjs.com/package/@angular-devkit/build-webpack) | [![README](https://img.shields.io/badge/README--green.svg)](/packages/angular_devkit/build_webpack/README.md) [![snapshot](https://img.shields.io/badge/snapshot--blue.svg)](https://github.com/angular/angular-devkit-build-webpack-builds)

0 commit comments

Comments
 (0)