feat(package): add Angular 15 support

closes #275
DethAriel · Nov 30, 2022 · 6c62634 · 6c62634
1 parent f968404
commit 6c62634
Show file tree

Hide file tree

Showing 9 changed files with 4,173 additions and 3,485 deletions.
diff --git a/README.md b/README.md
@@ -201,6 +201,7 @@ Besides specifying these options on the component itself, you can provide a glob
 
 | `ng-recaptcha` version                                                           | Supported Angular versions                           |
 | -------------------------------------------------------------------------------- | ---------------------------------------------------- |
+| `11.x.x`                                                                         | `15.x.x`                                             |
 | `10.x.x`                                                                         | `14.x.x`                                             |
 | `9.x.x`                                                                          | `13.x.x`                                             |
 | `8.x.x`                                                                          | `12.x.x`                                             |

diff --git a/angular.json b/angular.json
@@ -121,5 +121,13 @@
   },
   "cli": {
     "analytics": false
+  },
+  "schematics": {
+    "@angular-eslint/schematics:application": {
+      "setParserOptionsProject": true
+    },
+    "@angular-eslint/schematics:library": {
+      "setParserOptionsProject": true
+    }
   }
 }
diff --git a/package.json b/package.json
@@ -27,34 +27,34 @@
   },
   "peerDependencies": {},
   "devDependencies": {
-    "@angular-devkit/build-angular": "^14.0.3",
-    "@angular-eslint/builder": "14.0.0",
-    "@angular-eslint/eslint-plugin": "14.0.0",
-    "@angular-eslint/eslint-plugin-template": "14.0.0",
-    "@angular-eslint/schematics": "14.0.0",
-    "@angular-eslint/template-parser": "14.0.0",
-    "@angular/animations": "^14.0.3",
-    "@angular/cdk": "^14.0.0",
-    "@angular/cli": "^14.0.3",
-    "@angular/common": "^14.0.3",
-    "@angular/compiler": "^14.0.3",
-    "@angular/compiler-cli": "^14.0.3",
-    "@angular/core": "^14.0.3",
-    "@angular/forms": "^14.0.3",
-    "@angular/material": "^14.0.0",
-    "@angular/platform-browser": "^14.0.3",
-    "@angular/platform-browser-dynamic": "^14.0.3",
-    "@angular/router": "^14.0.3",
+    "@angular-devkit/build-angular": "^15.0.0",
+    "@angular-eslint/builder": "15.0.0",
+    "@angular-eslint/eslint-plugin": "15.0.0",
+    "@angular-eslint/eslint-plugin-template": "15.0.0",
+    "@angular-eslint/schematics": "15.0.0",
+    "@angular-eslint/template-parser": "15.0.0",
+    "@angular/animations": "^15.0.0",
+    "@angular/cdk": "^15.0.0",
+    "@angular/cli": "^15.0.0",
+    "@angular/common": "^15.0.0",
+    "@angular/compiler": "^15.0.0",
+    "@angular/compiler-cli": "^15.0.0",
+    "@angular/core": "^15.0.0",
+    "@angular/forms": "^15.0.0",
+    "@angular/material": "^15.0.0",
+    "@angular/platform-browser": "^15.0.0",
+    "@angular/platform-browser-dynamic": "^15.0.0",
+    "@angular/router": "^15.0.0",
     "@types/core-js": "^2.5.4",
     "@types/jasmine": "^3.8.1",
     "@types/node": "^12",
     "@types/query-string": "^6.3.0",
-    "@typescript-eslint/eslint-plugin": "^5.29.0",
-    "@typescript-eslint/parser": "^5.29.0",
+    "@typescript-eslint/eslint-plugin": "^5.43.0",
+    "@typescript-eslint/parser": "^5.43.0",
     "conventional-changelog-cli": "^2.1.1",
     "conventional-github-releaser": "^3.1.5",
     "coveralls": "^3.1.1",
-    "eslint": "^8.18.0",
+    "eslint": "^8.28.0",
     "eslint-config-prettier": "^8.3.0",
     "highlight.js": "^11.1.0",
     "http-server": "^0.12.3",
@@ -67,14 +67,14 @@
     "karma-jasmine": "^4.0.1",
     "karma-jasmine-html-reporter": "^1.7.0",
     "lint-staged": "^11.0.1",
-    "ng-packagr": "^14.0.2",
+    "ng-packagr": "^15.0.0",
     "prettier": "^2.3.2",
     "protractor": "^7.0.0",
     "query-string": "^7.0.1",
     "rimraf": "^3.0.2",
     "rxjs": "^6.5.3",
     "ts-node": "^10.8.1",
-    "typescript": "^4.7.4",
+    "typescript": "^4.8.4",
     "typescript-eslint": "^0.0.1-alpha.0",
     "zone.js": "~0.11.4"
   }

