Skip to content

Commit

Permalink
build: upgrade deps to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
daelmaak committed Nov 11, 2024
1 parent 9e23c38 commit d39feb1
Show file tree
Hide file tree
Showing 10 changed files with 6,809 additions and 5,651 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,4 @@ Thumbs.db

.angular/cache
.nx/cache
.nx/workspace-data
3 changes: 3 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ dist
.angular
.yarn
CHANGELOG.md

/.nx/cache
/.nx/workspace-data
17 changes: 7 additions & 10 deletions apps/demo/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"name": "demo",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "application",
"sourceRoot": "apps/demo/src",
"prefix": "app",
"generators": {
"@schematics/angular:component": {
"style": "scss"
}
},
"sourceRoot": "apps/demo/src",
"prefix": "app",
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
Expand Down Expand Up @@ -71,19 +71,19 @@
"serve": {
"executor": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "demo:build",
"hmr": true
"hmr": true,
"buildTarget": "demo:build"
},
"configurations": {
"production": {
"browserTarget": "demo:build:production"
"buildTarget": "demo:build:production"
}
}
},
"extract-i18n": {
"executor": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "demo:build"
"buildTarget": "demo:build"
}
},
"test": {
Expand All @@ -99,10 +99,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": ["apps/demo/**/*.ts", "apps/demo/**/*.html"]
}
"executor": "@nx/eslint:lint"
}
}
}
9 changes: 3 additions & 6 deletions libs/gallery/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
"name": "gallery",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"projectType": "library",
"sourceRoot": "libs/gallery/src",
"prefix": "",
"generators": {
"@schematics/angular:component": {
"style": "scss"
}
},
"sourceRoot": "libs/gallery/src",
"prefix": "",
"targets": {
"build": {
"executor": "@nx/angular:package",
Expand All @@ -31,10 +31,7 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"options": {
"lintFilePatterns": ["libs/gallery/**/*.ts", "libs/gallery/**/*.html"]
}
"executor": "@nx/eslint:lint"
},
"component-test": {
"executor": "@nx/cypress:cypress",
Expand Down
4 changes: 2 additions & 2 deletions libs/gallery/src/lib/components/thumbs/thumbs.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../core/mixins.scss';
@use '../../core/mixins';

$arrow-btn-dimension: 30px;

Expand Down Expand Up @@ -243,7 +243,7 @@ img {
padding: 0;
opacity: 0.7;

@include supports-hover {
@include mixins.supports-hover {
&:hover {
opacity: 1;
}
Expand Down
4 changes: 2 additions & 2 deletions libs/gallery/src/lib/components/viewer/viewer.component.scss
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@import '../../core/mixins.scss';
@use '../../core/mixins';

:host {
display: block;
Expand Down Expand Up @@ -152,7 +152,7 @@ img {
margin: 15px 6px;
opacity: 0.7;

@include supports-hover {
@include mixins.supports-hover {
&:hover {
opacity: 1;
}
Expand Down
138 changes: 138 additions & 0 deletions migrations.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
{
"migrations": [
{
"cli": "nx",
"version": "19.2.0-beta.2",
"description": "Updates the default workspace data directory to .nx/workspace-data",
"implementation": "./src/migrations/update-19-2-0/move-workspace-data-directory",
"package": "nx",
"name": "19-2-0-move-graph-cache-directory"
},
{
"cli": "nx",
"version": "19.2.2-beta.0",
"description": "Updates the nx wrapper.",
"implementation": "./src/migrations/update-17-3-0/update-nxw",
"package": "nx",
"name": "19-2-2-update-nx-wrapper"
},
{
"version": "19.2.4-beta.0",
"description": "Set project name in nx.json explicitly",
"implementation": "./src/migrations/update-19-2-4/set-project-name",
"x-repair-skip": true,
"package": "nx",
"name": "19-2-4-set-project-name"
},
{
"version": "20.0.0-beta.7",
"description": "Migration for v20.0.0-beta.7",
"implementation": "./src/migrations/update-20-0-0/move-use-daemon-process",
"package": "nx",
"name": "move-use-daemon-process"
},
{
"version": "20.0.1",
"description": "Set `useLegacyCache` to true for migrating workspaces",
"implementation": "./src/migrations/update-20-0-1/use-legacy-cache",
"x-repair-skip": true,
"package": "nx",
"name": "use-legacy-cache"
},
{
"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-18-0-0"
},
{
"cli": "nx",
"version": "19.2.1-beta.0",
"requires": { "@angular-eslint/eslint-plugin": ">=18.0.0" },
"description": "Installs the '@typescript-eslint/utils' package when having installed '@angular-eslint/eslint-plugin' or '@angular-eslint/eslint-plugin-template' with version >=18.0.0.",
"factory": "./src/migrations/update-19-2-1/add-typescript-eslint-utils",
"package": "@nx/angular",
"name": "add-typescript-eslint-utils"
},
{
"cli": "nx",
"version": "19.5.0-beta.1",
"requires": { "@angular/core": ">=18.1.0" },
"description": "Update the @angular/cli package version to ~18.1.0.",
"factory": "./src/migrations/update-19-5-0/update-angular-cli",
"package": "@nx/angular",
"name": "update-angular-cli-version-18-1-0"
},
{
"cli": "nx",
"version": "19.6.0-beta.4",
"description": "Ensure Module Federation DTS is turned off by default.",
"factory": "./src/migrations/update-19-6-0/turn-off-dts-by-default",
"package": "@nx/angular",
"name": "update-19-6-0"
},
{
"cli": "nx",
"version": "19.6.0-beta.7",
"requires": { "@angular/core": ">=18.2.0" },
"description": "Update the @angular/cli package version to ~18.2.0.",
"factory": "./src/migrations/update-19-6-0/update-angular-cli",
"package": "@nx/angular",
"name": "update-angular-cli-version-18-2-0"
},
{
"cli": "nx",
"version": "19.6.1-beta.0",
"description": "Ensure Target Defaults are set correctly for Module Federation.",
"factory": "./src/migrations/update-19-6-1/ensure-depends-on-for-mf",
"package": "@nx/angular",
"name": "update-19-6-1-ensure-module-federation-target-defaults"
},
{
"cli": "nx",
"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"
},
{
"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": "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.1.0",
"description": "Updates calls to afterRender with an explicit phase to the new API",
"factory": "./migrations/after-render-phase/bundle",
"package": "@angular/core",
"name": "migration-after-render-phase"
},
{
"version": "18.0.0-0",
"description": "Updates Angular Material to v18",
"factory": "./ng-update/index_bundled#updateToV18",
"package": "@angular/material",
"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"
}
]
}
34 changes: 15 additions & 19 deletions nx.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
{
"affected": {
"defaultBase": "main"
},
"tasksRunnerOptions": {
"default": {
"runner": "nx-cloud",
"options": {
"cacheableOperations": ["build", "test", "test:ci", "lint", "component-test"],
"accessToken": "Zjg2NjM5OWYtOWNjYi00ZGJhLWFmNDUtYWIwZTdjYjE0NDZmfHJlYWQtd3JpdGU="
}
}
},
"namedInputs": {
"sharedGlobals": [],
"default": ["{projectRoot}/**/*", "sharedGlobals"],
Expand All @@ -28,16 +16,24 @@
"targetDefaults": {
"build": {
"dependsOn": ["^build"],
"inputs": ["production", "^production"]
"inputs": ["production", "^production"],
"cache": true
},
"test": {
"inputs": ["default", "^production", "{workspaceRoot}/karma.conf.js"]
},
"lint": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"]
"inputs": ["default", "^production", "{workspaceRoot}/karma.conf.js"],
"cache": true
},
"component-test": {
"inputs": ["default", "^production"]
"inputs": ["default", "^production"],
"cache": true
},
"@nx/eslint:lint": {
"inputs": ["default", "{workspaceRoot}/.eslintrc.json"],
"cache": true
}
}
},
"nxCloudAccessToken": "Zjg2NjM5OWYtOWNjYi00ZGJhLWFmNDUtYWIwZTdjYjE0NDZmfHJlYWQtd3JpdGU=",
"useInferencePlugins": false,
"defaultBase": "main",
"useLegacyCache": true
}
Loading

0 comments on commit d39feb1

Please sign in to comment.