Skip to content

Commit 4e3c6e6

Browse files
benpsnyderbenpsnyder
authored
build: update to Nx 19.5.3 and Angular 18.2.x (#1348)
1 parent 9345c1b commit 4e3c6e6

File tree

15 files changed

+5589
-4370
lines changed

15 files changed

+5589
-4370
lines changed

‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
env:
1111
DOCS_APP_ARTIFACT_NAME: docs-app
1212
DOCS_APP_PATH: dist/apps/docs-app/
13-
NODE_OPTIONS: --max-old-space-size=6144
13+
NODE_OPTIONS: --max-old-space-size=16384
1414
VITE_ANALOG_PUBLIC_BASE_URL: ${{ vars.VITE_ANALOG_PUBLIC_BASE_URL || 'http://localhost:3000' }}
1515
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}
1616

‎.node-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
18.19.1
1+
22.8.0

‎.npmrc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
node-options=--max-old-space-size=16384

‎apps/analog-app-e2e-cypress/src/e2e/app.cy.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ describe('My Store', () => {
77
app.getTitle().contains(/my store/i);
88
});
99

10-
it(`Given the user has navigated an invalid page then the page not found title is visible`, () => {
10+
it('Given the user has navigated an invalid page then the page not found title is visible', () => {
1111
cy.visit('/bad');
1212
app.get404Title().contains(/page not found/i);
1313
});
1414

15-
it(`Given the user has navigated an invalid nested page then the page not found title is visible`, () => {
15+
it('Given the user has navigated an invalid nested page then the page not found title is visible', () => {
1616
cy.visit('/shipping/bad');
1717
app.getNested404Title().contains(/shipping page not found/i);
1818
});

‎apps/analog-app/src/app/cart.service.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Injectable } from '@angular/core';
22
import { HttpClient } from '@angular/common/http';
3-
import { Product } from './products';
3+
import type { Product } from './products';
44

55
@Injectable({
66
providedIn: 'root',
@@ -25,7 +25,7 @@ export class CartService {
2525

2626
getShippingPrices() {
2727
return this.http.get<{ type: string; price: number }[]>(
28-
`/assets/shipping.json`
28+
'/assets/shipping.json'
2929
);
3030
}
3131
}

‎apps/analog-app/src/main.server.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { enableProdMode } from '@angular/core';
33
import { bootstrapApplication } from '@angular/platform-browser';
44
import { renderApplication } from '@angular/platform-server';
55
import { provideServerContext } from '@analogjs/router/server';
6-
import { ServerContext } from '@analogjs/router/tokens';
6+
import type { ServerContext } from '@analogjs/router/tokens';
77

88
import { config } from './app/app.config.server';
99
import { AppComponent } from './app/app.component';

‎apps/docs-app/docusaurus.config.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ themes.nightOwl['plain'].backgroundColor = '#0a1429';
66
const organizationName = 'analogjs';
77
const projectName = 'analog';
88
const title = 'Analog';
9-
const url = `https://analogjs.org`;
9+
const url = 'https://analogjs.org';
1010

1111
/** @type {import('@docusaurus/types').Config} */
1212
const config = {
@@ -166,7 +166,7 @@ const config = {
166166
position: 'right',
167167
},
168168
{
169-
href: `https://chat.analogjs.org`,
169+
href: 'https://chat.analogjs.org',
170170
label: 'Discord',
171171
position: 'right',
172172
},

‎apps/docs-app/package.json

+11-11
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@
1111
"typecheck": "tsc"
1212
},
1313
"dependencies": {
14-
"@docusaurus/core": "3.4.0",
15-
"@docusaurus/preset-classic": "3.4.0",
16-
"@mdx-js/react": "^3.0.0",
17-
"clsx": "^2.0.0",
18-
"prism-react-renderer": "^2.3.0",
19-
"react": "^18.0.0",
20-
"react-dom": "^18.0.0"
14+
"@docusaurus/core": "3.5.2",
15+
"@docusaurus/preset-classic": "3.5.2",
16+
"@mdx-js/react": "^3.0.1",
17+
"clsx": "^2.1.1",
18+
"prism-react-renderer": "^2.4.0",
19+
"react": "^18.3.1",
20+
"react-dom": "^18.3.1"
2121
},
2222
"devDependencies": {
23-
"@docusaurus/module-type-aliases": "3.4.0",
24-
"@docusaurus/tsconfig": "3.4.0",
25-
"@docusaurus/types": "3.4.0",
26-
"typescript": "~5.2.2"
23+
"@docusaurus/module-type-aliases": "3.5.2",
24+
"@docusaurus/tsconfig": "3.5.2",
25+
"@docusaurus/types": "3.5.2",
26+
"typescript": "~5.5.4"
2727
},
2828
"browserslist": {
2929
"production": [

‎libs/card/vite.config.ts

+6
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@ export default defineConfig(({ mode }) => {
1717
cache: {
1818
dir: `../../node_modules/.vitest`,
1919
},
20+
deps: {
21+
inline: ['@analogjs/vitest-angular', 'zone.js'],
22+
},
2023
},
2124
define: {
2225
'import.meta.vitest': mode !== 'production',
2326
},
27+
ssr: {
28+
noExternal: ['@analogjs/vitest-angular', 'zone.js'],
29+
},
2430
};
2531
});

‎package.json

+48-48
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
"build:test": "nx build ng-app --skip-nx-cache"
2222
},
2323
"engines": {
24-
"node": "^18.13.0 || ^20.0.0",
24+
"node": "^18.13.0 || ^20.0.0 || ^22.0.0",
2525
"pnpm": "^9.0.0"
2626
},
27-
"packageManager": "pnpm@9.3.0",
27+
"packageManager": "pnpm@9.10.0",
2828
"keywords": [
2929
"vite-plugin",
3030
"angular",
@@ -41,23 +41,23 @@
4141
},
4242
"private": true,
4343
"dependencies": {
44-
"@angular/animations": "^18.0.0",
45-
"@angular/cdk": "^18.0.0",
46-
"@angular/common": "^18.0.0",
47-
"@angular/compiler": "^18.0.0",
48-
"@angular/core": "^18.0.0",
49-
"@angular/forms": "^18.0.0",
50-
"@angular/material": "^18.0.0",
51-
"@angular/platform-browser": "^18.0.0",
52-
"@angular/platform-browser-dynamic": "^18.0.0",
53-
"@angular/platform-server": "^18.0.0",
54-
"@angular/router": "^18.0.0",
44+
"@angular/animations": "^18.2.4",
45+
"@angular/cdk": "^18.2.4",
46+
"@angular/common": "^18.2.4",
47+
"@angular/compiler": "^18.2.4",
48+
"@angular/core": "^18.2.4",
49+
"@angular/forms": "^18.2.4",
50+
"@angular/material": "^18.2.4",
51+
"@angular/platform-browser": "^18.2.4",
52+
"@angular/platform-browser-dynamic": "^18.2.4",
53+
"@angular/platform-server": "^18.2.4",
54+
"@angular/router": "^18.2.4",
5555
"@astrojs/mdx": "^3.0.1",
5656
"@astrojs/react": "^3.0.0",
5757
"@babel/core": "^7.21.8",
5858
"@mdx-js/react": "3.0.1",
59-
"@nx/angular": "19.2.3",
60-
"@nx/devkit": "19.2.3",
59+
"@nx/angular": "19.5.3",
60+
"@nx/devkit": "19.5.3",
6161
"@trpc/client": "^10.25.0",
6262
"@trpc/server": "^10.25.0",
6363
"ajv-formats": "^2.1.1",
@@ -68,42 +68,42 @@
6868
"marked-gfm-heading-id": "^3.1.0",
6969
"marked-highlight": "^2.0.1",
7070
"mermaid": "^10.2.4",
71-
"react": "^18.2.0",
72-
"react-dom": "^18.0.0",
73-
"rxjs": "7.8.0",
74-
"semver": "^7.5.1",
71+
"react": "^18.3.1",
72+
"react-dom": "^18.3.1",
73+
"rxjs": "7.8.1",
74+
"semver": "^7.6.3",
7575
"superjson": "^2.2.1",
76-
"tslib": "^2.4.0",
77-
"ufo": "^1.1.2",
76+
"tslib": "^2.7.0",
77+
"ufo": "^1.5.4",
7878
"xhr2": "^0.2.1",
79-
"zod": "^3.21.4",
80-
"zone.js": "^0.14.8"
79+
"zod": "^3.23.8",
80+
"zone.js": "^0.14.10"
8181
},
8282
"devDependencies": {
83-
"@angular-devkit/architect": "^0.1800.0",
84-
"@angular-devkit/build-angular": "^18.0.0",
85-
"@angular-devkit/core": "^18.0.0",
86-
"@angular-devkit/schematics": "^18.0.0",
87-
"@angular-eslint/eslint-plugin": "18.0.1",
88-
"@angular-eslint/eslint-plugin-template": "18.0.1",
89-
"@angular-eslint/template-parser": "18.0.1",
90-
"@angular/build": "^18.0.3",
91-
"@angular/cli": "~18.0.0",
92-
"@angular/compiler-cli": "^18.0.0",
93-
"@angular/language-service": "^18.0.0",
83+
"@angular-devkit/architect": "^0.1802.4",
84+
"@angular-devkit/build-angular": "^18.2.4",
85+
"@angular-devkit/core": "^18.2.4",
86+
"@angular-devkit/schematics": "^18.2.4",
87+
"@angular-eslint/eslint-plugin": "18.3.1",
88+
"@angular-eslint/eslint-plugin-template": "18.3.1",
89+
"@angular-eslint/template-parser": "18.3.1",
90+
"@angular/build": "^18.2.4",
91+
"@angular/cli": "~18.2.4",
92+
"@angular/compiler-cli": "^18.2.4",
93+
"@angular/language-service": "^18.2.4",
9494
"@astrojs/markdown-component": "^1.0.5",
9595
"@commitlint/cli": "^17.4.2",
9696
"@commitlint/config-conventional": "^17.4.2",
9797
"@netlify/functions": "^2.3.0",
98-
"@nx/cypress": "19.2.3",
99-
"@nx/eslint": "19.2.3",
100-
"@nx/eslint-plugin": "19.2.3",
101-
"@nx/jest": "19.2.3",
102-
"@nx/js": "19.2.3",
103-
"@nx/plugin": "19.2.3",
104-
"@nx/vite": "19.2.3",
105-
"@nx/web": "19.2.3",
106-
"@schematics/angular": "^18.0.0",
98+
"@nx/cypress": "19.5.3",
99+
"@nx/eslint": "19.5.3",
100+
"@nx/eslint-plugin": "19.5.3",
101+
"@nx/jest": "19.5.3",
102+
"@nx/js": "19.5.3",
103+
"@nx/plugin": "19.5.3",
104+
"@nx/vite": "19.5.3",
105+
"@nx/web": "19.5.3",
106+
"@schematics/angular": "^18.2.4",
107107
"@semantic-release/changelog": "^6.0.3",
108108
"@semantic-release/exec": "^6.0.3",
109109
"@semantic-release/git": "^10.0.1",
@@ -128,11 +128,11 @@
128128
"conventional-changelog": "^3.1.25",
129129
"conventional-changelog-cli": "^2.2.2",
130130
"cpy-cli": "^4.2.0",
131-
"cypress": "13.9.0",
131+
"cypress": "13.14.2",
132132
"esbuild": "0.19.5",
133133
"eslint": "8.57.0",
134134
"eslint-config-prettier": "9.0.0",
135-
"eslint-plugin-cypress": "2.14.0",
135+
"eslint-plugin-cypress": "3.5.0",
136136
"execa": "^7.1.1",
137137
"fast-glob": "^3.2.12",
138138
"fs-extra": "^11.1.1",
@@ -147,9 +147,9 @@
147147
"marked-mangle": "^1.1.7",
148148
"marked-shiki": "^1.1.0",
149149
"minimist": "^1.2.7",
150-
"ng-packagr": "^18.0.0",
151-
"nitropack": "^2.9.0",
152-
"nx": "19.2.3",
150+
"ng-packagr": "^18.2.1",
151+
"nitropack": "^2.9.7",
152+
"nx": "19.5.3",
153153
"playwright": "^1.30.0",
154154
"postcss": "^8.4.21",
155155
"postcss-import": "~15.1.0",

‎packages/astro-angular/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"targets": {
88
"build": {
99
"executor": "@nx/js:tsc",
10-
"outputs": ["{workspaceRoot}/{options.outputPath}"],
10+
1111
"options": {
1212
"outputPath": "node_modules/@analogjs/astro-angular",
1313
"main": "packages/astro-angular/src/index.ts",

‎packages/nx-plugin/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"targets": {
88
"build": {
99
"executor": "@nx/js:tsc",
10-
"outputs": ["{workspaceRoot}/{options.outputPath}"],
10+
1111
"options": {
1212
"outputPath": "node_modules/@analogjs/platform/src/lib/nx-plugin",
1313
"main": "packages/nx-plugin/src/index.ts",

‎packages/vite-plugin-angular/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"targets": {
88
"build": {
99
"executor": "@nx/js:tsc",
10-
"outputs": ["{workspaceRoot}/{options.outputPath}"],
10+
1111
"options": {
1212
"outputPath": "node_modules/@analogjs/vite-plugin-angular",
1313
"main": "packages/vite-plugin-angular/src/index.ts",

‎packages/vite-plugin-nitro/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"targets": {
88
"build": {
99
"executor": "@nx/js:tsc",
10-
"outputs": ["{workspaceRoot}/{options.outputPath}"],
10+
1111
"options": {
1212
"outputPath": "node_modules/@analogjs/vite-plugin-nitro",
1313
"main": "packages/vite-plugin-nitro/src/index.ts",

0 commit comments

Comments
 (0)