Merge pull request #321 from chimurai/ng15

chore: upgrade to angular 15
maxisam · Apr 10, 2023 · 8258afb · 8258afb
2 parents 72c7ec4 + 9eaca49
commit 8258afb
Show file tree

Hide file tree

Showing 10 changed files with 3,450 additions and 3,244 deletions.
diff --git a/.browserslistrc b/.browserslistrc
diff --git a/.github/workflows/ngx-clipboard.yml b/.github/workflows/ngx-clipboard.yml
@@ -16,7 +16,7 @@ jobs:
 
             - uses: actions/setup-node@v2
               with:
-                  node-version: 14.17.0
+                  node-version: 14.20.0
                   cache: 'yarn'
 
             - uses: actions/cache@v2
@@ -38,7 +38,7 @@ jobs:
               run: yarn test --configuration=ci
 
             - name: Build host app
-              run: yarn ng build library-host --prod
+              run: yarn ng build library-host --configuration=production
 
             - name: Build library
               run: yarn build

diff --git a/.prettierignore b/.prettierignore
@@ -1 +1,2 @@
+.angular
 dist
diff --git a/angular.json b/angular.json
@@ -146,10 +146,17 @@
             }
         }
     },
-    "defaultProject": "library-host",
     "cli": {
         "packageManager": "yarn",
         "analytics": "26cce57c-232f-4bfb-ac75-bfc72a238bd7",
-        "defaultCollection": "@angular-eslint/schematics"
+        "schematicCollections": ["@angular-eslint/schematics"]
+    },
+    "schematics": {
+        "@angular-eslint/schematics:application": {
+            "setParserOptionsProject": true
+        },
+        "@angular-eslint/schematics:library": {
+            "setParserOptionsProject": true
+        }
     }
 }
diff --git a/package.json b/package.json
@@ -1,6 +1,9 @@
 {
     "name": "library-host",
     "version": "0.0.0",
+    "engines": {
+        "node": ">=14.20.0"
+    },
     "scripts": {
         "prepare": "husky install",
         "ng": "ng",
@@ -18,37 +21,37 @@
     },
     "private": true,
     "dependencies": {
-        "@angular/animations": "^13.0.1",
-        "@angular/common": "~13.0.1",
-        "@angular/compiler": "~13.0.1",
-        "@angular/core": "~13.0.1",
-        "@angular/forms": "~13.0.1",
-        "@angular/platform-browser": "~13.0.1",
-        "@angular/platform-browser-dynamic": "~13.0.1",
-        "@angular/router": "~13.0.1",
+        "@angular/animations": "^15.1.4",
+        "@angular/common": "^15.1.4",
+        "@angular/compiler": "^15.1.4",
+        "@angular/core": "^15.1.4",
+        "@angular/forms": "^15.1.4",
+        "@angular/platform-browser": "^15.1.4",
+        "@angular/platform-browser-dynamic": "^15.1.4",
+        "@angular/router": "^15.1.4",
         "ngx-clipboard": "15.0.0",
         "ngx-window-token": "6.0.0",
         "rxjs": "~7.4.0",
         "tslib": "^2.3.1",
         "zone.js": "~0.11.4"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "~13.0.2",
-        "@angular-eslint/builder": "13.0.0-alpha.0",
-        "@angular-eslint/eslint-plugin": "13.0.0-alpha.0",
-        "@angular-eslint/eslint-plugin-template": "13.0.0-alpha.0",
-        "@angular-eslint/schematics": "13.0.0-alpha.0",
-        "@angular-eslint/template-parser": "13.0.0-alpha.0",
-        "@angular/cli": "~13.0.2",
-        "@angular/compiler-cli": "~13.0.1",
-        "@angular/language-service": "~13.0.1",
+        "@angular-devkit/build-angular": "^15.1.5",
+        "@angular-eslint/builder": "15.2.1",
+        "@angular-eslint/eslint-plugin": "15.2.1",
+        "@angular-eslint/eslint-plugin-template": "15.2.1",
+        "@angular-eslint/schematics": "15.2.1",
+        "@angular-eslint/template-parser": "15.2.1",
+        "@angular/cli": "^15.1.5",
+        "@angular/compiler-cli": "^15.1.4",
+        "@angular/language-service": "^15.1.4",
         "@types/jasmine": "~3.10.2",
         "@types/jasminewd2": "~2.0.10",
         "@types/node": "^16.11.7",
-        "@typescript-eslint/eslint-plugin": "5.4.0",
-        "@typescript-eslint/parser": "5.4.0",
+        "@typescript-eslint/eslint-plugin": "^5.43.0",
+        "@typescript-eslint/parser": "^5.43.0",
         "cpx": "^1.5.0",
-        "eslint": "^8.2.0",
+        "eslint": "^8.28.0",
         "eslint-config-prettier": "^8.3.0",
         "eslint-plugin-prettier": "^4.0.0",
         "husky": "8.0.3",
@@ -59,12 +62,12 @@
         "karma-coverage-istanbul-reporter": "~3.0.3",
         "karma-jasmine": "~4.0.1",
         "karma-jasmine-html-reporter": "^1.7.0",
+        "ng-packagr": "^15.1.2",
         "lint-staged": "13.1.1",
-        "ng-packagr": "^13.0.3",
         "prettier": "2.4.1",
         "protractor": "~7.0.0",
         "ts-node": "~10.4.0",
-        "typescript": "~4.4.3"
+        "typescript": "~4.8.4"
     },
     "lint-staged": {
         "*.{json,md,ts,html,component.html}": [

diff --git a/projects/ngx-clipboard/src/test.ts b/projects/ngx-clipboard/src/test.ts
@@ -5,13 +5,7 @@ import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: any;
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
     teardown: { destroyAfterEach: false }
 });
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
diff --git a/projects/ngx-clipboard/tsconfig.lib.json b/projects/ngx-clipboard/tsconfig.lib.json
@@ -3,7 +3,6 @@
     "compilerOptions": {
         "outDir": "../../out-tsc/lib",
         "declarationMap": true,
-        "target": "es2015",
         "declaration": true,
         "inlineSources": true,
         "types": [],

diff --git a/src/test.ts b/src/test.ts
@@ -4,13 +4,7 @@ import 'zone.js/testing';
 import { getTestBed } from '@angular/core/testing';
 import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from '@angular/platform-browser-dynamic/testing';
 
-declare const require: any;
-
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting(), {
     teardown: { destroyAfterEach: false }
 });
-// Then we find all the tests.
-const context = require.context('./', true, /\.spec\.ts$/);
-// And load the modules.
-context.keys().map(context);
diff --git a/tsconfig.json b/tsconfig.json
@@ -11,12 +11,11 @@
         "moduleResolution": "node",
         "importHelpers": true,
         "strictNullChecks": true,
-        "target": "es2015",
+        "target": "ES2022",
         "typeRoots": ["node_modules/@types"],
         "lib": ["es2018", "dom"],
-        "paths": {
-            // "ngx-clipboard": ["projects/ngx-clipboard/src/public_api.ts"]
-        }
+        "paths": {},
+        "useDefineForClassFields": false
     },
     "angularCompilerOptions": {
         "fullTemplateTypeCheck": true,