Skip to content

GitLab

Commit 69a0b182 authored by Jaden DIEFENBAUGH's avatar Jaden DIEFENBAUGH Committed by Flavio Tarsetti
Browse files

upgrade all deps, move to babel 7 packages & clean babel setup

parent c58d2e7b
Expand all Show whitespace changes
Inline Side-by-side
conda/js/.babelrc
View file @ 69a0b182
{ {
"plugins": [ "plugins": [
"syntax-object-rest-spread", "@babel/plugin-syntax-flow",
"transform-object-rest-spread", "@babel/plugin-proposal-object-rest-spread",
"transform-class-properties", "@babel/plugin-proposal-class-properties"
"syntax-dynamic-import"
], ],
"presets": [ "presets": [
"react", "@babel/preset-react",
[ [
"env", "@babel/preset-env",
{ {
"modules": false, "modules": false,
"debug": true, "debug": true,
...@@ -19,12 +18,12 @@ ...@@ -19,12 +18,12 @@
] ]
} }
} }
] ],
"@babel/preset-flow"
], ],
"env": { "env": {
"test": { "test": {
"plugins": [ "plugins": [
"istanbul"
] ]
} }
}, },
......
conda/js/package-lock.json
View file @ 69a0b182
This diff is collapsed.
conda/js/package.json
View file @ 69a0b182
...@@ -22,84 +22,82 @@ ...@@ -22,84 +22,82 @@
"author": "", "author": "",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"babel-core": "^6.26.3", "@babel/core": "^7.1.0",
"babel-eslint": "^8.2.6", "@babel/plugin-proposal-class-properties": "^7.1.0",
"babel-loader": "^7.1.5", "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
"babel-plugin-dynamic-import-webpack": "^1.0.2", "@babel/plugin-syntax-flow": "^7.0.0",
"babel-plugin-istanbul": "^4.1.6", "@babel/preset-env": "^7.1.0",
"babel-plugin-syntax-dynamic-import": "^6.18.0", "@babel/preset-flow": "^7.0.0",
"babel-plugin-syntax-object-rest-spread": "^6.13.0", "@babel/preset-react": "^7.0.0",
"babel-plugin-transform-class-properties": "^6.24.1", "babel-eslint": "^9.0.0",
"babel-plugin-transform-object-rest-spread": "^6.26.0", "babel-loader": "^8.0.2",
"babel-preset-env": "^1.7.0",
"babel-preset-react": "^6.24.1",
"chai": "^4.1.2", "chai": "^4.1.2",
"chai-enzyme": "^1.0.0-beta.1", "chai-enzyme": "^1.0.0-beta.1",
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"css-loader": "^1.0.0", "css-loader": "^1.0.0",
"deep-equal-in-any-order": "^1.0.10", "deep-equal-in-any-order": "^1.0.10",
"enzyme": "^3.3.0", "enzyme": "^3.6.0",
"enzyme-adapter-react-16": "^1.1.1", "enzyme-adapter-react-16": "^1.5.0",
"eslint": "^5.2.0", "eslint": "^5.6.0",
"eslint-plugin-compat": "^2.5.1", "eslint-plugin-compat": "^2.5.1",
"eslint-plugin-flowtype": "^2.50.0", "eslint-plugin-flowtype": "^2.50.1",
"eslint-plugin-import": "^2.13.0", "eslint-plugin-import": "^2.14.0",
"eslint-plugin-react": "^7.10.0", "eslint-plugin-react": "^7.11.1",
"flow-bin": "^0.77.0", "flow-bin": "^0.81.0",
"html-webpack-plugin": "^3.2.0", "html-webpack-plugin": "^3.2.0",
"husky": "^0.14.3", "husky": "^0.14.3",
"karma": "^2.0.4", "karma": "^3.0.0",
"karma-chrome-launcher": "^2.2.0", "karma-chrome-launcher": "^2.2.0",
"karma-coverage": "^1.1.2", "karma-coverage": "^1.1.2",
"karma-firefox-launcher": "^1.1.0", "karma-firefox-launcher": "^1.1.0",
"karma-mocha": "^1.3.0", "karma-mocha": "^1.3.0",
"karma-mocha-reporter": "^2.2.5", "karma-mocha-reporter": "^2.2.5",
"karma-sourcemap-loader": "^0.3.7", "karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^3.0.0", "karma-webpack": "^3.0.5",
"mocha": "^5.2.0", "mocha": "^5.2.0",
"postcss": "^6.0.23", "postcss": "^7.0.2",
"postcss-cli": "^5.0.1", "postcss-cli": "^6.0.0",
"postcss-cssnext": "^3.1.0", "postcss-cssnext": "^3.1.0",
"postcss-loader": "^2.1.6", "postcss-loader": "^3.0.0",
"postcss-smart-import": "^0.7.6", "postcss-smart-import": "^0.7.6",
"react-hot-loader": "^4.3.3", "react-hot-loader": "^4.3.8",
"react-popper": "^0.10.4", "react-popper": "^1.0.2",
"react-test-renderer": "^16.4.1", "react-test-renderer": "^16.5.2",
"redux-devtools": "^3.4.1", "redux-devtools": "^3.4.1",
"rimraf": "^2.6.2", "rimraf": "^2.6.2",
"selenium-webdriver": "^4.0.0-alpha.1", "selenium-webdriver": "^4.0.0-alpha.1",
"sinon": "^6.1.4", "sinon": "^6.3.4",
"style-loader": "^0.21.0", "style-loader": "^0.23.0",
"stylelint": "^9.3.0", "stylelint": "^9.5.0",
"stylelint-config-standard": "^18.2.0", "stylelint-config-standard": "^18.2.0",
"svg-inline-loader": "^0.8.0", "svg-inline-loader": "^0.8.0",
"tern-jsx": "^1.0.3", "tern-jsx": "^1.0.3",
"uglifyjs-webpack-plugin": "^1.2.7", "terser-webpack-plugin": "^1.1.0",
"webpack": "^4.16.2", "webpack": "^4.19.1",
"webpack-cli": "^3.1.0", "webpack-cli": "^3.1.0",
"webpack-dev-server": "^3.1.5", "webpack-dev-server": "^3.1.8",
"webpack-visualizer-plugin": "^0.1.11", "webpack-visualizer-plugin": "^0.1.11",
"worker-loader": "^2.0.0" "worker-loader": "^2.0.0"
}, },
"dependencies": { "dependencies": {
"ajv": "^6.5.2", "ajv": "^6.5.3",
"bootstrap": "^4.1.3", "bootstrap": "^4.1.3",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"d3": "^5.5.0", "d3": "^5.7.0",
"fast-copy": "^1.2.2", "fast-copy": "^1.2.2",
"fast-levenshtein": "^2.0.6", "fast-levenshtein": "^2.0.6",
"fuse.js": "^3.2.1", "fuse.js": "^3.2.1",
"prop-types": "^15.6.2", "prop-types": "^15.6.2",
"react": "^16.4.1", "react": "^16.5.2",
"react-contextmenu": "^2.9.2", "react-contextmenu": "^2.9.3",
"react-dom": "^16.4.1", "react-dom": "^16.5.2",
"react-redux": "^5.0.7", "react-redux": "^5.0.7",
"react-router-dom": "^4.3.1", "react-router-dom": "^4.3.1",
"react-transition-group": "^2.4.0", "react-transition-group": "^2.4.0",
"reactstrap": "^6.3.0", "reactstrap": "^6.4.0",
"redux": "^4.0.0", "redux": "^4.0.0",
"redux-thunk": "^2.3.0", "redux-thunk": "^2.3.0",
"reselect": "^3.0.1", "reselect": "^3.0.1",
"throttle-debounce": "^2.0.0" "throttle-debounce": "^2.0.1"
} }
} }
conda/js/src/components/toolchain/ToolchainEditor.spec.jsx
View file @ 69a0b182
...@@ -639,7 +639,7 @@ describe('<ToolchainEditor />', function() { ...@@ -639,7 +639,7 @@ describe('<ToolchainEditor />', function() {
}); });
}); });
describe.only('Insert Object Modal', () => { describe('Insert Object Modal', () => {
const timeout = (ms) => { const timeout = (ms) => {
return new Promise(resolve => setTimeout(resolve, ms)); return new Promise(resolve => setTimeout(resolve, ms));
} }
......
conda/js/webpack.config.js
View file @ 69a0b182
...@@ -3,7 +3,7 @@ const { resolve } = require('path'); ...@@ -3,7 +3,7 @@ const { resolve } = require('path');
var webpack = require('webpack') var webpack = require('webpack')
const VisualizerPlugin = require('webpack-visualizer-plugin'); const VisualizerPlugin = require('webpack-visualizer-plugin');
const HtmlWebpackPlugin = require('html-webpack-plugin'); const HtmlWebpackPlugin = require('html-webpack-plugin');
const UglifyJsPlugin = require('uglifyjs-webpack-plugin') const TerserPlugin = require('terser-webpack-plugin')
const dist = resolve(__dirname, '../../beat/editor/js'); const dist = resolve(__dirname, '../../beat/editor/js');
...@@ -153,4 +153,7 @@ if (process.env.NODE_ENV === 'production') { ...@@ -153,4 +153,7 @@ if (process.env.NODE_ENV === 'production') {
} }
}), }),
].concat(module.exports.plugins); ].concat(module.exports.plugins);
module.exports.optimization = {
minimizer: [new TerserPlugin()]
};
} }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment