Merge pull request #67 from gregoranders/development

0.0.13 Release

.eslintignore

@@ -1,3 +1,4 @@
 #/public/**
+jestSetupAfterEnv.js
 *.config.js
 *-config.js

.vscode/extensions.json

@@ -0,0 +1,17 @@
+{
+  "recommendations": [
+    "coenraads.bracket-pair-colorizer",
+    "msjsdiag.debugger-for-chrome",
+    "editorconfig.editorconfig",
+    "dsznajder.es7-react-js-snippets",
+    "dbaeumer.vscode-eslint",
+    "orta.vscode-jest",
+    "pkief.material-icon-theme",
+    "marlosirapuan.nord-deep",
+    "eg2.vscode-npm-script",
+    "esbenp.prettier-vscode",
+    "rvest.vs-code-prettier-eslint",
+    "pflannery.vscode-versionlens",
+    "visualstudioexptteam.vscodeintellicode"
+  ]
+}

.vscode/settings.json

@@ -4,24 +4,12 @@
   },
   "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
   "editor.formatOnSave": true,
-  "[javascript]": {
-    "editor.formatOnSave": false
-  },
-  "[javascriptreact]": {
-    "editor.formatOnSave": false
-  },
-  "[typescript]": {
-    "editor.formatOnSave": false
-  },
-  "[typescriptreact]": {
-    "editor.formatOnSave": false
-  },
   "editor.tabSize": 2,
   "editor.wordWrapColumn": 120,
   "editor.minimap.enabled": false,
   "jest.pathToJest": "npm test --",
   "jest.coverageFormatter": "GutterFormatter",
-  "jest.enableInlineErrorMessages": false,
-  "jest.restartJestOnSnapshotUpdate": false,
-  "jest.showCoverageOnLoad": false
+  "jest.enableInlineErrorMessages": true,
+  "jest.restartJestOnSnapshotUpdate": true,
+  "jest.showCoverageOnLoad": true
 }

.vscode/workspace.code-workspace

@@ -3,22 +3,5 @@
     {
       "path": "../"
     }
-  ],
-  "extensions": {
-    "recommendations": [
-      "coenraads.bracket-pair-colorizer",
-      "msjsdiag.debugger-for-chrome",
-      "editorconfig.editorconfig",
-      "dsznajder.es7-react-js-snippets",
-      "dbaeumer.vscode-eslint",
-      "orta.vscode-jest",
-      "pkief.material-icon-theme",
-      "marlosirapuan.nord-deep",
-      "eg2.vscode-npm-script",
-      "esbenp.prettier-vscode",
-      "rvest.vs-code-prettier-eslint",
-      "pflannery.vscode-versionlens",
-      "visualstudioexptteam.vscodeintellicode"
-    ]
-  }
+  ]
 }

CHANGELOG.md

