Yarn, deps upgrade

.huskyrc

@@ -1,5 +1,5 @@
 {
   "hooks": {
-    "pre-commit": "npm run lint:staged && npm run test:quick"
+    "pre-commit": "yarn lint:staged && yarn test:quick"
   }
 }

.lintstagedrc

@@ -1,6 +1,6 @@
 {
   "*.{ts,tsx,js,jsx}": [
-    "npm run lint --",
+    "yarn lint",
     "git add"
   ]
 }

.travis.yml

@@ -1,8 +1,10 @@
 language: node_js
 
 cache:
+  yarn: true
   directories:
     - node_modules
+    - packages/*/node_modules
 
 node_js:
 - stable
@@ -11,16 +13,16 @@ before_install:
 - npm config set //registry.npmjs.org/:_authToken=${NPM_TOKEN}
 
 before_script:
-- DEBUG=eslint:cli-engine npm run lint:all
-- npm run build
+- DEBUG=eslint:cli-engine yarn lint:all
+- yarn build
 
 deploy:
 - provider: script
-  script: npm run publish:release -- ${TRAVIS_TAG} --yes
+  script: yarn publish:release ${TRAVIS_TAG} --yes
   skip_cleanup: true
   on:
     tags: true
     repo: kirill-konshin/next-redux-wrapper
 
 after_success:
-- npm run test:coverage
+- yarn test:coverage

lerna.json

@@ -1,6 +1,5 @@
 {
-  "packages": [
-    "packages/*"
-  ],
-  "version": "4.0.0"
+  "version": "4.0.0",
+  "useWorkspaces": true,
+  "npmClient": "yarn"
 }

package.json

@@ -1,32 +1,37 @@
 {
   "name": "next-redux-wrapper-mono",
   "private": true,
-  "version": "0.0.0",
+  "version": "4.0.0",
   "description": "Redux wrapper for Next.js",
   "scripts": {
-    "postinstall": "lerna bootstrap --hoist --no-ci",
     "clean": "lerna run clean && lerna clean --yes && rimraf node_modules",
-    "start": "npm run build && lerna run start --parallel",
+    "start": "yarn build && lerna run start --parallel",
     "build": "lerna run build --concurrency=1 --stream",
     "test": "lerna run test --concurrency=1 --stream",
     "test:quick": "lerna run test:quick --concurrency=1 --stream",
     "test:coverage": "cat packages/*/coverage/lcov.info | coveralls",
     "publish:release": "lerna publish --tag-version-prefix=\"\" --force-publish=* --no-push --no-git-tag-version",
     "lint": "eslint --cache --cache-location ./node_modules/.cache/eslint --fix",
-    "lint:all": "npm run lint -- 'packages/*/**/*.ts?' 'packages/*/*.js'",
+    "lint:all": "yarn lint 'packages/*/**/*.ts?' 'packages/*/*.js'",
     "lint:staged": "lint-staged --debug"
   },
   "devDependencies": {
     "coveralls": "3.0.6",
-    "eslint": "5.16.0",
-    "eslint-config-ringcentral-typescript": "1.0.1",
-    "husky": "3.0.4",
+    "eslint": "6.4.0",
+    "eslint-config-ringcentral-typescript": "2.1.1",
+    "husky": "3.0.5",
     "lerna": "3.16.4",
-    "lint-staged": "9.2.3",
+    "lint-staged": "9.3.0",
     "prettier": "1.18.2",
     "rimraf": "3.0.0",
-    "typescript": "3.5.3"
+    "typescript": "3.6.3"
   },
