Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Create a new pull request by comparing changes across two branches #873

Merged
merged 7 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/assistant-to-the-branch-manager.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
with:
persist-credentials: false
- uses: angular/dev-infra/github-actions/branch-manager@2e34229a11f8e47f2905ea5b077369e6d0456f81
- uses: angular/dev-infra/github-actions/branch-manager@b18378deb8556573a8dc7f841415260bccfba878
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
36 changes: 18 additions & 18 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b18378deb8556573a8dc7f841415260bccfba878
- name: Setup ESLint Caching
uses: actions/cache@13aacd865c20de90d75de3b17ebe84f7a17d57d2 # v4.0.0
with:
Expand Down Expand Up @@ -75,11 +75,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b18378deb8556573a8dc7f841415260bccfba878
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/bazel/setup@b18378deb8556573a8dc7f841415260bccfba878
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/bazel/configure-remote@b18378deb8556573a8dc7f841415260bccfba878
- name: Install node modules
run: yarn install --frozen-lockfile
- name: Build release targets
Expand All @@ -96,11 +96,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b18378deb8556573a8dc7f841415260bccfba878
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/bazel/setup@b18378deb8556573a8dc7f841415260bccfba878
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/bazel/configure-remote@b18378deb8556573a8dc7f841415260bccfba878
- name: Install node modules
run: yarn install --frozen-lockfile
- name: Run tests
Expand Down Expand Up @@ -128,13 +128,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b18378deb8556573a8dc7f841415260bccfba878
- name: Install node modules
run: yarn install --frozen-lockfile
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/bazel/setup@b18378deb8556573a8dc7f841415260bccfba878
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/bazel/configure-remote@b18378deb8556573a8dc7f841415260bccfba878
- name: Run CLI E2E tests
run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}

Expand All @@ -151,13 +151,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b18378deb8556573a8dc7f841415260bccfba878
- name: Install node modules
run: yarn install --frozen-lockfile
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/bazel/setup@b18378deb8556573a8dc7f841415260bccfba878
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/bazel/configure-remote@b18378deb8556573a8dc7f841415260bccfba878
- name: Run CLI E2E tests
run: yarn bazel test --define=E2E_SHARD_TOTAL=6 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.snapshots.${{ matrix.subset }}_node${{ matrix.node }}

