Merge 2c0a115 into b0b4344

spautz · Oct 3, 2020 · 96e48a8 · 96e48a8
2 parents b0b4344 + 2c0a115
commit 96e48a8
Show file tree

Hide file tree

Showing 10 changed files with 128 additions and 107 deletions.
diff --git a/.npmrc b/.npmrc
diff --git a/.yarnrc b/.yarnrc
@@ -0,0 +1,2 @@
+network-timeout 30000
+save-prefix ""
diff --git a/package.json b/package.json
@@ -11,40 +11,41 @@
   "sideEffects": false,
   "scripts": {
     "____ LIFECYCLE HOOKS _______________________________________________": "",
-    "prepare": "lerna bootstrap",
-    "prepublishOnly": "yarn checkup",
-    "prerelease": "yon clean",
-    "pretest": "yon test:clean",
+    "prepare": "lerna bootstrap && yon run packages:prepare",
+    "pretest": "yon run test:clean",
     "____ INTEGRATION ___________________________________________________": "",
-    "bootstrap": "yon run packages:prepare && lerna bootstrap",
-    "clean": "rimraf storybook-static/ && yon test:clean && yon packages:clean",
-    "checkup": "yon run format:checkup && yon run types && yon run lint",
+    "clean": "yon run storybook:clean && yon run test:clean && rimraf ./node_modules/.cache",
+    "test": "yon run test:watch",
     "dev": "yon run format && yon run types && yon run lint",
-    "ci": "yon run bootstrap && yon run checkup && yon run packages:checkup && yon run test:report && yon run build-storybook",
-    "all": "lerna bootstrap && yon run dev && yon run test && yon run build-storybook",
+    "dev:readonly": "yon run format:verify && yon run types && yon run lint",
+    "all": "yon run prepare && yon run dev && yon run test:nowatch && yon run build-storybook",
+    "all:readonly": "yon run dev:readonly && yon run test:nowatch",
+    "ci": "yon run dev:readonly && yon run test:report && yon run build-storybook",
     "____ BATCH COMMANDS FOR PACKAGES ___________________________________": "",
-    "packages:prepare": "lerna exec yon prepare",
-    "packages:build": "lerna exec yon build",
-    "packages:release:changelog": "lerna exec yon release:changelog ",
-    "packages:test": "lerna exec yon test",
-    "packages:clean": "lerna exec yon clean",
-    "packages:checkup": "lerna exec yon checkup",
-    "packages:dev": "lerna exec yon dev",
-    "packages:all": "lerna exec yon all",
+    "packages:prepare": "lerna run prepare",
+    "packages:clean": "lerna run clean",
+    "packages:test": "lerna run test:nowatch",
+    "packages:dev": "lerna run dev",
+    "packages:dev:readonly": "lerna run dev:readonly",
+    "packages:all": "lerna run all",
+    "packages:all:readonly": "lerna run all:readonly",
+    "packages:build": "lerna run build",
+    "packages:release:changelog": "lerna run release:changelog -- ",
     "____ INDIVIDUAL COMMANDS ___________________________________________": "",
     "demo:prepare": "yarn install && yarn build-storybook",
     "demo:deploy": "gh-pages -d ./storybook-static",
-    "format": "prettier --write \"**/*.*\"",
-    "format:checkup": "prettier --list-different \"**/*.*\"",
-    "lint": "eslint \"**/*.{js,jsx,json,ts,tsx}\"",
+    "format": "prettier --write .",
+    "format:verify": "prettier --list-different .",
+    "lint": "eslint . --max-warnings 0",
     "storybook": "start-storybook -p 6006",
+    "storybook:clean": "rimraf ./storybook-static",
     "build-storybook": "build-storybook",
     "release:version": "yarn lerna version --no-changelog --no-push --no-git-tag-version ",
     "release:tag": "yarn lerna version --no-changelog --no-push --sign-git-commit ",
     "release:postpublish": "standard-version --commit-all --sign --skip.changelog --release-as ",
-    "test": "jest --coverage",
-    "test:clean": "rimraf coverage/",
-    "test:report": "jest --coverage && coveralls < coverage/lcov.info",
+    "test:clean": "rimraf ./coverage",
+    "test:nowatch": "jest --coverage",
+    "test:report": "cross-env CI=true jest --coverage && coveralls < ./coverage/lcov.info",
     "test:watch": "jest --coverage --watch",
     "types": "tsc --noEmit --p tsconfig.json --jsx react"
   },
