From daf7678f8dc7851ca4683b6e1f4d69832e59df84 Mon Sep 17 00:00:00 2001 From: Chris Berns Date: Mon, 24 Feb 2020 20:59:39 -0800 Subject: [PATCH 1/4] update babel build --- .babelrc | 21 +++++++++++++++------ package.json | 15 +++++++-------- rollup.config.js | 30 +++++++++++++++--------------- 3 files changed, 37 insertions(+), 29 deletions(-) diff --git a/.babelrc b/.babelrc index 723ea64..dbd07a6 100644 --- a/.babelrc +++ b/.babelrc @@ -1,9 +1,18 @@ { + "env": { + "test": { + "presets": [["@babel/preset-env"], "@babel/preset-react"] + } + }, "presets": [ - ["env", { - "modules": false - }], - "stage-0", - "react" - ] + [ + "@babel/preset-env", + { + "modules": false + } + ], + "@babel/preset-react" + ], + "plugins": ["@babel/plugin-proposal-class-properties"], + "ignore": ["node_modules/**"] } diff --git a/package.json b/package.json index 9629209..1e49be5 100644 --- a/package.json +++ b/package.json @@ -30,13 +30,10 @@ "react-dom": "^15.0.0 || ^16.0.0" }, "devDependencies": { + "@babel/core": "^7.8.4", + "@babel/plugin-transform-runtime": "^7.8.3", "@svgr/rollup": "^2.4.1", "axios-mock-adapter": "^1.17.0", - "babel-core": "^6.26.3", - "babel-plugin-external-helpers": "^6.22.0", - "babel-preset-env": "^1.7.0", - "babel-preset-react": "^6.24.1", - "babel-preset-stage-0": "^6.24.1", "chai": "^4.2.0", "cross-env": "^5.2.1", "enzyme": "^3.10.0", @@ -49,11 +46,11 @@ "eslint-plugin-react": "^7.14.3", "eslint-plugin-standard": "^3.1.0", "gh-pages": "^1.2.0", - "react": "^16.4.1", - "react-dom": "^16.4.1", + "react": "^16.12.0", + "react-dom": "^16.12.0", "react-scripts": "^3.0.1", "rollup": "^0.64.1", - "rollup-plugin-babel": "^3.0.7", + "rollup-plugin-babel": "^4.3.3", "rollup-plugin-commonjs": "^9.1.3", "rollup-plugin-node-resolve": "^3.3.0", "rollup-plugin-peer-deps-external": "^2.2.0", @@ -68,6 +65,8 @@ "themes" ], "dependencies": { + "@babel/plugin-proposal-class-properties": "^7.8.3", + "@babel/runtime": "^7.8.4", "babel-plugin-transform-runtime": "^6.23.0", "lodash": "^4.17.15", "react-plaid-link": "^1.5.0" diff --git a/rollup.config.js b/rollup.config.js index 0e4db7d..634a4b3 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,24 +1,24 @@ -import babel from 'rollup-plugin-babel' -import commonjs from 'rollup-plugin-commonjs' -import external from 'rollup-plugin-peer-deps-external' -import postcss from 'rollup-plugin-postcss' -import resolve from 'rollup-plugin-node-resolve' -import url from 'rollup-plugin-url' -import svgr from '@svgr/rollup' +import babel from "rollup-plugin-babel"; +import commonjs from "rollup-plugin-commonjs"; +import external from "rollup-plugin-peer-deps-external"; +import postcss from "rollup-plugin-postcss"; +import resolve from "rollup-plugin-node-resolve"; +import url from "rollup-plugin-url"; +import svgr from "@svgr/rollup"; -import pkg from './package.json' +import pkg from "./package.json"; export default { - input: 'src/index.js', + input: "src/index.js", output: [ { file: pkg.main, - format: 'cjs', + format: "cjs", sourcemap: true }, { file: pkg.module, - format: 'es', + format: "es", sourcemap: true } ], @@ -27,18 +27,18 @@ export default { postcss({ modules: true, extract: true, - extensions: ['.css'] + extensions: [".css"] }), url(), svgr(), babel({ runtimeHelpers: true, - exclude: 'node_modules/**', - plugins: ['external-helpers', 'transform-runtime'] + exclude: "node_modules/**", + plugins: ["@babel/plugin-transform-runtime"] }), resolve({ browser: true }), commonjs() ] -} +}; From fcd9158487a85e3b01d4e7783c4a0f4be6046f1f Mon Sep 17 00:00:00 2001 From: Chris Berns Date: Mon, 24 Feb 2020 21:00:04 -0800 Subject: [PATCH 2/4] fix errors --- src/index.js | 2 +- src/models/EntityModel.js | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/index.js b/src/index.js index d3017d4..2bdcd36 100644 --- a/src/index.js +++ b/src/index.js @@ -8,7 +8,7 @@ export const configureVault = ( apiOptions = { env: 'production', }, - onLoad: false, + onLoad ) => { if (!!window !== true && !!document !== true) { throw new Error("Illegal call. `configureVault` is being executed outside browser context.") diff --git a/src/models/EntityModel.js b/src/models/EntityModel.js index 101fcd5..274727d 100644 --- a/src/models/EntityModel.js +++ b/src/models/EntityModel.js @@ -5,9 +5,6 @@ import { EntityDate } from './index' export class EntityModel { - dateUpdated: string - dateCreated: string - constructor(params = {}) { this.id = params.id || this._generateUUID() this.dateUpdated = params.dateUpdated || new EntityDate().toIsoString() From e3ff046d28257175ab7d993d5ed8e14417198232 Mon Sep 17 00:00:00 2001 From: Chris Berns Date: Wed, 26 Feb 2020 10:48:13 -0800 Subject: [PATCH 3/4] bump node version --- .travis.yml | 4 ++-- package.json | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 984658c..e5c2091 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ language: node_js node_js: - - 9 - - 8 + - 11 + - 10 diff --git a/package.json b/package.json index 1e49be5..07f9dc4 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,7 @@ "module": "dist/index.es.js", "jsnext:main": "dist/index.es.js", "engines": { - "node": ">=8", - "npm": ">=5" + "node": ">=10" }, "scripts": { "test": "cross-env CI=1 react-scripts test --env=jsdom", From 8816ea57393bd03bbb20369122cff3772a3a2356 Mon Sep 17 00:00:00 2001 From: Chris Berns Date: Thu, 27 Feb 2020 10:34:02 -0800 Subject: [PATCH 4/4] 1.0.0-beta23 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 07f9dc4..ea11726 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "revops-js", - "version": "1.0.0-beta22", + "version": "1.0.0-beta23", "description": "Official RevOps Javascript Component Library", "author": "RevOps", "license": "MIT",