Merge pull request #208 from piotter121/piotter121/issue206

feat: support Angular 13
btroncone · Jan 21, 2022 · e9dbef3 · e9dbef3
2 parents 943b926 + d720252
commit e9dbef3
Show file tree

Hide file tree

Showing 7 changed files with 10,026 additions and 10,959 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+/.angular/cache
 # Logs
 logs
 *.log

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,81 +1,81 @@
 {
-  "name": "ngrx-store-localstorage",
-  "version": "9.0.0",
-  "description": "State and local storage syncing for @ngrx/store",
-  "scripts": {
-    "build_dist": "npm run clean && ng build lib --configuration production",
-    "clean": "rimraf dist",
-    "lint": "ng lint --fix",
-    "ng": "ng",
-    "pretest": "npm run lint",
-    "test": "nyc ts-node -O '{\"module\": \"commonjs\"}' node_modules/jasmine/bin/jasmine",
-    "prepare": "husky install"
-  },
-  "repository": {
-    "type": "git",
-    "url": "[email protected]:btroncone/ngrx-store-localstorage.git"
-  },
-  "keywords": [
-    "redux",
-    "ngrx",
-    "store",
-    "localstorage",
-    "rxjs"
-  ],
-  "author": "Brian Troncone",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/btroncone/ngrx-store-localstorage/issues"
-  },
-  "homepage": "https://github.com/btroncone/ngrx-store-localstorage#readme",
-  "dependencies": {
-    "@angular/animations": "~12.0.0",
-    "@angular/common": "~12.0.0",
-    "@angular/compiler": "~12.0.0",
-    "@angular/core": "~12.0.0",
-    "@angular/forms": "~12.0.0",
-    "@angular/platform-browser": "~12.0.0",
-    "@angular/platform-browser-dynamic": "~12.0.0",
-    "@angular/router": "~12.0.0",
-    "@ngrx/store": "^12.0.0",
-    "deepmerge": "^4.2.2",
-    "rxjs": "~6.6.0",
-    "tslib": "^2.1.0",
-    "zone.js": "~0.11.4"
-  },
-  "devDependencies": {
-    "@angular-devkit/build-angular": "~12.0.0",
-    "@angular-eslint/builder": "12.0.0",
-    "@angular-eslint/eslint-plugin": "12.0.0",
-    "@angular-eslint/eslint-plugin-template": "12.0.0",
-    "@angular-eslint/schematics": "12.0.0",
-    "@angular-eslint/template-parser": "12.0.0",
-    "@angular/cli": "~12.0.0",
-    "@angular/compiler-cli": "~12.0.0",
-    "@commitlint/cli": "^12.1.4",
-    "@commitlint/config-conventional": "^12.1.4",
-    "@istanbuljs/nyc-config-typescript": "^1.0.1",
-    "@types/jasmine": "~3.6.0",
-    "@types/node": "^14.17.0",
-    "@typescript-eslint/eslint-plugin": "4.23.0",
-    "@typescript-eslint/parser": "4.23.0",
-    "crypto-js": "^4.0.0",
-    "es6-shim": "^0.35.6",
-    "eslint": "^7.26.0",
-    "husky": "^6.0.0",
-    "jasmine": "^3.7.0",
-    "jasmine-core": "~3.7.0",
-    "jasmine-spec-reporter": "^7.0.0",
-    "lint-staged": "^11.0.0",
-    "localstorage-polyfill": "^1.0.1",
-    "ng-packagr": "^12.0.0",
-    "nyc": "^15.1.0",
-    "rimraf": "^3.0.2",
-    "semantic-release": "^17.4.4",
-    "ts-node": "^9.1.1",
-    "typescript": "~4.2.3"
-  },
-  "lint-staged": {
-    "*.ts": "eslint --cache --fix"
-  }
+    "name": "ngrx-store-localstorage",
+    "version": "13.0.0",
+    "description": "State and local storage syncing for @ngrx/store",
+    "scripts": {
+        "build_dist": "npm run clean && ng build lib --configuration production",
+        "clean": "rimraf dist",
+        "lint": "ng lint --fix",
+        "ng": "ng",
+        "pretest": "npm run lint",
+        "test": "nyc ts-node -O '{\"module\": \"commonjs\"}' node_modules/jasmine/bin/jasmine",
+        "prepare": "husky install"
+    },
+    "repository": {
+        "type": "git",
+        "url": "[email protected]:btroncone/ngrx-store-localstorage.git"
+    },
+    "keywords": [
+        "redux",
+        "ngrx",
+        "store",
+        "localstorage",
+        "rxjs"
+    ],
+    "author": "Brian Troncone",
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/btroncone/ngrx-store-localstorage/issues"
+    },
+    "homepage": "https://github.com/btroncone/ngrx-store-localstorage#readme",
+    "dependencies": {
+        "@angular/animations": "~13.0.0",
+        "@angular/common": "~13.0.0",
+        "@angular/compiler": "~13.0.0",
+        "@angular/core": "~13.0.0",
+        "@angular/forms": "~13.0.0",
+        "@angular/platform-browser": "~13.0.0",
+        "@angular/platform-browser-dynamic": "~13.0.0",
+        "@angular/router": "~13.0.0",
+        "@ngrx/store": "^13.0.0",
+        "deepmerge": "^4.2.2",
+        "rxjs": "~7.4.0",
+        "tslib": "^2.3.0",
+        "zone.js": "~0.11.4"
+    },
+    "devDependencies": {
+        "@angular-devkit/build-angular": "~13.0.3",
+        "@angular-eslint/builder": "13.0.1",
+        "@angular-eslint/eslint-plugin": "13.0.1",
+        "@angular-eslint/eslint-plugin-template": "13.0.1",
+        "@angular-eslint/schematics": "13.0.1",
+        "@angular-eslint/template-parser": "13.0.1",
+        "@angular/cli": "~13.0.3",
+        "@angular/compiler-cli": "~13.0.2",
+        "@commitlint/cli": "^12.1.4",
+        "@commitlint/config-conventional": "^12.1.4",
+        "@istanbuljs/nyc-config-typescript": "^1.0.1",
+        "@types/jasmine": "~3.6.0",
+        "@types/node": "^14.17.0",
+        "@typescript-eslint/eslint-plugin": "5.3.0",
+        "@typescript-eslint/parser": "5.3.0",
+        "crypto-js": "^4.0.0",
+        "es6-shim": "^0.35.6",
+        "eslint": "^8.2.0",
+        "husky": "^6.0.0",
+        "jasmine": "^3.10.0",
+        "jasmine-core": "~3.10.0",
+        "jasmine-spec-reporter": "^7.0.0",
+        "lint-staged": "^11.0.0",
+        "localstorage-polyfill": "^1.0.1",
+        "ng-packagr": "^13.0.7",
+        "nyc": "^15.1.0",
+        "rimraf": "^3.0.2",
+        "semantic-release": "^17.4.4",
+        "ts-node": "^9.1.1",
+        "typescript": "~4.4.4"
+    },
+    "lint-staged": {
+        "*.ts": "eslint --cache --fix"
+    }
 }