Expand All @@ -169,13 +169,13 @@ jobs:
SAUCE_TUNNEL_IDENTIFIER: angular-cli-${{ github.workflow }}-${{ github.run_number }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b18378deb8556573a8dc7f841415260bccfba878
- name: Install node modules
run: yarn install --frozen-lockfile
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/bazel/setup@b18378deb8556573a8dc7f841415260bccfba878
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/bazel/configure-remote@b18378deb8556573a8dc7f841415260bccfba878
- name: Run E2E Browser tests
env:
SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }}
Expand Down Expand Up @@ -203,11 +203,11 @@ jobs:
CIRCLE_BRANCH: ${{ github.ref_name }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@b18378deb8556573a8dc7f841415260bccfba878
- name: Install node modules
run: yarn install --frozen-lockfile
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@2e34229a11f8e47f2905ea5b077369e6d0456f81
uses: angular/dev-infra/github-actions/bazel/setup@b18378deb8556573a8dc7f841415260bccfba878
- run: yarn admin snapshots --verbose
env:
SNAPSHOT_BUILDS_GITHUB_TOKEN: ${{ secrets.SNAPSHOT_BUILDS_GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/dev-infra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: angular/dev-infra/github-actions/commit-message-based-labels@2e34229a11f8e47f2905ea5b077369e6d0456f81
- uses: angular/dev-infra/github-actions/commit-message-based-labels@b18378deb8556573a8dc7f841415260bccfba878
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
post_approval_changes:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
- uses: angular/dev-infra/github-actions/post-approval-changes@2e34229a11f8e47f2905ea5b077369e6d0456f81
- uses: angular/dev-infra/github-actions/post-approval-changes@b18378deb8556573a8dc7f841415260bccfba878
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
2 changes: 1 addition & 1 deletion .github/workflows/feature-requests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
if: github.repository == 'angular/angular-cli'
runs-on: ubuntu-latest
steps:
- uses: angular/dev-infra/github-actions/feature-request@2e34229a11f8e47f2905ea5b077369e6d0456f81
- uses: angular/dev-infra/github-actions/feature-request@b18378deb8556573a8dc7f841415260bccfba878
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
<a name="17.2.2"></a>

# 17.2.2 (2024-02-28)

### @angular-devkit/build-angular

| Commit | Type | Description |
| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------------------- |
| [3394d3cf1](https://github.com/angular/angular-cli/commit/3394d3cf10996a93777edfb28d83cf4eb85ae40b) | fix | ensure all related stylesheets are rebuilt when an import changes |

<!-- CHANGELOG SPLIT MARKER -->

<a name="17.2.1"></a>

# 17.2.1 (2024-02-22)
Expand Down
50 changes: 25 additions & 25 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,32 +59,32 @@
},
"devDependencies": {
"@ampproject/remapping": "2.2.1",
"@angular/animations": "17.2.2",
"@angular/bazel": "https://github.com/angular/bazel-builds.git#70bda667b512e345318b00b567ff9cbad8e43028",
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#09890f7373db505241b45ecc8191b0a10b41c582",
"@angular/cdk": "17.2.1",
"@angular/common": "17.2.2",
"@angular/compiler": "17.2.2",
"@angular/compiler-cli": "17.2.2",
"@angular/core": "17.2.2",
"@angular/forms": "17.2.2",
"@angular/localize": "17.2.2",
"@angular/material": "17.2.1",
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#3f48b250482b1d7c1cc1d1b69ed80f3e5ceef916",
"@angular/platform-browser": "17.2.2",
"@angular/platform-browser-dynamic": "17.2.2",
"@angular/platform-server": "17.2.2",
"@angular/router": "17.2.2",
"@angular/service-worker": "17.2.2",
"@babel/core": "7.23.9",
"@angular/animations": "17.3.0-next.1",
"@angular/bazel": "https://github.com/angular/bazel-builds.git#e36a576fefef45f31fc486d6362bac289fde7db8",
"@angular/build-tooling": "https://github.com/angular/dev-infra-private-build-tooling-builds.git#1865c54b126a5d4cae5c254cf08056e57d5c8c14",
"@angular/cdk": "17.3.0-next.0",
"@angular/common": "17.3.0-next.1",
"@angular/compiler": "17.3.0-next.1",
"@angular/compiler-cli": "17.3.0-next.1",
"@angular/core": "17.3.0-next.1",
"@angular/forms": "17.3.0-next.1",
"@angular/localize": "17.3.0-next.1",
"@angular/material": "17.3.0-next.0",
"@angular/ng-dev": "https://github.com/angular/dev-infra-private-ng-dev-builds.git#0126481d9074759b2d1c5be77f8a3c87e5c3c1e4",
"@angular/platform-browser": "17.3.0-next.1",
"@angular/platform-browser-dynamic": "17.3.0-next.1",
"@angular/platform-server": "17.3.0-next.1",
"@angular/router": "17.3.0-next.1",
"@angular/service-worker": "17.3.0-next.1",
"@babel/core": "7.24.0",
"@babel/generator": "7.23.6",
"@babel/helper-annotate-as-pure": "7.22.5",
"@babel/helper-split-export-declaration": "7.22.6",
"@babel/plugin-transform-async-generator-functions": "7.23.9",
"@babel/plugin-transform-async-to-generator": "7.23.3",
"@babel/plugin-transform-runtime": "7.23.9",
"@babel/preset-env": "7.23.9",
"@babel/runtime": "7.23.9",
"@babel/plugin-transform-runtime": "7.24.0",
"@babel/preset-env": "7.24.0",
"@babel/runtime": "7.24.0",
"@bazel/bazelisk": "1.19.0",
"@bazel/buildifier": "6.4.0",
"@bazel/concatjs": "5.8.1",
Expand Down Expand Up @@ -168,7 +168,7 @@
"license-webpack-plugin": "4.0.2",
"loader-utils": "3.2.1",
"magic-string": "0.30.7",
"mini-css-extract-plugin": "2.8.0",
"mini-css-extract-plugin": "2.8.1",
"mrmime": "2.0.0",
"ng-packagr": "17.2.0",
"npm": "^8.11.0",
Expand All @@ -179,10 +179,10 @@
"parse5-html-rewriting-stream": "7.0.0",
"patch-package": "^7.0.1",
"picomatch": "4.0.1",
"piscina": "4.3.2",
"piscina": "4.4.0",
"popper.js": "^1.14.1",
"postcss": "8.4.35",
"postcss-loader": "8.1.0",
"postcss-loader": "8.1.1",
"prettier": "^3.0.0",
"protractor": "~7.0.0",
"puppeteer": "18.2.1",
Expand All @@ -206,7 +206,7 @@
"tree-kill": "1.2.2",
"ts-node": "^10.9.1",
"tslib": "2.6.2",
"typescript": "5.3.3",
"typescript": "5.4.1-rc",
"undici": "6.6.2",
"verdaccio": "5.29.2",
"verdaccio-auth-memory": "^10.0.0",
Expand Down
16 changes: 8 additions & 8 deletions packages/angular_devkit/build_angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@
"@angular-devkit/architect": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
"@angular-devkit/build-webpack": "0.0.0-EXPERIMENTAL-PLACEHOLDER",
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
"@babel/core": "7.23.9",
"@babel/core": "7.24.0",
"@babel/generator": "7.23.6",
"@babel/helper-annotate-as-pure": "7.22.5",
"@babel/helper-split-export-declaration": "7.22.6",
"@babel/plugin-transform-async-generator-functions": "7.23.9",
"@babel/plugin-transform-async-to-generator": "7.23.3",
"@babel/plugin-transform-runtime": "7.23.9",
"@babel/preset-env": "7.23.9",
"@babel/runtime": "7.23.9",
"@babel/plugin-transform-runtime": "7.24.0",
"@babel/preset-env": "7.24.0",
"@babel/runtime": "7.24.0",
"@discoveryjs/json-ext": "0.5.7",
"@ngtools/webpack": "0.0.0-PLACEHOLDER",
"@vitejs/plugin-basic-ssl": "1.1.0",
Expand All @@ -42,15 +42,15 @@
"license-webpack-plugin": "4.0.2",
"loader-utils": "3.2.1",
"magic-string": "0.30.7",
"mini-css-extract-plugin": "2.8.0",
"mini-css-extract-plugin": "2.8.1",
"mrmime": "2.0.0",
"open": "8.4.2",
"ora": "5.4.1",
"parse5-html-rewriting-stream": "7.0.0",
"picomatch": "4.0.1",
"piscina": "4.3.2",
"piscina": "4.4.0",
"postcss": "8.4.35",
"postcss-loader": "8.1.0",
"postcss-loader": "8.1.1",
"resolve-url-loader": "5.0.0",
"rxjs": "7.8.1",
"sass": "1.71.1",
Expand Down Expand Up @@ -86,7 +86,7 @@
"ng-packagr": "^17.0.0 || ^17.2.0-next.0",
"protractor": "^7.0.0",
"tailwindcss": "^2.0.0 || ^3.0.0",
"typescript": ">=5.2 <5.4"
"typescript": ">=5.2 <5.5"
},
"peerDependenciesMeta": {
"@angular/localize": {
Expand Down
8 changes: 4 additions & 4 deletions packages/ngtools/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
"dependencies": {},
"peerDependencies": {
"@angular/compiler-cli": "^17.0.0 || ^17.2.0-next.0",
"typescript": ">=5.2 <5.4",
"typescript": ">=5.2 <5.5",
"webpack": "^5.54.0"
},
"devDependencies": {
"@angular-devkit/core": "0.0.0-PLACEHOLDER",
"@angular/compiler": "17.2.2",
"@angular/compiler-cli": "17.2.2",
"typescript": "5.3.3",
"@angular/compiler": "17.2.3",
"@angular/compiler-cli": "17.2.3",
"typescript": "5.4.1-rc",
"webpack": "5.90.3"
}
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
load("//tools:defaults.bzl", "ts_library")

# files fetched on 2023-11-22 from
# https://github.com/microsoft/TypeScript/releases/tag/v5.2.3
# files fetched on 2024-02-28 from
# https://github.com/microsoft/TypeScript/releases/tag/v5.4-rc

# Commands to download:
# curl https://raw.githubusercontent.com/microsoft/TypeScript/v5.3.2/lib/typescript.d.ts -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
# curl https://raw.githubusercontent.com/microsoft/TypeScript/v5.3.2/lib/typescript.js -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
# curl https://raw.githubusercontent.com/microsoft/TypeScript/v5.4-rc/lib/typescript.d.ts -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.d.ts
# curl https://raw.githubusercontent.com/microsoft/TypeScript/v5.4-rc/lib/typescript.js -o packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js

licenses(["notice"]) # Apache 2.0

Expand Down
Loading
Loading