Skip to content

Commit

Permalink
Merge pull request #1133 from angular/main
Browse files Browse the repository at this point in the history
Create a new pull request by comparing changes across two branches
  • Loading branch information
GulajavaMinistudio authored Nov 8, 2024
2 parents 5a5e31d + b0965a9 commit d200673
Show file tree
Hide file tree
Showing 24 changed files with 620 additions and 617 deletions.
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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
with:
persist-credentials: false
- uses: angular/dev-infra/github-actions/branch-manager@c8e09d00cfc4bcefbab8c06f144608cd67d16451
- uses: angular/dev-infra/github-actions/branch-manager@933dcd42f8837d6d6ce3a28419a760edb94f10e6
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
42 changes: 21 additions & 21 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Install node modules
run: yarn install --immutable
- name: Generate JSON schema types
Expand All @@ -42,11 +42,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/setup@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/configure-remote@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Install node modules
run: yarn install --immutable
- name: Build release targets
Expand All @@ -56,11 +56,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/setup@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/configure-remote@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Install node modules
run: yarn install --immutable
- name: Run module and package tests
Expand Down Expand Up @@ -90,13 +90,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/setup@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/configure-remote@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- 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 @@ -111,13 +111,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/setup@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/configure-remote@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Run CLI E2E tests
run: yarn bazel test --define=E2E_SHARD_TOTAL=3 --define=E2E_SHARD_INDEX=${{ matrix.shard }} --config=e2e //tests/legacy-cli:e2e.${{ matrix.subset }}_node${{ matrix.node }}

Expand All @@ -132,13 +132,13 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/setup@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/configure-remote@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- 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 @@ -149,13 +149,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@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/setup@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/configure-remote@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Run E2E Browser tests
env:
SAUCE_USERNAME: ${{ vars.SAUCE_USERNAME }}
Expand All @@ -182,11 +182,11 @@ jobs:
CIRCLE_BRANCH: ${{ github.ref_name }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/setup@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- 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@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: angular/dev-infra/github-actions/commit-message-based-labels@c8e09d00cfc4bcefbab8c06f144608cd67d16451
- uses: angular/dev-infra/github-actions/commit-message-based-labels@933dcd42f8837d6d6ce3a28419a760edb94f10e6
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
post_approval_changes:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- uses: angular/dev-infra/github-actions/post-approval-changes@c8e09d00cfc4bcefbab8c06f144608cd67d16451
- uses: angular/dev-infra/github-actions/post-approval-changes@933dcd42f8837d6d6ce3a28419a760edb94f10e6
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@c8e09d00cfc4bcefbab8c06f144608cd67d16451
- uses: angular/dev-infra/github-actions/feature-request@933dcd42f8837d6d6ce3a28419a760edb94f10e6
with:
angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
40 changes: 20 additions & 20 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup ESLint Caching
uses: actions/cache@6849a6489940f00c2f30c0fb92c6274307ccb58a # v4.1.2
with:
Expand All @@ -54,7 +54,7 @@ jobs:
- name: Run Validation
run: yarn admin validate
- name: Check Package Licenses
uses: angular/dev-infra/github-actions/linting/licenses@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/linting/licenses@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Check tooling setup
run: yarn check-tooling-setup
- name: Check commit message
Expand All @@ -70,11 +70,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/setup@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/configure-remote@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Install node modules
run: yarn install --immutable
- name: Build release targets
Expand All @@ -90,11 +90,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/setup@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/configure-remote@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Install node modules
run: yarn install --immutable
- name: Run module and package tests
Expand All @@ -111,27 +111,27 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/setup@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/configure-remote@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- 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 }}

e2e-windows-subset:
runs-on: windows-latest
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/setup@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/configure-remote@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Run CLI E2E tests
run: yarn bazel test --config=e2e //tests/legacy-cli:e2e_node22 --test_filter="tests/basic/{build,rebuild}.ts" --test_arg="--esbuild"

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

Expand All @@ -169,12 +169,12 @@ jobs:
runs-on: ${{ matrix.os }}
steps:
- name: Initialize environment
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Install node modules
run: yarn install --immutable
- name: Setup Bazel
uses: angular/dev-infra/github-actions/bazel/setup@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/setup@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- name: Setup Bazel RBE
uses: angular/dev-infra/github-actions/bazel/configure-remote@c8e09d00cfc4bcefbab8c06f144608cd67d16451
uses: angular/dev-infra/github-actions/bazel/configure-remote@933dcd42f8837d6d6ce3a28419a760edb94f10e6
- 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 }}
13 changes: 0 additions & 13 deletions .yarn/patches/rollup-license-plugin-npm-3.0.0-038e5f6edc.patch

This file was deleted.

8 changes: 5 additions & 3 deletions goldens/public-api/angular/ssr/node/index.api.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
```ts

import { ApplicationRef } from '@angular/core';
import type { Http2ServerRequest } from 'node:http2';
import type { Http2ServerResponse } from 'node:http2';
import type { IncomingMessage } from 'node:http';
import type { ServerResponse } from 'node:http';
import { StaticProvider } from '@angular/core';
import { Type } from '@angular/core';

// @public
export class AngularNodeAppEngine {
handle(request: IncomingMessage, requestContext?: unknown): Promise<Response | null>;
handle(request: IncomingMessage | Http2ServerRequest, requestContext?: unknown): Promise<Response | null>;
}

// @public
Expand Down Expand Up @@ -46,7 +48,7 @@ export interface CommonEngineRenderOptions {
export function createNodeRequestHandler<T extends NodeRequestHandlerFunction>(handler: T): T;

// @public
export function createWebRequestFromNodeRequest(nodeRequest: IncomingMessage): Request;
export function createWebRequestFromNodeRequest(nodeRequest: IncomingMessage | Http2ServerRequest): Request;

// @public
export function isMainModule(url: string): boolean;
Expand All @@ -55,7 +57,7 @@ export function isMainModule(url: string): boolean;
export type NodeRequestHandlerFunction = (req: IncomingMessage, res: ServerResponse, next: (err?: unknown) => void) => Promise<void> | void;

// @public
export function writeResponseToNodeResponse(source: Response, destination: ServerResponse): Promise<void>;
export function writeResponseToNodeResponse(source: Response, destination: ServerResponse | Http2ServerResponse<Http2ServerRequest>): Promise<void>;

// (No @packageDocumentation comment for this package)

Expand Down
Loading

0 comments on commit d200673

Please sign in to comment.