Merge pull request #31 from gregoranders/development

0.0.8 Release

.github/workflows/development.yml

@@ -46,7 +46,7 @@ jobs:
         uses: coverallsapp/github-action@master
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
-          path-to-lcov: ./coverage/lcov.info
+          path-to-lcov: ./test/coverage/lcov.info
         env:
           CI: true
       - name: npm run e2e

.github/workflows/master.yml

@@ -51,12 +51,14 @@ jobs:
           CI: true
       - name: publish code coverage to code climate
         if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'
-        uses: paambaati/codeclimate-action@v2.3.0
+        uses: paambaati/codeclimate-action@v2.6.0
         env:
           CI: true
           CC_TEST_REPORTER_ID: ${{ secrets.CODE_CLIMATE }}
         with:
           coverageCommand: npm run test
+          coverageLocations: |
+            ./test/coverage/lcov.info:lcov
           debug: true
       - name: npm run e2e
         if: matrix.os == 'ubuntu-latest' && matrix.node-version == '14.x'

.gitignore

@@ -1,12 +1,10 @@
 dist/
 public/assets/
 public/favicon.html
-coverage/
-coverage-e2e/
+test/
 node_modules/
 
 package-lock.json
-junit.xml
 .jest-test-results.json
 
 *.js

.vscode/settings.json

@@ -2,12 +2,7 @@
   "editor.codeActionsOnSave": {
     "source.fixAll.eslint": true
   },
-  "eslint.validate": [
-    "javascript",
-    "javascriptreact",
-    "typescript",
-    "typescriptreact"
-  ],
+  "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
   "editor.formatOnSave": true,
   "[javascript]": {
     "editor.formatOnSave": false
@@ -21,20 +16,6 @@
   "[typescriptreact]": {
     "editor.formatOnSave": false
   },
-  "importCost.smallPackageSize": 50,
-  "importCost.mediumPackageSize": 100,
-  "importCost.smallPackageColor": "#7cc36e",
-  "importCost.mediumPackageColor": "#7cc36e",
-  "importCost.largePackageColor": "#d44e40",
-  "importCost.typescriptExtensions": [
-    "\\.tsx?$"
-  ],
-  "importCost.javascriptExtensions": [
-    "\\.jsx?$"
-  ],
-  "importCost.bundleSizeDecoration": "both",
-  "importCost.showCalculatingDecoration": true,
-  "importCost.debug": false,
   "editor.tabSize": 2,
   "editor.wordWrapColumn": 120,
   "editor.minimap.enabled": false

.vscode/workspace.code-workspace

@@ -5,32 +5,13 @@
     }
   ],
   "settings": {
-    "editor.defaultFormatter": "vscode.typescript-language-features",
+    "editor.defaultFormatter": "esbenp.prettier-vscode",
     "workbench.colorTheme": "Nord Deep",
     "workbench.iconTheme": "material-icon-theme",
     "editor.codeActionsOnSave": {
       "source.fixAll.eslint": true
     },
-    "eslint.validate": [
-      "javascript",
-      "javascriptreact",
-      "typescript",
-      "typescriptreact",
-    ],
-    "importCost.smallPackageSize": 50,
-    "importCost.mediumPackageSize": 100,
-    "importCost.smallPackageColor": "#7cc36e",
-    "importCost.mediumPackageColor": "#7cc36e",
-    "importCost.largePackageColor": "#d44e40",
-    "importCost.typescriptExtensions": [
-      "\\.tsx?$"
-    ],
-    "importCost.javascriptExtensions": [
-      "\\.jsx?$"
-    ],
-    "importCost.bundleSizeDecoration": "both",
-    "importCost.showCalculatingDecoration": true,
-    "importCost.debug": false,
+    "eslint.validate": ["javascript", "javascriptreact", "typescript", "typescriptreact"],
     "typescript.tsdk": "node_modules/typescript/lib"
   },
   "extensions": {
@@ -51,4 +32,3 @@
     ]
   }
 }
