From 32b365ea8b786a9fb9eda28211163df4512a5afd Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Mon, 23 Dec 2019 00:03:28 +0000 Subject: [PATCH 1/6] Update minor devDeps --- package.json | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 36bc359b2..4a141c623 100644 --- a/package.json +++ b/package.json @@ -31,12 +31,12 @@ "tinycolor2": "^1.4.1" }, "devDependencies": { - "@babel/cli": "7.7.5", - "@babel/core": "7.7.5", - "@babel/node": "7.7.4", - "@babel/plugin-proposal-object-rest-spread": "7.7.4", + "@babel/cli": "7.7.7", + "@babel/core": "7.7.7", + "@babel/node": "7.7.7", + "@babel/plugin-proposal-object-rest-spread": "7.7.7", "@babel/polyfill": "7.7.0", - "@babel/preset-env": "7.7.6", + "@babel/preset-env": "7.7.7", "@babel/preset-react": "7.7.4", "@babel/traverse": "7.7.4", "@hot-loader/react-dom": "16.11.0", @@ -47,11 +47,11 @@ "babel-jest": "24.9.0", "babel-loader": "8.0.6", "babel-plugin-module-resolver": "4.0.0", - "css-loader": "3.3.2", + "css-loader": "3.4.0", "cssnano": "4.1.10", - "enzyme": "3.10.0", - "enzyme-adapter-react-16": "1.15.1", - "eslint": "6.7.2", + "enzyme": "3.11.0", + "enzyme-adapter-react-16": "1.15.2", + "eslint": "6.8.0", "eslint-config-prettier": "6.7.0", "eslint-plugin-import": "2.19.1", "eslint-plugin-react": "7.17.0", @@ -62,7 +62,7 @@ "jest-cli": "24.9.0", "mkdirp": "0.5.1", "node-sass": "4.13.0", - "postcss": "7.0.24", + "postcss": "7.0.25", "postcss-combine-duplicated-selectors": "8.0.3", "postcss-custom-properties": "8.0.11", "postcss-remove-root": "0.0.2", @@ -75,11 +75,11 @@ "react-test-renderer": "16.12.0", "request": "2.88.0", "rimraf": "3.0.0", - "sass-loader": "7.1.0", - "style-loader": "1.0.1", - "webpack": "4.41.3", + "sass-loader": "7.3.1", + "style-loader": "1.1.1", + "webpack": "4.41.4", "webpack-cli": "3.3.10", - "webpack-dev-server": "3.9.0" + "webpack-dev-server": "3.10.1" }, "peerDependencies": { "react": ">15", From 16618c3d027ff27e8d6508a059e08e0be5ad859f Mon Sep 17 00:00:00 2001 From: Dmitry Shvedov Date: Mon, 23 Dec 2019 12:56:30 -0500 Subject: [PATCH 2/6] Downgrade sass-loader --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 4a141c623..3380b90be 100644 --- a/package.json +++ b/package.json @@ -75,7 +75,7 @@ "react-test-renderer": "16.12.0", "request": "2.88.0", "rimraf": "3.0.0", - "sass-loader": "7.3.1", + "sass-loader": "7.1.0", "style-loader": "1.1.1", "webpack": "4.41.4", "webpack-cli": "3.3.10", From 8f74f1c4f43deb981f3520eb7feb9e61bf65719e Mon Sep 17 00:00:00 2001 From: dmt0 Date: Mon, 23 Dec 2019 13:12:11 -0500 Subject: [PATCH 3/6] Upgrade node in CircleCI --- circle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/circle.yml b/circle.yml index 4f5d46c3e..59e39b8ab 100644 --- a/circle.yml +++ b/circle.yml @@ -3,7 +3,7 @@ jobs: build: docker: # specify the version you desire here - - image: circleci/node:8.11.2-browsers + - image: circleci/node:12.13.1-browsers working_directory: ~/react-chart-editor From 87f75911be295b31318d31a90eebc022c6bba640 Mon Sep 17 00:00:00 2001 From: dmt0 Date: Mon, 23 Dec 2019 17:58:09 -0500 Subject: [PATCH 4/6] Scripts to the top --- package.json | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 3380b90be..44865a15b 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,26 @@ "bugs": { "url": "https://github.com/plotly/react-chart-editor/issues" }, + "scripts": { + "lint": "prettier --write \"src/**/*.js\"", + "make:arrows": "node scripts/makeArrows.js", + "make:combined-translation-keys": "npm run make:translation-keys && node scripts/combineTranslationKeys.js", + "make:lib:css": "mkdirp lib && babel-node scripts/styles.js && SASS_ENV=ie babel-node scripts/styles.js && babel-node scripts/postcss.js && SASS_ENV=ie babel-node scripts/postcss.js", + "make:lib:js": "mkdirp lib && babel src --out-dir lib --ignore=__tests__/* --source-maps", + "make:lib": "rimraf lib && mkdir lib && npm run make:lib:js && npm run make:lib:css && npm run make:combined-translation-keys", + "make:translation-keys": "node scripts/findTranslationKeys.js", + "prepublishOnly": "npm run make:lib", + "start": "webpack-dev-server --hot", + "storybook": "start-storybook -p 9001 -c .storybook", + "test": "npm run test:lint && npm run test:pretty && npm run test:js", + "test:js": "jest --setupTestFrameworkScriptFile=raf/polyfill --maxWorkers=2", + "test:lint": "eslint \"src/**/*.js\" && echo -e '\\033[0;32m'PASS'\\033[0m'", + "test:pretty": "prettier -l \"src/**/*.js\" && echo -e '\\033[0;32m'PASS'\\033[0m'", + "test:percy": "node --max-old-space-size=4096 $(npm bin)/build-storybook && percy-storybook --widths=500", + "test:percy-local": "node --max-old-space-size=4096 $(npm bin)/build-storybook", + "watch": "babel src --watch --out-dir lib --source-maps | node-sass -w src/styles/main.scss lib/react-chart-editor.css", + "watch-test": "jest --watch" + }, "dependencies": { "@plotly/draft-js-export-html": "1.2.0", "classnames": "^2.2.6", @@ -113,25 +133,5 @@ }, "browserslist": [ "ie 11" - ], - "scripts": { - "lint": "prettier --write \"src/**/*.js\"", - "make:arrows": "node scripts/makeArrows.js", - "make:combined-translation-keys": "npm run make:translation-keys && node scripts/combineTranslationKeys.js", - "make:lib:css": "mkdirp lib && babel-node scripts/styles.js && SASS_ENV=ie babel-node scripts/styles.js && babel-node scripts/postcss.js && SASS_ENV=ie babel-node scripts/postcss.js", - "make:lib:js": "mkdirp lib && babel src --out-dir lib --ignore=__tests__/* --source-maps", - "make:lib": "rimraf lib && mkdir lib && npm run make:lib:js && npm run make:lib:css && npm run make:combined-translation-keys", - "make:translation-keys": "node scripts/findTranslationKeys.js", - "prepublishOnly": "npm run make:lib", - "start": "webpack-dev-server --hot", - "storybook": "start-storybook -p 9001 -c .storybook", - "test": "npm run test:lint && npm run test:pretty && npm run test:js", - "test:js": "jest --setupTestFrameworkScriptFile=raf/polyfill --maxWorkers=2", - "test:lint": "eslint \"src/**/*.js\" && echo -e '\\033[0;32m'PASS'\\033[0m'", - "test:pretty": "prettier -l \"src/**/*.js\" && echo -e '\\033[0;32m'PASS'\\033[0m'", - "test:percy": "node --max-old-space-size=4096 $(npm bin)/build-storybook && percy-storybook --widths=500", - "test:percy-local": "node --max-old-space-size=4096 $(npm bin)/build-storybook", - "watch": "babel src --watch --out-dir lib --source-maps | node-sass -w src/styles/main.scss lib/react-chart-editor.css", - "watch-test": "jest --watch" - } + ] } From 3620c6509768aa66e090edf7d8cf813408b76ac9 Mon Sep 17 00:00:00 2001 From: dmt0 Date: Mon, 23 Dec 2019 18:09:41 -0500 Subject: [PATCH 5/6] Clear Circle cache --- circle.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/circle.yml b/circle.yml index 59e39b8ab..888a1699d 100644 --- a/circle.yml +++ b/circle.yml @@ -11,15 +11,15 @@ jobs: - checkout - restore_cache: keys: - - v1-dependencies-{{ checksum "package.json" }} - - v1-dependencies- + - v2-dependencies-{{ checksum "package.json" }} + - v2-dependencies- - run: npm install - save_cache: paths: - node_modules - key: v1-dependencies-{{ checksum "package.json" }} + key: v2-dependencies-{{ checksum "package.json" }} - run: npm test - run: npm run test:percy From 386ee3c61041fb890d4979cb1ee7d817ce96a201 Mon Sep 17 00:00:00 2001 From: dmt0 Date: Mon, 23 Dec 2019 18:31:30 -0500 Subject: [PATCH 6/6] Don't syntax-test node-modules --- src/__tests__/syntax-test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/__tests__/syntax-test.js b/src/__tests__/syntax-test.js index daf88b1f6..1397f465f 100644 --- a/src/__tests__/syntax-test.js +++ b/src/__tests__/syntax-test.js @@ -7,7 +7,7 @@ const REGEXS = BLACK_LIST.map(token => new RegExp(`^\\s*${token}\\(.*`)); describe('Syntax and test validation', () => { describe(`ensures ${BLACK_LIST} is not present in tests`, () => { - const files = glob.sync('**/__tests__/*.js'); + const files = glob.sync('!(node_modules|examples)/**/__tests__/*.js'); files.forEach(file => it(`checks ${file} for test checks`, () => { const code = fs.readFileSync(file, {encoding: 'utf-8'});