diff --git a/background-sync/client/.eslintrc.json b/background-sync/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/background-sync/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/background-sync/client/eslint.config.js b/background-sync/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/background-sync/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/background-sync/client/package.json b/background-sync/client/package.json index 1ff7afdfb..a4e9b9c1c 100644 --- a/background-sync/client/package.json +++ b/background-sync/client/package.json @@ -15,46 +15,41 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "@types/uuid": "9.0.8", - "dexie": "4.0.4", + "dexie": "4.0.7", "rxjs": "7.8.1", - "tslib": "2.6.2", + "tslib": "2.6.3", "uuid": "9.0.1", "workbox-core": "7.1.0", "workbox-precaching": "7.1.0", "workbox-routing": "7.1.0", "workbox-strategies": "7.1.0", "workbox-window": "7.1.0", - "zone.js": "0.14.4" + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "npm-run-all": "4.1.5", - "rimraf": "5.0.5", + "rimraf": "5.0.7", "ts-loader": "9.5.1", "typescript": "5.4.5", "webpack-cli": "5.1.4", "workbox-cli": "7.1.0" } -} +} \ No newline at end of file diff --git a/background-sync/client/tsconfig.json b/background-sync/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/background-sync/client/tsconfig.json +++ b/background-sync/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/background-sync/clientng/.eslintrc.json b/background-sync/clientng/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/background-sync/clientng/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/background-sync/clientng/eslint.config.js b/background-sync/clientng/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/background-sync/clientng/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/background-sync/clientng/package.json b/background-sync/clientng/package.json index 7db8f2073..daeb87669 100644 --- a/background-sync/clientng/package.json +++ b/background-sync/clientng/package.json @@ -10,37 +10,32 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", - "@angular/service-worker": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", + "@angular/service-worker": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "@types/uuid": "9.0.8", - "dexie": "4.0.4", + "dexie": "4.0.7", "rxjs": "7.8.1", - "tslib": "2.6.2", + "tslib": "2.6.3", "uuid": "9.0.1", - "zone.js": "0.14.4" + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/background-sync/clientng/tsconfig.json b/background-sync/clientng/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/background-sync/clientng/tsconfig.json +++ b/background-sync/clientng/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/background-sync/server/.mvn/wrapper/maven-wrapper.properties b/background-sync/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/background-sync/server/.mvn/wrapper/maven-wrapper.properties +++ b/background-sync/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/background-sync/server/pom.xml b/background-sync/server/pom.xml index 7cde37394..c8c43ef6e 100644 --- a/background-sync/server/pom.xml +++ b/background-sync/server/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/beacon/.mvn/wrapper/maven-wrapper.properties b/beacon/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/beacon/.mvn/wrapper/maven-wrapper.properties +++ b/beacon/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/beacon/pom.xml b/beacon/pom.xml index 09210e966..6c7aeb0a6 100644 --- a/beacon/pom.xml +++ b/beacon/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/capped/.mvn/wrapper/maven-wrapper.properties b/capped/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/capped/.mvn/wrapper/maven-wrapper.properties +++ b/capped/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/capped/pom.xml b/capped/pom.xml index e8c8eb4b2..babb072f9 100644 --- a/capped/pom.xml +++ b/capped/pom.xml @@ -15,7 +15,7 @@ ch.qos.logback logback-classic - 1.5.3 + 1.5.6 diff --git a/customicons4/.eslintrc.json b/customicons4/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/customicons4/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/customicons4/eslint.config.js b/customicons4/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/customicons4/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/customicons4/package.json b/customicons4/package.json index 6abb51595..b71cc29ef 100644 --- a/customicons4/package.json +++ b/customicons4/package.json @@ -10,33 +10,28 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/customicons4/tsconfig.json b/customicons4/tsconfig.json index 093760655..56b644d6a 100644 --- a/customicons4/tsconfig.json +++ b/customicons4/tsconfig.json @@ -2,24 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -28,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/datefns/package.json b/datefns/package.json index 6ca769fee..f67c9029a 100644 --- a/datefns/package.json +++ b/datefns/package.json @@ -12,6 +12,6 @@ "moment": "2.30.1" }, "devDependencies": { - "vite": "5.2.7" + "vite": "5.2.12" } } diff --git a/dexiejs/.eslintrc.json b/dexiejs/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/dexiejs/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/dexiejs/eslint.config.js b/dexiejs/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/dexiejs/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/dexiejs/package.json b/dexiejs/package.json index 7fd3244b0..a5fd5daea 100644 --- a/dexiejs/package.json +++ b/dexiejs/package.json @@ -10,37 +10,32 @@ }, "private": true, "dependencies": { - "@angular/cdk": "17.3.6", - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/cdk": "18.0.2", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", - "dexie": "4.0.4", + "ionicons": "7.4.0", + "dexie": "4.0.7", "geolib": "3.3.4", "papaparse": "5.4.1", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", + "typescript-eslint": "8.0.0-alpha.20", "@types/papaparse": "5.3.14", - "eslint": "8.57.0", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } diff --git a/dexiejs/tsconfig.json b/dexiejs/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/dexiejs/tsconfig.json +++ b/dexiejs/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/dynamicpos/client/.eslintrc.json b/dynamicpos/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/dynamicpos/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/dynamicpos/client/eslint.config.js b/dynamicpos/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/dynamicpos/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/dynamicpos/client/package.json b/dynamicpos/client/package.json index 05353f389..3473b86c0 100644 --- a/dynamicpos/client/package.json +++ b/dynamicpos/client/package.json @@ -10,36 +10,31 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", - "@asymmetrik/ngx-leaflet": "17.0.0", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", + "@asymmetrik/ngx-leaflet": "18.0.1", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "leaflet": "1.9.4", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@types/leaflet": "1.9.8", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "@types/leaflet": "1.9.12", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/dynamicpos/client/src/app/app.module.ts b/dynamicpos/client/src/app/app.module.ts index 904e44760..1a0bdba93 100644 --- a/dynamicpos/client/src/app/app.module.ts +++ b/dynamicpos/client/src/app/app.module.ts @@ -5,7 +5,7 @@ import {IonicModule, IonicRouteStrategy} from '@ionic/angular'; import {AppComponent} from './app.component'; import {HomePage} from './home/home.page'; import {CommonModule} from '@angular/common'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import {LeafletModule} from '@asymmetrik/ngx-leaflet'; const routes: Routes = [ @@ -13,18 +13,14 @@ const routes: Routes = [ {path: 'home', component: HomePage}, ]; -@NgModule({ - declarations: [AppComponent, HomePage], - imports: [BrowserModule, - CommonModule, - HttpClientModule, - LeafletModule, - IonicModule.forRoot(), - RouterModule.forRoot(routes, { useHash: true })], - providers: [ - {provide: RouteReuseStrategy, useClass: IonicRouteStrategy} - ], - bootstrap: [AppComponent] -}) +@NgModule({ declarations: [AppComponent, HomePage], + bootstrap: [AppComponent], imports: [BrowserModule, + CommonModule, + LeafletModule, + IonicModule.forRoot(), + RouterModule.forRoot(routes, { useHash: true })], providers: [ + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, + provideHttpClient(withInterceptorsFromDi()) + ] }) export class AppModule { } diff --git a/dynamicpos/client/src/app/home/home.page.ts b/dynamicpos/client/src/app/home/home.page.ts index dbbc83247..07a8d3cdc 100644 --- a/dynamicpos/client/src/app/home/home.page.ts +++ b/dynamicpos/client/src/app/home/home.page.ts @@ -1,5 +1,5 @@ import {AfterViewInit, Component} from '@angular/core'; -import {HttpClient} from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; import {circleMarker, latLng, LatLngBounds, LayerGroup, layerGroup, Map, tileLayer} from 'leaflet'; @Component({ diff --git a/dynamicpos/client/tsconfig.json b/dynamicpos/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/dynamicpos/client/tsconfig.json +++ b/dynamicpos/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/dynamicpos/server/.mvn/wrapper/maven-wrapper.properties b/dynamicpos/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/dynamicpos/server/.mvn/wrapper/maven-wrapper.properties +++ b/dynamicpos/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/dynamicpos/server/pom.xml b/dynamicpos/server/pom.xml index 33641d3b9..10856460a 100644 --- a/dynamicpos/server/pom.xml +++ b/dynamicpos/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/echarts/.eslintrc.json b/echarts/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/echarts/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/echarts/eslint.config.js b/echarts/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/echarts/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/echarts/package.json b/echarts/package.json index 19ac4b76f..63857121e 100644 --- a/echarts/package.json +++ b/echarts/package.json @@ -12,39 +12,34 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "date-fns": "3.6.0", "echarts": "5.5.0", - "ngx-echarts": "17.1.0", + "ngx-echarts": "18.0.0", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", "@juggle/resize-observer": "3.4.0", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "bread-compressor-cli": "3.0.3", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "bread-compressor-cli": "3.1.0", + "eslint": "9.4.0", "local-web-server": "5.3.3", "resize-observer-polyfill": "1.5.1", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/echarts/tsconfig.json b/echarts/tsconfig.json index 3c2fedec2..56b644d6a 100644 --- a/echarts/tsconfig.json +++ b/echarts/tsconfig.json @@ -3,7 +3,6 @@ "compileOnSave": false, "compilerOptions": { "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, @@ -14,7 +13,7 @@ "sourceMap": true, "declaration": false, "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/geotracker/client/.eslintrc.json b/geotracker/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/geotracker/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/geotracker/client/eslint.config.js b/geotracker/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/geotracker/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/geotracker/client/package.json b/geotracker/client/package.json index f3f2a563e..273c1253b 100644 --- a/geotracker/client/package.json +++ b/geotracker/client/package.json @@ -10,37 +10,32 @@ }, "private": true, "dependencies": { - "@angular/animations": "17.3.6", - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/animations": "18.0.2", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic-native/core": "5.36.0", "@ionic-native/splash-screen": "5.36.0", "@ionic-native/status-bar": "5.36.0", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/geotracker/client/src/app/app.module.ts b/geotracker/client/src/app/app.module.ts index 5532db93a..8972ddb55 100644 --- a/geotracker/client/src/app/app.module.ts +++ b/geotracker/client/src/app/app.module.ts @@ -6,17 +6,14 @@ import {SplashScreen} from '@ionic-native/splash-screen/ngx'; import {StatusBar} from '@ionic-native/status-bar/ngx'; import {AppComponent} from './app.component'; import {AppRoutingModule} from './app-routing.module'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; -@NgModule({ - declarations: [AppComponent], - imports: [BrowserModule, HttpClientModule, IonicModule.forRoot(), AppRoutingModule], - providers: [ - StatusBar, - SplashScreen, - {provide: RouteReuseStrategy, useClass: IonicRouteStrategy} - ], - bootstrap: [AppComponent] -}) +@NgModule({ declarations: [AppComponent], + bootstrap: [AppComponent], imports: [BrowserModule, IonicModule.forRoot(), AppRoutingModule], providers: [ + StatusBar, + SplashScreen, + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, + provideHttpClient(withInterceptorsFromDi()) + ] }) export class AppModule { } diff --git a/geotracker/client/src/app/server-push.service.ts b/geotracker/client/src/app/server-push.service.ts index 55b7ea7a0..52dc20411 100644 --- a/geotracker/client/src/app/server-push.service.ts +++ b/geotracker/client/src/app/server-push.service.ts @@ -1,5 +1,5 @@ import {Injectable} from '@angular/core'; -import {HttpClient, HttpHeaders} from '@angular/common/http'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; import {environment} from '../environments/environment'; import {AppPosition} from './app-position'; diff --git a/geotracker/client/tsconfig.json b/geotracker/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/geotracker/client/tsconfig.json +++ b/geotracker/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/geotracker/server/.mvn/wrapper/maven-wrapper.properties b/geotracker/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/geotracker/server/.mvn/wrapper/maven-wrapper.properties +++ b/geotracker/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/geotracker/server/pom.xml b/geotracker/server/pom.xml index ae51b9299..0f3f0ce46 100644 --- a/geotracker/server/pom.xml +++ b/geotracker/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/googlevision/client/.eslintrc.json b/googlevision/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/googlevision/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/googlevision/client/eslint.config.js b/googlevision/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/googlevision/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/googlevision/client/package.json b/googlevision/client/package.json index 0839c6660..d85fd4a0b 100644 --- a/googlevision/client/package.json +++ b/googlevision/client/package.json @@ -11,35 +11,30 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/google-maps": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/google-maps": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "bread-compressor-cli": "3.0.3", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "bread-compressor-cli": "3.1.0", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/googlevision/client/tsconfig.json b/googlevision/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/googlevision/client/tsconfig.json +++ b/googlevision/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/googlevision/server/.mvn/wrapper/maven-wrapper.properties b/googlevision/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/googlevision/server/.mvn/wrapper/maven-wrapper.properties +++ b/googlevision/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/googlevision/server/pom.xml b/googlevision/server/pom.xml index b8d597455..5b6a0c9b1 100644 --- a/googlevision/server/pom.xml +++ b/googlevision/server/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 ch.rasc diff --git a/indexeddb/.eslintrc.json b/indexeddb/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/indexeddb/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/indexeddb/eslint.config.js b/indexeddb/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/indexeddb/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/indexeddb/package.json b/indexeddb/package.json index bb9280a8d..5d52d2a37 100644 --- a/indexeddb/package.json +++ b/indexeddb/package.json @@ -11,39 +11,34 @@ }, "private": true, "dependencies": { - "@angular/cdk": "17.3.6", - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/pwa": "17.3.6", - "@angular/router": "17.3.6", - "@angular/service-worker": "17.3.6", + "@angular/cdk": "18.0.2", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/pwa": "18.0.2", + "@angular/router": "18.0.2", + "@angular/service-worker": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "geolib": "3.3.4", "papaparse": "5.4.1", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", + "typescript-eslint": "8.0.0-alpha.20", "@types/papaparse": "5.3.14", - "bread-compressor-cli": "3.0.3", - "eslint": "8.57.0", + "bread-compressor-cli": "3.1.0", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } diff --git a/indexeddb/src/app/app.module.ts b/indexeddb/src/app/app.module.ts index 5da311921..5c29928cc 100644 --- a/indexeddb/src/app/app.module.ts +++ b/indexeddb/src/app/app.module.ts @@ -8,7 +8,7 @@ import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; import {DetailComponent} from './detail/detail.component'; import {FilterPage} from './filter/filter.page'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import {ServiceWorkerModule} from '@angular/service-worker'; import {environment} from '../environments/environment'; import {ScrollingModule} from '@angular/cdk/scrolling'; @@ -18,20 +18,16 @@ const routes: Routes = [ {path: 'home', component: HomePage} ]; -@NgModule({ - declarations: [AppComponent, HomePage, DetailComponent, FilterPage], - imports: [BrowserModule, - CommonModule, - ScrollingModule, - FormsModule, - HttpClientModule, - IonicModule.forRoot(), - RouterModule.forRoot(routes, {useHash: true}), - ServiceWorkerModule.register('ngsw-worker.js', {enabled: environment.production})], - providers: [ - {provide: RouteReuseStrategy, useClass: IonicRouteStrategy} - ], - bootstrap: [AppComponent] -}) +@NgModule({ declarations: [AppComponent, HomePage, DetailComponent, FilterPage], + bootstrap: [AppComponent], imports: [BrowserModule, + CommonModule, + ScrollingModule, + FormsModule, + IonicModule.forRoot(), + RouterModule.forRoot(routes, { useHash: true }), + ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production })], providers: [ + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, + provideHttpClient(withInterceptorsFromDi()) + ] }) export class AppModule { } diff --git a/indexeddb/src/app/earthquake.service.ts b/indexeddb/src/app/earthquake.service.ts index 6ce580b29..0282acf4b 100644 --- a/indexeddb/src/app/earthquake.service.ts +++ b/indexeddb/src/app/earthquake.service.ts @@ -3,7 +3,7 @@ import {Filter} from './filter-interface'; import {parse} from 'papaparse'; import * as geolib from 'geolib'; import {map} from 'rxjs/operators'; -import {HttpClient} from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; import {Earthquake} from './earthquake'; /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/indexeddb/tsconfig.json b/indexeddb/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/indexeddb/tsconfig.json +++ b/indexeddb/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/jwt/client/.eslintrc.json b/jwt/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/jwt/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/jwt/client/eslint.config.js b/jwt/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/jwt/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/jwt/client/package.json b/jwt/client/package.json index 2c86ae46b..d0b52155c 100644 --- a/jwt/client/package.json +++ b/jwt/client/package.json @@ -10,34 +10,29 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@auth0/angular-jwt": "5.2.0", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/jwt/client/src/app/app.module.ts b/jwt/client/src/app/app.module.ts index 508f85270..29e6ce4a9 100644 --- a/jwt/client/src/app/app.module.ts +++ b/jwt/client/src/app/app.module.ts @@ -6,7 +6,7 @@ import {AppComponent} from './app.component'; import {HomePage} from './home/home.page'; import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import {LoginPage} from './login/login.page'; import {SignupPage} from './signup/signup.page'; import {JwtModule} from '@auth0/angular-jwt'; @@ -25,24 +25,20 @@ export function tokenGetter(): string | null { return localStorage.getItem('jwt_token'); } -@NgModule({ - declarations: [AppComponent, HomePage, LoginPage, SignupPage], - imports: [BrowserModule, - CommonModule, - HttpClientModule, - JwtModule.forRoot({ - config: { - tokenGetter, - allowedDomains: environment.allowedDomains - } - }), - FormsModule, - IonicModule.forRoot(), - RouterModule.forRoot(routes, {useHash: true})], - providers: [ - {provide: RouteReuseStrategy, useClass: IonicRouteStrategy} - ], - bootstrap: [AppComponent] -}) +@NgModule({ declarations: [AppComponent, HomePage, LoginPage, SignupPage], + bootstrap: [AppComponent], imports: [BrowserModule, + CommonModule, + JwtModule.forRoot({ + config: { + tokenGetter, + allowedDomains: environment.allowedDomains + } + }), + FormsModule, + IonicModule.forRoot(), + RouterModule.forRoot(routes, { useHash: true })], providers: [ + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, + provideHttpClient(withInterceptorsFromDi()) + ] }) export class AppModule { } diff --git a/jwt/client/src/app/auth.service.ts b/jwt/client/src/app/auth.service.ts index 4f0ec295f..6749b7570 100644 --- a/jwt/client/src/app/auth.service.ts +++ b/jwt/client/src/app/auth.service.ts @@ -1,6 +1,6 @@ import {Injectable} from '@angular/core'; import {Observable, ReplaySubject} from 'rxjs'; -import {HttpClient} from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; import {JwtHelperService} from '@auth0/angular-jwt'; import {tap} from 'rxjs/operators'; import {environment} from '../environments/environment'; diff --git a/jwt/client/src/app/home/home.page.ts b/jwt/client/src/app/home/home.page.ts index 0cc73fe38..9ee0efd26 100644 --- a/jwt/client/src/app/home/home.page.ts +++ b/jwt/client/src/app/home/home.page.ts @@ -1,5 +1,5 @@ import {Component, OnInit} from '@angular/core'; -import {HttpClient} from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; import {AuthService} from '../auth.service'; import {JwtHelperService} from '@auth0/angular-jwt'; import {environment} from '../../environments/environment'; diff --git a/jwt/client/tsconfig.json b/jwt/client/tsconfig.json index 093760655..56b644d6a 100644 --- a/jwt/client/tsconfig.json +++ b/jwt/client/tsconfig.json @@ -2,24 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -28,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/jwt/server/.mvn/wrapper/maven-wrapper.properties b/jwt/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/jwt/server/.mvn/wrapper/maven-wrapper.properties +++ b/jwt/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/jwt/server/pom.xml b/jwt/server/pom.xml index 8490e0f99..5d19dc639 100644 --- a/jwt/server/pom.xml +++ b/jwt/server/pom.xml @@ -13,7 +13,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/lovefield/.eslintrc.json b/lovefield/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/lovefield/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/lovefield/eslint.config.js b/lovefield/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/lovefield/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/lovefield/package.json b/lovefield/package.json index add2071b6..dced432c0 100644 --- a/lovefield/package.json +++ b/lovefield/package.json @@ -10,37 +10,32 @@ }, "private": true, "dependencies": { - "@angular/cdk": "17.3.6", - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/cdk": "18.0.2", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "lovefield": "2.1.12", "papaparse": "5.4.1", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", "@types/lovefield": "2.1.7", "@types/papaparse": "5.3.14", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } diff --git a/lovefield/src/app/app.module.ts b/lovefield/src/app/app.module.ts index b5194ea9a..feea8e44a 100644 --- a/lovefield/src/app/app.module.ts +++ b/lovefield/src/app/app.module.ts @@ -8,7 +8,7 @@ import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; import {FilterPopoverComponent} from './home/filter'; import {DetailComponent} from './home/detail'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import {ScrollingModule} from '@angular/cdk/scrolling'; const routes: Routes = [ @@ -16,19 +16,15 @@ const routes: Routes = [ {path: 'home', component: HomePage}, ]; -@NgModule({ - declarations: [AppComponent, HomePage, DetailComponent, FilterPopoverComponent], - imports: [BrowserModule, - CommonModule, - HttpClientModule, - ScrollingModule, - FormsModule, - IonicModule.forRoot(), - RouterModule.forRoot(routes, {useHash: true})], - providers: [ - {provide: RouteReuseStrategy, useClass: IonicRouteStrategy} - ], - bootstrap: [AppComponent] -}) +@NgModule({ declarations: [AppComponent, HomePage, DetailComponent, FilterPopoverComponent], + bootstrap: [AppComponent], imports: [BrowserModule, + CommonModule, + ScrollingModule, + FormsModule, + IonicModule.forRoot(), + RouterModule.forRoot(routes, { useHash: true })], providers: [ + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, + provideHttpClient(withInterceptorsFromDi()) + ] }) export class AppModule { } diff --git a/lovefield/src/app/services/earthquake.ts b/lovefield/src/app/services/earthquake.ts index da9277d02..ad2fe2551 100644 --- a/lovefield/src/app/services/earthquake.ts +++ b/lovefield/src/app/services/earthquake.ts @@ -1,7 +1,7 @@ import {Injectable} from '@angular/core'; import {parse, ParseResult} from 'papaparse'; import * as lf from 'lovefield'; -import {HttpClient} from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; import {map} from 'rxjs/operators'; import {Filter} from '../filter'; import {firstValueFrom} from "rxjs"; diff --git a/lovefield/tsconfig.json b/lovefield/tsconfig.json index 351eb63e2..657e32530 100644 --- a/lovefield/tsconfig.json +++ b/lovefield/tsconfig.json @@ -3,7 +3,6 @@ "compileOnSave": false, "compilerOptions": { "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, @@ -14,7 +13,7 @@ "sourceMap": true, "declaration": false, "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", diff --git a/minio/.mvn/wrapper/maven-wrapper.properties b/minio/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/minio/.mvn/wrapper/maven-wrapper.properties +++ b/minio/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/minio/pom.xml b/minio/pom.xml index 3fa20769a..6c6402745 100644 --- a/minio/pom.xml +++ b/minio/pom.xml @@ -9,12 +9,12 @@ com.amazonaws aws-java-sdk-s3 - 1.12.711 + 1.12.738 io.minio minio - 8.5.9 + 8.5.10 diff --git a/mnist/java/.mvn/wrapper/maven-wrapper.properties b/mnist/java/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/mnist/java/.mvn/wrapper/maven-wrapper.properties +++ b/mnist/java/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/mnist/js/.eslintrc.json b/mnist/js/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/mnist/js/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/mnist/js/eslint.config.js b/mnist/js/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/mnist/js/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/mnist/js/package.json b/mnist/js/package.json index 77bf2d4c7..34a65d2e7 100644 --- a/mnist/js/package.json +++ b/mnist/js/package.json @@ -11,35 +11,30 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", - "mathjs": "12.1.0", + "ionicons": "7.4.0", + "mathjs": "13.0.0", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "bread-compressor-cli": "3.0.3", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "bread-compressor-cli": "3.1.0", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/mnist/js/tsconfig.json b/mnist/js/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/mnist/js/tsconfig.json +++ b/mnist/js/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/ngerrorhandler/client/.eslintrc.json b/ngerrorhandler/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/ngerrorhandler/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/ngerrorhandler/client/eslint.config.js b/ngerrorhandler/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/ngerrorhandler/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/ngerrorhandler/client/package.json b/ngerrorhandler/client/package.json index 12a1d0179..e6ac68d1c 100644 --- a/ngerrorhandler/client/package.json +++ b/ngerrorhandler/client/package.json @@ -10,35 +10,30 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", - "dexie": "4.0.4", + "ionicons": "7.4.0", + "dexie": "4.0.7", "rxjs": "7.8.1", "stacktrace-js": "2.0.2", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/ngerrorhandler/client/tsconfig.json b/ngerrorhandler/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/ngerrorhandler/client/tsconfig.json +++ b/ngerrorhandler/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/ngerrorhandler/server/.mvn/wrapper/maven-wrapper.properties b/ngerrorhandler/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/ngerrorhandler/server/.mvn/wrapper/maven-wrapper.properties +++ b/ngerrorhandler/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/ngerrorhandler/server/pom.xml b/ngerrorhandler/server/pom.xml index 0b0b8963f..61bb33814 100644 --- a/ngerrorhandler/server/pom.xml +++ b/ngerrorhandler/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/ngworkbox/package.json b/ngworkbox/package.json index 310acbde2..70ad8403f 100644 --- a/ngworkbox/package.json +++ b/ngworkbox/package.json @@ -14,41 +14,41 @@ }, "private": true, "dependencies": { - "@angular/animations": "17.3.6", - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/animations": "18.0.2", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "rxjs": "7.8.1", - "tslib": "2.6.2", + "tslib": "2.6.3", "workbox-core": "7.1.0", "workbox-precaching": "7.1.0", "workbox-routing": "7.1.0", "workbox-strategies": "7.1.0", "workbox-window": "7.1.0", - "zone.js": "0.14.4" + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", + "@angular-devkit/build-angular": "18.0.3", + "@angular-eslint/builder": "18.0.1", + "@angular-eslint/eslint-plugin": "18.0.1", + "@angular-eslint/eslint-plugin-template": "18.0.1", + "@angular-eslint/schematics": "18.0.1", + "@angular-eslint/template-parser": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", + "@typescript-eslint/eslint-plugin": "7.12.0", + "@typescript-eslint/parser": "7.12.0", "eslint": "8.57.0", "local-web-server": "5.3.3", "npm-run-all": "4.1.5", - "rimraf": "5.0.5", + "rimraf": "5.0.7", "ts-loader": "9.5.1", "typescript": "5.4.5", "webpack-cli": "5.1.4", "workbox-cli": "7.1.0" } -} +} \ No newline at end of file diff --git a/ngworkbox/tsconfig.json b/ngworkbox/tsconfig.json index 948cf0bee..56b644d6a 100644 --- a/ngworkbox/tsconfig.json +++ b/ngworkbox/tsconfig.json @@ -2,19 +2,18 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } + } } diff --git a/parcelmaven/.mvn/wrapper/maven-wrapper.properties b/parcelmaven/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/parcelmaven/.mvn/wrapper/maven-wrapper.properties +++ b/parcelmaven/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/parcelmaven/pom.xml b/parcelmaven/pom.xml index a872422a4..e65921442 100644 --- a/parcelmaven/pom.xml +++ b/parcelmaven/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/passwordcheck/client/package.json b/passwordcheck/client/package.json index e9d3e8241..a5806e818 100644 --- a/passwordcheck/client/package.json +++ b/passwordcheck/client/package.json @@ -15,7 +15,7 @@ }, "dependencies": { "babel-polyfill": "6.26.0", - "hibp": "14.0.3", + "hibp": "14.1.1", "zxcvbn": "4.4.2" } } diff --git a/passwordcheck/server/.mvn/wrapper/maven-wrapper.properties b/passwordcheck/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/passwordcheck/server/.mvn/wrapper/maven-wrapper.properties +++ b/passwordcheck/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/passwordcheck/server/pom.xml b/passwordcheck/server/pom.xml index 8711e28f3..11bf2ad2b 100644 --- a/passwordcheck/server/pom.xml +++ b/passwordcheck/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/pluggable-fs/.mvn/wrapper/maven-wrapper.properties b/pluggable-fs/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/pluggable-fs/.mvn/wrapper/maven-wrapper.properties +++ b/pluggable-fs/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/pluggable-fs/pom.xml b/pluggable-fs/pom.xml index 33b4e4781..87804f15e 100644 --- a/pluggable-fs/pom.xml +++ b/pluggable-fs/pom.xml @@ -10,12 +10,12 @@ org.cryptomator cryptofs - 1.9.15 + 2.6.9 com.google.jimfs jimfs - 1.2 + 1.3.0 @@ -23,10 +23,10 @@ maven-compiler-plugin - 3.12.1 + 3.13.0 - 17 - 17 + 21 + 21 true diff --git a/pluggable-fs/src/main/java/ch/rasc/pluggablefs/Cryptomator.java b/pluggable-fs/src/main/java/ch/rasc/pluggablefs/Cryptomator.java index 892fbe6da..f28603b68 100644 --- a/pluggable-fs/src/main/java/ch/rasc/pluggablefs/Cryptomator.java +++ b/pluggable-fs/src/main/java/ch/rasc/pluggablefs/Cryptomator.java @@ -4,17 +4,19 @@ import java.net.URI; import java.nio.charset.StandardCharsets; import java.nio.file.FileSystem; -import java.nio.file.FileSystems; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; +import java.nio.file.StandardOpenOption; +import java.security.SecureRandom; import java.util.Arrays; import java.util.List; import org.cryptomator.cryptofs.CryptoFileSystemProperties; import org.cryptomator.cryptofs.CryptoFileSystemProvider; -import org.cryptomator.cryptofs.CryptoFileSystemUri; +import org.cryptomator.cryptolib.api.Masterkey; +import org.cryptomator.cryptolib.api.MasterkeyLoader; public class Cryptomator { @@ -22,14 +24,21 @@ public static void main(String[] args) throws IOException { Path storageLocation = Paths.get("E:\\temp\\vault"); Files.createDirectories(storageLocation); - CryptoFileSystemProvider.initialize(storageLocation, "masterkey.cryptomator", - "password"); + SecureRandom csprng = new SecureRandom(); - URI uri = CryptoFileSystemUri.create(storageLocation); + Masterkey masterkey = Masterkey.generate(csprng); + MasterkeyLoader loader = ignoredUri -> masterkey.copy(); - try (FileSystem fs = FileSystems.newFileSystem(uri, - CryptoFileSystemProperties.cryptoFileSystemProperties().withPassphrase("password") - // .withFlags(FileSystemFlags.READONLY) + Path masterKeyPath = Paths.get("E:\\temp\\vault\\masterkey.cryptomator"); + + Files.write(masterKeyPath, masterkey.getEncoded(), StandardOpenOption.CREATE_NEW); + URI uri = masterKeyPath.toUri(); + CryptoFileSystemProperties fsProps = CryptoFileSystemProperties + .cryptoFileSystemProperties().withKeyLoader(loader).build(); + CryptoFileSystemProvider.initialize(storageLocation, fsProps, uri); + + try (FileSystem fs = CryptoFileSystemProvider.newFileSystem(storageLocation, + CryptoFileSystemProperties.cryptoFileSystemProperties().withKeyLoader(loader) .build())) { Path p1 = fs.getPath("/one.txt"); @@ -49,7 +58,6 @@ public static void main(String[] args) throws IOException { Files.write(p3, Arrays.asList("three")); Files.delete(p1); - } } diff --git a/poll/server/.mvn/wrapper/maven-wrapper.properties b/poll/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/poll/server/.mvn/wrapper/maven-wrapper.properties +++ b/poll/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/poll/server/pom.xml b/poll/server/pom.xml index 028effaed..bfe89b02d 100644 --- a/poll/server/pom.xml +++ b/poll/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/protobuf-js/client/.eslintrc.json b/protobuf-js/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/protobuf-js/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/protobuf-js/client/eslint.config.js b/protobuf-js/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/protobuf-js/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/protobuf-js/client/package.json b/protobuf-js/client/package.json index ed3840cf6..2bfdb777d 100644 --- a/protobuf-js/client/package.json +++ b/protobuf-js/client/package.json @@ -7,38 +7,33 @@ "build": "ng build", "serve-dist": "ws --hostname localhost -d dist/app -p 1234 -o --log.format stats", "lint": "ng lint", - "pbts": "pbjs -t static-module ../server/src/main/protobuf/Earthquake.proto -o src/app/protos/earthquake.js && pbts --no-comments src/app/protos/earthquake.js -o src/app/protos/earthquake.d.ts" + "pbts": "pbjs -t static-module --es6 -w es6 ../server/src/main/protobuf/Earthquake.proto -o src/app/protos/earthquake.js && pbts --no-comments src/app/protos/earthquake.js -o src/app/protos/earthquake.d.ts" }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", - "protobufjs": "7.2.6", + "ionicons": "7.4.0", + "protobufjs": "7.3.0", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/protobuf-js/client/src/app/app.module.ts b/protobuf-js/client/src/app/app.module.ts index f4094b550..f2c6a7f2d 100644 --- a/protobuf-js/client/src/app/app.module.ts +++ b/protobuf-js/client/src/app/app.module.ts @@ -6,7 +6,7 @@ import {AppComponent} from './app.component'; import {TabsPage} from './tabs/tabs.page'; import {JsonPage} from './json/json.page'; import {ProtobufPage} from './protobuf/protobuf.page'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import {DetailComponent} from './detail/detail.component'; @@ -43,13 +43,10 @@ const routes: Routes = [ } ]; -@NgModule({ - declarations: [AppComponent, TabsPage, ProtobufPage, JsonPage, DetailComponent], - imports: [BrowserModule, HttpClientModule, IonicModule.forRoot(), RouterModule.forRoot(routes, { useHash: true })], - providers: [ - {provide: RouteReuseStrategy, useClass: IonicRouteStrategy} - ], - bootstrap: [AppComponent] -}) +@NgModule({ declarations: [AppComponent, TabsPage, ProtobufPage, JsonPage, DetailComponent], + bootstrap: [AppComponent], imports: [BrowserModule, IonicModule.forRoot(), RouterModule.forRoot(routes, { useHash: true })], providers: [ + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, + provideHttpClient(withInterceptorsFromDi()) + ] }) export class AppModule { } diff --git a/protobuf-js/client/src/app/earthquake.service.ts b/protobuf-js/client/src/app/earthquake.service.ts index 7e21ee587..0b22771cf 100644 --- a/protobuf-js/client/src/app/earthquake.service.ts +++ b/protobuf-js/client/src/app/earthquake.service.ts @@ -1,7 +1,7 @@ import {Injectable} from '@angular/core'; import {Observable, throwError} from 'rxjs'; import {catchError, map} from 'rxjs/operators'; -import {HttpClient, HttpHeaders} from '@angular/common/http'; +import { HttpClient, HttpHeaders } from '@angular/common/http'; import {Earthquakes, IEarthquake} from './protos/earthquake'; import {environment} from '../environments/environment'; diff --git a/protobuf-js/client/tsconfig.json b/protobuf-js/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/protobuf-js/client/tsconfig.json +++ b/protobuf-js/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/protobuf-js/server/.mvn/wrapper/maven-wrapper.properties b/protobuf-js/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/protobuf-js/server/.mvn/wrapper/maven-wrapper.properties +++ b/protobuf-js/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/protobuf-js/server/pom.xml b/protobuf-js/server/pom.xml index 7f98a24de..5f4c237e0 100644 --- a/protobuf-js/server/pom.xml +++ b/protobuf-js/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 @@ -42,12 +42,12 @@ com.google.protobuf protobuf-java - 4.26.1 + 4.27.1 com.google.protobuf protobuf-java-util - 4.26.1 + 4.27.1 com.univocity @@ -79,7 +79,7 @@ run - 4.26.1 + 4.27.1 src/main/protobuf diff --git a/protobuf/.mvn/wrapper/maven-wrapper.properties b/protobuf/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/protobuf/.mvn/wrapper/maven-wrapper.properties +++ b/protobuf/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/protobuf/pom.xml b/protobuf/pom.xml index 740a2b19d..dc1829f1f 100644 --- a/protobuf/pom.xml +++ b/protobuf/pom.xml @@ -33,7 +33,7 @@ com.google.protobuf protobuf-java - 4.26.1 + 4.27.1 @@ -60,7 +60,7 @@ run - 4.26.1 + 4.27.1 src/main/protobuf diff --git a/push/client/.eslintrc.json b/push/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/push/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/push/client/eslint.config.js b/push/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/push/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/push/client/package.json b/push/client/package.json index 48a5d05a9..75ce8893f 100644 --- a/push/client/package.json +++ b/push/client/package.json @@ -10,19 +10,19 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic-native/core": "5.36.0", "@ionic-native/splash-screen": "5.36.0", "@ionic-native/status-bar": "5.36.0", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", - "cordova-android": "12.0.1", + "ionicons": "7.4.0", + "cordova-android": "13.0.0", "cordova-plugin-device": "2.1.0", "cordova-plugin-firebase-analytics": "8.0.0", "cordova-plugin-firebase-messaging": "8.0.1", @@ -34,22 +34,17 @@ "cordova-support-android-plugin": "2.0.4", "cordova-support-google-services": "1.4.1", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" }, @@ -72,4 +67,4 @@ "android" ] } -} +} \ No newline at end of file diff --git a/push/client/src/app/app.module.ts b/push/client/src/app/app.module.ts index 839cce9ea..f1f2c40ab 100644 --- a/push/client/src/app/app.module.ts +++ b/push/client/src/app/app.module.ts @@ -6,7 +6,7 @@ import {AppComponent} from './app.component'; import {HomePage} from './home/home.page'; import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import {SplashScreen} from '@ionic-native/splash-screen/ngx'; import {StatusBar} from '@ionic-native/status-bar/ngx'; @@ -15,20 +15,16 @@ const routes: Routes = [ {path: 'home', component: HomePage}, ]; -@NgModule({ - declarations: [AppComponent, HomePage], - imports: [BrowserModule, - CommonModule, - HttpClientModule, - FormsModule, - IonicModule.forRoot(), - RouterModule.forRoot(routes, { useHash: true })], - providers: [ - StatusBar, - SplashScreen, - {provide: RouteReuseStrategy, useClass: IonicRouteStrategy} - ], - bootstrap: [AppComponent] -}) +@NgModule({ declarations: [AppComponent, HomePage], + bootstrap: [AppComponent], imports: [BrowserModule, + CommonModule, + FormsModule, + IonicModule.forRoot(), + RouterModule.forRoot(routes, { useHash: true })], providers: [ + StatusBar, + SplashScreen, + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, + provideHttpClient(withInterceptorsFromDi()) + ] }) export class AppModule { } diff --git a/push/client/src/app/home/home.page.ts b/push/client/src/app/home/home.page.ts index f099de8ac..21a24db9c 100644 --- a/push/client/src/app/home/home.page.ts +++ b/push/client/src/app/home/home.page.ts @@ -1,5 +1,5 @@ import {ChangeDetectorRef, Component} from '@angular/core'; -import {HttpClient} from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; import {Platform} from '@ionic/angular'; import {timeout} from 'rxjs/operators'; import {environment} from '../../environments/environment'; diff --git a/push/client/tsconfig.json b/push/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/push/client/tsconfig.json +++ b/push/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/push/server/.mvn/wrapper/maven-wrapper.properties b/push/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/push/server/.mvn/wrapper/maven-wrapper.properties +++ b/push/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/push/server/pom.xml b/push/server/pom.xml index 50a6a0f63..60b0f1ff9 100644 --- a/push/server/pom.xml +++ b/push/server/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/pwmanager/client/.eslintrc.json b/pwmanager/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/pwmanager/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/pwmanager/client/eslint.config.js b/pwmanager/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/pwmanager/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/pwmanager/client/package.json b/pwmanager/client/package.json index d5a904902..9afe5a2cc 100644 --- a/pwmanager/client/package.json +++ b/pwmanager/client/package.json @@ -10,38 +10,33 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "lzutf8": "0.6.3", "rxjs": "7.8.1", "stream": "0.0.2", "text-encoding-shim": "1.0.5", - "tslib": "2.6.2", + "tslib": "2.6.3", "uuid": "9.0.1", - "zone.js": "0.14.4" + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", "@types/uuid": "9.0.8", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/pwmanager/client/src/app/app.module.ts b/pwmanager/client/src/app/app.module.ts index 225fdb7e8..f34bf3e11 100644 --- a/pwmanager/client/src/app/app.module.ts +++ b/pwmanager/client/src/app/app.module.ts @@ -6,7 +6,7 @@ import {AppComponent} from './app.component'; import {HomePage} from './home/home.page'; import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import {LoginPage} from './login/login.page'; import {EditPage} from './edit/edit.page'; import {AuthGuard} from './auth-guard.service'; @@ -20,18 +20,14 @@ const routes: Routes = [ {path: '**', redirectTo: '/home'} ]; -@NgModule({ - declarations: [AppComponent, HomePage, LoginPage, EditPage], - imports: [BrowserModule, - CommonModule, - HttpClientModule, - FormsModule, - IonicModule.forRoot(), - RouterModule.forRoot(routes, {useHash: true})], - providers: [ - {provide: RouteReuseStrategy, useClass: IonicRouteStrategy} - ], - bootstrap: [AppComponent] -}) +@NgModule({ declarations: [AppComponent, HomePage, LoginPage, EditPage], + bootstrap: [AppComponent], imports: [BrowserModule, + CommonModule, + FormsModule, + IonicModule.forRoot(), + RouterModule.forRoot(routes, { useHash: true })], providers: [ + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, + provideHttpClient(withInterceptorsFromDi()) + ] }) export class AppModule { } diff --git a/pwmanager/client/tsconfig.json b/pwmanager/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/pwmanager/client/tsconfig.json +++ b/pwmanager/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/pwmanager/server/.mvn/wrapper/maven-wrapper.properties b/pwmanager/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/pwmanager/server/.mvn/wrapper/maven-wrapper.properties +++ b/pwmanager/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/pwmanager/server/pom.xml b/pwmanager/server/pom.xml index 65f96be08..d754bc160 100644 --- a/pwmanager/server/pom.xml +++ b/pwmanager/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/pwnd/.mvn/wrapper/maven-wrapper.properties b/pwnd/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/pwnd/.mvn/wrapper/maven-wrapper.properties +++ b/pwnd/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/pwnd/pom.xml b/pwnd/pom.xml index ba5be465a..6a8f426b7 100644 --- a/pwnd/pom.xml +++ b/pwnd/pom.xml @@ -14,12 +14,12 @@ org.slf4j slf4j-api - 2.0.12 + 2.0.13 ch.qos.logback logback-classic - 1.5.3 + 1.5.6 com.squareup.okhttp3 diff --git a/rss/.mvn/wrapper/maven-wrapper.properties b/rss/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/rss/.mvn/wrapper/maven-wrapper.properties +++ b/rss/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/rss/pom.xml b/rss/pom.xml index 2434e1fb8..4cecfff38 100644 --- a/rss/pom.xml +++ b/rss/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/secure-todo-asm/.eslintrc.json b/secure-todo-asm/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/secure-todo-asm/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/secure-todo-asm/eslint.config.js b/secure-todo-asm/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/secure-todo-asm/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/secure-todo-asm/package.json b/secure-todo-asm/package.json index 894797c72..ea1fccb7d 100644 --- a/secure-todo-asm/package.json +++ b/secure-todo-asm/package.json @@ -10,34 +10,29 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "asmcrypto.js": "2.3.2", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/secure-todo-asm/tsconfig.json b/secure-todo-asm/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/secure-todo-asm/tsconfig.json +++ b/secure-todo-asm/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/secure-todo/.eslintrc.json b/secure-todo/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/secure-todo/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/secure-todo/eslint.config.js b/secure-todo/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/secure-todo/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/secure-todo/package.json b/secure-todo/package.json index a0eb7e694..8287b7aeb 100644 --- a/secure-todo/package.json +++ b/secure-todo/package.json @@ -10,33 +10,28 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/secure-todo/tsconfig.json b/secure-todo/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/secure-todo/tsconfig.json +++ b/secure-todo/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/speechsearch/client/.eslintrc.json b/speechsearch/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/speechsearch/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/speechsearch/client/eslint.config.js b/speechsearch/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/speechsearch/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/speechsearch/client/package.json b/speechsearch/client/package.json index 1d3457aea..89926aea0 100644 --- a/speechsearch/client/package.json +++ b/speechsearch/client/package.json @@ -10,38 +10,33 @@ }, "private": true, "dependencies": { - "@angular/animations": "17.3.6", - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/animations": "18.0.2", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic-native/core": "5.36.0", "@ionic-native/splash-screen": "5.36.0", "@ionic-native/status-bar": "5.36.0", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "recordrtc": "5.6.2", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/speechsearch/client/src/app/home/home.module.ts b/speechsearch/client/src/app/home/home.module.ts index 0eb100121..332639953 100644 --- a/speechsearch/client/src/app/home/home.module.ts +++ b/speechsearch/client/src/app/home/home.module.ts @@ -4,22 +4,16 @@ import {IonicModule} from '@ionic/angular'; import {FormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; import {HomePage} from './home.page'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - HttpClientModule, - RouterModule.forChild([ - { - path: '', - component: HomePage - } - ]) - ], - declarations: [HomePage] -}) +@NgModule({ declarations: [HomePage], imports: [CommonModule, + FormsModule, + IonicModule, + RouterModule.forChild([ + { + path: '', + component: HomePage + } + ])], providers: [provideHttpClient(withInterceptorsFromDi())] }) export class HomePageModule { } diff --git a/speechsearch/client/tsconfig.json b/speechsearch/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/speechsearch/client/tsconfig.json +++ b/speechsearch/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/speechsearch/server/.mvn/wrapper/maven-wrapper.properties b/speechsearch/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/speechsearch/server/.mvn/wrapper/maven-wrapper.properties +++ b/speechsearch/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/speechsearch/server/pom.xml b/speechsearch/server/pom.xml index 62f5a87f9..e2803827d 100644 --- a/speechsearch/server/pom.xml +++ b/speechsearch/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/sse-client/.mvn/wrapper/maven-wrapper.properties b/sse-client/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/sse-client/.mvn/wrapper/maven-wrapper.properties +++ b/sse-client/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/sse-client/pom.xml b/sse-client/pom.xml index 1afa94fde..b66778bbc 100644 --- a/sse-client/pom.xml +++ b/sse-client/pom.xml @@ -24,7 +24,7 @@ org.slf4j slf4j-api - 2.0.12 + 2.0.13 org.springframework diff --git a/sse/.mvn/wrapper/maven-wrapper.properties b/sse/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/sse/.mvn/wrapper/maven-wrapper.properties +++ b/sse/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/sse/pom.xml b/sse/pom.xml index 8b69fa2fc..3c0c55bad 100644 --- a/sse/pom.xml +++ b/sse/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/sw-cache/.eslintrc.json b/sw-cache/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/sw-cache/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/sw-cache/eslint.config.js b/sw-cache/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/sw-cache/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/sw-cache/package.json b/sw-cache/package.json index 0e282bc1b..dc12f46d6 100644 --- a/sw-cache/package.json +++ b/sw-cache/package.json @@ -10,34 +10,29 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "rxjs": "7.8.1", - "swiper": "11.1.0", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "swiper": "11.1.4", + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/sw-cache/src/app/app.module.ts b/sw-cache/src/app/app.module.ts index acff685ab..d5c33b957 100644 --- a/sw-cache/src/app/app.module.ts +++ b/sw-cache/src/app/app.module.ts @@ -6,26 +6,22 @@ import {AppComponent} from './app.component'; import {HomePage} from './home/home.page'; import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; const routes: Routes = [ {path: '', redirectTo: 'home', pathMatch: 'full'}, {path: 'home', component: HomePage}, ]; -@NgModule({ - schemas: [CUSTOM_ELEMENTS_SCHEMA], - declarations: [AppComponent, HomePage], - imports: [BrowserModule, - CommonModule, - HttpClientModule, - FormsModule, - IonicModule.forRoot(), - RouterModule.forRoot(routes, {useHash: true})], - providers: [ - {provide: RouteReuseStrategy, useClass: IonicRouteStrategy} - ], - bootstrap: [AppComponent] -}) +@NgModule({ schemas: [CUSTOM_ELEMENTS_SCHEMA], + declarations: [AppComponent, HomePage], + bootstrap: [AppComponent], imports: [BrowserModule, + CommonModule, + FormsModule, + IonicModule.forRoot(), + RouterModule.forRoot(routes, { useHash: true })], providers: [ + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, + provideHttpClient(withInterceptorsFromDi()) + ] }) export class AppModule { } diff --git a/sw-cache/tsconfig.json b/sw-cache/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/sw-cache/tsconfig.json +++ b/sw-cache/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/sw-push/.mvn/wrapper/maven-wrapper.properties b/sw-push/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/sw-push/.mvn/wrapper/maven-wrapper.properties +++ b/sw-push/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/sw-push/pom.xml b/sw-push/pom.xml index c49413f18..3a1713ab1 100644 --- a/sw-push/pom.xml +++ b/sw-push/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/swagger/client/.eslintrc.json b/swagger/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/swagger/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/swagger/client/eslint.config.js b/swagger/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/swagger/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/swagger/client/package.json b/swagger/client/package.json index 26197718e..b1bdc5209 100644 --- a/swagger/client/package.json +++ b/swagger/client/package.json @@ -10,35 +10,30 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "rxjs": "7.8.1", - "tslib": "2.6.2", + "tslib": "2.6.3", "uuid": "9.0.1", - "zone.js": "0.14.4" + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", "@types/uuid": "9.0.8", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/swagger/client/src/app/app.module.ts b/swagger/client/src/app/app.module.ts index 33c296d83..5a51a43c4 100644 --- a/swagger/client/src/app/app.module.ts +++ b/swagger/client/src/app/app.module.ts @@ -6,7 +6,7 @@ import {AppComponent} from './app.component'; import {HomePage} from './home/home.page'; import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import {EditPage} from './edit/edit.page'; import {ApiModule, Configuration, ConfigurationParameters} from './swagger'; import {environment} from '../environments/environment'; @@ -25,19 +25,15 @@ export function apiConfigFactory(): Configuration { return new Configuration(params); } -@NgModule({ - declarations: [AppComponent, HomePage, EditPage], - imports: [BrowserModule, - CommonModule, - HttpClientModule, - ApiModule.forRoot(apiConfigFactory), - FormsModule, - IonicModule.forRoot(), - RouterModule.forRoot(routes, {useHash: true})], - providers: [ - {provide: RouteReuseStrategy, useClass: IonicRouteStrategy} - ], - bootstrap: [AppComponent] -}) +@NgModule({ declarations: [AppComponent, HomePage, EditPage], + bootstrap: [AppComponent], imports: [BrowserModule, + CommonModule, + ApiModule.forRoot(apiConfigFactory), + FormsModule, + IonicModule.forRoot(), + RouterModule.forRoot(routes, { useHash: true })], providers: [ + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, + provideHttpClient(withInterceptorsFromDi()) + ] }) export class AppModule { } diff --git a/swagger/client/src/app/swagger/api.module.ts b/swagger/client/src/app/swagger/api.module.ts index 66954c1a5..8d6d30fcb 100644 --- a/swagger/client/src/app/swagger/api.module.ts +++ b/swagger/client/src/app/swagger/api.module.ts @@ -1,6 +1,6 @@ import {ModuleWithProviders, NgModule, Optional, SkipSelf} from '@angular/core'; import {Configuration} from './configuration'; -import {HttpClient} from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; import {TodoServiceService} from './api/todoService.service'; diff --git a/swagger/client/src/app/swagger/api/todoService.service.ts b/swagger/client/src/app/swagger/api/todoService.service.ts index 1259fbc3b..2b45e852d 100644 --- a/swagger/client/src/app/swagger/api/todoService.service.ts +++ b/swagger/client/src/app/swagger/api/todoService.service.ts @@ -12,7 +12,7 @@ /* eslint-disable @typescript-eslint/no-unused-vars, @typescript-eslint/member-ordering */ import {Inject, Injectable, Optional} from '@angular/core'; -import {HttpClient, HttpEvent, HttpHeaders, HttpResponse} from '@angular/common/http'; +import { HttpClient, HttpEvent, HttpHeaders, HttpResponse } from '@angular/common/http'; import {Observable} from 'rxjs'; diff --git a/swagger/client/tsconfig.json b/swagger/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/swagger/client/tsconfig.json +++ b/swagger/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/swagger/server/.mvn/wrapper/maven-wrapper.properties b/swagger/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/swagger/server/.mvn/wrapper/maven-wrapper.properties +++ b/swagger/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/swagger/server/pom.xml b/swagger/server/pom.xml index 65577c9b4..58a9459e4 100644 --- a/swagger/server/pom.xml +++ b/swagger/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/text2speech/client/.eslintrc.json b/text2speech/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/text2speech/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/text2speech/client/eslint.config.js b/text2speech/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/text2speech/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/text2speech/client/package.json b/text2speech/client/package.json index bbd3cf50f..57e19a0e5 100644 --- a/text2speech/client/package.json +++ b/text2speech/client/package.json @@ -10,33 +10,28 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/text2speech/client/tsconfig.json b/text2speech/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/text2speech/client/tsconfig.json +++ b/text2speech/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/text2speech/server/.mvn/wrapper/maven-wrapper.properties b/text2speech/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/text2speech/server/.mvn/wrapper/maven-wrapper.properties +++ b/text2speech/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/text2speech/server/pom.xml b/text2speech/server/pom.xml index 6935aa1ee..2ff694137 100644 --- a/text2speech/server/pom.xml +++ b/text2speech/server/pom.xml @@ -15,7 +15,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/twolegged/.mvn/wrapper/maven-wrapper.properties b/twolegged/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/twolegged/.mvn/wrapper/maven-wrapper.properties +++ b/twolegged/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/twolegged/pom.xml b/twolegged/pom.xml index e631b25eb..fa0689106 100644 --- a/twolegged/pom.xml +++ b/twolegged/pom.xml @@ -7,8 +7,8 @@ 0.0.1 - 2.0.12 - 1.5.3 + 2.0.13 + 1.5.6 @@ -58,7 +58,7 @@ com.google.cloud google-cloud-translate - 2.39.0 + 2.43.0 com.google.auth diff --git a/upload-minio/client/.eslintrc.json b/upload-minio/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/upload-minio/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/upload-minio/client/eslint.config.js b/upload-minio/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/upload-minio/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/upload-minio/client/package.json b/upload-minio/client/package.json index 3255218ef..ebfb102a4 100644 --- a/upload-minio/client/package.json +++ b/upload-minio/client/package.json @@ -10,37 +10,32 @@ }, "private": true, "dependencies": { - "@angular/animations": "17.3.6", - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/animations": "18.0.2", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic-native/core": "5.36.0", "@ionic-native/splash-screen": "5.36.0", "@ionic-native/status-bar": "5.36.0", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/upload-minio/client/src/app/home/home.module.ts b/upload-minio/client/src/app/home/home.module.ts index 0eb100121..332639953 100644 --- a/upload-minio/client/src/app/home/home.module.ts +++ b/upload-minio/client/src/app/home/home.module.ts @@ -4,22 +4,16 @@ import {IonicModule} from '@ionic/angular'; import {FormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; import {HomePage} from './home.page'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - HttpClientModule, - RouterModule.forChild([ - { - path: '', - component: HomePage - } - ]) - ], - declarations: [HomePage] -}) +@NgModule({ declarations: [HomePage], imports: [CommonModule, + FormsModule, + IonicModule, + RouterModule.forChild([ + { + path: '', + component: HomePage + } + ])], providers: [provideHttpClient(withInterceptorsFromDi())] }) export class HomePageModule { } diff --git a/upload-minio/client/src/app/home/home.page.ts b/upload-minio/client/src/app/home/home.page.ts index a7315724b..8559380a9 100644 --- a/upload-minio/client/src/app/home/home.page.ts +++ b/upload-minio/client/src/app/home/home.page.ts @@ -1,5 +1,5 @@ import {Component} from '@angular/core'; -import {HttpClient} from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; import {LoadingController, ToastController} from '@ionic/angular'; import {catchError, finalize} from 'rxjs/operators'; import {Observable, throwError} from 'rxjs'; diff --git a/upload-minio/client/tsconfig.json b/upload-minio/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/upload-minio/client/tsconfig.json +++ b/upload-minio/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/upload-minio/server/.mvn/wrapper/maven-wrapper.properties b/upload-minio/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/upload-minio/server/.mvn/wrapper/maven-wrapper.properties +++ b/upload-minio/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/upload-minio/server/pom.xml b/upload-minio/server/pom.xml index d1328b436..e35559353 100644 --- a/upload-minio/server/pom.xml +++ b/upload-minio/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 @@ -32,7 +32,7 @@ io.minio minio - 8.5.9 + 8.5.10 org.springframework.boot diff --git a/uploadflowjs/client/.eslintrc.json b/uploadflowjs/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/uploadflowjs/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/uploadflowjs/client/eslint.config.js b/uploadflowjs/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/uploadflowjs/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/uploadflowjs/client/package.json b/uploadflowjs/client/package.json index 736f78422..0d5674c8a 100644 --- a/uploadflowjs/client/package.json +++ b/uploadflowjs/client/package.json @@ -10,36 +10,31 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@flowjs/flow.js": "2.14.1", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "recordrtc": "5.6.2", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", "@types/flowjs": "2.13.13", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/uploadflowjs/client/src/app/app.module.ts b/uploadflowjs/client/src/app/app.module.ts index 2ade6a5fc..70901606d 100644 --- a/uploadflowjs/client/src/app/app.module.ts +++ b/uploadflowjs/client/src/app/app.module.ts @@ -6,7 +6,7 @@ import {AppComponent} from './app.component'; import {HomePage} from './home/home.page'; import {CommonModule} from '@angular/common'; import {FormsModule} from '@angular/forms'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; import {ProgressBarComponent} from './progress-bar/progress-bar.component'; const routes: Routes = [ @@ -14,18 +14,14 @@ const routes: Routes = [ {path: 'home', component: HomePage}, ]; -@NgModule({ - declarations: [AppComponent, HomePage, ProgressBarComponent], - imports: [BrowserModule, - CommonModule, - HttpClientModule, - FormsModule, - IonicModule.forRoot(), - RouterModule.forRoot(routes, { useHash: true })], - providers: [ - {provide: RouteReuseStrategy, useClass: IonicRouteStrategy} - ], - bootstrap: [AppComponent] -}) +@NgModule({ declarations: [AppComponent, HomePage, ProgressBarComponent], + bootstrap: [AppComponent], imports: [BrowserModule, + CommonModule, + FormsModule, + IonicModule.forRoot(), + RouterModule.forRoot(routes, { useHash: true })], providers: [ + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, + provideHttpClient(withInterceptorsFromDi()) + ] }) export class AppModule { } diff --git a/uploadflowjs/client/tsconfig.json b/uploadflowjs/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/uploadflowjs/client/tsconfig.json +++ b/uploadflowjs/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/uploadflowjs/server/.mvn/wrapper/maven-wrapper.properties b/uploadflowjs/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/uploadflowjs/server/.mvn/wrapper/maven-wrapper.properties +++ b/uploadflowjs/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/uploadflowjs/server/pom.xml b/uploadflowjs/server/pom.xml index 76e544ce1..93718eaf3 100644 --- a/uploadflowjs/server/pom.xml +++ b/uploadflowjs/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/uploadsb/client/.eslintrc.json b/uploadsb/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/uploadsb/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/uploadsb/client/eslint.config.js b/uploadsb/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/uploadsb/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/uploadsb/client/package.json b/uploadsb/client/package.json index 87a236127..235c153fd 100644 --- a/uploadsb/client/package.json +++ b/uploadsb/client/package.json @@ -10,36 +10,31 @@ }, "private": true, "dependencies": { - "@angular/animations": "17.3.6", - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/animations": "18.0.2", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic-native/core": "5.36.0", "@ionic-native/splash-screen": "5.36.0", "@ionic-native/status-bar": "5.36.0", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", - "cordova-android": "12.0.1", + "ionicons": "7.4.0", + "cordova-android": "13.0.0", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", + "typescript-eslint": "8.0.0-alpha.20", "cordova-plugin-camera": "7.0.0", "cordova-plugin-device": "2.1.0", "cordova-plugin-file": "8.0.1", @@ -48,7 +43,7 @@ "cordova-plugin-splashscreen": "6.0.2", "cordova-plugin-statusbar": "4.0.0", "cordova-plugin-whitelist": "1.3.5", - "eslint": "8.57.0", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" }, @@ -69,4 +64,4 @@ "android" ] } -} +} \ No newline at end of file diff --git a/uploadsb/client/src/app/home/home.module.ts b/uploadsb/client/src/app/home/home.module.ts index 0eb100121..332639953 100644 --- a/uploadsb/client/src/app/home/home.module.ts +++ b/uploadsb/client/src/app/home/home.module.ts @@ -4,22 +4,16 @@ import {IonicModule} from '@ionic/angular'; import {FormsModule} from '@angular/forms'; import {RouterModule} from '@angular/router'; import {HomePage} from './home.page'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; -@NgModule({ - imports: [ - CommonModule, - FormsModule, - IonicModule, - HttpClientModule, - RouterModule.forChild([ - { - path: '', - component: HomePage - } - ]) - ], - declarations: [HomePage] -}) +@NgModule({ declarations: [HomePage], imports: [CommonModule, + FormsModule, + IonicModule, + RouterModule.forChild([ + { + path: '', + component: HomePage + } + ])], providers: [provideHttpClient(withInterceptorsFromDi())] }) export class HomePageModule { } diff --git a/uploadsb/client/src/app/home/home.page.ts b/uploadsb/client/src/app/home/home.page.ts index d33b360c5..9b135cfc0 100644 --- a/uploadsb/client/src/app/home/home.page.ts +++ b/uploadsb/client/src/app/home/home.page.ts @@ -1,5 +1,5 @@ import {ChangeDetectorRef, Component} from '@angular/core'; -import {HttpClient} from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; import {LoadingController, ToastController} from '@ionic/angular'; import {catchError, finalize} from 'rxjs/operators'; import {Observable, throwError} from 'rxjs'; diff --git a/uploadsb/client/tsconfig.json b/uploadsb/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/uploadsb/client/tsconfig.json +++ b/uploadsb/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/uploadsb/server/.mvn/wrapper/maven-wrapper.properties b/uploadsb/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/uploadsb/server/.mvn/wrapper/maven-wrapper.properties +++ b/uploadsb/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/uploadsb/server/pom.xml b/uploadsb/server/pom.xml index 574c99bb6..8070aa777 100644 --- a/uploadsb/server/pom.xml +++ b/uploadsb/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/validation/client/.eslintrc.json b/validation/client/.eslintrc.json deleted file mode 100644 index 8df8160c8..000000000 --- a/validation/client/.eslintrc.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "root": true, - "ignorePatterns": [ - "projects/**/*" - ], - "overrides": [ - { - "files": [ - "*.ts" - ], - "extends": [ - "eslint:recommended", - "plugin:@typescript-eslint/recommended", - "plugin:@angular-eslint/recommended", - "plugin:@angular-eslint/template/process-inline-templates" - ], - "rules": { - "@angular-eslint/directive-selector": [ - "error", - { - "type": "attribute", - "prefix": "app", - "style": "camelCase" - } - ], - "@angular-eslint/component-class-suffix": [ - "error", - { - "suffixes": ["Page", "Component"] - } - ], - "@angular-eslint/component-selector": [ - "error", - { - "type": "element", - "prefix": "app", - "style": "kebab-case" - } - ] - } - }, - { - "files": [ - "*.html" - ], - "extends": [ - "plugin:@angular-eslint/template/recommended", - "plugin:@angular-eslint/template/accessibility" - ], - "rules": {} - } - ] -} diff --git a/validation/client/eslint.config.js b/validation/client/eslint.config.js new file mode 100644 index 000000000..6715b61de --- /dev/null +++ b/validation/client/eslint.config.js @@ -0,0 +1,50 @@ +// @ts-check +const eslint = require("@eslint/js"); +const tseslint = require("typescript-eslint"); +const angular = require("angular-eslint"); + +module.exports = tseslint.config( + { + files: ["**/*.ts"], + ignores: ["**/zone-flags.ts"], + extends: [ + eslint.configs.recommended, + ...tseslint.configs.recommended, + ...tseslint.configs.stylistic, + ...angular.configs.tsRecommended, + ], + processor: angular.processInlineTemplates, + rules: { + "@angular-eslint/component-class-suffix": [ + "error", + { + "suffixes": ["Page", "Component"] + } + ], + "@angular-eslint/directive-selector": [ + "error", + { + type: "attribute", + prefix: "app", + style: "camelCase", + }, + ], + "@angular-eslint/component-selector": [ + "error", + { + type: "element", + prefix: "app", + style: "kebab-case", + }, + ], + }, + }, + { + files: ["**/*.html"], + extends: [ + ...angular.configs.templateRecommended, + ...angular.configs.templateAccessibility, + ], + rules: {}, + } +); diff --git a/validation/client/package.json b/validation/client/package.json index 20688d750..15130855c 100644 --- a/validation/client/package.json +++ b/validation/client/package.json @@ -10,33 +10,28 @@ }, "private": true, "dependencies": { - "@angular/common": "17.3.6", - "@angular/compiler": "17.3.6", - "@angular/core": "17.3.6", - "@angular/forms": "17.3.6", - "@angular/platform-browser": "17.3.6", - "@angular/platform-browser-dynamic": "17.3.6", - "@angular/router": "17.3.6", + "@angular/common": "18.0.2", + "@angular/compiler": "18.0.2", + "@angular/core": "18.0.2", + "@angular/forms": "18.0.2", + "@angular/platform-browser": "18.0.2", + "@angular/platform-browser-dynamic": "18.0.2", + "@angular/router": "18.0.2", "@ionic/angular": "7.8.6", - "ionicons": "7.3.1", + "ionicons": "7.4.0", "rxjs": "7.8.1", - "tslib": "2.6.2", - "zone.js": "0.14.4" + "tslib": "2.6.3", + "zone.js": "0.14.7" }, "devDependencies": { - "@angular-devkit/build-angular": "17.3.6", - "@angular-eslint/builder": "17.3.0", - "@angular-eslint/eslint-plugin": "17.3.0", - "@angular-eslint/eslint-plugin-template": "17.3.0", - "@angular-eslint/schematics": "17.3.0", - "@angular-eslint/template-parser": "17.3.0", - "@angular/cli": "17.3.6", - "@angular/compiler-cli": "17.3.6", + "@angular-devkit/build-angular": "18.0.3", + "angular-eslint": "18.0.1", + "@angular/cli": "18.0.3", + "@angular/compiler-cli": "18.0.2", "@ionic/angular-toolkit": "11.0.1", - "@typescript-eslint/eslint-plugin": "7.8.0", - "@typescript-eslint/parser": "7.8.0", - "eslint": "8.57.0", + "typescript-eslint": "8.0.0-alpha.20", + "eslint": "9.4.0", "local-web-server": "5.3.3", "typescript": "5.4.5" } -} +} \ No newline at end of file diff --git a/validation/client/src/app/app.module.ts b/validation/client/src/app/app.module.ts index 3956f9d22..776d322d2 100644 --- a/validation/client/src/app/app.module.ts +++ b/validation/client/src/app/app.module.ts @@ -6,25 +6,21 @@ import {AppComponent} from './app.component'; import {HomePage} from './home/home.page'; import {CommonModule} from '@angular/common'; import {ReactiveFormsModule} from '@angular/forms'; -import {HttpClientModule} from '@angular/common/http'; +import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'; const routes: Routes = [ {path: '', redirectTo: 'home', pathMatch: 'full'}, {path: 'home', component: HomePage}, ]; -@NgModule({ - declarations: [AppComponent, HomePage], - imports: [BrowserModule, - CommonModule, - HttpClientModule, - ReactiveFormsModule, - IonicModule.forRoot(), - RouterModule.forRoot(routes, {useHash: true})], - providers: [ - {provide: RouteReuseStrategy, useClass: IonicRouteStrategy} - ], - bootstrap: [AppComponent] -}) +@NgModule({ declarations: [AppComponent, HomePage], + bootstrap: [AppComponent], imports: [BrowserModule, + CommonModule, + ReactiveFormsModule, + IonicModule.forRoot(), + RouterModule.forRoot(routes, { useHash: true })], providers: [ + { provide: RouteReuseStrategy, useClass: IonicRouteStrategy }, + provideHttpClient(withInterceptorsFromDi()) + ] }) export class AppModule { } diff --git a/validation/client/src/app/home/home.page.ts b/validation/client/src/app/home/home.page.ts index b8b7581a7..d0f556371 100644 --- a/validation/client/src/app/home/home.page.ts +++ b/validation/client/src/app/home/home.page.ts @@ -1,6 +1,6 @@ import {Component} from '@angular/core'; import {UntypedFormBuilder, UntypedFormGroup, Validators} from '@angular/forms'; -import {HttpClient} from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; import {UsernameValidator} from '../username-validator'; import {ToastController} from '@ionic/angular'; import {AgeValidator} from '../age-validator'; diff --git a/validation/client/src/app/username-validator.ts b/validation/client/src/app/username-validator.ts index fed644d71..8bb4f1bea 100644 --- a/validation/client/src/app/username-validator.ts +++ b/validation/client/src/app/username-validator.ts @@ -1,4 +1,4 @@ -import {HttpClient} from '@angular/common/http'; +import { HttpClient } from '@angular/common/http'; import {AbstractControl} from '@angular/forms'; import {environment} from '../environments/environment'; import {Injectable} from '@angular/core'; diff --git a/validation/client/tsconfig.json b/validation/client/tsconfig.json index 8998684e0..56b644d6a 100644 --- a/validation/client/tsconfig.json +++ b/validation/client/tsconfig.json @@ -2,25 +2,24 @@ { "compileOnSave": false, "compilerOptions": { - "baseUrl": "./", "outDir": "./dist/out-tsc", - "forceConsistentCasingInFileNames": true, "strict": true, "noImplicitOverride": true, "noPropertyAccessFromIndexSignature": true, "noImplicitReturns": true, "noFallthroughCasesInSwitch": true, + "skipLibCheck": true, + "esModuleInterop": true, "sourceMap": true, "declaration": false, - "experimentalDecorators": true, - "moduleResolution": "node", + "moduleResolution": "bundler", "importHelpers": true, "target": "ES2022", "module": "ES2022", "useDefineForClassFields": false, "lib": [ - "ES2022", + "ES2022", "dom" ] }, @@ -29,5 +28,5 @@ "strictInjectionParameters": true, "strictInputAccessModifiers": true, "strictTemplates": true - } -} \ No newline at end of file + } +} diff --git a/validation/server/.mvn/wrapper/maven-wrapper.properties b/validation/server/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/validation/server/.mvn/wrapper/maven-wrapper.properties +++ b/validation/server/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file diff --git a/validation/server/pom.xml b/validation/server/pom.xml index d0b65d15f..3726450ee 100644 --- a/validation/server/pom.xml +++ b/validation/server/pom.xml @@ -14,7 +14,7 @@ org.springframework.boot spring-boot-starter-parent - 3.2.5 + 3.3.0 diff --git a/verbalregex/.mvn/wrapper/maven-wrapper.properties b/verbalregex/.mvn/wrapper/maven-wrapper.properties index d81494bb2..701003eb8 100644 --- a/verbalregex/.mvn/wrapper/maven-wrapper.properties +++ b/verbalregex/.mvn/wrapper/maven-wrapper.properties @@ -14,5 +14,5 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.7/apache-maven-3.9.7-bin.zip wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.2.0/maven-wrapper-3.2.0.jar \ No newline at end of file