Skip to content

Commit

Permalink
update nx to v18.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mpro7 committed Nov 28, 2024
1 parent a1bddb0 commit e9bfc58
Show file tree
Hide file tree
Showing 45 changed files with 11,771 additions and 18,696 deletions.
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,5 @@
/coverage

.angular

/.nx/cache
28 changes: 8 additions & 20 deletions apps/dateAdapter/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,7 @@
"main": "apps/dateAdapter/src/main.ts",
"polyfills": "apps/dateAdapter/src/polyfills.ts",
"tsConfig": "apps/dateAdapter/tsconfig.app.json",
"assets": [
"apps/dateAdapter/src/favicon.ico",
"apps/dateAdapter/src/assets"
],
"assets": ["apps/dateAdapter/src/favicon.ico", "apps/dateAdapter/src/assets"],
"styles": ["apps/dateAdapter/src/styles.scss"],
"scripts": []
},
Expand Down Expand Up @@ -53,32 +50,26 @@
"serve": {
"executor": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "dateAdapter:build"
"buildTarget": "dateAdapter:build"
},
"configurations": {
"development": {
"browserTarget": "dateAdapter:build:development"
"buildTarget": "dateAdapter:build:development"
},
"production": {
"browserTarget": "dateAdapter:build:production",
"buildTarget": "dateAdapter:build:production"
}
}
},
"extract-i18n": {
"executor": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "dateAdapter:build"
"buildTarget": "dateAdapter:build"
}
},
"lint": {
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
"apps/dateAdapter/**/*.ts",
"apps/dateAdapter/**/*.html"
]
}
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@angular-devkit/build-angular:karma",
Expand All @@ -89,10 +80,7 @@
"karmaConfig": "apps/dateAdapter/karma.conf.js",
"styles": ["apps/dateAdapter/src/styles.scss"],
"scripts": [],
"assets": [
"apps/dateAdapter/src/favicon.ico",
"apps/dateAdapter/src/assets"
]
"assets": ["apps/dateAdapter/src/favicon.ico", "apps/dateAdapter/src/assets"]
},
"configurations": {
"ci": {
Expand Down
2 changes: 1 addition & 1 deletion apps/dateAdapter/src/test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files

import 'zone.js/dist/zone-testing';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';

Expand Down
49 changes: 16 additions & 33 deletions apps/dsp-app/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,7 @@
"targets": {
"build": {
"executor": "@angular-devkit/build-angular:browser",
"outputs": [
"{options.outputPath}"
],
"outputs": ["{options.outputPath}"],
"options": {
"outputPath": "dist/apps/dsp-app",
"index": "apps/dsp-app/src/index.html",
Expand All @@ -39,15 +37,11 @@
"output": "/assets/"
}
],
"styles": [
"apps/dsp-app/src/styles.scss"
],
"styles": ["apps/dsp-app/src/styles.scss"],
"stylePreprocessorOptions": {
"includePaths": ["apps/dsp-app/src/styles"]
},
"scripts": [
"node_modules/openseadragon/build/openseadragon/openseadragon.min.js"
]
"scripts": ["node_modules/openseadragon/build/openseadragon/openseadragon.min.js"]
},
"configurations": {
"production": {
Expand Down Expand Up @@ -161,48 +155,41 @@
"serve": {
"executor": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "dsp-app:build"
"buildTarget": "dsp-app:build"
},
"configurations": {
"development": {
"browserTarget": "dsp-app:build:development"
"buildTarget": "dsp-app:build:development"
},
"production": {
"browserTarget": "dsp-app:build:production"
"buildTarget": "dsp-app:build:production"
},
"dev-server": {
"browserTarget": "dsp-app:build:dev-server"
"buildTarget": "dsp-app:build:dev-server"
},
"test-server": {
"browserTarget": "dsp-app:build:test-server"
"buildTarget": "dsp-app:build:test-server"
},
"ls-test-server": {
"browserTarget": "dsp-app:build:ls-test-server"
"buildTarget": "dsp-app:build:ls-test-server"
},
"0845-test-server": {
"browserTarget": "dsp-app:build:ls-test-server"
"buildTarget": "dsp-app:build:ls-test-server"
},
"stage-server": {
"browserTarget": "dsp-app:build:stage-server"
"buildTarget": "dsp-app:build:stage-server"
}
}
},
"extract-i18n": {
"executor": "@angular-devkit/build-angular:extract-i18n",
"options": {
"browserTarget": "dsp-app:build"
"buildTarget": "dsp-app:build"
}
},
"lint": {
"executor": "@nx/linter:eslint",
"outputs": [
"{options.outputFile}"
],
"options": {
"lintFilePatterns": [
"apps/dsp-app/**/*.{ts,html}"
]
}
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@angular-devkit/build-angular:karma",
Expand All @@ -212,12 +199,8 @@
"tsConfig": "apps/dsp-app/tsconfig.spec.json",
"inlineStyleLanguage": "scss",
"karmaConfig": "apps/dsp-app/karma.conf.js",
"styles": [
"apps/dsp-app/src/styles.scss"
],
"scripts": [
"node_modules/openseadragon/build/openseadragon/openseadragon.min.js"
],
"styles": ["apps/dsp-app/src/styles.scss"],
"scripts": ["node_modules/openseadragon/build/openseadragon/openseadragon.min.js"],
"assets": [
"apps/dsp-app/src/favicon.ico",
"apps/dsp-app/src/config",
Expand Down
2 changes: 1 addition & 1 deletion apps/dsp-app/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
/** *************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // included with Angular CLI.
import 'zone.js'; // included with Angular CLI.

/** *************************************************************************************************
* APPLICATION IMPORTS
Expand Down
2 changes: 1 addition & 1 deletion apps/dsp-app/src/test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* This file is required by karma.conf.js and loads recursively all the .spec and framework files.
*/

import 'zone.js/dist/zone-testing';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';

Expand Down
20 changes: 5 additions & 15 deletions libs/jdnconvertiblecalendar/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/jdnconvertiblecalendar/src",
"projectType": "library",
"tags": [],
"targets": {
"build": {
"executor": "@nx/js:tsc",
Expand All @@ -22,26 +23,15 @@
"dependsOn": ["build"]
},
"lint": {
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": ["libs/jdnconvertiblecalendar/**/*.ts"]
}
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
},
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "libs/jdnconvertiblecalendar/jest.config.ts",
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
"jestConfig": "libs/jdnconvertiblecalendar/jest.config.ts"
}
}
},
"tags": []
}
}
14 changes: 4 additions & 10 deletions libs/jdnconvertiblecalendardateadapter/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"projectType": "library",
"sourceRoot": "libs/jdnconvertiblecalendardateadapter/src",
"prefix": "dasch-swiss",
"tags": [],
"targets": {
"build": {
"executor": "@nx/angular:package",
Expand Down Expand Up @@ -37,15 +38,8 @@
}
},
"lint": {
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
"libs/jdnconvertiblecalendardateadapter/**/*.ts",
"libs/jdnconvertiblecalendardateadapter/**/*.html"
]
}
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
}
},
"tags": []
}
}
21 changes: 4 additions & 17 deletions libs/vre/advanced-search/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,32 +3,19 @@
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/vre/advanced-search/src",
"prefix": "dasch-swiss",
"tags": [],
"projectType": "library",
"tags": [],
"targets": {
"test": {
"executor": "@nx/jest:jest",
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "libs/vre/advanced-search/jest.config.ts",
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
"jestConfig": "libs/vre/advanced-search/jest.config.ts"
}
},
"lint": {
"executor": "@nx/linter:eslint",
"outputs": ["{options.outputFile}"],
"options": {
"lintFilePatterns": [
"libs/vre/advanced-search/**/*.ts",
"libs/vre/advanced-search/**/*.html"
]
}
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
}
}
}
4 changes: 2 additions & 2 deletions libs/vre/open-api/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
"$schema": "../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/vre/open-api/src",
"prefix": "dasch-swiss",
"tags": [],
"projectType": "library"
"projectType": "library",
"tags": []
}
27 changes: 5 additions & 22 deletions libs/vre/resource-editor/mathjax/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,19 @@
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/vre/resource-editor/mathjax/src",
"prefix": "dasch-swiss",
"tags": [],
"projectType": "library",
"tags": [],
"targets": {
"test": {
"executor": "@nx/jest:jest",
"outputs": [
"{workspaceRoot}/coverage/{projectRoot}"
],
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "libs/vre/resource-editor/mathjax/jest.config.ts",
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
"jestConfig": "libs/vre/resource-editor/mathjax/jest.config.ts"
}
},
"lint": {
"executor": "@nx/linter:eslint",
"outputs": [
"{options.outputFile}"
],
"options": {
"lintFilePatterns": [
"libs/vre/resource-editor/mathjax/**/*.ts",
"libs/vre/resource-editor/mathjax/**/*.html"
]
}
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
}
}
}
27 changes: 5 additions & 22 deletions libs/vre/resource-editor/representations/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,36 +3,19 @@
"$schema": "../../../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "libs/vre/resource-editor/representations/src",
"prefix": "dasch-swiss",
"tags": [],
"projectType": "library",
"tags": [],
"targets": {
"test": {
"executor": "@nx/jest:jest",
"outputs": [
"{workspaceRoot}/coverage/{projectRoot}"
],
"outputs": ["{workspaceRoot}/coverage/{projectRoot}"],
"options": {
"jestConfig": "libs/vre/resource-editor/representations/jest.config.ts",
"passWithNoTests": true
},
"configurations": {
"ci": {
"ci": true,
"codeCoverage": true
}
"jestConfig": "libs/vre/resource-editor/representations/jest.config.ts"
}
},
"lint": {
"executor": "@nx/linter:eslint",
"outputs": [
"{options.outputFile}"
],
"options": {
"lintFilePatterns": [
"libs/vre/resource-editor/representations/**/*.ts",
"libs/vre/resource-editor/representations/**/*.html"
]
}
"executor": "@nx/eslint:lint",
"outputs": ["{options.outputFile}"]
}
}
}
Loading

0 comments on commit e9bfc58

Please sign in to comment.