diff --git a/clients/chart/.babelrc b/clients/chart/.babelrc deleted file mode 100644 index 5d19ab5269..0000000000 --- a/clients/chart/.babelrc +++ /dev/null @@ -1,11 +0,0 @@ -{ - "optional": ["asyncToGenerator"], - "blacklist": [ - "es6.blockScoping", - "es6.constants", - "es6.forOf", - "es6.properties.computed", - "es6.properties.shorthand", - "es6.templateLiterals" - ] -} diff --git a/clients/chart/.babelrc b/clients/chart/.babelrc new file mode 120000 index 0000000000..1e7d0c1803 --- /dev/null +++ b/clients/chart/.babelrc @@ -0,0 +1 @@ +../../js/.babelrc \ No newline at end of file diff --git a/clients/chart/.eslintrc b/clients/chart/.eslintrc deleted file mode 100644 index 1c3e995d8c..0000000000 --- a/clients/chart/.eslintrc +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parser": "babel-eslint", - "rules": { - "array-bracket-spacing": [2, "never"], - "camelcase": 2, - "eqeqeq": 2, - "indent": [2, 2, {"SwitchCase": 1}], - "linebreak-style": [2, "unix"], - "no-multi-spaces": 2, - "no-new-wrappers": 2, - "no-throw-literal": 2, - "no-var": 2, - "object-curly-spacing": [2, "never"], - "quotes": [2, "single"], - "radix": 2, - "semi": 2, - "space-after-keywords": 2, - "space-before-function-paren": [2, "never"], - "space-infix-ops": 2, - "space-in-parens": [2, "never"] - }, - "env": { - "es6": true, - "node": true, - "browser": true - }, - "extends": "eslint:recommended", - "ecmaFeatures": { - "jsx": true, - "experimentalObjectRestSpread": true - }, - "plugins": [ - "react" - ] -} diff --git a/clients/chart/.eslintrc b/clients/chart/.eslintrc new file mode 120000 index 0000000000..0e3373d7ee --- /dev/null +++ b/clients/chart/.eslintrc @@ -0,0 +1 @@ +../../js/.eslintrc \ No newline at end of file diff --git a/clients/chart/.flowconfig b/clients/chart/.flowconfig deleted file mode 100644 index 2ee138b7b3..0000000000 --- a/clients/chart/.flowconfig +++ /dev/null @@ -1,13 +0,0 @@ -[ignore] -.*/node_modules/d3/.* -.*/node_modules/fbjs/flow/.* -.*/node_modules/react/.* - -[include] - -[libs] - -[options] -unsafe.enable_getters_and_setters=true -munge_underscores=true -suppress_comment=\\(.\\|\n\\)*\\$FlowIssue diff --git a/clients/chart/.flowconfig b/clients/chart/.flowconfig new file mode 120000 index 0000000000..6eef3a9002 --- /dev/null +++ b/clients/chart/.flowconfig @@ -0,0 +1 @@ +../../js/.flowconfig \ No newline at end of file diff --git a/clients/chart/build.sh b/clients/chart/build.sh new file mode 100755 index 0000000000..e55d4273c6 --- /dev/null +++ b/clients/chart/build.sh @@ -0,0 +1,11 @@ +SRC="node_modules/babel-regenerator-runtime/runtime.js src/main.js" +OUT="out.js" + +export NODE_ENV=production + +cp node_modules/nvd3/build/nv.d3.min.css nv.d3.css + +node_modules/.bin/browserify \ + -p bundle-collapser/plugin \ + $SRC \ + | node_modules/.bin/uglifyjs -c -m > $OUT diff --git a/clients/chart/package.json b/clients/chart/package.json index 097ba46dae..86fa1e28f6 100644 --- a/clients/chart/package.json +++ b/clients/chart/package.json @@ -7,20 +7,33 @@ "react-dom": "^0.14.1" }, "devDependencies": { - "babel": "^5.6.23", - "babel-eslint": "^4.1.3", - "babelify": "^6.1.3", + "babel-cli": "^6.1.18", + "babel-core": "^6.1.20", + "babel-eslint": "^4.1.5", + "babel-plugin-syntax-async-functions": "^6.1.18", + "babel-plugin-syntax-flow": "^6.1.18", + "babel-plugin-transform-class-properties": "^6.2.2", + "babel-plugin-transform-regenerator": "^6.2.0", + "babel-preset-es2015": "^6.1.18", + "babel-preset-react": "^6.1.18", + "babel-regenerator-runtime": "^6.2.0", + "babelify": "^7.2.0", "browserify": "^12.0.1", + "bundle-collapser": "^1.2.1", + "chai": "^3.2.0", "envify": "^3.4.0", - "eslint": "^1.7.3", - "eslint-plugin-react": "^3.6.3", + "eslint": "^1.9.0", + "eslint-plugin-react": "^3.8.0", "flow-bin": "^0.18.1", + "grunt": "^0.4.5", + "mocha": "^2.3.0", + "uglify-js": "^2.6.1", "watchify": "^3.6" }, "scripts": { - "start": "cp node_modules/nvd3/build/nv.d3.css nv.d3.css; NOMS_SERVER=http://localhost:8000 watchify -o out.js -v -d src/main.js", - "build": "cp node_modules/nvd3/build/nv.d3.min.css nv.d3.css; NOMS_SERVER=http://localhost:8000 NODE_ENV=production browserify src/main.js > out.js", - "test": "rm -f out.js && eslint *.js && flow" + "start": "cp node_modules/nvd3/build/nv.d3.css nv.d3.css; watchify -o out.js -v -d src/main.js", + "build": "./build.sh", + "test": "rm -f out.js && eslint src/ && flow src/" }, "browserify": { "transform": [ diff --git a/clients/splore/.babelrc b/clients/splore/.babelrc deleted file mode 100644 index ebf90c3cc2..0000000000 --- a/clients/splore/.babelrc +++ /dev/null @@ -1,9 +0,0 @@ -{ - "presets": ["react", "es2015"], - "plugins": [ - "syntax-async-functions", - "syntax-flow", - "transform-class-properties", - "transform-regenerator" - ] -} diff --git a/clients/splore/.babelrc b/clients/splore/.babelrc new file mode 120000 index 0000000000..1e7d0c1803 --- /dev/null +++ b/clients/splore/.babelrc @@ -0,0 +1 @@ +../../js/.babelrc \ No newline at end of file diff --git a/clients/splore/.eslintrc b/clients/splore/.eslintrc deleted file mode 100644 index 1c3e995d8c..0000000000 --- a/clients/splore/.eslintrc +++ /dev/null @@ -1,35 +0,0 @@ -{ - "parser": "babel-eslint", - "rules": { - "array-bracket-spacing": [2, "never"], - "camelcase": 2, - "eqeqeq": 2, - "indent": [2, 2, {"SwitchCase": 1}], - "linebreak-style": [2, "unix"], - "no-multi-spaces": 2, - "no-new-wrappers": 2, - "no-throw-literal": 2, - "no-var": 2, - "object-curly-spacing": [2, "never"], - "quotes": [2, "single"], - "radix": 2, - "semi": 2, - "space-after-keywords": 2, - "space-before-function-paren": [2, "never"], - "space-infix-ops": 2, - "space-in-parens": [2, "never"] - }, - "env": { - "es6": true, - "node": true, - "browser": true - }, - "extends": "eslint:recommended", - "ecmaFeatures": { - "jsx": true, - "experimentalObjectRestSpread": true - }, - "plugins": [ - "react" - ] -} diff --git a/clients/splore/.eslintrc b/clients/splore/.eslintrc new file mode 120000 index 0000000000..0e3373d7ee --- /dev/null +++ b/clients/splore/.eslintrc @@ -0,0 +1 @@ +../../js/.eslintrc \ No newline at end of file diff --git a/clients/splore/.flowconfig b/clients/splore/.flowconfig deleted file mode 100644 index 65cf8e0bb3..0000000000 --- a/clients/splore/.flowconfig +++ /dev/null @@ -1,13 +0,0 @@ -[ignore] -.*/node_modules/babel.* -.*/node_modules/babylon/.* -.*/node_modules/fbjs/.* -.*/node_modules/react/.* - -[include] - -[libs] - -[options] -unsafe.enable_getters_and_setters=true -munge_underscores=true diff --git a/clients/splore/.flowconfig b/clients/splore/.flowconfig new file mode 120000 index 0000000000..6eef3a9002 --- /dev/null +++ b/clients/splore/.flowconfig @@ -0,0 +1 @@ +../../js/.flowconfig \ No newline at end of file diff --git a/clients/splore/build.sh b/clients/splore/build.sh index 96d44fff3c..0017649a74 100755 --- a/clients/splore/build.sh +++ b/clients/splore/build.sh @@ -4,5 +4,5 @@ OUT="out.js" export NODE_ENV=production node_modules/.bin/browserify \ -p bundle-collapser/plugin \ - -g uglifyify $SRC \ + $SRC \ | node_modules/.bin/uglifyjs -c -m > $OUT diff --git a/clients/splore/package.json b/clients/splore/package.json index 0511fc35a0..b1fcce9d52 100644 --- a/clients/splore/package.json +++ b/clients/splore/package.json @@ -27,7 +27,6 @@ "grunt": "^0.4.5", "mocha": "^2.3.0", "uglify-js": "^2.6.1", - "uglifyify": "^3.0.1", "watchify": "^3.6" }, "scripts": {