@@ -68,6 +69,7 @@
     "@typescript-eslint/parser": "4.3.0",
     "babel-loader": "8.1.0",
     "coveralls": "3.1.0",
+    "cross-env": "7.0.2",
     "eslint": "7.10.0",
     "eslint-config-prettier": "6.12.0",
     "eslint-plugin-prettier": "3.1.4",

diff --git a/packages/dev-helpers/package.json b/packages/dev-helpers/package.json
@@ -19,36 +19,36 @@
     "dist/",
     "src/",
     "LICENSE",
-    "README.md"
+    "*.md"
   ],
   "source": "src/index.ts",
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "jsnext:main": "dist/index.esm.js",
+  "main": "dist/react-hibernate-dev-helpers.js",
   "types": "dist/index.d.ts",
   "sideEffects": false,
   "scripts": {
     "____ LIFECYCLE HOOKS _______________________________________________": "",
     "prepare": "yon run build",
     "prebuild": "yon run build:clean",
     "prerelease": "yon run clean",
-    "prepublishOnly": "yarn run checkup && yarn run build",
+    "prepublishOnly": "yarn run dev:readonly && yarn run build",
     "pretest": "yon run test:clean",
     "____ INTEGRATION ___________________________________________________": "",
-    "clean": "yon run build:clean && yon run test:clean",
-    "dev": "yon run format && yon run types && yon run lint",
-    "checkup": "yon format:checkup && yon run types && yon run lint",
-    "all": "yon run dev && yon run test && yon run build",
+    "clean": "yon run build:clean && yon run test:clean && rimraf ./node_modules/.cache",
+    "test": "yarn run test:watch",
+    "dev": "yarn run format && yarn run types && yarn run lint",
+    "dev:readonly": "yarn run format:verify && yarn run types && yarn run lint",
+    "all": "yarn run clean && yarn run dev && yarn run test:nowatch && yarn run build",
+    "all:readonly": "yarn run dev:readonly && yarn run test:nowatch",
     "____ INDIVIDUAL COMMANDS ___________________________________________": "",
-    "build": "microbundle build --jsx React.createElement",
-    "build:clean": "rimraf dist/",
-    "build:watch": "microbundle watch --jsx React.createElement",
-    "format": "prettier --write \"**/*.*\"",
-    "format:checkup": "prettier --list-different \"**/*.*\"",
-    "lint": "eslint \"**/*.{js,jsx,json,ts,tsx}\"",
+    "build": "microbundle build -f cjs --jsx React.createElement",
+    "build:clean": "rimraf ./dist",
+    "build:watch": "microbundle watch -f cjs --jsx React.createElement",
+    "format": "prettier --write .",
+    "format:verify": "prettier --list-different .",
+    "lint": "eslint . --max-warnings 0",
     "release:changelog": "standard-version --skip.commit --skip.tag --release-as ",
-    "test": "echo \"@TODO: tests for dev-helpers\"",
-    "test:clean": "rimraf coverage-local/",
+    "test:clean": "rimraf ./coverage-local",
+    "test:nowatch": "echo \"@TODO: tests for dev-helpers\"",
     "test:watch": "echo \"@TODO: tests for dev-helpers\"",
     "types": "tsc --noEmit --p tsconfig.json --jsx react"
   },