-

CHANGELOG.md

@@ -0,0 +1,18 @@
+#### 0.0.8 (2020-06-14)
+
+##### Chores
+
+* **vscode:**  remove unused configuration ([21b6479c](https://github.com/gregoranders/ts-react-playground/commit/21b6479cdca62da9b7526ef70a33dd38b737a946))
+* **test:**  move results into common folder ([e6e45b22](https://github.com/gregoranders/ts-react-playground/commit/e6e45b229c6bb97eee6ea38599b4e1496288af64))
+* **package:**  move prettier config ([68b76317](https://github.com/gregoranders/ts-react-playground/commit/68b7631735566cec3622cb6ad9e2b51ac26d1aa8))
+* **build:**  move scripts ([77b92587](https://github.com/gregoranders/ts-react-playground/commit/77b92587181f43ce710c33093c7d7f10744788d9))
+
+##### Documentation Changes
+
+* **security:**  support only latest version ([bc2eea82](https://github.com/gregoranders/ts-react-playground/commit/bc2eea828e6c8a17cc22529148ac43355f5ae0db))
+* **build:**  add changelog generation ([ee4f85e2](https://github.com/gregoranders/ts-react-playground/commit/ee4f85e2436ed69f264445f67c24c706b8a1f75b))
+
+##### Other Changes
+
+*  bump @types/recharts from 1.8.11 to 1.8.12 ([e95f780f](https://github.com/gregoranders/ts-react-playground/commit/e95f780ff41d3d6802416065d4e22c3ea64ab47f))
+

SECURITY.md

@@ -1,17 +1,19 @@
 # Security Policy
-​
+
 ## Supported Versions
+
 ​
-| Version | Supported          |
+| Version | Supported |
 | ------- | ------------------ |
-| 0.0.7   | :white_check_mark: |
-| 0.0.6   | :white_check_mark: |
-| 0.0.5   | :white_check_mark: |
-| 0.0.4   | :white_check_mark: |
-| 0.0.3   | :white_check_mark: |
-| 0.0.2   | :white_check_mark: |
-| 0.0.1   | :white_check_mark: |
+| 0.0.7 | :white_check_mark: |
+| 0.0.6 | :x: |
+| 0.0.5 | :x: |
+| 0.0.4 | :x: |
+| 0.0.3 | :x: |
+| 0.0.2 | :x: |
+| 0.0.1 | :x: |
 ​
+
 ## Reporting a Vulnerability
 
 [Create Issue](https://github.com/gregoranders/ts-react-playground/issues/new?labels=bug&template=bug_report.md&title=Security+Issue)

docs/Intro.stories.mdx

@@ -2,7 +2,7 @@ import { Meta } from '@storybook/addon-docs/blocks';
 
 <Meta title="Docs|Intro" />
 
-# ts-react-playground - [TypeScript](http://www.typescriptlang.org/) [React](https://reactjs.org/) Playground v0.0.7
+# ts-react-playground - [TypeScript](http://www.typescriptlang.org/) [React](https://reactjs.org/) Playground
 
 [![Dependency Status][daviddm-image]][daviddm-url]
 [![License][license-image]][license-url]

package.json

@@ -1,23 +1,24 @@
 {
   "name": "ts-react-playground",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "description": "TypeScript React Playground",
   "scripts": {
     "start": "webpack-dev-server --open --progress --config webpack.config.js",
-    "clear": "npm run prebuild && rimraf ./node_modules ./dist ./coverage ./coverage-e2e ./package-lock.json .jest-test-results.json junit.xml",
+    "clear": "npm run prebuild && npm run pretest && rimraf ./node_modules ./dist ./package-lock.json .jest-test-results.json junit.xml",
     "prebuild": "npm run prebuild:webpack && npm run prebuild:esm",
     "build": "npm run build:webpack",
     "prebuild:esm": "npm run prevendor && npm run prescript && npm run preserviceWorker && npm run prescss && npm run prefavicon",
     "build:esm": "npm run vendor && npm run script && npm run scss && npm run favicon && npm run serviceWorker",
-    "postbuild:esm": "ts-node minify.ts",
+    "postbuild:esm": "ts-node ./scripts/minify.ts",
     "prebuild:webpack": "rimraf ./dist",
     "build:webpack": "cross-env NODE_ENV=production webpack --config webpack.config.js",
-    "test": "jest --runInBand --env=enzyme --setupFilesAfterEnv=jest-enzyme --reporters=jest-spec-reporter jest-junit --coverage --coverageDirectory ../coverage --rootDir ./src",
+    "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:update": "npm run test -- -u",
     "e2e:serve": "webpack-dev-server --config ./e2e/webpack.config.js --quiet true --liveReload false --inline false",
-    "e2e": "cross-env-shell NODE_PORT=$(ts-node findport.ts) NODE_E2E=webpack jest --testTimeout=60000 --runInBand --reporters=jest-spec-reporter --preset=jest-puppeteer --coverage --coverageDirectory ../coverage-e2e --rootDir ./e2e",
-    "serve": "ts-node server.ts",
-    "e2e:esm": "cross-env-shell NODE_PORT=$(ts-node findport.ts) NODE_E2E=esm jest --testTimeout=60000 --runInBand --reporters=jest-spec-reporter --preset=jest-puppeteer --coverage --coverageDirectory ../coverage-e2e --rootDir ./e2e",
+    "e2e": "cross-env-shell NODE_PORT=$(ts-node ./scripts/findport.ts) NODE_E2E=webpack jest --testTimeout=60000 --runInBand --reporters=jest-spec-reporter --preset=jest-puppeteer --rootDir ./e2e",
+    "serve": "ts-node ./scripts/server.ts",
+    "e2e:esm": "cross-env-shell NODE_PORT=$(ts-node ./scripts/findport.ts) NODE_E2E=esm jest --testTimeout=60000 --runInBand --reporters=jest-spec-reporter --preset=jest-puppeteer --rootDir ./e2e",
     "livereload": "livereloadx -a ./public",
     "prescript": "rimraf ./public/script",
     "script": "tsc --project ./src/script --outDir ./public/script",
@@ -28,7 +29,7 @@
     "prewatch-scss": "npm run scss",
     "watch-scss": "node-sass --output-style compressed  --watch --output ./public ./src/style/styles.scss",
     "prefavicon": "rimraf ./public/assets ./public/favicon.html",
-    "favicon": "ts-node favicon.ts",
+    "favicon": "ts-node ./scripts/favicon.ts",
     "prevendor": "rimraf ./public/vendor ./public/es-module-shims.js",
     "vendor": "rimraf ./public/vendor && npm run vendor:base && npm run vendor:faker && npm run vendor:fontawesome && npm run vendor:react && npm run vendor:recharts && npm run vendor:esmoduleshims",
     "vendor:base": "cross-env NODE_ENV=production rollup -c ./src/vendor/rollup-base.config.js",
@@ -47,9 +48,9 @@
     "docker:up": "docker-compose up -d",
     "docker:down": "docker-compose down",
     "codeclimate": "docker run --interactive --tty --rm --env CODECLIMATE_CODE=\"$PWD\" --volume \"$PWD\":/code --volume /var/run/docker.sock:/var/run/docker.sock --volume /tmp/cc:/tmp/cc codeclimate/codeclimate analyze",
-    "prestorybook": "jest --runInBand --json --outputFile=.jest-test-results.json --env=enzyme --setupFilesAfterEnv=jest-enzyme --reporters=jest-spec-reporter jest-junit --coverage --coverageDirectory ../coverage --rootDir ./src",
+    "prestorybook": "jest --runInBand --json --outputFile=.jest-test-results.json --env=enzyme --setupFilesAfterEnv=jest-enzyme --reporters=jest-spec-reporter jest-junit --coverage --collectCoverage true --coverageDirectory ../test/coverage --rootDir ./src",
     "storybook": "cross-env NODE_ENV=production start-storybook",
-    "prebuild-storybook": "jest --runInBand --json --outputFile=.jest-test-results.json --env=enzyme --setupFilesAfterEnv=jest-enzyme --reporters=jest-spec-reporter jest-junit --coverage --coverageDirectory ../coverage --rootDir ./src",
+    "prebuild-storybook": "jest --runInBand --json --outputFile=.jest-test-results.json --env=enzyme --setupFilesAfterEnv=jest-enzyme --reporters=jest-spec-reporter jest-junit --coverage --collectCoverage true --coverageDirectory ../test/coverage --rootDir ./src",
     "build-storybook": "rimraf ./docs/public/docs/* && cross-env NODE_ENV=production build-storybook -c .storybook --quiet -o ./docs/public/docs"
   },
   "repository": {
@@ -87,7 +88,6 @@
     ]
   },
   "jest": {
-    "collectCoverage": true,
     "collectCoverageFrom": [
       "!setup.ts",
       "!webpack.config.js",
@@ -148,6 +148,20 @@
       "^.+\\.mdx$": "@storybook/addon-docs/jest-transform-mdx"
     }
   },
+  "jest-html-reporter": {
+    "pageTitle": "ts-react-playground",
+    "outputPath": "./test/index.html"
+  },
+  "jest-junit": {
+    "outputDirectory": "./test"
+  },
+  "prettier": {
+    "semi": true,
+    "trailingComma": "all",
+    "singleQuote": true,
+    "printWidth": 120,
+    "tabWidth": 2
+  },
   "author": "Gregor Anders <gregor.anders@gmail.com>",
   "license": "MIT",
   "bugs": {
@@ -242,7 +256,7 @@
     "@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.11",
+    "@types/recharts": "1.8.12",
     "@types/recoil": "0.0.0",
     "@types/scheduler": "0.16.1",
     "@types/storybook__addon-info": "5.2.1",
@@ -268,13 +282,15 @@
     "faker": "4.1.0",
     "favicons": "6.1.0",
     "file-loader": "6.0.0",
+    "generate-changelog": "1.8.0",
     "html-webpack-plugin": "4.3.0",
     "husky": "4.2.5",
     "identity-obj-proxy": "3.0.0",
     "jest": "26.0.1",
     "jest-cli": "26.0.1",
     "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-puppeteer": "4.4.0",

favicon.ts → scripts/favicon.ts

@@ -1,4 +1,4 @@
-import * as packageJson from './package.json';
+import * as packageJson from '../package.json';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as favicons from 'favicons';
@@ -20,7 +20,7 @@ const configuration: favicons.Configuration = {
     display: 'standalone',
     orientation: 'any',
     scope: '/',
-    start_url: `${packageJson.basename}/index.html`,
+    start_url: `${packageJson.basename}index.html`,
     version: '1.0',
     logging: false,
     pixel_art: false,

findport.ts → scripts/findport.ts

@@ -1,4 +1,4 @@
 import { getPort } from 'portfinder-sync';
-import { baseport } from './package.json';
+import { baseport } from '../package.json';
 
 console.log(getPort(baseport));

server.ts → scripts/server.ts

@@ -5,11 +5,11 @@ import * as express from 'express';
 import * as https from 'http';
 import * as compression from 'compression';
 
-import { baseport } from './package.json';
+import { baseport } from '../package.json';
 
 // import { api } from './controller';
 const hostname = 'localhost';
-const staticPath: string = path.join(__dirname, 'public');
+const staticPath: string = path.join(__dirname, '..', 'public');
 
 const application = express();