Skip to content

Commit a4fe589

Browse files
authored
Angular 19 (#1318)
* Bump yarn to 4.9.2 * Use npm * More npm * ng update @angular/core@19 @angular/cli@19 * Fixes * accept node 20 * ng update @angular/material@19 * ng update @angular/core@20 @angular/cli@20 * ng update @angular/material@20 * Bump linter versions * Bump expected node version * Bump nvmrc version
1 parent a597780 commit a4fe589

File tree

16 files changed

+17603
-12187
lines changed

16 files changed

+17603
-12187
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ jobs:
1010
- uses: actions/checkout@v4
1111
- uses: actions/setup-node@v4
1212
with:
13-
node-version: '20'
14-
cache: 'yarn'
13+
node-version: '24'
14+
cache: 'npm'
1515

1616
- name: Install dependencies
17-
run: yarn
17+
run: npm i
1818

1919
- name: Store Playwright's Version
2020
run: |
@@ -29,10 +29,10 @@ jobs:
2929
path: ~/.cache/ms-playwright
3030
key: playwright-browsers-${{ env.PLAYWRIGHT_VERSION }}
3131

32-
- run: yarn playwright install
32+
- run: npm playwright install
3333
if: steps.cache-playwright-browsers.outputs.cache-hit != 'true'
3434

3535
- name: Lint and Test
3636
run: |
37-
yarn lint
38-
yarn e2e
37+
npm run lint
38+
npm run e2e

.gitignore

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
# Node
1010
/node_modules
1111
npm-debug.log
12-
yarn-error.log
1312

1413
# IDEs and editors
1514
.idea/
@@ -40,12 +39,3 @@ testem.log
4039
# System files
4140
.DS_Store
4241
Thumbs.db
43-
44-
# from https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored
45-
.pnp.*
46-
.yarn/*
47-
!.yarn/patches
48-
!.yarn/plugins
49-
!.yarn/releases
50-
!.yarn/sdks
51-
!.yarn/versions

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v20.17.0
1+
24

.yarn/releases/yarn-4.4.1.cjs

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

.yarnrc.yml

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

README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,10 @@ This is a web page for displaying the order of comics in the Uncanny X-Men serie
66

77
## Developer notes
88

9-
To run it locally, you need to have `yarn` installed. See instructions for installing it at https://yarnpkg.com/en/docs/install
10-
You can then install the dependencies by running `yarn`, then launch the server locally with `yarn dev`. It will open itself in your default web browser.
9+
You can install the dependencies by running `npm i`, then launch the server locally with `npm dev`. It will open itself in your default web browser.
1110

12-
Each push will trigger a Travis build which will run ESLint and stylelint. If either of them report errors, any Pull Request related to the branch will be prevented from being merged. A Heroku Review App is created for each Pull Request. To check linting run `yarn lint`.
11+
Each push will trigger a Travis build which will run ESLint and stylelint. If either of them report errors, any Pull Request related to the branch will be prevented from being merged. A Heroku Review App is created for each Pull Request. To check linting run `npm lint`.
1312

14-
To run tests locally run `yarn e2e`
13+
To run tests locally run `npm e2e`
1514

1615
There is a garbage collection functionality built-in to check the database for orphans. It can be run by adding `gc=1` to the URL, e.g. `http://localhost:4200/?gc=1` and looking in the browser console.

angular.json

Lines changed: 36 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,16 @@
1515
"prefix": "app",
1616
"architect": {
1717
"build": {
18-
"builder": "@angular-devkit/build-angular:browser",
18+
"builder": "@angular-devkit/build-angular:application",
1919
"options": {
20-
"outputPath": "dist/timeline-tools",
20+
"outputPath": {
21+
"base": "dist/timeline-tools"
22+
},
2123
"index": "src/index.html",
2224
"inlineStyleLanguage": "scss",
23-
"main": "src/main.ts",
24-
"polyfills": "src/polyfills.ts",
25+
"polyfills": [
26+
"src/polyfills.ts"
27+
],
2528
"tsConfig": "tsconfig.app.json",
2629
"assets": [
2730
"src/favicon.ico",
@@ -35,12 +38,11 @@
3538
"allowedCommonJsDependencies": [
3639
"jquery"
3740
],
38-
"vendorChunk": true,
3941
"extractLicenses": false,
40-
"buildOptimizer": false,
4142
"sourceMap": true,
4243
"optimization": false,
43-
"namedChunks": true
44+
"namedChunks": true,
45+
"browser": "src/main.ts"
4446
},
4547
"configurations": {
4648
"production": {
@@ -55,8 +57,6 @@
5557
"sourceMap": false,
5658
"namedChunks": false,
5759
"extractLicenses": true,
58-
"vendorChunk": false,
59-
"buildOptimizer": true,
6060
"budgets": [
6161
{
6262
"type": "initial",
@@ -140,10 +140,36 @@
140140
}
141141
},
142142
"cli": {
143-
"packageManager": "yarn",
143+
"packageManager": "npm",
144144
"analytics": "4548fde3-7ce7-43ba-8fd4-4cc0bf8c4630",
145145
"schematicCollections": [
146146
"@angular-eslint/schematics"
147147
]
148+
},
149+
"schematics": {
150+
"@schematics/angular:component": {
151+
"type": "component"
152+
},
153+
"@schematics/angular:directive": {
154+
"type": "directive"
155+
},
156+
"@schematics/angular:service": {
157+
"type": "service"
158+
},
159+
"@schematics/angular:guard": {
160+
"typeSeparator": "."
161+
},
162+
"@schematics/angular:interceptor": {
163+
"typeSeparator": "."
164+
},
165+
"@schematics/angular:module": {
166+
"typeSeparator": "."
167+
},
168+
"@schematics/angular:pipe": {
169+
"typeSeparator": "."
170+
},
171+
"@schematics/angular:resolver": {
172+
"typeSeparator": "."
173+
}
148174
}
149175
}

0 commit comments

Comments
 (0)