@@ -1,3 +1,51 @@
+#### 0.0.13 (2020-06-26)
+
+##### Build System / Dependencies
+
+- **webpack:** refactor webpack config ([b73cc2aa](https://github.com/gregoranders/ts-react-playground/commit/b73cc2aacd2838aecfca60a302d81630aa334a18))
+- **e2e:** add screenshots ([2eae49fd](https://github.com/gregoranders/ts-react-playground/commit/2eae49fdf7ee08ec715127d82b275e28b3c9afb9))
+
+##### Chores
+
+- **release:**
+  - 0.0.13 release ([ac91f3d4](https://github.com/gregoranders/ts-react-playground/commit/ac91f3d4798f6d163f618e14f5a835288055d51f))
+  - prepare next release ([e287cd75](https://github.com/gregoranders/ts-react-playground/commit/e287cd752e5b484ff550f86bf2abd9fabf0c5444))
+- **dependencies:** update dependencies ([94fc59f1](https://github.com/gregoranders/ts-react-playground/commit/94fc59f18f0f7be5637dc4726a3fc9c6a83754c3))
+
+##### Bug Fixes
+
+- **eslint:** fix eslint issue ([2bb32049](https://github.com/gregoranders/ts-react-playground/commit/2bb320492233bfc6bdce6c8660e61ab3932b64c5))
+- **e2e:** fix e2e test due to test refactoring ([840c4a50](https://github.com/gregoranders/ts-react-playground/commit/840c4a5027f47dfe65b5fcc7f08a84150926ea47))
+- **test:** fix test ([b83155dd](https://github.com/gregoranders/ts-react-playground/commit/b83155dd552bc6f8809ba115d255c4c1407f89bb))
+
+##### Other Changes
+
+- bump @types/jest from 26.0.0 to 26.0.3 ([42324ba1](https://github.com/gregoranders/ts-react-playground/commit/42324ba1adb0a9fca5ef7b81bfa939f3f7076f50))
+- bump puppeteer from 4.0.0 to 4.0.1 ([fec81ab5](https://github.com/gregoranders/ts-react-playground/commit/fec81ab5483e80dc248b1b893f9874d44604b9b0))
+- bump @types/recharts from 1.8.12 to 1.8.13 ([40212304](https://github.com/gregoranders/ts-react-playground/commit/402123045305d9d89c59acb6ec0b4d1ed98562ee))
+- bump @types/node from 14.0.13 to 14.0.14 ([9bc641a2](https://github.com/gregoranders/ts-react-playground/commit/9bc641a21a6918885dc9083447d427aa8f388a97))
+- bump @types/react from 16.9.38 to 16.9.41 ([74dad208](https://github.com/gregoranders/ts-react-playground/commit/74dad208eb9c7ba079b87f52539c436b414c5531))
+- bump jest from 26.0.1 to 26.1.0 ([1a45293f](https://github.com/gregoranders/ts-react-playground/commit/1a45293f40f6b2c0d0042bd02e6d2c810b7fd073))
+- bump webpack-cli from 3.3.11 to 3.3.12 ([f10b63fd](https://github.com/gregoranders/ts-react-playground/commit/f10b63fd4d5e8810efdc35f850b94c301382e255))
+- bump jest-cli from 26.0.1 to 26.1.0 ([9f175292](https://github.com/gregoranders/ts-react-playground/commit/9f17529244e5e78c049b4d016c51a1a6c918d8e1))
+- gregoranders/ts-react-playground into development ([9462428f](https://github.com/gregoranders/ts-react-playground/commit/9462428f4764a48072cecb67c7b17771762aef64))
+- bump @rollup/plugin-node-resolve from 8.0.1 to 8.1.0 ([ca37df6c](https://github.com/gregoranders/ts-react-playground/commit/ca37df6cd556b7f01af052de584093f089a71ea2))
+- bump jest-junit from 10.0.0 to 11.0.1 ([4715f69e](https://github.com/gregoranders/ts-react-playground/commit/4715f69e3a0806bbfb1d38202863c1443ee7cabd))
+- bump @typescript-eslint/parser from 3.3.0 to 3.4.0 ([9d969c4d](https://github.com/gregoranders/ts-react-playground/commit/9d969c4d22498ec4941b778f1507bc1bc0dd8857))
+- bump @typescript-eslint/eslint-plugin from 3.3.0 to 3.4.0 ([8727e3ae](https://github.com/gregoranders/ts-react-playground/commit/8727e3aebdebc9e5af7cfc006f3deebd87777190))
+- bump ts-jest from 26.1.0 to 26.1.1 ([3bd3b787](https://github.com/gregoranders/ts-react-playground/commit/3bd3b787ad3a7395f6b1e43bd01ee5f97e2cc31d))
+- bump rollup from 2.17.1 to 2.18.0 ([c86b929e](https://github.com/gregoranders/ts-react-playground/commit/c86b929ee19d66c95fcd50cf76b525e5f873efe6))
+- bump gsap from 3.3.3 to 3.3.4 ([2735dac3](https://github.com/gregoranders/ts-react-playground/commit/2735dac36f216be7ace93c25c779b989adf5aa36))
+- bump @babel/core from 7.10.2 to 7.10.3 ([b9ff2b9c](https://github.com/gregoranders/ts-react-playground/commit/b9ff2b9c0018b5ff461d698a9ebe0a7585df6fea))
+
+##### Refactors
+
+- **script:** remove FunctionComponent usage ([aa9f7e2c](https://github.com/gregoranders/ts-react-playground/commit/aa9f7e2c9a41ea55f2733ec227d841b23c30bca5))
+- **test:**
+  - refactor and fix tests ([354f13ca](https://github.com/gregoranders/ts-react-playground/commit/354f13cac8fc9511d988f1fe303f6bf34e068ad0))
+  - add fetch mock to tests ([15dfc3c3](https://github.com/gregoranders/ts-react-playground/commit/15dfc3c30f0a322caf8b5a8e1617e1dc7f2bc927))
+- **vscode:** refactor configuration ([33ff2473](https://github.com/gregoranders/ts-react-playground/commit/33ff247313e57d46441a6055ba5361da9f77789e))
+
 #### 0.0.12 (2020-06-20)
 
 ##### Build System / Dependencies

SECURITY.md

@@ -5,7 +5,8 @@
 ​
 | Version | Supported |
 | ------- | ------------------ |
-| 0.0.12 | :white_check_mark: |
+| 0.0.13 | :white_check_mark: |
+| 0.0.12 | :x: |
 | 0.0.11 | :x: |
 | 0.0.10 | :x: |
 | 0.0.9 | :x: |

e2e/index.spec.ts

@@ -3,7 +3,7 @@ import { customDiffDir, customSnapshotsDir, mkdir, timeout, url } from './setup'
 
 declare const browser: Browser;
 
-describe('Index', () => {
+describe.skip('Index', () => {
   beforeAll(async () => {
     mkdir(customSnapshotsDir);
     mkdir(customDiffDir);
@@ -12,7 +12,7 @@ describe('Index', () => {
   Object.keys(devices).forEach((key) => {
     const device = devices[key];
 
-    xtest(
+    test.skip(
       `${device.name}`,
       async () => {
         const page = await browser.newPage();

e2e/journey.spec.ts

@@ -55,7 +55,7 @@ describe('index', () => {
       const button = await page.$('button');
       expect(button).toBeTruthy();
       const html = await page.evaluate((h2) => h2.innerHTML, button);
-      expect(html).toBe('Generate Users [0]');
+      expect(html).toBe('Generate Users');
       const image = await page.screenshot();
       expect(image).toMatchImageSnapshot();
     },
@@ -76,7 +76,7 @@ describe('index', () => {
       let list = await page.$$('dl');
       expect(list).toHaveLength(15);
       const html = await page.evaluate((h2) => h2.innerHTML, button);
-      expect(html).toBe('Generate Users [15]');
+      expect(html).toBe('Generate Users');
       const after = await page.screenshot();
       expect(after).toMatchImageSnapshot();
       list = await page.$$('dl');

jestSetupAfterEnv.js

@@ -0,0 +1,8 @@
+window.fetch = jest.fn().mockImplementation(() => {
+  return Promise.resolve({
+    text: () => Promise.resolve(),
+    json: () => Promise.resolve(),
+  });
+});
+
+fetch = window.fetch;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ts-react-playground",
-  "version": "0.0.12",
+  "version": "0.0.13",
   "description": "TypeScript React Playground",
   "scripts": {
     "start": "webpack-dev-server --open --progress --config webpack.config.js",
@@ -13,7 +13,7 @@
     "prebuild:webpack": "rimraf ./dist",
     "build:webpack": "cross-env NODE_ENV=production webpack --config webpack.config.js",
     "pretest": "rimraf ./test",
-    "test": "jest --runInBand --env=enzyme --setupFilesAfterEnv=jest-enzyme --reporters=jest-html-reporter jest-spec-reporter jest-junit --coverage --collectCoverage true --coverageDirectory ../test/coverage --rootDir ./src",
+    "test": "jest --runInBand --env=enzyme --setupFilesAfterEnv=jest-enzyme ../jestSetupAfterEnv.js --reporters=jest-html-reporter jest-spec-reporter jest-junit --coverage --collectCoverage true --coverageDirectory ../test/coverage --rootDir ./src",
     "test:update": "npm run test -- -u",
     "watch-test": "npm run test -- --watch",
     "e2e:serve": "webpack-dev-server --config ./e2e/webpack.config.js --quiet true --liveReload false --inline false",
@@ -166,6 +166,7 @@
     },
     "rules": {
       "@typescript-eslint/explicit-function-return-type": "off",
+      "@typescript-eslint/explicit-module-boundary-types": "off",
       "react-hooks/rules-of-hooks": "error",
       "react-hooks/exhaustive-deps": "warn",
       "sort-imports": [
@@ -212,7 +213,7 @@
   },
   "homepage": "https://gregoranders.github.io/ts-react-playground/",
   "devDependencies": {
-    "@babel/core": "7.10.2",
+    "@babel/core": "7.10.3",
     "@devexpress/dx-react-chart": "2.6.4",
     "@devexpress/dx-react-chart-material-ui": "2.6.4",
     "@devexpress/dx-react-core": "2.6.4",
@@ -228,9 +229,9 @@
     "@rollup/plugin-commonjs": "13.0.0",
     "@rollup/plugin-html": "0.2.0",
     "@rollup/plugin-json": "4.1.0",
-    "@rollup/plugin-node-resolve": "8.0.1",
+    "@rollup/plugin-node-resolve": "8.1.0",
     "@rollup/plugin-replace": "2.3.3",
-    "@rollup/plugin-typescript": "4.1.2",
+    "@rollup/plugin-typescript": "5.0.0",
     "@storybook/addon-a11y": "5.3.19",
     "@storybook/addon-actions": "5.3.19",
     "@storybook/addon-backgrounds": "5.3.19",
@@ -257,24 +258,24 @@
     "@types/express": "4.17.6",
     "@types/faker": "4.1.12",
     "@types/favicons": "5.5.0",
-    "@types/jest": "26.0.0",
+    "@types/jest": "26.0.3",
     "@types/jest-image-snapshot": "3.1.0",
-    "@types/node": "14.0.13",
+    "@types/node": "14.0.14",
     "@types/object-assign": "4.0.30",
     "@types/prop-types": "15.7.3",
     "@types/puppeteer": "3.0.0",
-    "@types/react": "16.9.38",
+    "@types/react": "16.9.41",
     "@types/react-dom": "16.9.8",
     "@types/react-is": "16.7.1",
     "@types/react-router-dom": "5.1.5",
     "@types/react-test-renderer": "16.9.2",
     "@types/react-transition-group": "4.4.0",
-    "@types/recharts": "1.8.12",
+    "@types/recharts": "1.8.13",
     "@types/recoil": "0.0.1",
     "@types/scheduler": "0.16.1",
     "@types/storybook__addon-info": "5.2.1",
-    "@typescript-eslint/eslint-plugin": "3.3.0",
-    "@typescript-eslint/parser": "3.3.0",
+    "@typescript-eslint/eslint-plugin": "3.4.0",
+    "@typescript-eslint/parser": "3.4.0",
     "@zeit/ncc": "0.22.3",
     "babel-loader": "8.1.0",
     "breakpoint-sass": "2.7.1",
@@ -297,7 +298,7 @@
     "enzyme": "3.11.0",
     "enzyme-adapter-react-16": "1.15.2",
     "es-module-shims": "0.4.7",
-    "eslint": "7.3.0",
+    "eslint": "7.3.1",
     "eslint-config-prettier": "6.11.0",
     "eslint-plugin-prettier": "3.1.4",
     "eslint-plugin-react": "7.20.0",
@@ -307,18 +308,18 @@
     "favicons": "6.1.0",
     "file-loader": "6.0.0",
     "generate-changelog": "1.8.0",
-    "gsap": "3.3.3",
+    "gsap": "3.3.4",
     "html-webpack-plugin": "4.3.0",
     "husky": "4.2.5",
     "idb": "5.0.4",
     "identity-obj-proxy": "3.0.0",
-    "jest": "26.0.1",
-    "jest-cli": "26.0.1",
+    "jest": "26.1.0",
+    "jest-cli": "26.1.0",
     "jest-environment-enzyme": "7.1.2",
     "jest-enzyme": "7.1.2",
     "jest-html-reporter": "3.1.3",
     "jest-image-snapshot": "4.0.2",
-    "jest-junit": "10.0.0",
+    "jest-junit": "11.0.1",
     "jest-puppeteer": "4.4.0",
     "jest-spec-reporter": "1.0.14",
     "lint-staged": "10.2.11",
@@ -331,7 +332,7 @@
     "portfinder-sync": "0.0.2",
     "prettier": "2.0.5",
     "prop-types": "15.7.2",
-    "puppeteer": "4.0.0",
+    "puppeteer": "4.0.1",
     "react": "16.13.1",
     "react-docgen-typescript-loader": "3.7.2",
     "react-dom": "16.13.1",
@@ -343,16 +344,16 @@
     "recharts": "1.8.5",
     "recoil": "0.0.10",
     "rimraf": "3.0.2",
-    "rollup": "2.17.1",
+    "rollup": "2.18.0",
     "sass-loader": "8.0.2",
     "source-map": "0.7.3",
-    "ts-jest": "26.1.0",
+    "ts-jest": "26.1.1",
     "ts-loader": "7.0.5",
     "ts-node": "8.10.2",
     "typescript": "3.9.5",
     "url-loader": "4.1.0",
     "webpack": "4.43.0",
-    "webpack-cli": "3.3.11",
+    "webpack-cli": "3.3.12",
     "webpack-dev-server": "3.11.0",
     "workbox-background-sync": "5.1.3",
     "workbox-broadcast-update": "5.1.3",