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

chore: update to Nx 19.5.3 and Angular 18.2.x #1348

Merged
merged 1 commit into from
Sep 17, 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/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
env:
DOCS_APP_ARTIFACT_NAME: docs-app
DOCS_APP_PATH: dist/apps/docs-app/
NODE_OPTIONS: --max-old-space-size=6144
NODE_OPTIONS: --max-old-space-size=16384
VITE_ANALOG_PUBLIC_BASE_URL: ${{ vars.VITE_ANALOG_PUBLIC_BASE_URL || 'http://localhost:3000' }}
NX_CLOUD_ACCESS_TOKEN: ${{ secrets.NX_CLOUD_ACCESS_TOKEN }}

Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18.19.1
22.8.0
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node-options=--max-old-space-size=16384
4 changes: 2 additions & 2 deletions apps/analog-app-e2e-cypress/src/e2e/app.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@ describe('My Store', () => {
app.getTitle().contains(/my store/i);
});

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

it(`Given the user has navigated an invalid nested page then the page not found title is visible`, () => {
it('Given the user has navigated an invalid nested page then the page not found title is visible', () => {
cy.visit('/shipping/bad');
app.getNested404Title().contains(/shipping page not found/i);
});
Expand Down
4 changes: 2 additions & 2 deletions apps/analog-app/src/app/cart.service.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Product } from './products';
import type { Product } from './products';

@Injectable({
providedIn: 'root',
Expand All @@ -25,7 +25,7 @@ export class CartService {

getShippingPrices() {
return this.http.get<{ type: string; price: number }[]>(
`/assets/shipping.json`
'/assets/shipping.json'
);
}
}
2 changes: 1 addition & 1 deletion apps/analog-app/src/main.server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { enableProdMode } from '@angular/core';
import { bootstrapApplication } from '@angular/platform-browser';
import { renderApplication } from '@angular/platform-server';
import { provideServerContext } from '@analogjs/router/server';
import { ServerContext } from '@analogjs/router/tokens';
import type { ServerContext } from '@analogjs/router/tokens';

import { config } from './app/app.config.server';
import { AppComponent } from './app/app.component';
Expand Down
4 changes: 2 additions & 2 deletions apps/docs-app/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ themes.nightOwl['plain'].backgroundColor = '#0a1429';
const organizationName = 'analogjs';
const projectName = 'analog';
const title = 'Analog';
const url = `https://analogjs.org`;
const url = 'https://analogjs.org';

/** @type {import('@docusaurus/types').Config} */
const config = {
Expand Down Expand Up @@ -166,7 +166,7 @@ const config = {
position: 'right',
},
{
href: `https://chat.analogjs.org`,
href: 'https://chat.analogjs.org',
label: 'Discord',
position: 'right',
},
Expand Down
22 changes: 11 additions & 11 deletions apps/docs-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,19 @@
"typecheck": "tsc"
},
"dependencies": {
"@docusaurus/core": "3.4.0",
"@docusaurus/preset-classic": "3.4.0",
"@mdx-js/react": "^3.0.0",
"clsx": "^2.0.0",
"prism-react-renderer": "^2.3.0",
"react": "^18.0.0",
"react-dom": "^18.0.0"
"@docusaurus/core": "3.5.2",
"@docusaurus/preset-classic": "3.5.2",
"@mdx-js/react": "^3.0.1",
"clsx": "^2.1.1",
"prism-react-renderer": "^2.4.0",
"react": "^18.3.1",
"react-dom": "^18.3.1"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "3.4.0",
"@docusaurus/tsconfig": "3.4.0",
"@docusaurus/types": "3.4.0",
"typescript": "~5.2.2"
"@docusaurus/module-type-aliases": "3.5.2",
"@docusaurus/tsconfig": "3.5.2",
"@docusaurus/types": "3.5.2",
"typescript": "~5.5.4"
},
"browserslist": {
"production": [
Expand Down
6 changes: 6 additions & 0 deletions libs/card/vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,15 @@ export default defineConfig(({ mode }) => {
cache: {
dir: `../../node_modules/.vitest`,
},
deps: {
inline: ['@analogjs/vitest-angular', 'zone.js'],
},
},
define: {
'import.meta.vitest': mode !== 'production',
},
ssr: {
noExternal: ['@analogjs/vitest-angular', 'zone.js'],
},
};
});
96 changes: 48 additions & 48 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
"build:test": "nx build ng-app --skip-nx-cache"
},
"engines": {
"node": "^18.13.0 || ^20.0.0",
"node": "^18.13.0 || ^20.0.0 || ^22.0.0",
"pnpm": "^9.0.0"
},
"packageManager": "pnpm@9.3.0",
"packageManager": "pnpm@9.10.0",
"keywords": [
"vite-plugin",
"angular",
Expand All @@ -41,23 +41,23 @@
},
"private": true,
"dependencies": {
"@angular/animations": "^18.0.0",
"@angular/cdk": "^18.0.0",
"@angular/common": "^18.0.0",
"@angular/compiler": "^18.0.0",
"@angular/core": "^18.0.0",
"@angular/forms": "^18.0.0",
"@angular/material": "^18.0.0",
"@angular/platform-browser": "^18.0.0",
"@angular/platform-browser-dynamic": "^18.0.0",
"@angular/platform-server": "^18.0.0",
"@angular/router": "^18.0.0",
"@angular/animations": "^18.2.4",
"@angular/cdk": "^18.2.4",
"@angular/common": "^18.2.4",
"@angular/compiler": "^18.2.4",
"@angular/core": "^18.2.4",
"@angular/forms": "^18.2.4",
"@angular/material": "^18.2.4",
"@angular/platform-browser": "^18.2.4",
"@angular/platform-browser-dynamic": "^18.2.4",
"@angular/platform-server": "^18.2.4",
"@angular/router": "^18.2.4",
"@astrojs/mdx": "^3.0.1",
"@astrojs/react": "^3.0.0",
"@babel/core": "^7.21.8",
"@mdx-js/react": "3.0.1",
"@nx/angular": "19.2.3",
"@nx/devkit": "19.2.3",
"@nx/angular": "19.5.3",
"@nx/devkit": "19.5.3",
"@trpc/client": "^10.25.0",
"@trpc/server": "^10.25.0",
"ajv-formats": "^2.1.1",
Expand All @@ -68,42 +68,42 @@
"marked-gfm-heading-id": "^3.1.0",
"marked-highlight": "^2.0.1",
"mermaid": "^10.2.4",
"react": "^18.2.0",
"react-dom": "^18.0.0",
"rxjs": "7.8.0",
"semver": "^7.5.1",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"rxjs": "7.8.1",
"semver": "^7.6.3",
"superjson": "^2.2.1",
"tslib": "^2.4.0",
"ufo": "^1.1.2",
"tslib": "^2.7.0",
"ufo": "^1.5.4",
"xhr2": "^0.2.1",
"zod": "^3.21.4",
"zone.js": "^0.14.8"
"zod": "^3.23.8",
"zone.js": "^0.14.10"
},
"devDependencies": {
"@angular-devkit/architect": "^0.1800.0",
"@angular-devkit/build-angular": "^18.0.0",
"@angular-devkit/core": "^18.0.0",
"@angular-devkit/schematics": "^18.0.0",
"@angular-eslint/eslint-plugin": "18.0.1",
"@angular-eslint/eslint-plugin-template": "18.0.1",
"@angular-eslint/template-parser": "18.0.1",
"@angular/build": "^18.0.3",
"@angular/cli": "~18.0.0",
"@angular/compiler-cli": "^18.0.0",
"@angular/language-service": "^18.0.0",
"@angular-devkit/architect": "^0.1802.4",
"@angular-devkit/build-angular": "^18.2.4",
"@angular-devkit/core": "^18.2.4",
"@angular-devkit/schematics": "^18.2.4",
"@angular-eslint/eslint-plugin": "18.3.1",
"@angular-eslint/eslint-plugin-template": "18.3.1",
"@angular-eslint/template-parser": "18.3.1",
"@angular/build": "^18.2.4",
"@angular/cli": "~18.2.4",
"@angular/compiler-cli": "^18.2.4",
"@angular/language-service": "^18.2.4",
"@astrojs/markdown-component": "^1.0.5",
"@commitlint/cli": "^17.4.2",
"@commitlint/config-conventional": "^17.4.2",
"@netlify/functions": "^2.3.0",
"@nx/cypress": "19.2.3",
"@nx/eslint": "19.2.3",
"@nx/eslint-plugin": "19.2.3",
"@nx/jest": "19.2.3",
"@nx/js": "19.2.3",
"@nx/plugin": "19.2.3",
"@nx/vite": "19.2.3",
"@nx/web": "19.2.3",
"@schematics/angular": "^18.0.0",
"@nx/cypress": "19.5.3",
"@nx/eslint": "19.5.3",
"@nx/eslint-plugin": "19.5.3",
"@nx/jest": "19.5.3",
"@nx/js": "19.5.3",
"@nx/plugin": "19.5.3",
"@nx/vite": "19.5.3",
"@nx/web": "19.5.3",
"@schematics/angular": "^18.2.4",
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/exec": "^6.0.3",
"@semantic-release/git": "^10.0.1",
Expand All @@ -128,11 +128,11 @@
"conventional-changelog": "^3.1.25",
"conventional-changelog-cli": "^2.2.2",
"cpy-cli": "^4.2.0",
"cypress": "13.9.0",
"cypress": "13.14.2",
"esbuild": "0.19.5",
"eslint": "8.57.0",
"eslint-config-prettier": "9.0.0",
"eslint-plugin-cypress": "2.14.0",
"eslint-plugin-cypress": "3.5.0",
"execa": "^7.1.1",
"fast-glob": "^3.2.12",
"fs-extra": "^11.1.1",
Expand All @@ -147,9 +147,9 @@
"marked-mangle": "^1.1.7",
"marked-shiki": "^1.1.0",
"minimist": "^1.2.7",
"ng-packagr": "^18.0.0",
"nitropack": "^2.9.0",
"nx": "19.2.3",
"ng-packagr": "^18.2.1",
"nitropack": "^2.9.7",
"nx": "19.5.3",
"playwright": "^1.30.0",
"postcss": "^8.4.21",
"postcss-import": "~15.1.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/astro-angular/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"targets": {
"build": {
"executor": "@nx/js:tsc",
"outputs": ["{workspaceRoot}/{options.outputPath}"],

"options": {
"outputPath": "node_modules/@analogjs/astro-angular",
"main": "packages/astro-angular/src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/nx-plugin/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"targets": {
"build": {
"executor": "@nx/js:tsc",
"outputs": ["{workspaceRoot}/{options.outputPath}"],

"options": {
"outputPath": "node_modules/@analogjs/platform/src/lib/nx-plugin",
"main": "packages/nx-plugin/src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/vite-plugin-angular/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"targets": {
"build": {
"executor": "@nx/js:tsc",
"outputs": ["{workspaceRoot}/{options.outputPath}"],

"options": {
"outputPath": "node_modules/@analogjs/vite-plugin-angular",
"main": "packages/vite-plugin-angular/src/index.ts",
Expand Down
2 changes: 1 addition & 1 deletion packages/vite-plugin-nitro/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"targets": {
"build": {
"executor": "@nx/js:tsc",
"outputs": ["{workspaceRoot}/{options.outputPath}"],

"options": {
"outputPath": "node_modules/@analogjs/vite-plugin-nitro",
"main": "packages/vite-plugin-nitro/src/index.ts",
Expand Down
Loading
Loading