Skip to content

Commit

Permalink
fix: update nx to 19.1
Browse files Browse the repository at this point in the history
  • Loading branch information
lacolaco committed Nov 21, 2024
1 parent eaeecfe commit 3a460c1
Show file tree
Hide file tree
Showing 6 changed files with 2,312 additions and 1,840 deletions.
10 changes: 8 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,12 +27,18 @@
"parserOptions": {
"project": "./tsconfig.*?.json"
},
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
},
{
"files": ["*.js", "*.jsx"],
"extends": ["plugin:@nx/javascript"],
"rules": {}
"rules": {
"@typescript-eslint/no-extra-semi": "error",
"no-extra-semi": "off"
}
}
]
}
4 changes: 2 additions & 2 deletions apps/webapp/src/app/app.config.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { HttpClientModule } from '@angular/common/http';
import { provideHttpClient } from '@angular/common/http';
import { ApplicationConfig, importProvidersFrom } from '@angular/core';
import { getAnalytics, provideAnalytics } from '@angular/fire/analytics';
import { initializeApp, provideFirebaseApp } from '@angular/fire/app';
Expand All @@ -13,7 +13,7 @@ import { provideFeaturedRepositoryDatasource } from './shared/featured-repositor
export const appConfig: ApplicationConfig = {
providers: [
provideAnimations(),
importProvidersFrom(HttpClientModule),
provideHttpClient(),
provideRouter(routes),
importProvidersFrom(provideFirebaseApp(() => initializeApp(environment.firebaseConfig))),
importProvidersFrom(provideFirestore(() => getFirestore())),
Expand Down
6 changes: 3 additions & 3 deletions apps/webapp/src/styles.scss
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ body {

// Define a custom typography config that overrides the font-family as well as the
// `headlines` and `body-1` levels.
$custom-typography: mat.define-legacy-typography-config(
$custom-typography: mat.m2-define-legacy-typography-config(
$font-family: "'Montserrat', sans-serif",
$headline: mat.define-typography-level(32px, 48px, 700),
$body-1: mat.define-typography-level(16px, 24px, 500),
$headline: mat.m2-define-typography-level(32px, 48px, 700),
$body-1: mat.m2-define-typography-level(16px, 24px, 500),
);

// TODO(v15): As of v15 mat.legacy-core no longer includes default typography styles.
Expand Down
42 changes: 32 additions & 10 deletions migrations.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,48 @@
"migrations": [
{
"cli": "nx",
"version": "18.2.0-beta.0",
"requires": { "@angular/core": ">=17.3.0" },
"description": "Update the @angular/cli package version to ~17.3.0.",
"factory": "./src/migrations/update-18-2-0/update-angular-cli",
"version": "19.1.0-beta.6",
"description": "Migrate no-extra-semi rules into user config, out of nx extendable configs",
"implementation": "./src/migrations/update-19-1-0-migrate-no-extra-semi/migrate-no-extra-semi",
"package": "@nx/eslint-plugin",
"name": "update-19-1-0-rename-no-extra-semi"
},
{
"cli": "nx",
"version": "19.1.0-beta.2",
"requires": { "@angular/core": ">=18.0.0" },
"description": "Update the @angular/cli package version to ~18.0.0.",
"factory": "./src/migrations/update-19-1-0/update-angular-cli",
"package": "@nx/angular",
"name": "update-angular-cli-version-17-3-0"
"name": "update-angular-cli-version-18-0-0"
},
{
"version": "17.3.0",
"version": "18.0.0",
"description": "Updates two-way bindings that have an invalid expression to use the longform expression instead.",
"factory": "./migrations/invalid-two-way-bindings/bundle",
"package": "@angular/core",
"name": "invalid-two-way-bindings"
},
{
"version": "17.0.0-0",
"description": "Updates Angular Material to v17",
"factory": "./ng-update/index_bundled#updateToV17",
"version": "18.0.0",
"description": "Replace deprecated HTTP related modules with provider functions",
"factory": "./migrations/http-providers/bundle",
"package": "@angular/core",
"name": "migration-http-providers"
},
{
"version": "18.0.0-0",
"description": "Updates Angular Material to v18",
"factory": "./ng-update/index_bundled#updateToV18",
"package": "@angular/material",
"name": "migration-v17"
"name": "migration-v18"
},
{
"version": "18.0.0-0",
"description": "Updates the Angular CDK to v18",
"factory": "./ng-update/index#updateToV18",
"package": "@angular/cdk",
"name": "migration-v18"
}
]
}
52 changes: 26 additions & 26 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@
"private": true,
"packageManager": "[email protected]",
"dependencies": {
"@angular/animations": "17.3.12",
"@angular/cdk": "17.3.9",
"@angular/common": "17.3.12",
"@angular/compiler": "17.3.12",
"@angular/core": "17.3.12",
"@angular/animations": "18.0.7",
"@angular/cdk": "18.0.6",
"@angular/common": "18.0.7",
"@angular/compiler": "18.0.7",
"@angular/core": "18.0.7",
"@angular/fire": "17.0.0",
"@angular/forms": "17.3.12",
"@angular/material": "^16.2.0",
"@angular/platform-browser": "17.3.12",
"@angular/platform-browser-dynamic": "17.3.12",
"@angular/router": "17.3.12",
"@angular/forms": "18.0.7",
"@angular/material": "18.0.6",
"@angular/platform-browser": "18.0.7",
"@angular/platform-browser-dynamic": "18.0.7",
"@angular/router": "18.0.7",
"@rx-angular/state": "16.3.0",
"firebase": "9.23.0",
"normalize.css": "8.0.1",
Expand All @@ -50,22 +50,22 @@
"zone.js": "0.14.8"
},
"devDependencies": {
"@angular-devkit/architect": "0.1703.9",
"@angular-devkit/build-angular": "17.3.11",
"@angular-eslint/eslint-plugin": "17.3.0",
"@angular-eslint/eslint-plugin-template": "17.3.0",
"@angular-eslint/template-parser": "17.3.0",
"@angular/cli": "~17.3.0",
"@angular/compiler-cli": "17.3.12",
"@angular/language-service": "17.3.12",
"@angular-devkit/architect": "0.1800.7",
"@angular-devkit/build-angular": "18.0.7",
"@angular-eslint/eslint-plugin": "18.4.1",
"@angular-eslint/eslint-plugin-template": "18.4.1",
"@angular-eslint/template-parser": "18.4.1",
"@angular/cli": "~18.0.0",
"@angular/compiler-cli": "18.0.7",
"@angular/language-service": "18.0.7",
"@faker-js/faker": "9.2.0",
"@nx/angular": "19.0.8",
"@nx/eslint": "19.0.8",
"@nx/eslint-plugin": "19.0.8",
"@nx/jest": "19.0.8",
"@nx/node": "19.0.8",
"@nx/web": "19.0.8",
"@nx/workspace": "19.0.8",
"@nx/angular": "19.1.2",
"@nx/eslint": "19.1.2",
"@nx/eslint-plugin": "19.1.2",
"@nx/jest": "19.1.2",
"@nx/node": "19.1.2",
"@nx/web": "19.1.2",
"@nx/workspace": "19.1.2",
"@types/jest": "29.5.14",
"@types/jsdom": "21.1.7",
"@types/node": "18.19.64",
Expand All @@ -79,7 +79,7 @@
"firebase-tools": "13.24.2",
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"jest-preset-angular": "14.0.4",
"jest-preset-angular": "14.1.1",
"prettier": "2.8.8",
"ts-node": "10.9.2",
"typescript": "5.4.5"
Expand Down
Loading

0 comments on commit 3a460c1

Please sign in to comment.