Skip to content

Commit a95e3a2

Browse files
Assorted updates to dependencies and build system in preparation for migration (angular#2214)
* build: update to use bazel 6.5.0 * build: update lockfile for pnpm * build: update bazel ts_version to match the version in package.json * build: update to bazel 7.6.0 * build: update lockfiles for pnpm * build: migrate to latest bazel dependencies and use module.bazel * build: merge all pnpm workspaces into single pnpm workspace * build: update to version 10 of pnpm * build: change from yarn to pnpm as the package manager for the repo * build: remove legacy build setup scripts from package.json * build: update to latest version of @angular/ng-dev and set up formatting * build: apply formatting to the repo now that its set up again * ci: use github actions for ci * build: update to latest @bazel/bazelisk Update to a later versin of @bazel/bazelisk that properly adheres to the .bazelversion file
1 parent dab7f98 commit a95e3a2

File tree

123 files changed

+10232
-28388
lines changed

Some content is hidden

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

123 files changed

+10232
-28388
lines changed

.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE2Njg3NjQwMg==

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

.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE4Nzc1MDcwNjU=

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

.aspect/rules/external_repository_action_cache/npm_translate_lock_LTE5NDc2NjEwNDI=

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

.aspect/rules/external_repository_action_cache/npm_translate_lock_LTIxMDU2NzY0MDI=

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

.bazelrc

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Release configuration
2-
build:release --workspace_status_command="yarn -s ng-dev release build-env-stamp --mode=release"
2+
build:release --workspace_status_command="pnpm --silent ng-dev release build-env-stamp --mode=release"
33
build:release --stamp
44

55
# ======================================================================================================================
@@ -27,6 +27,10 @@ test:debug --test_timeout=9999
2727
test:debug --nocache_test_results
2828
# ======================================================================================================================
2929

30+
# Required by `rules_ts`.
31+
common --@aspect_rules_ts//ts:skipLibCheck=always
32+
common --@aspect_rules_ts//ts:default_to_tsc_transpiler
33+
3034
###############################
3135
# Filesystem interactions #
3236
###############################
@@ -40,7 +44,7 @@ test --nolegacy_external_runfiles
4044
# in Bazel 0.21.0 but turned off again in 0.22.0. Follow
4145
# https://github.com/bazelbuild/bazel/issues/7026 for more details.
4246
# This flag is needed to so that the bazel cache is not invalidated
43-
# when running bazel via `yarn bazel`.
47+
# when running bazel via `bazel`.
4448
# See https://github.com/angular/angular/issues/27514.
4549
build --incompatible_strict_action_env
4650
run --incompatible_strict_action_env

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
5.2.0
1+
7.6.0

.circleci/config.yml

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

.github/workflows/ci.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
name: CI
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
pull_request:
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
permissions: {}
14+
15+
defaults:
16+
run:
17+
shell: bash
18+
19+
20+
jobs:
21+
lint:
22+
runs-on: ubuntu-latest
23+
steps:
24+
- name: Initialize environment
25+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@4b4659eabe75a67cebf4692c3c88a98275c67200
26+
- name: Install node modules
27+
run: pnpm install --frozen-lockfile
28+
- name: Check Formatting
29+
run: pnpm format --check
30+
- name: Check Lint
31+
run: |
32+
pnpm tslint --project client/tsconfig.json
33+
pnpm tslint --project server/tsconfig.json
34+
pnpm tslint --project server/src/tests/tsconfig.json
35+
pnpm tslint --project syntaxes/tsconfig.json
36+
test:
37+
runs-on: ubuntu-latest
38+
steps:
39+
- name: Initialize environment
40+
uses: angular/dev-infra/github-actions/npm/checkout-and-setup-node@4b4659eabe75a67cebf4692c3c88a98275c67200
41+
- name: Install node modules
42+
run: pnpm install --frozen-lockfile
43+
- name: Ensure Build
44+
run: pnpm bazel build //:npm --config=release
45+
- name: Run Tests
46+
run: pnpm bazel test //...

.github/workflows/node.js.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,10 @@ jobs:
2121
uses: actions/setup-node@v2
2222
with:
2323
node-version: 14.x
24-
- run: yarn install
25-
- run: yarn install --cwd integration/project
24+
- run: pnpm install
2625
- run: cd integration/project
27-
- run: scripts/build.sh package.json
28-
- run: xvfb-run -a yarn run test:e2e
26+
- run: pnpm bazel build //:npm --config=release
27+
- run: xvfb-run -a pnpm run test:e2e
2928
if: runner.os == 'Linux'
30-
- run: yarn run test:e2e
29+
- run: pnpm run test:e2e
3130
if: runner.os != 'Linux'

.ng-dev/format.mts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import {FormatConfig} from '@angular/dev-infra-private/ng-dev';
1+
import {FormatConfig} from '@angular/ng-dev';
22

33
/**
44
* Configuration for the `ng-dev format` command.
55
*/
66
export const format: FormatConfig = {
7-
'clang-format': {
7+
'prettier': {
88
'matchers': [
99
'**/*.{js,ts}',
1010
],

0 commit comments

Comments
 (0)