feat: Angular 13 support (#632)

BREAKING CHANGE: drops support for angular < 13
stalniy · Jun 14, 2022 · 6b86fd9 · 6b86fd9
1 parent 270446f
commit 6b86fd9
Show file tree

Hide file tree

Showing 9 changed files with 5,919 additions and 601 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/casl-ability/package.json b/packages/casl-ability/package.json
@@ -54,7 +54,7 @@
   "license": "MIT",
   "devDependencies": {
     "@casl/dx": "workspace:^1.0.0",
-    "@types/jest": "^26.0.22",
+    "@types/jest": "^27.4.7",
     "@types/node": "^14.0.5",
     "chai": "^4.1.0",
     "chai-spies": "^1.0.0",

diff --git a/packages/casl-ability/src/RuleIndex.ts b/packages/casl-ability/src/RuleIndex.ts
@@ -19,8 +19,8 @@ export interface RuleIndexOptions<A extends Abilities, C> extends Partial<RuleOp
   anySubjectType?: string;
 }
 
-declare const $abilities: unique symbol;
-declare const $conditions: unique symbol;
+export declare const $abilities: unique symbol;
+export declare const $conditions: unique symbol;
 interface WithGenerics {
   [$abilities]: any
   [$conditions]: any

diff --git a/packages/casl-angular/jest.config.js b/packages/casl-angular/jest.config.js
@@ -2,7 +2,11 @@ const config = require('@casl/dx/config/jest.config');
 
 module.exports = {
   ...config,
+  transform: {
+    '^.+\\.(ts|js|mjs|html|svg)$': 'jest-preset-angular',
+  },
   testEnvironment: "jsdom",
+  preset: 'jest-preset-angular',
   setupFilesAfterEnv: [
     '@abraham/reflection',
     'zone.js/dist/zone',

diff --git a/packages/casl-angular/package.json b/packages/casl-angular/package.json
@@ -46,25 +46,28 @@
   "author": "Sergii Stotskyi <sergiy.stotskiy@gmail.com>",
   "license": "MIT",
   "peerDependencies": {
-    "@angular/core": "^12.0.0",
+    "@angular/core": "^13.0.0",
     "@casl/ability": "^3.0.0 || ^4.0.0 || ^5.1.0",
-    "rxjs": "^6.5.3",
+    "rxjs": "^7.5.5",
     "tslib": "^2.0.0"
   },
   "devDependencies": {
     "@abraham/reflection": "^0.8.0",
-    "@angular/common": "^12.0.0",
-    "@angular/compiler": "^12.0.0",
-    "@angular/compiler-cli": "^12.0.0",
-    "@angular/core": "^12.0.0",
-    "@angular/platform-browser": "^12.0.0",
-    "@angular/platform-browser-dynamic": "^12.0.0",
+    "@angular/common": "^13.0.0",
+    "@angular/compiler": "^13.0.0",
+    "@angular/compiler-cli": "^13.0.0",
+    "@angular/core": "^13.0.0",
+    "@angular/platform-browser": "^13.0.0",
+    "@angular/platform-browser-dynamic": "^13.0.0",
+    "@angular-devkit/build-angular": "^13.0.0",
+    "jest": "^27.0.0",
     "@casl/ability": "^5.1.0",
     "@casl/dx": "workspace:^1.0.0",
-    "@types/jest": "^26.0.22",
-    "rxjs": "^6.5.3",
+    "@types/jest": "^27.4.7",
+    "jest-preset-angular": "^11.0.0",
+    "rxjs": "^7.5.5",
     "tslib": "^2.0.0",
-    "typescript": "~4.2.3",
+    "typescript": "~4.4.4",
     "zone.js": "~0.11.4"
   },
   "files": [

diff --git a/packages/casl-angular/tsconfig.json b/packages/casl-angular/tsconfig.json
@@ -4,8 +4,8 @@
     "inlineSources": true,
     "inlineSourceMap": true,
     "declaration": false,
-    "module": "es2015",
-    "target": "es2015",
+    "module": "es2020",
+    "target": "es2017",
     "skipLibCheck": true,
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
@@ -15,7 +15,7 @@
     "importHelpers": true,
     "noEmitHelpers": true,
     "lib": [
-      "es2018",
+      "es2019",
       "dom"
     ]
   },

diff --git a/packages/casl-angular/tsconfig.spec.json b/packages/casl-angular/tsconfig.spec.json
@@ -0,0 +1,8 @@
+{
+  "extends": "./tsconfig.json",
+  "compilerOptions": {
+    "module": "commonjs",
+    "types": ["jest"]
+  },
+  "include": ["src/**/*.spec.ts", "src/**/*.d.ts"]
+}
diff --git a/packages/dx/package.json b/packages/dx/package.json
@@ -24,16 +24,19 @@
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-airbnb-typescript": "^12.3.1",
     "eslint-plugin-import": "^2.22.1",
+    "eslint-plugin-jsx-a11y": "^6.4.1",
+    "eslint-plugin-react": "^7.21.5",
+    "eslint-plugin-react-hooks": "^4 || ^3 || ^2.3.0 || ^1.7.0",
     "jest": "^27.0.0",
     "lint-staged": "^11.0.0",
     "rollup": "^2.47.0",
     "rollup-plugin-sourcemaps": "^0.6.3",
     "rollup-plugin-terser": "^7.0.2",
     "semantic-release": "^17.4.2",
     "ts-jest": "^27.0.0",
-    "typescript": "~4.1.0"
+    "typescript": "~4.4.4"
   },
   "devDependencies": {
-    "@types/jest": "^26.0.22"
+    "@types/jest": "^27.4.7"
   }
 }