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

Lines changed: 1 addition & 8 deletions
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

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

.github/ISSUE_TEMPLATE/Bug.md

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

.github/ISSUE_TEMPLATE/Feature_Request.md

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

.github/ISSUE_TEMPLATE/Proposal.md

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

.github/PULL_REQUEST_TEMPLATE/Improvement.md

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

.github/PULL_REQUEST_TEMPLATE/New_Feature.md

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

.github/workflows/dev-infra.yml

Lines changed: 0 additions & 8 deletions
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

Lines changed: 0 additions & 17 deletions
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

Lines changed: 10 additions & 0 deletions
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": [

0 commit comments

Comments
 (0)