Skip to content

Commit 8fe8cdf

Browse files
alan-agius4alan-agius4
committed
refactor: move universal code into CLI repo
Merge remote-tracking branch 'universal/move-to-cli' into universal-merge
2 parents c3c4853 + e6ce7f8 commit 8fe8cdf

File tree

203 files changed

+8320
-1
lines changed

Some content is hidden

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

203 files changed

+8320
-1
lines changed

‎.bazelignore

+9-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
.git
22
dist
33
node_modules
4+
<<<<<<< HEAD
45
packages/angular/cli/node_modules
56
packages/angular/create/node_modules
67
packages/angular/pwa/node_modules
@@ -12,4 +13,11 @@ packages/angular_devkit/core/node_modules
1213
packages/angular_devkit/schematics/node_modules
1314
packages/angular_devkit/schematics_cli/node_modules
1415
packages/ngtools/webpack/node_modules
15-
packages/schematics/angular/node_modules
16+
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
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
/modules/builders @alan-agius4
2+
/modules/common/* @dgp1130 @CaerusKaru @alan-agius4
3+
/modules/express-engine/* @dgp1130 @alan-agius4
4+
5+
# Tooling
6+
/scripts/** @CaerusKaru @dgp1130 @alan-agius4
7+
/integration/** @CaerusKaru @dgp1130 @alan-agius4
8+
/tools/** @CaerusKaru @dgp1130 @alan-agius4
9+
10+
# Misc
11+
/* @dgp1130
12+
/.github/** @dgp1130
13+
/modules/* @dgp1130

‎.github/ISSUE_TEMPLATE/Bug.md

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
---
2+
name: 🐞 Bug Report
3+
about: Something is broken in Angular Universal
4+
---
5+
6+
<--
7+
Please follow the below issue template. Issues not following the issue template will be closed.
8+
Please provide _as much detail as possible_ in as minimal a reproduction as possible. This means no/only one third-party
9+
libraries, no application-specific code, etc. Essentially, we're looking for an `ng new` project with maybe one
10+
additional file/change. If this is not possible, please look deeper into your issue or post it to StackOverflow
11+
for support. This is a bug/feature tracker, meaning that something is actively _missing or broken_ in Angular Universal.
12+
Anything else does not belong on this forum.
13+
14+
For very common issues when using Angular Universal, please see [this doc](docs/gotchas.md). This includes
15+
issues for `window is not defined` and other hiccups when adopting Angular Universal for the first time.
16+
-->
17+
18+
# 🐞 Bug report
19+
20+
#### What modules are related to this issue?
21+
22+
<!-- ✍️edit: -->
23+
24+
- [ ] builders
25+
- [ ] common
26+
- [ ] express-engine
27+
28+
### Is this a regression?
29+
30+
<!-- Did this behavior used to work in the previous version? -->
31+
<!-- ✍️--> Yes, the previous version in which this bug was not present was: ....
32+
33+
### Description
34+
35+
<!-- ✍️--> A clear and concise description of the problem...
36+
37+
## 🔬 Minimal Reproduction
38+
39+
<!--
40+
Simple steps to reproduce this bug.
41+
42+
Please include: commands run (including args), packages added, related code changes.
43+
44+
If reproduction steps are not enough for reproduction of your issue, please create a minimal GitHub repository with the reproduction of the issue.
45+
A good way to make a minimal reproduction is to create a new app via `ng new repro-app` and add the minimum possible code to show the problem.
46+
Share the link to the repo below along with step-by-step instructions to reproduce the problem, as well as expected and actual behavior.
47+
48+
Issues that don't have enough info and can't be reproduced will be closed.
49+
50+
You can read more about issue submission guidelines here: https://github.com/angular/universal/blob/main/CONTRIBUTING.md#-submitting-an-issue
51+
-->
52+
53+
## 🔥 Exception or Error
54+
55+
<pre><code>
56+
<!-- If the issue is accompanied by an exception or an error, please share it below: -->
57+
<!-- ✍️-->
58+
59+
</code></pre>
60+
61+
## 🌍 Your Environment
62+
63+
<pre><code>
64+
<!-- run `ng version` and paste output below -->
65+
<!-- ✍️-->
66+
67+
</code></pre>

‎.github/ISSUE_TEMPLATE/Feature_Request.md

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
---
2+
name: 🚀 Feature Request
3+
about: You have an idea that you'd like to be implemented in Angular Universal
4+
---
5+
6+
# 🚀 Feature request
7+
8+
#### What modules are relevant for this feature request?
9+
10+
<!-- ✍️edit: -->
11+
12+
- [ ] builders
13+
- [ ] common
14+
- [ ] express-engine
15+
16+
### Description
17+
18+
<!-- ✍️--> A clear and concise description of the problem or missing capability...
19+
20+
### Describe the solution you'd like
21+
22+
<!-- ✍️--> If you have a solution in mind, please describe it.
23+
24+
### Describe alternatives you've considered
25+
26+
<!-- ✍️--> Have you considered any alternative solutions or workarounds?

‎.github/ISSUE_TEMPLATE/Proposal.md

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
name: 🤔 Proposal
3+
about: You have a proposal for a change in Angular Universal
4+
---
5+
6+
# Proposal
7+
8+
#### What is the summary of the proposal?
9+
10+
#### What is the proposal?
11+
12+
#### Is there anything else we should know?

‎.github/PULL_REQUEST_TEMPLATE/Improvement.md

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
---
2+
name: ⚙ Improvement
3+
about: You have made an improvement to Angular Universal
4+
---
5+
6+
## PR Checklist
7+
8+
Please check if your PR fulfills the following requirements:
9+
10+
- [ ] The commit message follows our guidelines: https://github.com/angular/universal/blob/main/CONTRIBUTING.md#commit
11+
- [ ] Tests for the changes have been added (for bug fixes / features)
12+
- [ ] Docs have been added / updated (for bug fixes / features)
13+
14+
## PR Type: Bugfix
15+
16+
## What is the current behavior?
17+
18+
<!-- Please describe the current behavior that you are modifying, or link to a relevant issue. -->
19+
20+
Issue Number: N/A
21+
22+
## What is the new behavior?
23+
24+
## Does this PR introduce a breaking change?
25+
26+
```
27+
[ ] Yes
28+
[ ] No
29+
```
30+
31+
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->
32+
33+
## Other information

‎.github/PULL_REQUEST_TEMPLATE/New_Feature.md

+27
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
name: 🎉 New Feature
3+
about: You have implemented new functionality that you want to make part of Angular Universal
4+
---
5+
6+
## PR Checklist
7+
8+
Please check if your PR fulfills the following requirements:
9+
10+
- [ ] The commit message follows our guidelines: https://github.com/angular/universal/blob/main/CONTRIBUTING.md#commit
11+
- [ ] Tests for the changes have been added (for bug fixes / features)
12+
- [ ] Docs have been added / updated (for bug fixes / features)
13+
14+
## PR Type: New Feature
15+
16+
## What is the new behavior?
17+
18+
## Does this PR introduce a breaking change?
19+
20+
```
21+
[ ] Yes
22+
[ ] No
23+
```
24+
25+
<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->
26+
27+
## Other information

‎.github/workflows/dev-infra.yml

+8
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,21 @@ jobs:
1313
runs-on: ubuntu-latest
1414
steps:
1515
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
16+
<<<<<<< HEAD
1617
- 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
1721
with:
1822
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
1923
post_approval_changes:
2024
runs-on: ubuntu-latest
2125
steps:
2226
- uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
27+
<<<<<<< HEAD
2328
- 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
2432
with:
2533
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}

‎.github/workflows/scorecard.yml

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

1010
# Declare default permissions as read only.
11+
<<<<<<< HEAD
1112
permissions:
1213
contents: read
14+
=======
15+
permissions: read-all
16+
>>>>>>> universal/move-to-cli
1317

1418
jobs:
1519
analysis:
@@ -20,9 +24,14 @@ jobs:
2024
contents: read
2125
# Needed to upload the results to code-scanning dashboard.
2226
security-events: write
27+
<<<<<<< HEAD
2328
# Needed to publish results
2429
id-token: write
2530

31+
=======
32+
# Needed for signing and publishing of results for the badge.
33+
id-token: write
34+
>>>>>>> universal/move-to-cli
2635
steps:
2736
- name: 'Checkout code'
2837
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
@@ -34,6 +43,10 @@ jobs:
3443
with:
3544
results_file: results.sarif
3645
results_format: sarif
46+
<<<<<<< HEAD
47+
=======
48+
repo_token: ${{ secrets.GITHUB_TOKEN }}
49+
>>>>>>> universal/move-to-cli
3750
publish_results: true
3851

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

4760
# Upload the results to GitHub's code scanning dashboard.
4861
- name: 'Upload to code-scanning'
62+
<<<<<<< HEAD
4963
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
5067
with:
5168
sarif_file: results.sarif

0 commit comments

Comments
 (0)