diff --git a/projects/lib/ng-package.json b/projects/lib/ng-package.json
@@ -2,11 +2,7 @@
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
   "dest": "../../dist/lib",
   "lib": {
-    "entryFile": "src/public_api.ts",
-    "umdModuleIds": {
-      "deepmerge": "deepmerge",
-      "@ngrx/store": "ngrx.store"
-    }
+    "entryFile": "src/public_api.ts"
   },
   "allowedNonPeerDependencies": [
     "deepmerge"

diff --git a/projects/lib/package.json b/projects/lib/package.json
@@ -1,13 +1,13 @@
 {
-  "name": "ngrx-store-localstorage",
-  "version": "9.0.0",
-  "peerDependencies": {
-    "@angular/common": "^12.0.0",
-    "@angular/core": "^12.0.0",
-    "@ngrx/store": "^12.0.0"
-  },
-  "dependencies": {
-    "deepmerge": "^4.2.2",
-    "tslib": "^2.1.0"
-  }
-}
+    "name": "ngrx-store-localstorage",
+    "version": "13.0.0",
+    "peerDependencies": {
+        "@angular/common": "^13.0.0",
+        "@angular/core": "^13.0.0",
+        "@ngrx/store": "^13.0.0"
+    },
+    "dependencies": {
+        "deepmerge": "^4.2.2",
+        "tslib": "^2.3.0"
+    }
+}
diff --git a/projects/lib/src/lib/index.ts b/projects/lib/src/lib/index.ts
@@ -1,8 +1,9 @@
 import deepmerge from 'deepmerge';
-import {
-    INIT as INIT_ACTION,
-    UPDATE as UPDATE_ACTION
-} from '@ngrx/store';
+
+// Cannot import from the @ngrx/store package due to a module resolution issue.
+// See Issue #206.
+const INIT_ACTION = '@ngrx/store/init';
+const UPDATE_ACTION = '@ngrx/store/update-reducers';
 
 const detectDate = /(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})/;
 

diff --git a/spec/index_spec.ts b/spec/index_spec.ts
@@ -4,7 +4,8 @@ import * as CryptoJS from 'crypto-js';
 import deepmerge from 'deepmerge';
 import 'localstorage-polyfill';
 import { dateReviver, localStorageSync, rehydrateApplicationState, syncStateUpdate } from '../projects/lib/src/public_api';
-import { INIT as INIT_ACTION } from '@ngrx/store';
+
+const INIT_ACTION = '@ngrx/store/init';
 
 // Very simple classes to test serialization options.  They cover string, number, date, and nested classes
 // The top level class has static functions to help test reviver, replacer, serialize and deserialize