Merge pull request #1272 from IgorKvasn/development

angular 18 upgrade

.gitignore

@@ -38,4 +38,5 @@ src/**/*.map
 scripts/**/*.js
 scripts/**/*.map
 
-.nx/cache
+.nx/cache
+.yarn

apps/demo/project.json

@@ -3,6 +3,10 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "apps/demo/src",
   "projectType": "application",
+  "tags": [],
+  "implicitDependencies": [
+    "ng2-file-upload"
+  ],
   "targets": {
     "build": {
       "executor": "@angular-devkit/build-angular:browser",
@@ -72,9 +76,5 @@
         "{options.outputFile}"
       ]
     }
-  },
-  "tags": [],
-  "implicitDependencies": [
-    "ng2-file-upload"
-  ]
+  }
 }

libs/ng2-file-upload/.eslintrc.json

@@ -6,6 +6,13 @@
     "!**/*"
   ],
   "overrides": [
+    {
+      "files": ["*.json"],
+      "parser": "jsonc-eslint-parser",
+      "rules": {
+        "@nx/dependency-checks": "error"
+      }
+    },
     {
       "files": [
         "*.ts"

libs/ng2-file-upload/package.json

@@ -5,8 +5,10 @@
   "author": "Dmitriy Shekhovtsov <[email protected]>",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/core": "^17.0.0",
-    "@angular/common": "^17.0.0"
+    "@angular/core": "^18.0.0",
+    "@angular/platform-browser": "^18.0.0",
+    "jest-preset-angular": "14.1.0",
+    "@angular/common": "^18.0.0"
   },
   "sideEffects": false,
   "publishConfig": {

libs/ng2-file-upload/project.json

@@ -3,6 +3,9 @@
   "$schema": "../../node_modules/nx/schemas/project-schema.json",
   "sourceRoot": "libs/ng2-file-upload/",
   "projectType": "library",
+  "tags": [
+    "lib"
+  ],
   "targets": {
     "build": {
       "executor": "@nx/angular:package",
@@ -21,11 +24,6 @@
     },
     "lint": {
       "executor": "@nx/eslint:lint",
-      "options": {
-        "lintFilePatterns": [
-          "libs/ng2-file-upload/**/*.ts"
-        ]
-      },
       "outputs": [
         "{options.outputFile}"
       ]
@@ -54,8 +52,5 @@
         "production": {}
       }
     }
-  },
-  "tags": [
-    "lib"
-  ]
+  }
 }

migrations.json

@@ -0,0 +1,37 @@
+{
+  "migrations": [
+    {
+      "cli": "nx",
+      "version": "19.1.0-beta.2",
+      "requires": {
+        "@angular/core": ">=18.0.0"
+      },
+      "description": "Update the @angular/cli package version to ~18.0.0.",
+      "factory": "./src/migrations/update-19-1-0/update-angular-cli",
+      "package": "@nx/angular",
+      "name": "update-angular-cli-version-18-0-0"
+    },
+    {
+      "cli": "nx",
+      "version": "19.1.0-beta.6",
+      "description": "Migrate no-extra-semi rules into user config, out of nx extendable configs",
+      "implementation": "./src/migrations/update-19-1-0-migrate-no-extra-semi/migrate-no-extra-semi",
+      "package": "@nx/eslint-plugin",
+      "name": "update-19-1-0-rename-no-extra-semi"
+    },
+    {
+      "version": "18.0.0",
+      "description": "Updates two-way bindings that have an invalid expression to use the longform expression instead.",
+      "factory": "./migrations/invalid-two-way-bindings/bundle",
+      "package": "@angular/core",
+      "name": "invalid-two-way-bindings"
+    },
+    {
+      "version": "18.0.0",
+      "description": "Replace deprecated HTTP related modules with provider functions",
+      "factory": "./migrations/http-providers/bundle",
+      "package": "@angular/core",
+      "name": "migration-http-providers"
+    }
+  ]
+}

nx.json

@@ -1,7 +1,4 @@
 {
-  "affected": {
-    "defaultBase": "master"
-  },
   "defaultProject": "ng2-file-upload-demo",
   "generators": {
     "@schematics/angular:component": {
@@ -14,13 +11,6 @@
   },
   "$schema": "./node_modules/nx/schemas/nx-schema.json",
   "targetDefaults": {
-    "lint": {
-      "inputs": [
-        "default",
-        "{workspaceRoot}/.eslintrc.json"
-      ],
-      "cache": true
-    },
     "build": {
       "inputs": [
         "production",
@@ -44,6 +34,13 @@
           "codeCoverage": true
         }
       }
+    },
+    "@nx/eslint:lint": {
+      "inputs": [
+        "default",
+        "{workspaceRoot}/.eslintrc.json"
+      ],
+      "cache": true
     }
   },
   "namedInputs": {
@@ -63,5 +60,7 @@
     ]
   },
   "nxCloudAccessToken": "MmJkYThiZTUtNjUzMS00NzNmLWFiZTYtZjM5NDBlYWJlZTk4fHJlYWQtd3JpdGU=",
-  "parallel": 1
+  "parallel": 1,
+  "useInferencePlugins": false,
+  "defaultBase": "master"
 }