diff --git a/packages/react-hibernate/package.json b/packages/react-hibernate/package.json
@@ -19,9 +19,8 @@
   "files": [
     "dist/",
     "src/",
-    "CHANGELOG.md",
     "LICENSE",
-    "README.md"
+    "*.md"
   ],
   "source": "src/index.ts",
   "main": "dist/index.js",
@@ -34,23 +33,25 @@
     "prepare": "yon run build",
     "prebuild": "yon run build:clean",
     "prerelease": "yon run clean",
-    "prepublishOnly": "yarn run checkup && yarn run build",
+    "prepublishOnly": "yarn run dev:readonly && yarn run build",
     "pretest": "yon run test:clean",
     "____ INTEGRATION ___________________________________________________": "",
-    "clean": "yon run build:clean && yon run test:clean",
-    "dev": "yon run format && yon run types && yon run lint",
-    "checkup": "yon format:checkup && yon run types && yon run lint",
-    "all": "yon run dev && yon run test && yon run build",
+    "clean": "yon run build:clean && yon run test:clean && rimraf ./node_modules/.cache",
+    "test": "yarn run test:watch",
+    "dev": "yarn run format && yarn run types && yarn run lint",
+    "dev:readonly": "yarn run format:verify && yarn run types && yarn run lint",
+    "all": "yarn run clean && yarn run dev && yarn run test:nowatch && yarn run build",
+    "all:readonly": "yarn run dev:readonly && yarn run test:nowatch",
     "____ INDIVIDUAL COMMANDS ___________________________________________": "",
     "build": "microbundle build --jsx React.createElement",
-    "build:clean": "rimraf dist/",
+    "build:clean": "rimraf ./dist",
     "build:watch": "microbundle watch --jsx React.createElement",
-    "format": "prettier --write \"**/*.*\"",
-    "format:checkup": "prettier --list-different \"**/*.*\"",
-    "lint": "eslint \"**/*.{js,jsx,json,ts,tsx}\"",
+    "format": "prettier --write .",
+    "format:verify": "prettier --list-different .",
+    "lint": "eslint . --max-warnings 0",
     "release:changelog": "standard-version --skip.commit --skip.tag --release-as ",
-    "test": "echo \"@TODO: tests for react-hibernate\"",
-    "test:clean": "rimraf coverage-local/",
+    "test:clean": "rimraf ./coverage-local",
+    "test:nowatch": "echo \"@TODO: tests for react-hibernate\"",
     "test:watch": "echo \"@TODO: tests for react-hibernate\"",
     "types": "tsc --noEmit --p tsconfig.json --jsx react"
   },