diff --git a/projects/demo/.browserslistrc b/projects/demo/.browserslistrc
diff --git a/projects/demo/src/app/demo-wrapper/demo-wrapper.module.ts b/projects/demo/src/app/demo-wrapper/demo-wrapper.module.ts
@@ -2,16 +2,16 @@ import { LayoutModule } from "@angular/cdk/layout";
 import { NgModule } from "@angular/core";
 import { BrowserModule } from "@angular/platform-browser";
 
-import { MatButtonModule } from "@angular/material/button";
+import { MatLegacyButtonModule as MatButtonModule } from "@angular/material/legacy-button";
 import { MatIconModule } from "@angular/material/icon";
-import { MatFormFieldModule } from "@angular/material/form-field";
-import { MatListModule } from "@angular/material/list";
-import { MatSelectModule } from "@angular/material/select";
-import { MatMenuModule } from "@angular/material/menu";
+import { MatLegacyFormFieldModule as MatFormFieldModule } from "@angular/material/legacy-form-field";
+import { MatLegacyListModule as MatListModule } from "@angular/material/legacy-list";
+import { MatLegacySelectModule as MatSelectModule } from "@angular/material/legacy-select";
+import { MatLegacyMenuModule as MatMenuModule } from "@angular/material/legacy-menu";
 import { MatButtonToggleModule } from "@angular/material/button-toggle";
-import { MatRadioModule } from "@angular/material/radio";
+import { MatLegacyRadioModule as MatRadioModule } from "@angular/material/legacy-radio";
 import { MatSidenavModule } from "@angular/material/sidenav";
-import { MatTabsModule } from "@angular/material/tabs";
+import { MatLegacyTabsModule as MatTabsModule } from "@angular/material/legacy-tabs";
 import { MatToolbarModule } from "@angular/material/toolbar";
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
 

diff --git a/projects/ng-recaptcha/package.json b/projects/ng-recaptcha/package.json
@@ -16,7 +16,7 @@
     "ng-recaptcha"
   ],
   "peerDependencies": {
-    "@angular/core": "^14.0.0"
+    "@angular/core": "^15.0.0"
   },
   "dependencies": {
     "@types/grecaptcha": "^3.0.3",

diff --git a/projects/ng-recaptcha/src/test.ts b/projects/ng-recaptcha/src/test.ts
@@ -5,22 +5,7 @@ import "zone.js/testing";
 import { getTestBed } from "@angular/core/testing";
 import { BrowserDynamicTestingModule, platformBrowserDynamicTesting } from "@angular/platform-browser-dynamic/testing";
 
-declare const require: {
-  context(
-    path: string,
-    deep?: boolean,
-    filter?: RegExp
-  ): {
-    keys(): string[];
-    <T>(id: string): T;
-  };
-};
-
 // 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
@@ -4,7 +4,6 @@
     "baseUrl": "./",
     "outDir": "./dist/out-tsc",
     "forceConsistentCasingInFileNames": true,
-    // "strict": true,
     "noImplicitReturns": true,
     "noFallthroughCasesInSwitch": true,
     "sourceMap": true,
@@ -13,12 +12,13 @@
     "experimentalDecorators": true,
     "moduleResolution": "node",
     "importHelpers": true,
-    "target": "es2020",
+    "target": "ES2022",
     "module": "es2020",
     "lib": ["es2020", "dom"],
     "paths": {
       "ng-recaptcha": ["dist/ng-recaptcha/ng-recaptcha", "dist/ng-recaptcha"]
-    }
+    },
+    "useDefineForClassFields": false
   },
   "angularCompilerOptions": {
     // "strictInjectionParameters": true,