+  "resolutions": {
+    "@types/react": "16.9.3"
+  },
+  "workspaces": [
+    "packages/*"
+  ],
   "author": "Kirill Konshin",
   "repository": {
     "type": "git",

packages/demo/jest-puppeteer.config.js

@@ -1,6 +1,6 @@
 module.exports = {
     server: {
-        command: 'npm run serve',
+        command: 'yarn serve',
         debug: true,
         port: 3000,
         launchTimeout: 30000,

packages/demo/package.json

@@ -5,7 +5,7 @@
   "description": "Demo of redux wrapper for Next.js",
   "scripts": {
     "clean": "rimraf .next coverage",
-    "test": "jest --runInBand",
+    "test": "jest",
     "start": "next",
     "build": "next build",
     "serve": "next start"
@@ -14,26 +14,26 @@
     "next-redux-wrapper": "^4.0.0",
     "react": "16.9.0",
     "react-dom": "16.9.0",
-    "react-redux": "7.1.0",
+    "react-redux": "7.1.1",
     "redux": "4.0.4"
   },
   "devDependencies": {
     "@types/expect-puppeteer": "3.3.1",
     "@types/jest": "24.0.18",
-    "@types/jest-environment-puppeteer": "4.0.0",
-    "@types/puppeteer": "1.12.4",
-    "@types/react": "16.9.2",
-    "@types/react-dom": "16.9.0",
-    "@types/react-redux": "7.1.2",
+    "@types/jest-environment-puppeteer": "4.3.1",
+    "@types/puppeteer": "1.19.1",
+    "@types/react": "16.9.3",
+    "@types/react-dom": "16.9.1",
+    "@types/react-redux": "7.1.3",
     "@types/redux-promise-middleware": "0.0.11",
     "@types/webpack-env": "1.14.0",
     "jest-puppeteer": "4.3.0",
-    "next": "9.0.4",
+    "next": "9.0.6",
     "next-redux-wrapper-configs": "^4.0.0",
-    "puppeteer": "1.19.0",
+    "puppeteer": "1.20.0",
     "rimraf": "3.0.0",
-    "ts-jest": "24.0.2",
-    "typescript": "3.5.3"
+    "ts-jest": "24.1.0",
+    "typescript": "3.6.3"
   },
   "author": "Kirill Konshin",
   "repository": {

packages/wrapper/package.json

@@ -10,33 +10,33 @@
   "main:src": "src/index.ts",
   "scripts": {
     "test": "jest",
-    "test:quick": "npm run test",
+    "test:quick": "yarn test",
     "clean": "rimraf lib es6 types coverage",
-    "build": "npm run clean && npm run build:tsc:es5 && npm run build:tsc:es6",
+    "build": "yarn clean && yarn build:tsc:es5 && yarn build:tsc:es6",
     "build:tsc:es5": "tsc",
     "build:tsc:es6": "tsc --project tsconfig.es6.json",
     "start": "npm-run-all -p start:tsc:es5 start:tsc:es6",
-    "start:tsc:es5": "npm run build:tsc:es5 -- --watch --preserveWatchOutput",
-    "start:tsc:es6": "npm run build:tsc:es6 -- --watch --preserveWatchOutput"
+    "start:tsc:es5": "yarn build:tsc:es5 --watch --preserveWatchOutput",
+    "start:tsc:es6": "yarn build:tsc:es6 --watch --preserveWatchOutput"
   },
   "devDependencies": {
     "@types/jest": "24.0.18",
-    "@types/react": "16.9.2",
-    "@types/react-redux": "7.1.2",
+    "@types/react": "16.9.3",
+    "@types/react-redux": "7.1.3",
     "@types/redux-promise-middleware": "0.0.11",
     "jest": "24.9.0",
-    "next": "9.0.4",
+    "next": "9.0.6",
     "next-redux-wrapper-configs": "^4.0.0",
     "npm-run-all": "4.1.5",
     "react": "16.9.0",
     "react-dom": "16.9.0",
-    "react-redux": "7.1.0",
+    "react-redux": "7.1.1",
     "react-test-renderer": "16.9.0",
     "redux": "4.0.4",
     "redux-promise-middleware": "6.1.1",
     "rimraf": "3.0.0",
-    "ts-jest": "24.0.2",
-    "typescript": "3.5.3"
+    "ts-jest": "24.1.0",
+    "typescript": "3.6.3"
   },
   "peerDependencies": {
     "next": ">=9.0.0",

packages/wrapper/src/index.tsx

@@ -31,7 +31,7 @@ export default (makeStore: MakeStore, config?: Config) => {
         if (isServer) return createStore();
 
         // Memoize store if client
-        if (!window.hasOwnProperty(storeKey)) {
+        if (!(storeKey in window)) {
             window[storeKey] = createStore();
         }