diff --git a/packages/react-hibernate/src/HibernationProvider.tsx b/packages/react-hibernate/src/HibernationProvider.tsx
@@ -130,15 +130,19 @@ const HibernationProvider: React.FC<HibernationProviderProps> = ({
 
     const existingEntry = activeSubtreeCache[subtreeId];
 
-    console.log('...markInactive: ', subtreeId, ...existingEntry!);
+    if (existingEntry) {
+      console.log('...markInactive: ', subtreeId, ...existingEntry);
 
-    activeSubtreeCache[subtreeId] = null;
-    hibernatedSubtreeCache.set(subtreeId, existingEntry);
+      activeSubtreeCache[subtreeId] = null;
+      hibernatedSubtreeCache.set(subtreeId, existingEntry);
 
-    rerender();
+      rerender();
 
-    console.log('activeSubtreeCache = ', activeSubtreeCache);
-    console.log('hibernatedSubtreeCache = ', hibernatedSubtreeCache.getAll());
+      console.log('activeSubtreeCache = ', activeSubtreeCache);
+      console.log('hibernatedSubtreeCache = ', hibernatedSubtreeCache.getAll());
+    } else {
+      console.warn('Tried to mark a subtree inactive when it was not active!', subtreeId);
+    }
   };
 
   const subtreeAccessorFns = useRef<HibernationAccessorFns>([

diff --git a/packages/react-pauseable-containers/package.json b/packages/react-pauseable-containers/package.json
@@ -23,9 +23,8 @@
   "files": [
     "dist/",
     "src/",
-    "CHANGELOG.md",
     "LICENSE",
-    "README.md"
+    "*.md"
   ],
   "source": "src/index.ts",
   "main": "dist/index.js",
@@ -38,24 +37,26 @@
     "prepare": "yon run build",
     "prebuild": "yon run build:clean",
     "prerelease": "yon run clean",
-    "prepublishOnly": "yarn run checkup && yarn run build",
+    "prepublishOnly": "yarn run dev:readonly && yarn run build",
     "pretest": "yon run test:clean",
     "____ INTEGRATION ___________________________________________________": "",
-    "clean": "yon run build:clean && yon run test:clean",
-    "dev": "yon run format && yon run types && yon run lint",
-    "checkup": "yon format:checkup && yon run types && yon run lint",
-    "all": "yon run dev && yon run test && yon run build",
+    "clean": "yon run build:clean && yon run test:clean && rimraf ./node_modules/.cache",
+    "test": "yarn run test:watch",
+    "dev": "yarn run format && yarn run types && yarn run lint",
+    "dev:readonly": "yarn run format:verify && yarn run types && yarn run lint",
+    "all": "yarn run clean && yarn run dev && yarn run test:nowatch && yarn run build",
+    "all:readonly": "yarn run dev:readonly && yarn run test:nowatch",
     "____ INDIVIDUAL COMMANDS ___________________________________________": "",
     "build": "microbundle build --jsx React.createElement",
-    "build:clean": "rimraf dist/",
+    "build:clean": "rimraf ./dist",
     "build:watch": "microbundle watch --jsx React.createElement",
-    "format": "prettier --write \"**/*.*\"",
-    "format:checkup": "prettier --list-different \"**/*.*\"",
-    "lint": "eslint \"**/*.{js,jsx,json,ts,tsx}\"",
+    "format": "prettier --write .",
+    "format:verify": "prettier --list-different .",
+    "lint": "eslint . --max-warnings 0",
     "release:changelog": "standard-version --skip.commit --skip.tag --release-as ",
-    "test": "echo \"@TODO: tests for pauseable-containers\"",
-    "test:clean": "rimraf coverage-local/",
-    "test:watch": "echo \"@TODO: tests for pauseable-containers\"",
+    "test:clean": "rimraf ./coverage-local",
+    "test:nowatch": "echo \"@TODO: tests for react-pauseable-containers\"",
+    "test:watch": "echo \"@TODO: tests for react-pauseable-containers\"",
     "types": "tsc --noEmit --p tsconfig.json --jsx react"
   },
   "dependencies": {

diff --git a/packages/react-router-hibernate/package.json b/packages/react-router-hibernate/package.json
@@ -22,9 +22,8 @@
   "files": [
     "dist/",
     "src/",
-    "CHANGELOG.md",
     "LICENSE",
-    "README.md"
+    "*.md"
   ],
   "source": "src/index.ts",
   "main": "dist/index.js",
@@ -37,23 +36,25 @@
     "prepare": "yon run build",
     "prebuild": "yon run build:clean",
     "prerelease": "yon run clean",
-    "prepublishOnly": "yarn run checkup && yarn run build",
+    "prepublishOnly": "yarn run dev:readonly && yarn run build",
     "pretest": "yon run test:clean",
     "____ INTEGRATION ___________________________________________________": "",
-    "clean": "yon run build:clean && yon run test:clean",
-    "dev": "yon run format && yon run types && yon run lint",
-    "checkup": "yon format:checkup && yon run types && yon run lint",
-    "all": "yon run dev && yon run test && yon run build",
+    "clean": "yon run build:clean && yon run test:clean && rimraf ./node_modules/.cache",
+    "test": "yarn run test:watch",
+    "dev": "yarn run format && yarn run types && yarn run lint",
+    "dev:readonly": "yarn run format:verify && yarn run types && yarn run lint",
+    "all": "yarn run clean && yarn run dev && yarn run test:nowatch && yarn run build",
+    "all:readonly": "yarn run dev:readonly && yarn run test:nowatch",
     "____ INDIVIDUAL COMMANDS ___________________________________________": "",
     "build": "microbundle build --jsx React.createElement",
-    "build:clean": "rimraf dist/",
+    "build:clean": "rimraf ./dist",
     "build:watch": "microbundle watch --jsx React.createElement",
-    "format": "prettier --write \"**/*.*\"",
-    "format:checkup": "prettier --list-different \"**/*.*\"",
-    "lint": "eslint \"**/*.{js,jsx,json,ts,tsx}\"",
+    "format": "prettier --write .",
+    "format:verify": "prettier --list-different .",
+    "lint": "eslint . --max-warnings 0",
     "release:changelog": "standard-version --skip.commit --skip.tag --release-as ",
-    "test": "jest --coverage",
-    "test:clean": "rimraf coverage-local/",
+    "test:clean": "rimraf ./coverage-local",
+    "test:nowatch": "jest --coverage",
     "test:watch": "jest --coverage --watch",
     "types": "tsc --noEmit --p tsconfig.json --jsx react"
   },

diff --git a/packages/redux-pauseable-store/package.json b/packages/redux-pauseable-store/package.json
@@ -23,9 +23,8 @@
   "files": [
     "dist/",
     "src/",
-    "CHANGELOG.md",
     "LICENSE",
-    "README.md"
+    "*.md"
   ],
   "source": "src/index.ts",
   "main": "dist/index.js",
@@ -38,26 +37,31 @@
     "prepare": "yon run build",
     "prebuild": "yon run build:clean",
     "prerelease": "yon run clean",
-    "prepublishOnly": "yarn run checkup && yarn run build",
+    "prepublishOnly": "yarn run dev:readonly && yarn run build",
     "pretest": "yon run test:clean",
     "____ INTEGRATION ___________________________________________________": "",
-    "clean": "yon run build:clean && yon run test:clean",
-    "dev": "yon run format && yon run types && yon run lint",
-    "checkup": "yon format:checkup && yon run types && yon run lint",
-    "all": "yon run dev && yon run test && yon run build",
+    "clean": "yon run build:clean && yon run test:clean && rimraf ./node_modules/.cache",
+    "test": "yarn run test:watch",
+    "dev": "yarn run format && yarn run types && yarn run lint",
+    "dev:readonly": "yarn run format:verify && yarn run types && yarn run lint",
+    "all": "yarn run clean && yarn run dev && yarn run test:nowatch && yarn run build",
+    "all:readonly": "yarn run dev:readonly && yarn run test:nowatch",
     "____ INDIVIDUAL COMMANDS ___________________________________________": "",
     "build": "microbundle build --jsx React.createElement",
-    "build:clean": "rimraf dist/",
+    "build:clean": "rimraf ./dist",
     "build:watch": "microbundle watch --jsx React.createElement",
-    "format": "prettier --write \"**/*.*\"",
-    "format:checkup": "prettier --list-different \"**/*.*\"",
-    "lint": "eslint \"**/*.{js,jsx,json,ts,tsx}\"",
+    "format": "prettier --write .",
+    "format:verify": "prettier --list-different .",
+    "lint": "eslint . --max-warnings 0",
     "release:changelog": "standard-version --skip.commit --skip.tag --release-as ",
-    "test": "jest --coverage",
-    "test:clean": "rimraf coverage-local/",
+    "test:clean": "rimraf ./coverage-local",
+    "test:nowatch": "jest --coverage",
     "test:watch": "jest --coverage --watch",
     "types": "tsc --noEmit --p tsconfig.json --jsx react"
   },
+  "devDependencies": {
+    "react-hibernate-dev-helpers": "0.1.0"
+  },
   "peerDependencies": {
     "redux": "^4.0.0"
   },