Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,23 @@ 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

steps:
- 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
68 changes: 34 additions & 34 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -31,12 +51,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",
Expand All @@ -47,11 +67,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",
Expand All @@ -62,7 +82,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",
Expand All @@ -76,10 +96,10 @@
"request": "2.88.0",
"rimraf": "3.0.0",
"sass-loader": "7.1.0",
"style-loader": "1.0.1",
"webpack": "4.41.3",
"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",
Expand Down Expand Up @@ -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"
}
]
}
2 changes: 1 addition & 1 deletion src/__tests__/syntax-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'});
Expand Down