From 79d2c257ed29c1fa0aa3f819e4f2622c9bc76e4f Mon Sep 17 00:00:00 2001 From: Wei-Wei Wu Date: Fri, 1 Jun 2018 00:47:16 -0700 Subject: [PATCH 1/9] update .babelrc -> .babelrc.js --- .babelrc | 4 ---- .babelrc.js | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 4 deletions(-) delete mode 100755 .babelrc create mode 100755 .babelrc.js diff --git a/.babelrc b/.babelrc deleted file mode 100755 index 098379d4..00000000 --- a/.babelrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "presets": ["env", "react"], - "plugins": ["transform-object-rest-spread", "react-hot-loader/babel"] -} diff --git a/.babelrc.js b/.babelrc.js new file mode 100755 index 00000000..ae8ca1a8 --- /dev/null +++ b/.babelrc.js @@ -0,0 +1,34 @@ +const env = process.env.NODE_ENV; + +if (env === 'commonjs' || env === 'es') { + module.exports = { + plugins: ['transform-runtime'], + presets: [['env', { modules: false }], 'react', 'stage-2'], + }; + + if (env === 'commonjs') { + module.exports.plugins.push('transform-es2015-modules-commonjs'); + } +} + +if (env === 'rollup') { + module.exports = { + comments: false, + plugins: ['external-helpers'], + presets: [['env', { modules: false }], 'react', 'stage-2'], + }; +} + +if (env === 'development') { + module.exports = { + presets: ['react', 'stage-2'], + }; +} + +if (env === 'production') { + module.exports = { + comments: false, + plugins: ['transform-runtime'], + presets: ['env', 'react', 'stage-2'], + }; +} From 04e42f1a27791280f1de727ef0f4ded74a07c15a Mon Sep 17 00:00:00 2001 From: Wei-Wei Wu Date: Fri, 1 Jun 2018 01:02:32 -0700 Subject: [PATCH 2/9] possibly use rollup? --- .babelrc.js | 1 + rollup.config.js | 34 ++++++++++++++++++++++++++++++++++ webpack.config.js | 2 +- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 rollup.config.js diff --git a/.babelrc.js b/.babelrc.js index ae8ca1a8..7b48b83a 100755 --- a/.babelrc.js +++ b/.babelrc.js @@ -2,6 +2,7 @@ const env = process.env.NODE_ENV; if (env === 'commonjs' || env === 'es') { module.exports = { + ignore: ['*.test.js', 'src/tests.js'], plugins: ['transform-runtime'], presets: [['env', { modules: false }], 'react', 'stage-2'], }; diff --git a/rollup.config.js b/rollup.config.js new file mode 100644 index 00000000..d24fffe7 --- /dev/null +++ b/rollup.config.js @@ -0,0 +1,34 @@ +import nodeResolve from 'rollup-plugin-node-resolve'; +import commonjs from 'rollup-plugin-commonjs'; +import babel from 'rollup-plugin-babel'; +import uglify from 'rollup-plugin-uglify'; + +export default { + input: './src/index.js', + output: { + file: 'dist/umd/react-sortable-tree.js', + format: 'umd', + name: 'ReactSortableTree', + globals: { + react: 'React', + 'react-dom': 'ReactDOM', + }, + }, + external: ['react', 'react-dom'], + plugins: [ + nodeResolve(), + commonjs({ + include: 'node_modules/**', + }), + babel({ + exclude: 'node_modules/**', + }), + uglify({ + mangle: false, + output: { + comments: true, + beautify: true, + }, + }), + ], +}; diff --git a/webpack.config.js b/webpack.config.js index 074113b7..407784ef 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -44,7 +44,7 @@ const cssLoaders = const config = { mode: 'production', - entry: { 'dist/main': './src/index' }, + entry: { 'dist/umd/react-sortable-tree': './src/index' }, output: { path: __dirname, filename: '[name].js', From 0698a9b0ac958f77184e551f8fcca41c35a16fb7 Mon Sep 17 00:00:00 2001 From: Wei-Wei Wu Date: Fri, 1 Jun 2018 01:02:39 -0700 Subject: [PATCH 3/9] dependencies --- package.json | 55 ++- yarn.lock | 964 ++++++++++++++++++++++++++++++++++++--------------- 2 files changed, 724 insertions(+), 295 deletions(-) diff --git a/package.json b/package.json index 089497e2..4d3487e2 100644 --- a/package.json +++ b/package.json @@ -3,10 +3,16 @@ "version": "2.1.2", "description": "Drag-and-drop sortable component for nested data and hierarchies", "scripts": { - "build": "npm run clean && cross-env NODE_ENV=production TARGET=umd webpack --bail", + "prebuild": "npm run lint", + "build": "npm run build:commonjs && npm run build:es && npm run build:demo && npm run build:umd", + "build:umd": "npm run clean:umd && cross-env NODE_ENV=production TARGET=umd webpack --bail", + "build:es": "npm run clean:es && cross-env NODE_ENV=es babel src --out-dir dist/es", + "build:commonjs": "npm run clean:commonjs && cross-env NODE_ENV=commonjs babel src --out-dir dist/commonjs", "build:demo": "npm run clean:demo && cross-env NODE_ENV=production TARGET=demo webpack --bail && npm run build-storybook", - "clean": "rimraf dist style.css style.css.map", "clean:demo": "rimraf build", + "clean:commonjs": "rimraf dist/commonjs", + "clean:es": "rimraf dist/es", + "clean:umd": "rimraf dist/umd", "start": "cross-env NODE_ENV=development TARGET=development webpack-dev-server --inline --hot", "lint": "eslint src examples", "prettier": "prettier --single-quote --trailing-comma es5 --write \"{src,examples}/**/*.{js,css,md}\"", @@ -18,7 +24,14 @@ "storybook": "cross-env TARGET=development start-storybook -p ${PORT:-3001} -h 0.0.0.0", "build-storybook": "cross-env NODE_ENV=production build-storybook -o build/storybook" }, - "main": "dist/main.js", + "main": "dist/commonjs/index.js", + "module": "dist/es/index.js", + "jsnext:main": "dist/es/index.js", + "babel": { + "presets": [ + "./.babelrc.js" + ] + }, "files": [ "dist", "style.css", @@ -60,8 +73,8 @@ "dependencies": { "lodash.isequal": "^4.5.0", "prop-types": "^15.6.1", - "react-dnd": "2.6.0", - "react-dnd-html5-backend": "2.6.0", + "react-dnd": "3.0.2", + "react-dnd-html5-backend": "3.0.2", "react-dnd-scrollzone": "^4.0.0", "react-lifecycles-compat": "^3.0.4", "react-virtualized": "^9.19.1" @@ -74,16 +87,20 @@ "@storybook/addon-options": "^4.0.0-alpha.4", "@storybook/addon-storyshots": "^4.0.0-alpha.4", "@storybook/react": "^4.0.0-alpha.4", - "autoprefixer": "^8.5.0", + "autoprefixer": "^8.5.2", "babel-cli": "^6.26.0", "babel-core": "^6.26.3", "babel-eslint": "^8.2.3", - "babel-jest": "^22.4.4", + "babel-jest": "^23.0.1", "babel-loader": "^7.1.4", + "babel-plugin-external-helpers": "^6.22.0", + "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2", "babel-plugin-transform-object-rest-spread": "^6.26.0", + "babel-plugin-transform-runtime": "^6.23.0", "babel-polyfill": "^6.26.0", "babel-preset-env": "^1.7.0", "babel-preset-react": "^6.24.1", + "babel-preset-stage-2": "^6.24.1", "codesandbox": "^1.2.10", "coveralls": "^3.0.1", "cross-env": "^5.1.6", @@ -100,25 +117,29 @@ "file-loader": "^1.1.11", "gh-pages": "^1.1.0", "html-webpack-plugin": "^3.2.0", - "jest": "^22.4.4", - "jest-enzyme": "^6.0.0", + "jest": "^23.1.0", + "jest-enzyme": "^6.0.1", "json-loader": "^0.5.7", "postcss-loader": "^2.1.5", - "prettier": "^1.12.1", - "react": "^16.2.0", + "prettier": "^1.13.3", + "react": "^16.4.0", "react-addons-shallow-compare": "^15.6.2", - "react-dnd-test-backend": "2.6.0", + "react-dnd-test-backend": "3.0.2", "react-dnd-touch-backend": "0.4.0", - "react-dom": "^16.2.0", + "react-dom": "^16.4.0", "react-hot-loader": "^4.2.0", "react-sortable-tree-theme-file-explorer": "^1.1.2", - "react-test-renderer": "^16.3.2", + "react-test-renderer": "^16.4.0", "rimraf": "^2.6.2", + "rollup": "^0.59.4", + "rollup-plugin-babel": "^3.0.4", + "rollup-plugin-commonjs": "^9.1.3", + "rollup-plugin-node-resolve": "^3.3.0", + "rollup-plugin-uglify": "^3.0.0", "standard-version": "^4.4.0", "style-loader": "^0.21.0", - "uglifyjs-webpack-plugin": "^1.2.5", - "webpack": "^4.8.3", - "webpack-cli": "^2.1.3", + "webpack": "^4.10.2", + "webpack-cli": "^2.1.4", "webpack-dev-server": "^3.1.4", "webpack-node-externals": "^1.7.2" }, diff --git a/yarn.lock b/yarn.lock index 15bd2ef8..3ca7b422 100644 --- a/yarn.lock +++ b/yarn.lock @@ -117,6 +117,12 @@ version "1.0.2" resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.0.2.tgz#d056b68999769728a1cff8d643bc59eb6f0be436" +"@samverschueren/stream-to-observable@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f" + dependencies: + any-observable "^0.3.0" + "@sindresorhus/is@^0.7.0": version "0.7.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd" @@ -348,10 +354,32 @@ react-split-pane "^0.1.77" react-treebeard "^2.1.0" +"@types/estree@0.0.39": + version "0.0.39" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" + +"@types/invariant@^2.2.29": + version "2.2.29" + resolved "https://registry.yarnpkg.com/@types/invariant/-/invariant-2.2.29.tgz#aa845204cd0a289f65d47e0de63a6a815e30cc66" + +"@types/lodash@^4.14.107": + version "4.14.109" + resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.109.tgz#b1c4442239730bf35cabaf493c772b18c045886d" + "@types/node@*": version "10.1.2" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.1.2.tgz#1b928a0baa408fc8ae3ac012cc81375addc147c6" +"@types/node@^8.10.11": + version "8.10.18" + resolved "https://registry.yarnpkg.com/@types/node/-/node-8.10.18.tgz#eb9ad8b0723d13fa9bc8b42543e3661ed805f2bb" + +"@types/redux@^3.6.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@types/redux/-/redux-3.6.0.tgz#f1ebe1e5411518072e4fdfca5c76e16e74c1399a" + dependencies: + redux "*" + "@webassemblyjs/ast@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.3.tgz#3b3f6fced944d8660273347533e6d4d315b5934a" @@ -361,30 +389,72 @@ debug "^3.1.0" webassemblyjs "1.4.3" +"@webassemblyjs/ast@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.9.tgz#b2770182678691ab4949d593105c15d4074fedb6" + dependencies: + "@webassemblyjs/helper-module-context" "1.5.9" + "@webassemblyjs/helper-wasm-bytecode" "1.5.9" + "@webassemblyjs/wast-parser" "1.5.9" + debug "^3.1.0" + mamacro "^0.0.3" + "@webassemblyjs/floating-point-hex-parser@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.4.3.tgz#f5aee4c376a717c74264d7bacada981e7e44faad" +"@webassemblyjs/floating-point-hex-parser@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.9.tgz#ee56243f6ba30781ff6f92fe7f1c377255219a7c" + +"@webassemblyjs/helper-api-error@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.9.tgz#c80e204afe1ae102c23b0357f1ec25aeb61022a2" + "@webassemblyjs/helper-buffer@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.4.3.tgz#0434b55958519bf503697d3824857b1dea80b729" dependencies: debug "^3.1.0" +"@webassemblyjs/helper-buffer@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.9.tgz#90d99afcb0fdc1ee11bc403894f3ae37cd926a81" + dependencies: + debug "^3.1.0" + "@webassemblyjs/helper-code-frame@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.4.3.tgz#f1349ca3e01a8e29ee2098c770773ef97af43641" dependencies: "@webassemblyjs/wast-printer" "1.4.3" +"@webassemblyjs/helper-code-frame@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.9.tgz#b56ac06a39c3e1cfefcc421ade1ee471a738a570" + dependencies: + "@webassemblyjs/wast-printer" "1.5.9" + "@webassemblyjs/helper-fsm@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.4.3.tgz#65a921db48fb43e868f17b27497870bdcae22b79" +"@webassemblyjs/helper-fsm@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.9.tgz#8f996268eb07ee6728130a9e97fa3aac32772454" + +"@webassemblyjs/helper-module-context@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.9.tgz#69e2eea310f755a0b750b84f8af59f890f2046ac" + "@webassemblyjs/helper-wasm-bytecode@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.4.3.tgz#0e5b4b5418e33f8a26e940b7809862828c3721a5" +"@webassemblyjs/helper-wasm-bytecode@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.9.tgz#467ba0f9e4d0e4a48bf1c5107b9f4abe3ca1171a" + "@webassemblyjs/helper-wasm-section@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.4.3.tgz#9ceedd53a3f152c3412e072887ade668d0b1acbf" @@ -395,12 +465,34 @@ "@webassemblyjs/wasm-gen" "1.4.3" debug "^3.1.0" +"@webassemblyjs/helper-wasm-section@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.9.tgz#aec9486ab5d56e3cb5252a7ed88777b6792ac624" + dependencies: + "@webassemblyjs/ast" "1.5.9" + "@webassemblyjs/helper-buffer" "1.5.9" + "@webassemblyjs/helper-wasm-bytecode" "1.5.9" + "@webassemblyjs/wasm-gen" "1.5.9" + debug "^3.1.0" + +"@webassemblyjs/ieee754@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.9.tgz#846856ece040c7debd5b5645b319c26523613bcf" + dependencies: + ieee754 "^1.1.11" + "@webassemblyjs/leb128@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.4.3.tgz#5a5e5949dbb5adfe3ae95664d0439927ac557fb8" dependencies: leb "^0.3.0" +"@webassemblyjs/leb128@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.9.tgz#7249443a0fd7574a7e3c1c39532535c735390bbc" + dependencies: + leb "^0.3.0" + "@webassemblyjs/validation@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/validation/-/validation-1.4.3.tgz#9e66c9b3079d7bbcf2070c1bf52a54af2a09aac9" @@ -421,6 +513,20 @@ "@webassemblyjs/wast-printer" "1.4.3" debug "^3.1.0" +"@webassemblyjs/wasm-edit@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.9.tgz#9b8e054b2d305a7e0528088571c95904bd73df48" + dependencies: + "@webassemblyjs/ast" "1.5.9" + "@webassemblyjs/helper-buffer" "1.5.9" + "@webassemblyjs/helper-wasm-bytecode" "1.5.9" + "@webassemblyjs/helper-wasm-section" "1.5.9" + "@webassemblyjs/wasm-gen" "1.5.9" + "@webassemblyjs/wasm-opt" "1.5.9" + "@webassemblyjs/wasm-parser" "1.5.9" + "@webassemblyjs/wast-printer" "1.5.9" + debug "^3.1.0" + "@webassemblyjs/wasm-gen@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.4.3.tgz#8553164d0154a6be8f74d653d7ab355f73240aa4" @@ -429,6 +535,15 @@ "@webassemblyjs/helper-wasm-bytecode" "1.4.3" "@webassemblyjs/leb128" "1.4.3" +"@webassemblyjs/wasm-gen@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.9.tgz#85e07c047fab917e06b18dee4d16342a2fd3c59c" + dependencies: + "@webassemblyjs/ast" "1.5.9" + "@webassemblyjs/helper-wasm-bytecode" "1.5.9" + "@webassemblyjs/ieee754" "1.5.9" + "@webassemblyjs/leb128" "1.5.9" + "@webassemblyjs/wasm-opt@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.4.3.tgz#26c7a23bfb136aa405b1d3410e63408ec60894b8" @@ -439,6 +554,16 @@ "@webassemblyjs/wasm-parser" "1.4.3" debug "^3.1.0" +"@webassemblyjs/wasm-opt@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.9.tgz#ccac17c41a044c167bc95d3e8645cf889a137ce5" + dependencies: + "@webassemblyjs/ast" "1.5.9" + "@webassemblyjs/helper-buffer" "1.5.9" + "@webassemblyjs/wasm-gen" "1.5.9" + "@webassemblyjs/wasm-parser" "1.5.9" + debug "^3.1.0" + "@webassemblyjs/wasm-parser@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.4.3.tgz#7ddd3e408f8542647ed612019cfb780830993698" @@ -449,6 +574,17 @@ "@webassemblyjs/wasm-parser" "1.4.3" webassemblyjs "1.4.3" +"@webassemblyjs/wasm-parser@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.9.tgz#ddab84da4957b64aafbc61e4ab706cc667082f32" + dependencies: + "@webassemblyjs/ast" "1.5.9" + "@webassemblyjs/helper-api-error" "1.5.9" + "@webassemblyjs/helper-wasm-bytecode" "1.5.9" + "@webassemblyjs/ieee754" "1.5.9" + "@webassemblyjs/leb128" "1.5.9" + "@webassemblyjs/wasm-parser" "1.5.9" + "@webassemblyjs/wast-parser@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.4.3.tgz#3250402e2c5ed53dbe2233c9de1fe1f9f0d51745" @@ -460,6 +596,18 @@ long "^3.2.0" webassemblyjs "1.4.3" +"@webassemblyjs/wast-parser@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.9.tgz#193d24ccf4742a5f8f1915936680ab2314011df2" + dependencies: + "@webassemblyjs/ast" "1.5.9" + "@webassemblyjs/floating-point-hex-parser" "1.5.9" + "@webassemblyjs/helper-api-error" "1.5.9" + "@webassemblyjs/helper-code-frame" "1.5.9" + "@webassemblyjs/helper-fsm" "1.5.9" + long "^3.2.0" + mamacro "^0.0.3" + "@webassemblyjs/wast-printer@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.4.3.tgz#3d59aa8d0252d6814a3ef4e6d2a34c9ded3904e0" @@ -468,6 +616,14 @@ "@webassemblyjs/wast-parser" "1.4.3" long "^3.2.0" +"@webassemblyjs/wast-printer@1.5.9": + version "1.5.9" + resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.9.tgz#16605d90a481c01a130b7c4edeb2bce503787eb4" + dependencies: + "@webassemblyjs/ast" "1.5.9" + "@webassemblyjs/wast-parser" "1.5.9" + long "^3.2.0" + JSONStream@^1.0.4: version "1.3.3" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.3.tgz#27b4b8fbbfeab4e71bcf551e7f27be8d952239bf" @@ -631,9 +787,9 @@ ansi-styles@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.0.0.tgz#cb102df1c56f5123eab8b67cd7b98027a0279178" -any-observable@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.2.0.tgz#c67870058003579009083f54ac0abafb5c33d242" +any-observable@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/any-observable/-/any-observable-0.3.0.tgz#af933475e5806a67d0d7df090dd5e8bef65d119b" anymatch@^1.3.0: version "1.3.2" @@ -860,6 +1016,10 @@ atob@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a" +autobind-decorator@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/autobind-decorator/-/autobind-decorator-2.1.0.tgz#4451240dbfeff46361c506575a63ed40f0e5bc68" + autoprefixer@^6.3.1: version "6.7.7" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014" @@ -871,7 +1031,7 @@ autoprefixer@^6.3.1: postcss "^5.2.16" postcss-value-parser "^3.2.3" -autoprefixer@^8.4.1, autoprefixer@^8.5.0: +autoprefixer@^8.4.1: version "8.5.0" resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.5.0.tgz#89a39b1316fbe7bc2b4997a0c7dad0149d99511c" dependencies: @@ -882,6 +1042,17 @@ autoprefixer@^8.4.1, autoprefixer@^8.5.0: postcss "^6.0.22" postcss-value-parser "^3.2.3" +autoprefixer@^8.5.2: + version "8.5.2" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.5.2.tgz#52d86a5ea51a6191024d843f88f2748ce3ab39e5" + dependencies: + browserslist "^3.2.8" + caniuse-lite "^1.0.30000846" + normalize-range "^0.1.2" + num2fraction "^1.2.2" + postcss "^6.0.22" + postcss-value-parser "^3.2.3" + aws-sign2@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" @@ -1134,12 +1305,12 @@ babel-helpers@^6.24.1: babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-jest@^22.4.4: - version "22.4.4" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-22.4.4.tgz#977259240420e227444ebe49e226a61e49ea659d" +babel-jest@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-23.0.1.tgz#bbad3bf523fb202da05ed0a6540b48c84eed13a6" dependencies: - babel-plugin-istanbul "^4.1.5" - babel-preset-jest "^22.4.4" + babel-plugin-istanbul "^4.1.6" + babel-preset-jest "^23.0.1" babel-loader@^7.1.4: version "7.1.4" @@ -1161,7 +1332,13 @@ babel-plugin-check-es2015-constants@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-istanbul@^4.1.5: +babel-plugin-external-helpers@^6.22.0: + version "6.22.0" + resolved "https://registry.yarnpkg.com/babel-plugin-external-helpers/-/babel-plugin-external-helpers-6.22.0.tgz#2285f48b02bd5dede85175caf8c62e86adccefa1" + dependencies: + babel-runtime "^6.22.0" + +babel-plugin-istanbul@^4.1.6: version "4.1.6" resolved "https://registry.yarnpkg.com/babel-plugin-istanbul/-/babel-plugin-istanbul-4.1.6.tgz#36c59b2192efce81c5b378321b74175add1c9a45" dependencies: @@ -1170,9 +1347,9 @@ babel-plugin-istanbul@^4.1.5: istanbul-lib-instrument "^1.10.1" test-exclude "^4.2.1" -babel-plugin-jest-hoist@^22.4.4: - version "22.4.4" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-22.4.4.tgz#b9851906eab34c7bf6f8c895a2b08bea1a844c0b" +babel-plugin-jest-hoist@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-23.0.1.tgz#eaa11c964563aea9c21becef2bdf7853f7f3c148" babel-plugin-macros@^2.2.0: version "2.2.1" @@ -1443,7 +1620,7 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015 babel-runtime "^6.22.0" babel-template "^6.24.1" -babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1: +babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1, babel-plugin-transform-es2015-modules-commonjs@^6.26.2: version "6.26.2" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3" dependencies: @@ -1736,11 +1913,11 @@ babel-preset-flow@^6.23.0: dependencies: babel-plugin-transform-flow-strip-types "^6.22.0" -babel-preset-jest@^22.4.4: - version "22.4.4" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-22.4.4.tgz#ec9fbd8bcd7dfd24b8b5320e0e688013235b7c39" +babel-preset-jest@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.0.1.tgz#631cc545c6cf021943013bcaf22f45d87fe62198" dependencies: - babel-plugin-jest-hoist "^22.4.4" + babel-plugin-jest-hoist "^23.0.1" babel-plugin-syntax-object-rest-spread "^6.13.0" babel-preset-minify@^0.4.1: @@ -2110,7 +2287,7 @@ browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6: caniuse-db "^1.0.30000639" electron-to-chromium "^1.2.7" -browserslist@^3.2.6, browserslist@^3.2.7: +browserslist@^3.2.6, browserslist@^3.2.7, browserslist@^3.2.8: version "3.2.8" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6" dependencies: @@ -2162,6 +2339,10 @@ builtin-modules@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" +builtin-modules@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e" + builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" @@ -2305,6 +2486,10 @@ caniuse-lite@^1.0.30000815, caniuse-lite@^1.0.30000839, caniuse-lite@^1.0.300008 version "1.0.30000844" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000844.tgz#de7c84cde0582143cf4f5abdf1b98e5a0539ad4a" +caniuse-lite@^1.0.30000846: + version "1.0.30000847" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000847.tgz#be77f439be29bbc57ae08004b1e470b653b1ec1d" + capture-exit@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f" @@ -2348,7 +2533,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.2, chalk@^2.4.1: +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" dependencies: @@ -3475,6 +3660,19 @@ dnd-core@^2.5.4, dnd-core@^2.6.0: lodash "^4.2.0" redux "^3.7.1" +dnd-core@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/dnd-core/-/dnd-core-3.0.2.tgz#e947577620531c7ee37a518cd5dde17d0efdf0f3" + dependencies: + "@types/invariant" "^2.2.29" + "@types/lodash" "^4.14.107" + "@types/node" "^8.10.11" + "@types/redux" "^3.6.0" + asap "^2.0.6" + invariant "^2.0.0" + lodash "^4.2.0" + redux "^4.0.0" + dns-equal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/dns-equal/-/dns-equal-1.0.0.tgz#b39e7f1da6eb0a75ba9c17324b34753c47e0654d" @@ -3696,9 +3894,9 @@ entities@^1.1.1, entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" -envinfo@^4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-4.4.2.tgz#472c49f3a8b9bca73962641ce7cb692bf623cd1c" +envinfo@^5.7.0: + version "5.9.0" + resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-5.9.0.tgz#1e681b7400c384c679ffc886b6e3f811d7e687b5" enzyme-adapter-react-16@^1.1.1: version "1.1.1" @@ -3720,9 +3918,9 @@ enzyme-adapter-utils@^1.3.0: object.assign "^4.0.4" prop-types "^15.6.0" -enzyme-matchers@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/enzyme-matchers/-/enzyme-matchers-6.0.0.tgz#b88a28abad42ec69dc1bac7c67152dba2e157950" +enzyme-matchers@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/enzyme-matchers/-/enzyme-matchers-6.0.1.tgz#1ee6e8c7f59a46a1ab62d971e3afdb45b7fb3ea2" dependencies: circular-json-es6 "^2.0.1" deep-equal-ident "^1.1.1" @@ -4016,6 +4214,14 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" +estree-walker@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e" + +estree-walker@^0.5.1, estree-walker@^0.5.2: + version "0.5.2" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39" + esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" @@ -4115,16 +4321,16 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -expect@^22.4.0: - version "22.4.3" - resolved "https://registry.yarnpkg.com/expect/-/expect-22.4.3.tgz#d5a29d0a0e1fb2153557caef2674d4547e914674" +expect@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/expect/-/expect-23.1.0.tgz#bfdfd57a2a20170d875999ee9787cc71f01c205f" dependencies: ansi-styles "^3.2.0" - jest-diff "^22.4.3" - jest-get-type "^22.4.3" - jest-matcher-utils "^22.4.3" - jest-message-util "^22.4.3" - jest-regex-util "^22.4.3" + jest-diff "^23.0.1" + jest-get-type "^22.1.0" + jest-matcher-utils "^23.0.1" + jest-message-util "^23.1.0" + jest-regex-util "^23.0.0" express@^4.16.2, express@^4.16.3: version "4.16.3" @@ -4915,7 +5121,7 @@ got@^7.0.0: url-parse-lax "^1.0.0" url-to-options "^1.0.1" -got@^8.2.0: +got@^8.3.1: version "8.3.1" resolved "https://registry.yarnpkg.com/got/-/got-8.3.1.tgz#093324403d4d955f5a16a7a8d39955d055ae10ed" dependencies: @@ -5285,7 +5491,7 @@ icss-utils@^2.1.0: dependencies: postcss "^6.0.1" -ieee754@^1.1.4: +ieee754@^1.1.11, ieee754@^1.1.4: version "1.1.11" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.11.tgz#c16384ffe00f5b7835824e67b6f2bd44a5229455" @@ -5414,7 +5620,7 @@ inquirer@^3.0.6, inquirer@^3.1.1: strip-ansi "^4.0.0" through "^2.3.6" -inquirer@^5.1.0, inquirer@^5.2.0: +inquirer@^5.2.0: version "5.2.0" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-5.2.0.tgz#db350c2b73daca77ff1243962e9f22f099685726" dependencies: @@ -5438,7 +5644,7 @@ internal-ip@1.2.0: dependencies: meow "^3.3.0" -interpret@^1.0.0, interpret@^1.0.4: +interpret@^1.0.0, interpret@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614" @@ -5630,6 +5836,10 @@ is-installed-globally@^0.1.0: global-dirs "^0.1.0" is-path-inside "^1.0.0" +is-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" + is-npm@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4" @@ -5662,11 +5872,11 @@ is-object@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470" -is-observable@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-0.2.0.tgz#b361311d83c6e5d726cabf5e250b0237106f5ae2" +is-observable@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-observable/-/is-observable-1.1.0.tgz#b3e986c8f44de950867cab5403f5a3465005975e" dependencies: - symbol-observable "^0.2.2" + symbol-observable "^1.1.0" is-odd@^2.0.0: version "2.0.0" @@ -5825,7 +6035,7 @@ isstream@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" -istanbul-api@^1.1.14: +istanbul-api@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/istanbul-api/-/istanbul-api-1.3.1.tgz#4c3b05d18c0016d1022e079b98dc82c40f488954" dependencies: @@ -5842,7 +6052,7 @@ istanbul-api@^1.1.14: mkdirp "^0.5.1" once "^1.4.0" -istanbul-lib-coverage@^1.1.1, istanbul-lib-coverage@^1.1.2, istanbul-lib-coverage@^1.2.0: +istanbul-lib-coverage@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-1.2.0.tgz#f7d8f2e42b97e37fe796114cb0f9d68b5e3a4341" @@ -5852,7 +6062,7 @@ istanbul-lib-hook@^1.2.0: dependencies: append-transform "^0.4.0" -istanbul-lib-instrument@^1.10.1, istanbul-lib-instrument@^1.8.0: +istanbul-lib-instrument@^1.10.1: version "1.10.1" resolved "https://registry.yarnpkg.com/istanbul-lib-instrument/-/istanbul-lib-instrument-1.10.1.tgz#724b4b6caceba8692d3f1f9d0727e279c401af7b" dependencies: @@ -5873,16 +6083,6 @@ istanbul-lib-report@^1.1.4: path-parse "^1.0.5" supports-color "^3.1.2" -istanbul-lib-source-maps@^1.2.1: - version "1.2.3" - resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.3.tgz#20fb54b14e14b3fb6edb6aca3571fd2143db44e6" - dependencies: - debug "^3.1.0" - istanbul-lib-coverage "^1.1.2" - mkdirp "^0.5.1" - rimraf "^2.6.1" - source-map "^0.5.3" - istanbul-lib-source-maps@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/istanbul-lib-source-maps/-/istanbul-lib-source-maps-1.2.4.tgz#cc7ccad61629f4efff8e2f78adb8c522c9976ec7" @@ -5914,15 +6114,15 @@ isurl@^1.0.0-alpha5: has-to-string-tag-x "^1.2.0" is-object "^1.0.1" -jest-changed-files@^22.2.0: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-22.4.3.tgz#8882181e022c38bd46a2e4d18d44d19d90a90fb2" +jest-changed-files@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-23.0.1.tgz#f79572d0720844ea5df84c2a448e862c2254f60c" dependencies: throat "^4.0.0" -jest-cli@^22.4.4: - version "22.4.4" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-22.4.4.tgz#68cd2a2aae983adb1e6638248ca21082fd6d9e90" +jest-cli@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-23.1.0.tgz#eb8bdd4ce0d15250892e31ad9b69bc99d2a8f6bf" dependencies: ansi-escapes "^3.0.0" chalk "^2.0.1" @@ -5931,24 +6131,25 @@ jest-cli@^22.4.4: graceful-fs "^4.1.11" import-local "^1.0.0" is-ci "^1.0.10" - istanbul-api "^1.1.14" - istanbul-lib-coverage "^1.1.1" - istanbul-lib-instrument "^1.8.0" - istanbul-lib-source-maps "^1.2.1" - jest-changed-files "^22.2.0" - jest-config "^22.4.4" - jest-environment-jsdom "^22.4.1" + istanbul-api "^1.3.1" + istanbul-lib-coverage "^1.2.0" + istanbul-lib-instrument "^1.10.1" + istanbul-lib-source-maps "^1.2.4" + jest-changed-files "^23.0.1" + jest-config "^23.1.0" + jest-environment-jsdom "^23.1.0" jest-get-type "^22.1.0" - jest-haste-map "^22.4.2" - jest-message-util "^22.4.0" - jest-regex-util "^22.1.0" - jest-resolve-dependencies "^22.1.0" - jest-runner "^22.4.4" - jest-runtime "^22.4.4" - jest-snapshot "^22.4.0" - jest-util "^22.4.1" - jest-validate "^22.4.4" - jest-worker "^22.2.2" + jest-haste-map "^23.1.0" + jest-message-util "^23.1.0" + jest-regex-util "^23.0.0" + jest-resolve-dependencies "^23.0.1" + jest-runner "^23.1.0" + jest-runtime "^23.1.0" + jest-snapshot "^23.0.1" + jest-util "^23.1.0" + jest-validate "^23.0.1" + jest-watcher "^23.1.0" + jest-worker "^23.0.1" micromatch "^2.3.11" node-notifier "^5.2.1" realpath-native "^1.0.0" @@ -5957,25 +6158,27 @@ jest-cli@^22.4.4: string-length "^2.0.0" strip-ansi "^4.0.0" which "^1.2.12" - yargs "^10.0.3" + yargs "^11.0.0" -jest-config@^22.4.4: - version "22.4.4" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-22.4.4.tgz#72a521188720597169cd8b4ff86934ef5752d86a" +jest-config@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-23.1.0.tgz#708ca0f431d356ee424fb4895d3308006bdd8241" dependencies: + babel-core "^6.0.0" + babel-jest "^23.0.1" chalk "^2.0.1" glob "^7.1.1" - jest-environment-jsdom "^22.4.1" - jest-environment-node "^22.4.1" + jest-environment-jsdom "^23.1.0" + jest-environment-node "^23.1.0" jest-get-type "^22.1.0" - jest-jasmine2 "^22.4.4" - jest-regex-util "^22.1.0" - jest-resolve "^22.4.2" - jest-util "^22.4.1" - jest-validate "^22.4.4" - pretty-format "^22.4.0" - -jest-diff@^22.4.0, jest-diff@^22.4.3: + jest-jasmine2 "^23.1.0" + jest-regex-util "^23.0.0" + jest-resolve "^23.1.0" + jest-util "^23.1.0" + jest-validate "^23.0.1" + pretty-format "^23.0.1" + +jest-diff@^22.4.3: version "22.4.3" resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-22.4.3.tgz#e18cc3feff0aeef159d02310f2686d4065378030" dependencies: @@ -5984,15 +6187,31 @@ jest-diff@^22.4.0, jest-diff@^22.4.3: jest-get-type "^22.4.3" pretty-format "^22.4.3" -jest-docblock@^22.4.0, jest-docblock@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-22.4.3.tgz#50886f132b42b280c903c592373bb6e93bb68b19" +jest-diff@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-23.0.1.tgz#3d49137cee12c320a4b4d2b4a6fa6e82d491a16a" + dependencies: + chalk "^2.0.1" + diff "^3.2.0" + jest-get-type "^22.1.0" + pretty-format "^23.0.1" + +jest-docblock@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-docblock/-/jest-docblock-23.0.1.tgz#deddd18333be5dc2415260a04ef3fce9276b5725" dependencies: detect-newline "^2.1.0" -jest-environment-enzyme@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/jest-environment-enzyme/-/jest-environment-enzyme-6.0.0.tgz#469ceaa0a21579af86cb01255f0591a3a5d95f40" +jest-each@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-23.1.0.tgz#16146b592c354867a5ae5e13cdf15c6c65b696c6" + dependencies: + chalk "^2.0.1" + pretty-format "^23.0.1" + +jest-environment-enzyme@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/jest-environment-enzyme/-/jest-environment-enzyme-6.0.1.tgz#99f51d7f988918a963df2859b31e29696d7f6bed" dependencies: jest-environment-jsdom "^22.4.1" @@ -6004,34 +6223,42 @@ jest-environment-jsdom@^22.4.1: jest-util "^22.4.3" jsdom "^11.5.1" -jest-environment-node@^22.4.1: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-22.4.3.tgz#54c4eaa374c83dd52a9da8759be14ebe1d0b9129" +jest-environment-jsdom@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-23.1.0.tgz#85929914e23bed3577dac9755f4106d0697c479c" dependencies: - jest-mock "^22.4.3" - jest-util "^22.4.3" + jest-mock "^23.1.0" + jest-util "^23.1.0" + jsdom "^11.5.1" -jest-enzyme@^6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/jest-enzyme/-/jest-enzyme-6.0.0.tgz#518d4ecc5e32c8c1564b41b7bc83ea38667e8661" +jest-environment-node@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-23.1.0.tgz#452c0bf949cfcbbacda1e1762eeed70bc784c7d5" + dependencies: + jest-mock "^23.1.0" + jest-util "^23.1.0" + +jest-enzyme@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/jest-enzyme/-/jest-enzyme-6.0.1.tgz#6963498f89550bf315b75011a0790c73df95860d" dependencies: - enzyme-matchers "^6.0.0" + enzyme-matchers "^6.0.1" enzyme-to-json "^3.3.0" - jest-environment-enzyme "^6.0.0" + jest-environment-enzyme "^6.0.1" jest-get-type@^22.1.0, jest-get-type@^22.4.3: version "22.4.3" resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-22.4.3.tgz#e3a8504d8479342dd4420236b322869f18900ce4" -jest-haste-map@^22.4.2: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-22.4.3.tgz#25842fa2ba350200767ac27f658d58b9d5c2e20b" +jest-haste-map@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-23.1.0.tgz#18e6c7d5a8d27136f91b7d9852f85de0c7074c49" dependencies: fb-watchman "^2.0.0" graceful-fs "^4.1.11" - jest-docblock "^22.4.3" - jest-serializer "^22.4.3" - jest-worker "^22.4.3" + jest-docblock "^23.0.1" + jest-serializer "^23.0.1" + jest-worker "^23.0.1" micromatch "^2.3.11" sane "^2.0.0" @@ -6047,29 +6274,29 @@ jest-image-snapshot@^2.4.1: pngjs "^3.3.3" rimraf "^2.6.2" -jest-jasmine2@^22.4.4: - version "22.4.4" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-22.4.4.tgz#c55f92c961a141f693f869f5f081a79a10d24e23" +jest-jasmine2@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-23.1.0.tgz#4afab31729b654ddcd2b074add849396f13b30b8" dependencies: chalk "^2.0.1" co "^4.6.0" - expect "^22.4.0" - graceful-fs "^4.1.11" + expect "^23.1.0" is-generator-fn "^1.0.0" - jest-diff "^22.4.0" - jest-matcher-utils "^22.4.0" - jest-message-util "^22.4.0" - jest-snapshot "^22.4.0" - jest-util "^22.4.1" - source-map-support "^0.5.0" - -jest-leak-detector@^22.4.0: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-22.4.3.tgz#2b7b263103afae8c52b6b91241a2de40117e5b35" + jest-diff "^23.0.1" + jest-each "^23.1.0" + jest-matcher-utils "^23.0.1" + jest-message-util "^23.1.0" + jest-snapshot "^23.0.1" + jest-util "^23.1.0" + pretty-format "^23.0.1" + +jest-leak-detector@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-23.0.1.tgz#9dba07505ac3495c39d3ec09ac1e564599e861a0" dependencies: - pretty-format "^22.4.3" + pretty-format "^23.0.1" -jest-matcher-utils@^22.4.0, jest-matcher-utils@^22.4.3: +jest-matcher-utils@^22.4.3: version "22.4.3" resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-22.4.3.tgz#4632fe428ebc73ebc194d3c7b65d37b161f710ff" dependencies: @@ -6077,7 +6304,15 @@ jest-matcher-utils@^22.4.0, jest-matcher-utils@^22.4.3: jest-get-type "^22.4.3" pretty-format "^22.4.3" -jest-message-util@^22.4.0, jest-message-util@^22.4.3: +jest-matcher-utils@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-23.0.1.tgz#0c6c0daedf9833c2a7f36236069efecb4c3f6e5f" + dependencies: + chalk "^2.0.1" + jest-get-type "^22.1.0" + pretty-format "^23.0.1" + +jest-message-util@^22.4.3: version "22.4.3" resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-22.4.3.tgz#cf3d38aafe4befddbfc455e57d65d5239e399eb7" dependencies: @@ -6087,73 +6322,92 @@ jest-message-util@^22.4.0, jest-message-util@^22.4.3: slash "^1.0.0" stack-utils "^1.0.1" +jest-message-util@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-23.1.0.tgz#9a809ba487ecac5ce511d4e698ee3b5ee2461ea9" + dependencies: + "@babel/code-frame" "^7.0.0-beta.35" + chalk "^2.0.1" + micromatch "^2.3.11" + slash "^1.0.0" + stack-utils "^1.0.1" + jest-mock@^22.4.3: version "22.4.3" resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-22.4.3.tgz#f63ba2f07a1511772cdc7979733397df770aabc7" -jest-regex-util@^22.1.0, jest-regex-util@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-22.4.3.tgz#a826eb191cdf22502198c5401a1fc04de9cef5af" +jest-mock@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-23.1.0.tgz#a381c31b121ab1f60c462a2dadb7b86dcccac487" -jest-resolve-dependencies@^22.1.0: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-22.4.3.tgz#e2256a5a846732dc3969cb72f3c9ad7725a8195e" +jest-regex-util@^23.0.0: + version "23.0.0" + resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-23.0.0.tgz#dd5c1fde0c46f4371314cf10f7a751a23f4e8f76" + +jest-resolve-dependencies@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-23.0.1.tgz#d01a10ddad9152c4cecdf5eac2b88571c4b6a64d" dependencies: - jest-regex-util "^22.4.3" + jest-regex-util "^23.0.0" + jest-snapshot "^23.0.1" -jest-resolve@^22.4.2: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-22.4.3.tgz#0ce9d438c8438229aa9b916968ec6b05c1abb4ea" +jest-resolve@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-23.1.0.tgz#b9e316eecebd6f00bc50a3960d1527bae65792d2" dependencies: browser-resolve "^1.11.2" chalk "^2.0.1" + realpath-native "^1.0.0" -jest-runner@^22.4.4: - version "22.4.4" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-22.4.4.tgz#dfca7b7553e0fa617e7b1291aeb7ce83e540a907" +jest-runner@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-23.1.0.tgz#fa20a933fff731a5432b3561e7f6426594fa29b5" dependencies: exit "^0.1.2" - jest-config "^22.4.4" - jest-docblock "^22.4.0" - jest-haste-map "^22.4.2" - jest-jasmine2 "^22.4.4" - jest-leak-detector "^22.4.0" - jest-message-util "^22.4.0" - jest-runtime "^22.4.4" - jest-util "^22.4.1" - jest-worker "^22.2.2" + graceful-fs "^4.1.11" + jest-config "^23.1.0" + jest-docblock "^23.0.1" + jest-haste-map "^23.1.0" + jest-jasmine2 "^23.1.0" + jest-leak-detector "^23.0.1" + jest-message-util "^23.1.0" + jest-runtime "^23.1.0" + jest-util "^23.1.0" + jest-worker "^23.0.1" + source-map-support "^0.5.6" throat "^4.0.0" -jest-runtime@^22.4.4: - version "22.4.4" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-22.4.4.tgz#9ba7792fc75582a5be0f79af6f8fe8adea314048" +jest-runtime@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-23.1.0.tgz#b4ae0e87259ecacfd4a884b639db07cf4dd620af" dependencies: babel-core "^6.0.0" - babel-jest "^22.4.4" - babel-plugin-istanbul "^4.1.5" + babel-plugin-istanbul "^4.1.6" chalk "^2.0.1" convert-source-map "^1.4.0" exit "^0.1.2" + fast-json-stable-stringify "^2.0.0" graceful-fs "^4.1.11" - jest-config "^22.4.4" - jest-haste-map "^22.4.2" - jest-regex-util "^22.1.0" - jest-resolve "^22.4.2" - jest-util "^22.4.1" - jest-validate "^22.4.4" - json-stable-stringify "^1.0.1" + jest-config "^23.1.0" + jest-haste-map "^23.1.0" + jest-message-util "^23.1.0" + jest-regex-util "^23.0.0" + jest-resolve "^23.1.0" + jest-snapshot "^23.0.1" + jest-util "^23.1.0" + jest-validate "^23.0.1" micromatch "^2.3.11" realpath-native "^1.0.0" slash "^1.0.0" strip-bom "3.0.0" write-file-atomic "^2.1.0" - yargs "^10.0.3" + yargs "^11.0.0" -jest-serializer@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-22.4.3.tgz#a679b81a7f111e4766235f4f0c46d230ee0f7436" +jest-serializer@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-23.0.1.tgz#a3776aeb311e90fe83fab9e533e85102bd164165" -jest-snapshot@>=20.0.3, jest-snapshot@^22.4.0: +jest-snapshot@>=20.0.3: version "22.4.3" resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-22.4.3.tgz#b5c9b42846ffb9faccb76b841315ba67887362d2" dependencies: @@ -6164,13 +6418,24 @@ jest-snapshot@>=20.0.3, jest-snapshot@^22.4.0: natural-compare "^1.4.0" pretty-format "^22.4.3" +jest-snapshot@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-23.0.1.tgz#6674fa19b9eb69a99cabecd415bddc42d6af3e7e" + dependencies: + chalk "^2.0.1" + jest-diff "^23.0.1" + jest-matcher-utils "^23.0.1" + mkdirp "^0.5.1" + natural-compare "^1.4.0" + pretty-format "^23.0.1" + jest-specific-snapshot@^0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/jest-specific-snapshot/-/jest-specific-snapshot-0.5.0.tgz#92201b5f51fbe56cc744bdfab08f379867c1bb18" dependencies: jest-snapshot ">=20.0.3" -jest-util@^22.4.1, jest-util@^22.4.3: +jest-util@^22.4.3: version "22.4.3" resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-22.4.3.tgz#c70fec8eec487c37b10b0809dc064a7ecf6aafac" dependencies: @@ -6182,28 +6447,48 @@ jest-util@^22.4.1, jest-util@^22.4.3: mkdirp "^0.5.1" source-map "^0.6.0" -jest-validate@^22.4.4: - version "22.4.4" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-22.4.4.tgz#1dd0b616ef46c995de61810d85f57119dbbcec4d" +jest-util@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-23.1.0.tgz#c0251baf34644c6dd2fea78a962f4263ac55772d" + dependencies: + callsites "^2.0.0" + chalk "^2.0.1" + graceful-fs "^4.1.11" + is-ci "^1.0.10" + jest-message-util "^23.1.0" + mkdirp "^0.5.1" + slash "^1.0.0" + source-map "^0.6.0" + +jest-validate@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-23.0.1.tgz#cd9f01a89d26bb885f12a8667715e9c865a5754f" dependencies: chalk "^2.0.1" - jest-config "^22.4.4" jest-get-type "^22.1.0" leven "^2.1.0" - pretty-format "^22.4.0" + pretty-format "^23.0.1" -jest-worker@^22.2.2, jest-worker@^22.4.3: - version "22.4.3" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-22.4.3.tgz#5c421417cba1c0abf64bf56bd5fb7968d79dd40b" +jest-watcher@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-23.1.0.tgz#a8d5842e38d9fb4afff823df6abb42a58ae6cdbd" + dependencies: + ansi-escapes "^3.0.0" + chalk "^2.0.1" + string-length "^2.0.0" + +jest-worker@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-23.0.1.tgz#9e649dd963ff4046026f91c4017f039a6aa4a7bc" dependencies: merge-stream "^1.0.1" -jest@^22.4.4: - version "22.4.4" - resolved "https://registry.yarnpkg.com/jest/-/jest-22.4.4.tgz#ffb36c9654b339a13e10b3d4b338eb3e9d49f6eb" +jest@^23.1.0: + version "23.1.0" + resolved "https://registry.yarnpkg.com/jest/-/jest-23.1.0.tgz#bbb7f893100a11a742dd8bd0d047a54b0968ad1a" dependencies: import-local "^1.0.0" - jest-cli "^22.4.4" + jest-cli "^23.1.0" js-base64@^2.1.9: version "2.4.5" @@ -6322,7 +6607,7 @@ json-loader@^0.5.7: version "0.5.7" resolved "https://registry.yarnpkg.com/json-loader/-/json-loader-0.5.7.tgz#dca14a70235ff82f0ac9a3abeb60d337a365185d" -json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1: +json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9" @@ -6338,12 +6623,6 @@ json-stable-stringify-without-jsonify@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" -json-stable-stringify@^1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz#9a759d39c5f2ff503fd5300646ed445f88c4f9af" - dependencies: - jsonify "~0.0.0" - json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" @@ -6496,15 +6775,15 @@ listr-verbose-renderer@^0.4.0: date-fns "^1.27.2" figures "^1.7.0" -listr@^0.13.0: - version "0.13.0" - resolved "https://registry.yarnpkg.com/listr/-/listr-0.13.0.tgz#20bb0ba30bae660ee84cc0503df4be3d5623887d" +listr@^0.14.1: + version "0.14.1" + resolved "https://registry.yarnpkg.com/listr/-/listr-0.14.1.tgz#8a7afa4a7135cee4c921d128e0b7dfc6e522d43d" dependencies: - chalk "^1.1.3" + "@samverschueren/stream-to-observable" "^0.3.0" cli-truncate "^0.2.1" figures "^1.7.0" indent-string "^2.1.0" - is-observable "^0.2.0" + is-observable "^1.1.0" is-promise "^2.1.0" is-stream "^1.1.0" listr-silent-renderer "^1.1.1" @@ -6514,8 +6793,7 @@ listr@^0.13.0: log-update "^1.0.2" ora "^0.2.3" p-map "^1.1.1" - rxjs "^5.4.2" - stream-to-observable "^0.2.0" + rxjs "^6.1.0" strip-ansi "^3.0.1" load-json-file@^1.0.0: @@ -6768,6 +7046,12 @@ macaddress@^0.2.8: version "0.2.8" resolved "https://registry.yarnpkg.com/macaddress/-/macaddress-0.2.8.tgz#5904dc537c39ec6dbefeae902327135fa8511f12" +magic-string@^0.22.4: + version "0.22.5" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e" + dependencies: + vlq "^0.2.2" + make-dir@^1.0.0, make-dir@^1.1.0: version "1.3.0" resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" @@ -6796,6 +7080,10 @@ makeerror@1.0.x: dependencies: tmpl "1.0.x" +mamacro@^0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4" + map-cache@^0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf" @@ -8240,10 +8528,14 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -prettier@^1.12.1, prettier@^1.5.3: +prettier@^1.12.1: version "1.12.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325" +prettier@^1.13.3: + version "1.13.3" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.3.tgz#e74c09a7df6519d472ca6febaa37cf7addb48a20" + pretty-bytes@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9" @@ -8255,13 +8547,20 @@ pretty-error@^2.0.2: renderkid "^2.0.1" utila "~0.4" -pretty-format@^22.4.0, pretty-format@^22.4.3: +pretty-format@^22.4.3: version "22.4.3" resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-22.4.3.tgz#f873d780839a9c02e9664c8a082e9ee79eaac16f" dependencies: ansi-regex "^3.0.0" ansi-styles "^3.2.0" +pretty-format@^23.0.1: + version "23.0.1" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-23.0.1.tgz#d61d065268e4c759083bccbca27a01ad7c7601f4" + dependencies: + ansi-regex "^3.0.0" + ansi-styles "^3.2.0" + private@^0.1.6, private@^0.1.8, private@~0.1.5: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" @@ -8530,11 +8829,14 @@ react-dnd-html5-backend@2.5.4: dependencies: lodash "^4.2.0" -react-dnd-html5-backend@2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-2.6.0.tgz#590cd1cca78441bb274edd571fef4c0b16ddcf8e" +react-dnd-html5-backend@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/react-dnd-html5-backend/-/react-dnd-html5-backend-3.0.2.tgz#87172fd4be90e45353119b40e10f591ddf8661ed" dependencies: + autobind-decorator "^2.1.0" + dnd-core "^3.0.2" lodash "^4.2.0" + shallowequal "^1.0.2" react-dnd-scrollzone@^4.0.0: version "4.0.0" @@ -8546,11 +8848,12 @@ react-dnd-scrollzone@^4.0.0: raf "^3.2.0" react-display-name "^0.2.0" -react-dnd-test-backend@2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/react-dnd-test-backend/-/react-dnd-test-backend-2.6.0.tgz#3d78af6805e0730a019c6b7ef9c81eb6f9b3b9e3" +react-dnd-test-backend@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/react-dnd-test-backend/-/react-dnd-test-backend-3.0.2.tgz#790c2d372cd2d767fa27d36c0bd0c0d4bdbd703e" dependencies: - dnd-core "^2.6.0" + dnd-core "^3.0.2" + lodash "^4.17.10" react-dnd-touch-backend@0.4.0: version "0.4.0" @@ -8570,7 +8873,19 @@ react-dnd@2.5.4: lodash "^4.2.0" prop-types "^15.5.10" -react-dnd@2.6.0, react-dnd@^2.5.4: +react-dnd@3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-3.0.2.tgz#b0c23d8d82969f5b7be34cbc4f84fa1ffc5c7ddc" + dependencies: + disposables "^1.0.1" + dnd-core "^3.0.2" + hoist-non-react-statics "^2.5.0" + invariant "^2.1.0" + lodash "^4.2.0" + prop-types "^15.5.10" + shallowequal "^1.0.2" + +react-dnd@^2.5.4: version "2.6.0" resolved "https://registry.yarnpkg.com/react-dnd/-/react-dnd-2.6.0.tgz#7fa25676cf827d58a891293e3c1ab59da002545a" dependencies: @@ -8593,7 +8908,7 @@ react-docgen@^3.0.0-beta11: node-dir "^0.1.10" recast "^0.12.6" -react-dom@^16.2.0: +react-dom@^16.4.0: version "16.4.0" resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.4.0.tgz#099f067dd5827ce36a29eaf9a6cdc7cbf6216b1e" dependencies: @@ -8646,6 +8961,10 @@ react-is@^16.3.2: version "16.3.2" resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.3.2.tgz#f4d3d0e2f5fbb6ac46450641eb2e25bf05d36b22" +react-is@^16.4.0: + version "16.4.0" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.4.0.tgz#cc9fdc855ac34d2e7d9d2eb7059bbc240d35ffcf" + react-lifecycles-compat@^1.0.2: version "1.1.4" resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-1.1.4.tgz#fc005c72849b7ed364de20a0f64ff58ebdc2009a" @@ -8697,7 +9016,7 @@ react-style-proptype@^3.0.0: dependencies: prop-types "^15.5.4" -react-test-renderer@^16.0.0-0, react-test-renderer@^16.3.2: +react-test-renderer@^16.0.0-0: version "16.3.2" resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.3.2.tgz#3d1ed74fda8db42521fdf03328e933312214749a" dependencies: @@ -8706,6 +9025,15 @@ react-test-renderer@^16.0.0-0, react-test-renderer@^16.3.2: prop-types "^15.6.0" react-is "^16.3.2" +react-test-renderer@^16.4.0: + version "16.4.0" + resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.4.0.tgz#0dbe0e24263e94e1830c7afb1f403707fad313a3" + dependencies: + fbjs "^0.8.16" + object-assign "^4.1.1" + prop-types "^15.6.0" + react-is "^16.4.0" + react-transition-group@^2.0.0: version "2.3.1" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-2.3.1.tgz#31d611b33e143a5e0f2d94c348e026a0f3b474b6" @@ -8747,7 +9075,7 @@ react-virtualized@^9.19.1: prop-types "^15.6.0" react-lifecycles-compat "^3.0.4" -react@^16.2.0: +react@^16.4.0: version "16.4.0" resolved "https://registry.yarnpkg.com/react/-/react-16.4.0.tgz#402c2db83335336fba1962c08b98c6272617d585" dependencies: @@ -8903,6 +9231,13 @@ reduce-function-call@^1.0.1: dependencies: balanced-match "^0.4.2" +redux@*, redux@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.0.tgz#aa698a92b729315d22b34a0553d7e6533555cc03" + dependencies: + loose-envify "^1.1.0" + symbol-observable "^1.2.0" + redux@^3.7.1: version "3.7.2" resolved "https://registry.yarnpkg.com/redux/-/redux-3.7.2.tgz#06b73123215901d25d065be342eb026bc1c8537b" @@ -8912,13 +9247,6 @@ redux@^3.7.1: loose-envify "^1.1.0" symbol-observable "^1.0.3" -redux@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.0.tgz#aa698a92b729315d22b34a0553d7e6533555cc03" - dependencies: - loose-envify "^1.1.0" - symbol-observable "^1.2.0" - regenerate@^1.2.1: version "1.4.0" resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" @@ -9206,6 +9534,56 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" +rollup-plugin-babel@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-3.0.4.tgz#41b3e762fe64450dd61da3105a2cf7ad76be4edc" + dependencies: + rollup-pluginutils "^1.5.0" + +rollup-plugin-commonjs@^9.1.3: + version "9.1.3" + resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.1.3.tgz#37bfbf341292ea14f512438a56df8f9ca3ba4d67" + dependencies: + estree-walker "^0.5.1" + magic-string "^0.22.4" + resolve "^1.5.0" + rollup-pluginutils "^2.0.1" + +rollup-plugin-node-resolve@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.3.0.tgz#c26d110a36812cbefa7ce117cadcd3439aa1c713" + dependencies: + builtin-modules "^2.0.0" + is-module "^1.0.0" + resolve "^1.1.6" + +rollup-plugin-uglify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-uglify/-/rollup-plugin-uglify-3.0.0.tgz#a34eca24617709c6bf1778e9653baafa06099b86" + dependencies: + uglify-es "^3.3.7" + +rollup-pluginutils@^1.5.0: + version "1.5.2" + resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408" + dependencies: + estree-walker "^0.2.1" + minimatch "^3.0.2" + +rollup-pluginutils@^2.0.1: + version "2.3.0" + resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.0.tgz#478ace04bd7f6da2e724356ca798214884738fc4" + dependencies: + estree-walker "^0.5.2" + micromatch "^2.3.11" + +rollup@^0.59.4: + version "0.59.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.59.4.tgz#6f80f7017c22667ff1bf3e62adf8624a44cc44aa" + dependencies: + "@types/estree" "0.0.39" + "@types/node" "*" + rst-selector-parser@^2.2.3: version "2.2.3" resolved "https://registry.yarnpkg.com/rst-selector-parser/-/rst-selector-parser-2.2.3.tgz#81b230ea2fcc6066c89e3472de794285d9b03d91" @@ -9239,12 +9617,18 @@ rx-lite@*, rx-lite@^4.0.8: version "4.0.8" resolved "https://registry.yarnpkg.com/rx-lite/-/rx-lite-4.0.8.tgz#0b1e11af8bc44836f04a6407e92da42467b79444" -rxjs@^5.4.2, rxjs@^5.5.2: +rxjs@^5.5.2: version "5.5.10" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.10.tgz#fde02d7a614f6c8683d0d1957827f492e09db045" dependencies: symbol-observable "1.0.1" +rxjs@^6.1.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.0.tgz#e024d0e180b72756a83c2aaea8f25423751ba978" + dependencies: + tslib "^1.9.0" + safe-buffer@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" @@ -9573,7 +9957,7 @@ source-map-support@^0.4.15: dependencies: source-map "^0.5.6" -source-map-support@^0.5.0: +source-map-support@^0.5.6: version "0.5.6" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13" dependencies: @@ -9755,12 +10139,6 @@ stream-shift@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952" -stream-to-observable@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/stream-to-observable/-/stream-to-observable-0.2.0.tgz#59d6ea393d87c2c0ddac10aa0d561bc6ba6f0e10" - dependencies: - any-observable "^0.2.0" - strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" @@ -9918,11 +10296,7 @@ symbol-observable@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.1.tgz#8340fc4702c3122df5d22288f88283f513d3fdd4" -symbol-observable@^0.2.2: - version "0.2.4" - resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40" - -symbol-observable@^1.0.3, symbol-observable@^1.2.0: +symbol-observable@^1.0.3, symbol-observable@^1.1.0, symbol-observable@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -10122,6 +10496,10 @@ trim-right@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/trim-right/-/trim-right-1.0.1.tgz#cb2e1203067e0c8de1f614094b9fe45704ea6003" +tslib@^1.9.0: + version "1.9.2" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e" + tty-browserify@0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6" @@ -10157,7 +10535,7 @@ ua-parser-js@^0.7.9: version "0.7.18" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed" -uglify-es@^3.3.4: +uglify-es@^3.3.4, uglify-es@^3.3.7: version "3.3.9" resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677" dependencies: @@ -10184,7 +10562,7 @@ uglify-to-browserify@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" -uglifyjs-webpack-plugin@^1.2.4, uglifyjs-webpack-plugin@^1.2.5: +uglifyjs-webpack-plugin@^1.2.4: version "1.2.5" resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.5.tgz#2ef8387c8f1a903ec5e44fa36f9f3cbdcea67641" dependencies: @@ -10391,9 +10769,9 @@ uuid@^3.0.1, uuid@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" -v8-compile-cache@^1.1.2: - version "1.1.2" - resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-1.1.2.tgz#8d32e4f16974654657e676e0e467a348e89b0dc4" +v8-compile-cache@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.0.tgz#526492e35fc616864284700b7043e01baee09f0a" v8flags@^2.1.1: version "2.1.1" @@ -10473,6 +10851,10 @@ vinyl@^2.0.1: remove-trailing-separator "^1.0.1" replace-ext "^1.0.0" +vlq@^0.2.2: + version "0.2.3" + resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" + vm-browserify@0.0.4: version "0.0.4" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" @@ -10538,36 +10920,36 @@ webpack-addons@^1.1.5: dependencies: jscodeshift "^0.4.0" -webpack-cli@^2.1.3: - version "2.1.3" - resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.1.3.tgz#65d166851abaa56067ef3f716b02a97ba6bbe84d" +webpack-cli@^2.1.4: + version "2.1.4" + resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.1.4.tgz#cab81e79249127384fb69b2fdfe2055f9c771b76" dependencies: - chalk "^2.3.2" + chalk "^2.4.1" cross-spawn "^6.0.5" diff "^3.5.0" enhanced-resolve "^4.0.0" - envinfo "^4.4.2" + envinfo "^5.7.0" glob-all "^3.1.0" global-modules "^1.0.0" - got "^8.2.0" + got "^8.3.1" import-local "^1.0.0" - inquirer "^5.1.0" - interpret "^1.0.4" + inquirer "^5.2.0" + interpret "^1.1.0" jscodeshift "^0.5.0" - listr "^0.13.0" + listr "^0.14.1" loader-utils "^1.1.0" - lodash "^4.17.5" + lodash "^4.17.10" log-symbols "^2.2.0" mkdirp "^0.5.1" p-each-series "^1.0.0" p-lazy "^1.0.0" - prettier "^1.5.3" - supports-color "^5.3.0" - v8-compile-cache "^1.1.2" + prettier "^1.12.1" + supports-color "^5.4.0" + v8-compile-cache "^2.0.0" webpack-addons "^1.1.5" yargs "^11.1.0" - yeoman-environment "^2.0.0" - yeoman-generator "^2.0.4" + yeoman-environment "^2.1.1" + yeoman-generator "^2.0.5" webpack-dev-middleware@3.1.3, webpack-dev-middleware@^3.1.3: version "3.1.3" @@ -10643,7 +11025,36 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0: source-list-map "^2.0.0" source-map "~0.6.1" -webpack@^4.8.0, webpack@^4.8.3: +webpack@^4.10.2: + version "4.10.2" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.10.2.tgz#d6a4cc3e2fa748f96ca62a70f91eaaa939ef3858" + dependencies: + "@webassemblyjs/ast" "1.5.9" + "@webassemblyjs/wasm-edit" "1.5.9" + "@webassemblyjs/wasm-opt" "1.5.9" + "@webassemblyjs/wasm-parser" "1.5.9" + acorn "^5.0.0" + acorn-dynamic-import "^3.0.0" + ajv "^6.1.0" + ajv-keywords "^3.1.0" + chrome-trace-event "^0.1.1" + enhanced-resolve "^4.0.0" + eslint-scope "^3.7.1" + json-parse-better-errors "^1.0.2" + loader-runner "^2.3.0" + loader-utils "^1.1.0" + memory-fs "~0.4.1" + micromatch "^3.1.8" + mkdirp "~0.5.0" + neo-async "^2.5.0" + node-libs-browser "^2.0.0" + schema-utils "^0.4.4" + tapable "^1.0.0" + uglifyjs-webpack-plugin "^1.2.4" + watchpack "^1.5.0" + webpack-sources "^1.0.1" + +webpack@^4.8.0: version "4.8.3" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.8.3.tgz#957c8e80000f9e5cc03d775e78b472d8954f4eeb" dependencies: @@ -10833,19 +11244,13 @@ yargs-parser@^7.0.0: dependencies: camelcase "^4.1.0" -yargs-parser@^8.1.0: - version "8.1.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-8.1.0.tgz#f1376a33b6629a5d063782944da732631e966950" - dependencies: - camelcase "^4.1.0" - yargs-parser@^9.0.2: version "9.0.2" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-9.0.2.tgz#9ccf6a43460fe4ed40a9bb68f48d43b8a68cc077" dependencies: camelcase "^4.1.0" -yargs@11.0.0: +yargs@11.0.0, yargs@^11.0.0: version "11.0.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.0.0.tgz#c052931006c5eee74610e5fc0354bedfd08a201b" dependencies: @@ -10862,23 +11267,6 @@ yargs@11.0.0: y18n "^3.2.1" yargs-parser "^9.0.2" -yargs@^10.0.3: - version "10.1.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-10.1.2.tgz#454d074c2b16a51a43e2fb7807e4f9de69ccb5c5" - dependencies: - cliui "^4.0.0" - decamelize "^1.1.1" - find-up "^2.1.0" - get-caller-file "^1.0.1" - os-locale "^2.0.0" - require-directory "^2.1.1" - require-main-filename "^1.0.1" - set-blocking "^2.0.0" - string-width "^2.0.0" - which-module "^2.0.0" - y18n "^3.2.1" - yargs-parser "^8.1.0" - yargs@^11.1.0: version "11.1.0" resolved "https://registry.yarnpkg.com/yargs/-/yargs-11.1.0.tgz#90b869934ed6e871115ea2ff58b03f4724ed2d77" @@ -10935,7 +11323,7 @@ yauzl@2.4.1: dependencies: fd-slicer "~1.0.1" -yeoman-environment@^2.0.0, yeoman-environment@^2.0.5: +yeoman-environment@^2.0.5: version "2.1.1" resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.1.1.tgz#10a045f7fc4397873764882eae055a33e56ee1c5" dependencies: @@ -10955,7 +11343,27 @@ yeoman-environment@^2.0.0, yeoman-environment@^2.0.5: text-table "^0.2.0" untildify "^3.0.2" -yeoman-generator@^2.0.4: +yeoman-environment@^2.1.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-2.2.0.tgz#6c0ee93a8d962a9f6dbc5ad4e90ae7ab34875393" + dependencies: + chalk "^2.1.0" + cross-spawn "^6.0.5" + debug "^3.1.0" + diff "^3.3.1" + escape-string-regexp "^1.0.2" + globby "^8.0.1" + grouped-queue "^0.3.3" + inquirer "^5.2.0" + is-scoped "^1.0.0" + lodash "^4.17.10" + log-symbols "^2.1.0" + mem-fs "^1.1.0" + strip-ansi "^4.0.0" + text-table "^0.2.0" + untildify "^3.0.2" + +yeoman-generator@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-2.0.5.tgz#57b0b3474701293cc9ec965288f3400b00887c81" dependencies: From 27f05abf497c935babe47b57709bed4b5ec04a00 Mon Sep 17 00:00:00 2001 From: Wei-Wei Wu Date: Fri, 1 Jun 2018 01:09:26 -0700 Subject: [PATCH 4/9] update tests: undefined is now removed from snapshots --- .babelrc.js | 8 +++++ .../__snapshots__/storyshots.test.js.snap | 34 +++---------------- package.json | 2 +- .../react-sortable-tree.test.js.snap | 1 - 4 files changed, 14 insertions(+), 31 deletions(-) diff --git a/.babelrc.js b/.babelrc.js index 7b48b83a..5c6cc067 100755 --- a/.babelrc.js +++ b/.babelrc.js @@ -33,3 +33,11 @@ if (env === 'production') { presets: ['env', 'react', 'stage-2'], }; } + +if (env === 'test') { + module.exports = { + comments: false, + plugins: ['transform-es2015-modules-commonjs'], + presets: ['react', 'stage-2'], + }; +} diff --git a/examples/storybooks/__snapshots__/storyshots.test.js.snap b/examples/storybooks/__snapshots__/storyshots.test.js.snap index 30269355..81fc17e7 100644 --- a/examples/storybooks/__snapshots__/storyshots.test.js.snap +++ b/examples/storybooks/__snapshots__/storyshots.test.js.snap @@ -23,7 +23,6 @@ exports[`Storyshots Advanced Drag from external source 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ @@ -276,7 +275,6 @@ exports[`Storyshots Advanced Drag out to remove 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ @@ -747,7 +745,6 @@ exports[`Storyshots Advanced Playing with generateNodeProps 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ @@ -1075,7 +1072,6 @@ exports[`Storyshots Advanced Touch support (Experimental) 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ @@ -1338,7 +1334,6 @@ exports[`Storyshots Advanced Tree-to-tree dragging 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ @@ -1552,7 +1547,6 @@ exports[`Storyshots Advanced Tree-to-tree dragging 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ @@ -1812,7 +1806,6 @@ exports[`Storyshots Basics Add and remove nodes programmatically 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ @@ -2087,7 +2080,6 @@ exports[`Storyshots Basics Callbacks 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ @@ -2416,7 +2408,6 @@ exports[`Storyshots Basics Minimal implementation 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ @@ -2675,7 +2666,6 @@ exports[`Storyshots Basics Modify nodes 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ @@ -3028,7 +3018,6 @@ exports[`Storyshots Basics Prevent drop 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ @@ -3660,7 +3649,6 @@ exports[`Storyshots Basics Search 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ @@ -3833,7 +3821,6 @@ exports[`Storyshots Basics Themes 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ @@ -3931,9 +3918,7 @@ exports[`Storyshots Basics Themes 1`] = `
- + The file explorer theme
@@ -4019,9 +4004,7 @@ exports[`Storyshots Basics Themes 1`] = `
- + Imported from react-sortable-tree-theme-file-explorer
@@ -4104,9 +4087,7 @@ exports[`Storyshots Basics Themes 1`] = `
- +
Find it on @@ -4181,9 +4162,7 @@ exports[`Storyshots Basics Themes 1`] = `
- + More compact than the default
@@ -4250,9 +4229,7 @@ exports[`Storyshots Basics Themes 1`] = `
- +
Simply set it to the @@ -4329,7 +4306,6 @@ exports[`Storyshots Basics treeData import/export 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ diff --git a/package.json b/package.json index 4d3487e2..c01bfaaf 100644 --- a/package.json +++ b/package.json @@ -18,7 +18,7 @@ "prettier": "prettier --single-quote --trailing-comma es5 --write \"{src,examples}/**/*.{js,css,md}\"", "prepublishOnly": "npm run lint && npm run test && npm run build", "release": "standard-version", - "test": "jest", + "test": "cross-env NODE_ENV=test jest", "test:watch": "jest --watchAll", "deploy": "npm run build:demo && gh-pages -d build", "storybook": "cross-env TARGET=development start-storybook -p ${PORT:-3001} -h 0.0.0.0", diff --git a/src/__snapshots__/react-sortable-tree.test.js.snap b/src/__snapshots__/react-sortable-tree.test.js.snap index 3ce89633..e8454cbe 100644 --- a/src/__snapshots__/react-sortable-tree.test.js.snap +++ b/src/__snapshots__/react-sortable-tree.test.js.snap @@ -14,7 +14,6 @@ exports[` should render tree correctly 1`] = ` aria-label="grid" aria-readonly={true} className="ReactVirtualized__Grid ReactVirtualized__List rst__virtualScrollOverride" - id={undefined} onScroll={[Function]} role="grid" style={ From f429e2b57e22cd24eb8c5c60590332e8a7767ec7 Mon Sep 17 00:00:00 2001 From: Wei-Wei Wu Date: Fri, 1 Jun 2018 01:10:51 -0700 Subject: [PATCH 5/9] setting NODE_ENV on test:watch --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c01bfaaf..c4191228 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "prepublishOnly": "npm run lint && npm run test && npm run build", "release": "standard-version", "test": "cross-env NODE_ENV=test jest", - "test:watch": "jest --watchAll", + "test:watch": "cross-env NODE_ENV=test jest --watchAll", "deploy": "npm run build:demo && gh-pages -d build", "storybook": "cross-env TARGET=development start-storybook -p ${PORT:-3001} -h 0.0.0.0", "build-storybook": "cross-env NODE_ENV=production build-storybook -o build/storybook" From 1217c31a9b16f6bc2e3756a2c910fecf4397e37d Mon Sep 17 00:00:00 2001 From: Wei-Wei Wu Date: Fri, 1 Jun 2018 01:43:11 -0700 Subject: [PATCH 6/9] updating README --- README.md | 121 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 76 insertions(+), 45 deletions(-) diff --git a/README.md b/README.md index 1fe8eea8..cd107caf 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,47 @@ # React Sortable Tree -[![NPM](https://nodei.co/npm/react-sortable-tree.png)](https://npmjs.org/package/react-sortable-tree) [![Build Status](https://travis-ci.org/frontend-collective/react-sortable-tree.svg?branch=master)](https://travis-ci.org/frontend-collective/react-sortable-tree) [![Coverage Status](https://coveralls.io/repos/github/frontend-collective/react-sortable-tree/badge.svg?branch=master)](https://coveralls.io/github/frontend-collective/react-sortable-tree?branch=master) - [![tree200](https://cloud.githubusercontent.com/assets/4413963/18860410/26f64de8-84b8-11e6-9284-350308eed30a.png)](https://frontend-collective.github.io/react-sortable-tree/) -### [Demo](https://frontend-collective.github.io/react-sortable-tree/) +![NPM version](https://img.shields.io/npm/v/react-sortable-tree.svg?style=flat) +![NPM license](https://img.shields.io/npm/l/react-sortable-tree.svg?style=flat) +[![NPM total downloads](https://img.shields.io/npm/dt/react-sortable-tree.svg?style=flat)](https://npmcharts.com/compare/react-sortable-tree?minimal=true) +[![NPM monthly downloads](https://img.shields.io/npm/dm/react-sortable-tree.svg?style=flat)](https://npmcharts.com/compare/react-sortable-tree?minimal=true) +[![Build Status](https://travis-ci.org/frontend-collective/react-sortable-tree.svg?branch=master)](https://travis-ci.org/frontend-collective/react-sortable-tree) +[![Coverage Status](https://coveralls.io/repos/github/frontend-collective/react-sortable-tree/badge.svg?branch=master)](https://coveralls.io/github/frontend-collective/react-sortable-tree?branch=master) + +A React component for Drag-and-drop sortable representation of hierarchical data. Checkout [the demo](https://frontend-collective.github.io/react-sortable-tree/) for some examples. Checkout [the storybook](https://frontend-collective.github.io/react-sortable-tree/storybook/index.html) for advanced usage. Play with the code on an [example on CodeSandbox](https://codesandbox.io/s/wkxvy3z15w). [![demo](https://cloud.githubusercontent.com/assets/4413963/19334888/2be8261c-913a-11e6-9508-4b347ae114b4.gif)](https://frontend-collective.github.io/react-sortable-tree/) +## Getting started + +Install `react-sortable-tree` using npm. + +```sh +npm install react-sortable-tree --save +``` + +ES6, CommonJS, and UMD builds are available with each distribution. +For example: + +```js +// This only needs to be done once; probably during your application's bootstrapping process. +import 'react-sortable-tree/styles.css'; + +// You can import the default tree with dnd context +import SortableTree from 'react-sortable-tree'; + +// Or you can import the tree without the dnd context as a named export. eg +import { SortableTreeWithoutDndContext as SortableTree } from 'react-sortable-tree'; +``` + +You can also use a global-friendly UMD build: + +```html + + +``` + ## Usage ```jsx @@ -37,40 +71,36 @@ export default class Tree extends Component { } ``` -Find more examples in the [Storybook](https://frontend-collective.github.io/react-sortable-tree/storybook/) - -Play with the code on an [example on CodeSandbox](https://codesandbox.io/s/wkxvy3z15w) - ## Options -| Prop | Type |
Description
| -| :----------------------------- | :------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| treeData
_(required)_ | object[] | Tree data with the following keys:
`title` is the primary label for the node.
`subtitle` is a secondary label for the node.
`expanded` shows children of the node if true, or hides them if false. Defaults to false.
`children` is an array of child nodes belonging to the node.
**Example**: `[{title: 'main', subtitle: 'sub'}, { title: 'value2', expanded: true, children: [{ title: 'value3') }] }]` | -| onChange
_(required)_ | func | Called whenever tree data changed. Just like with React input elements, you have to update your own component's data to see the changes reflected.
`( treeData: object[] ): void`
| +| Prop | Type |
Description
| +| :----------------------------- | :------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| treeData
_(required)_ | object[] | Tree data with the following keys:
`title` is the primary label for the node.
`subtitle` is a secondary label for the node.
`expanded` shows children of the node if true, or hides them if false. Defaults to false.
`children` is an array of child nodes belonging to the node.
**Example**: `[{title: 'main', subtitle: 'sub'}, { title: 'value2', expanded: true, children: [{ title: 'value3') }] }]` | +| onChange
_(required)_ | func | Called whenever tree data changed. Just like with React input elements, you have to update your own component's data to see the changes reflected.
`( treeData: object[] ): void`
| | getNodeKey
_(recommended)_ | func | Specify the unique key used to identify each node and generate the `path` array passed in callbacks. With a setting of `getNodeKey={({ node }) => node.id}`, for example, in callbacks this will let you easily determine that the node with an `id` of `35` is (or has just become) a child of the node with an `id` of `12`, which is a child of ... and so on. It uses [`defaultGetNodeKey`](https://github.com/frontend-collective/react-sortable-tree/blob/master/src/utils/default-handlers.js) by default, which returns the index in the tree (omitting hidden nodes).
`({ node: object, treeIndex: number }): string or number`
| -| generateNodeProps | func | Generate an object with additional props to be passed to the node renderer. Use this for adding buttons via the `buttons` key, or additional `style` / `className` settings.
`({ node: object, path: number[] or string[], treeIndex: number, lowerSiblingCounts: number[], isSearchMatch: bool, isSearchFocus: bool }): object`
| -| onMoveNode | func | Called after node move operation.
`({ treeData: object[], node: object, nextParentNode: object, prevPath: number[] or string[], prevTreeIndex: number, nextPath: number[] or string[], nextTreeIndex: number }): void`
| -| onVisibilityToggle | func | Called after children nodes collapsed or expanded.
`({ treeData: object[], node: object, expanded: bool, path: number[] or string[] }): void`
| -| onDragStateChanged | func | Called when a drag is initiated or ended.
`({ isDragging: bool, draggedNode: object }): void`
| -| maxDepth | number | Maximum depth nodes can be inserted at. Defaults to infinite. | -| canDrag | func or bool | Return false from callback to prevent node from dragging, by hiding the drag handle. Set prop to `false` to disable dragging on all nodes. Defaults to `true`.
`({ node: object, path: number[] or string[], treeIndex: number, lowerSiblingCounts: number[], isSearchMatch: bool, isSearchFocus: bool }): bool`
| -| canDrop | func | Return false to prevent node from dropping in the given location.
`({ node: object, prevPath: number[] or string[], prevParent: object, prevTreeIndex: number, nextPath: number[] or string[], nextParent: object, nextTreeIndex: number }): bool`
| -| theme | object | Set an all-in-one packaged appearance for the tree. See the [Themes](#themes) section for more information. | +| generateNodeProps | func | Generate an object with additional props to be passed to the node renderer. Use this for adding buttons via the `buttons` key, or additional `style` / `className` settings.
`({ node: object, path: number[] or string[], treeIndex: number, lowerSiblingCounts: number[], isSearchMatch: bool, isSearchFocus: bool }): object`
| +| onMoveNode | func | Called after node move operation.
`({ treeData: object[], node: object, nextParentNode: object, prevPath: number[] or string[], prevTreeIndex: number, nextPath: number[] or string[], nextTreeIndex: number }): void`
| +| onVisibilityToggle | func | Called after children nodes collapsed or expanded.
`({ treeData: object[], node: object, expanded: bool, path: number[] or string[] }): void`
| +| onDragStateChanged | func | Called when a drag is initiated or ended.
`({ isDragging: bool, draggedNode: object }): void`
| +| maxDepth | number | Maximum depth nodes can be inserted at. Defaults to infinite. | +| canDrag | func or bool | Return false from callback to prevent node from dragging, by hiding the drag handle. Set prop to `false` to disable dragging on all nodes. Defaults to `true`.
`({ node: object, path: number[] or string[], treeIndex: number, lowerSiblingCounts: number[], isSearchMatch: bool, isSearchFocus: bool }): bool`
| +| canDrop | func | Return false to prevent node from dropping in the given location.
`({ node: object, prevPath: number[] or string[], prevParent: object, prevTreeIndex: number, nextPath: number[] or string[], nextParent: object, nextTreeIndex: number }): bool`
| +| theme | object | Set an all-in-one packaged appearance for the tree. See the [Themes](#themes) section for more information. | | searchMethod | func | The method used to search nodes. Defaults to [`defaultSearchMethod`](https://github.com/frontend-collective/react-sortable-tree/blob/master/src/utils/default-handlers.js), which uses the `searchQuery` string to search for nodes with matching `title` or `subtitle` values. NOTE: Changing `searchMethod` will not update the search, but changing the `searchQuery` will.
`({ node: object, path: number[] or string[], treeIndex: number, searchQuery: any }): bool`
| -| searchQuery | string or any | Used by the `searchMethod` to highlight and scroll to matched nodes. Should be a string for the default `searchMethod`, but can be anything when using a custom search. Defaults to `null`. | -| searchFocusOffset | number | Outline the <`searchFocusOffset`>th node and scroll to it. | -| expandOnlySearchedNodes | boolean | Only expand the nodes that match searches. Collapses all other nodes. Defaults to `false`. | -| searchFinishCallback | func | Get the nodes that match the search criteria. Used for counting total matches, etc.
`(matches: { node: object, path: number[] or string[], treeIndex: number }[]): void`
| -| dndType | string | String value used by [react-dnd](http://react-dnd.github.io/react-dnd/docs-overview.html) (see overview at the link) for dropTargets and dragSources types. If not set explicitly, a default value is applied by react-sortable-tree for you for its internal use. **NOTE:** Must be explicitly set and the same value used in order for correct functioning of external nodes | -| shouldCopyOnOutsideDrop | func or bool | Return true, or a callback returning true, and dropping nodes to react-dnd drop targets outside of the tree will not remove them from the tree. Defaults to `false`.
`({ node: object, prevPath: number[] or string[], prevTreeIndex: number, }): bool`
| -| reactVirtualizedListProps | object | Custom properties to hand to the [react-virtualized list](https://github.com/bvaughn/react-virtualized/blob/master/docs/List.md#prop-types) | -| style | object | Style applied to the container wrapping the tree (style defaults to `{height: '100%'}`) | -| innerStyle | object | Style applied to the inner, scrollable container (for padding, etc.) | -| className | string | Class name for the container wrapping the tree | -| rowHeight | number or func | Used by react-virtualized. Defaults to `62`. Either a fixed row height (number) or a function that returns the height of a row given its index: `({ treeIndex: number, node: object, path: number[] or string[] }): number` | -| slideRegionSize | number | Size in px of the region near the edges that initiates scrolling on dragover. Defaults to `100`. | -| scaffoldBlockPxWidth | number | The width of the blocks containing the lines representing the structure of the tree. Defaults to `44`. | -| isVirtualized | bool | Set to false to disable virtualization. Defaults to `true`. **NOTE**: Auto-scrolling while dragging, and scrolling to the `searchFocusOffset` will be disabled. | +| searchQuery | string or any | Used by the `searchMethod` to highlight and scroll to matched nodes. Should be a string for the default `searchMethod`, but can be anything when using a custom search. Defaults to `null`. | +| searchFocusOffset | number | Outline the <`searchFocusOffset`>th node and scroll to it. | +| expandOnlySearchedNodes | boolean | Only expand the nodes that match searches. Collapses all other nodes. Defaults to `false`. | +| searchFinishCallback | func | Get the nodes that match the search criteria. Used for counting total matches, etc.
`(matches: { node: object, path: number[] or string[], treeIndex: number }[]): void`
| +| dndType | string | String value used by [react-dnd](http://react-dnd.github.io/react-dnd/docs-overview.html) (see overview at the link) for dropTargets and dragSources types. If not set explicitly, a default value is applied by react-sortable-tree for you for its internal use. **NOTE:** Must be explicitly set and the same value used in order for correct functioning of external nodes | +| shouldCopyOnOutsideDrop | func or bool | Return true, or a callback returning true, and dropping nodes to react-dnd drop targets outside of the tree will not remove them from the tree. Defaults to `false`.
`({ node: object, prevPath: number[] or string[], prevTreeIndex: number, }): bool`
| +| reactVirtualizedListProps | object | Custom properties to hand to the [react-sortable-tree list](https://github.com/bvaughn/react-sortable-tree/blob/master/docs/List.md#prop-types) | +| style | object | Style applied to the container wrapping the tree (style defaults to `{height: '100%'}`) | +| innerStyle | object | Style applied to the inner, scrollable container (for padding, etc.) | +| className | string | Class name for the container wrapping the tree | +| rowHeight | number or func | Used by react-sortable-tree. Defaults to `62`. Either a fixed row height (number) or a function that returns the height of a row given its index: `({ treeIndex: number, node: object, path: number[] or string[] }): number` | +| slideRegionSize | number | Size in px of the region near the edges that initiates scrolling on dragover. Defaults to `100`. | +| scaffoldBlockPxWidth | number | The width of the blocks containing the lines representing the structure of the tree. Defaults to `44`. | +| isVirtualized | bool | Set to false to disable virtualization. Defaults to `true`. **NOTE**: Auto-scrolling while dragging, and scrolling to the `searchFocusOffset` will be disabled. | | nodeContentRenderer | any | Override the default component ([`NodeRendererDefault`](https://github.com/frontend-collective/react-sortable-tree/blob/master/src/node-renderer-default.js)) for rendering nodes (but keep the scaffolding generator). This is a last resort for customization - most custom styling should be able to be solved with `generateNodeProps`, a `theme` or CSS rules. If you must use it, is best to copy the component in `node-renderer-default.js` to use as a base, and customize as needed. | | placeholderRenderer | any | Override the default placeholder component ([`PlaceholderRendererDefault`](https://github.com/frontend-collective/react-sortable-tree/blob/master/src/placeholder-renderer-default.js)) which is displayed when the tree is empty. This is an advanced option, and in most cases should probably be solved with a `theme` or custom CSS instead. | @@ -82,13 +112,13 @@ Check out the helper functions exported from [`tree-data-utils.js`](https://gith Notable among the available functions: -* **`getTreeFromFlatData`**: Convert flat data (like that from a database) into nested tree data -* **`getFlatDataFromTree`**: Convert tree data back to flat data -* **`addNodeUnderParent`**: Add a node under the parent node at the given path -* **`removeNode`**: For a given path, get the node at that path and the treeData with that node removed. -* **`changeNodeAtPath`**: Modify the node object at the given path -* **`map`**: Perform a change on every node in the tree -* **`walk`**: Visit every node in the tree in order +- **`getTreeFromFlatData`**: Convert flat data (like that from a database) into nested tree data +- **`getFlatDataFromTree`**: Convert tree data back to flat data +- **`addNodeUnderParent`**: Add a node under the parent node at the given path +- **`removeNode`**: For a given path, get the node at that path and the treeData with that node removed. +- **`changeNodeAtPath`**: Modify the node object at the given path +- **`map`**: Perform a change on every node in the tree +- **`walk`**: Visit every node in the tree in order Documentation for each method is only available in the code at this time. You can also refer to the tests for simple usage examples. If your hobbies happen to include writing documentation, by all means submit a pull request. It would really help out. @@ -99,12 +129,13 @@ Using the `theme` prop along with an imported theme module, you can easily overr ### Featured themes -| ![File Explorer Theme](https://user-images.githubusercontent.com/4413963/32144502-1df1ae08-bcfd-11e7-8f63-8b836dace1a4.png) | Full Node Drag Theme | MINIMAL THEME | -| :----------------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------------------------------------------------------------------------: | -| **File Explorer** | **Full Node Drag** | **Minimalistic theme inspired from MATERIAL UI** | -| react-sortable-tree-theme-file-explorer | react-sortable-tree-theme-full-node-drag | react-sortable-tree-theme-minimal | +| ![File Explorer Theme](https://user-images.githubusercontent.com/4413963/32144502-1df1ae08-bcfd-11e7-8f63-8b836dace1a4.png) | Full Node Drag Theme | MINIMAL THEME | +| :-------------------------------------------------------------------------------------------------------------------------: | :----------------------------------------------------------------------------------------------------------------------------------------------------: | :------------------------------------------------------------------------------------------------------------------------------------------------: | +| **File Explorer** | **Full Node Drag** | **Minimalistic theme inspired from MATERIAL UI** | +| react-sortable-tree-theme-file-explorer | react-sortable-tree-theme-full-node-drag | react-sortable-tree-theme-minimal | + | [Github](https://github.com/ -/react-sortable-tree-theme-file-explorer) \| [NPM](https://www.npmjs.com/package/react-sortable-tree-theme-file-explorer) | [Github](https://github.com/frontend-collective/react-sortable-tree-theme-full-node-drag) \| [NPM](https://www.npmjs.com/package/react-sortable-tree-theme-full-node-drag) | [Github](https://github.com/lifejuggler/react-sortable-tree-theme-minimal) \| [NPM](https://www.npmjs.com/package/react-sortable-tree-theme-minimal) | +/react-sortable-tree-theme-file-explorer) \| [NPM](https://www.npmjs.com/package/react-sortable-tree-theme-file-explorer) | [Github](https://github.com/frontend-collective/react-sortable-tree-theme-full-node-drag) \| [NPM](https://www.npmjs.com/package/react-sortable-tree-theme-full-node-drag) | [Github](https://github.com/lifejuggler/react-sortable-tree-theme-minimal) \| [NPM](https://www.npmjs.com/package/react-sortable-tree-theme-minimal) | **Help Wanted** - As the themes feature has just been enabled, there are very few (only _two_ at the time of this writing) theme modules available. If you've customized the appearance of your tree to be especially cool or easy to use, I would be happy to feature it in this readme with a link to the Github repo and NPM page if you convert it to a theme. You can use my [file explorer theme repo](https://github.com/frontend-collective/react-sortable-tree-theme-file-explorer) as a template to plug in your own stuff. From 44bd0bd88362e4708132c30ccbe97c94d648f543 Mon Sep 17 00:00:00 2001 From: Wei-Wei Wu Date: Wed, 6 Jun 2018 00:22:13 -0700 Subject: [PATCH 7/9] rollup build WOOOO --- package.json | 20 ++--- rollup.config.js | 16 +++- webpack.config.js | 118 ++++++-------------------- yarn.lock | 207 ++++++++++++++++++++++++++++++++++++++++++---- 4 files changed, 239 insertions(+), 122 deletions(-) diff --git a/package.json b/package.json index c4191228..216e7076 100644 --- a/package.json +++ b/package.json @@ -4,16 +4,16 @@ "description": "Drag-and-drop sortable component for nested data and hierarchies", "scripts": { "prebuild": "npm run lint", - "build": "npm run build:commonjs && npm run build:es && npm run build:demo && npm run build:umd", - "build:umd": "npm run clean:umd && cross-env NODE_ENV=production TARGET=umd webpack --bail", + "build": "npm run build:commonjs && npm run build:es && npm run build:umd && npm run build:demo", + "build:umd": "npm run clean:umd && cross-env NODE_ENV=rollup rollup -c", "build:es": "npm run clean:es && cross-env NODE_ENV=es babel src --out-dir dist/es", "build:commonjs": "npm run clean:commonjs && cross-env NODE_ENV=commonjs babel src --out-dir dist/commonjs", - "build:demo": "npm run clean:demo && cross-env NODE_ENV=production TARGET=demo webpack --bail && npm run build-storybook", + "build:demo": "npm run clean:demo && cross-env NODE_ENV=production webpack --bail && npm run build-storybook", "clean:demo": "rimraf build", "clean:commonjs": "rimraf dist/commonjs", "clean:es": "rimraf dist/es", "clean:umd": "rimraf dist/umd", - "start": "cross-env NODE_ENV=development TARGET=development webpack-dev-server --inline --hot", + "start": "cross-env NODE_ENV=development webpack-dev-server --hot", "lint": "eslint src examples", "prettier": "prettier --single-quote --trailing-comma es5 --write \"{src,examples}/**/*.{js,css,md}\"", "prepublishOnly": "npm run lint && npm run test && npm run build", @@ -21,8 +21,8 @@ "test": "cross-env NODE_ENV=test jest", "test:watch": "cross-env NODE_ENV=test jest --watchAll", "deploy": "npm run build:demo && gh-pages -d build", - "storybook": "cross-env TARGET=development start-storybook -p ${PORT:-3001} -h 0.0.0.0", - "build-storybook": "cross-env NODE_ENV=production build-storybook -o build/storybook" + "storybook": "start-storybook -p ${PORT:-3001} -h 0.0.0.0", + "build-storybook": "build-storybook -o build/storybook" }, "main": "dist/commonjs/index.js", "module": "dist/es/index.js", @@ -34,8 +34,7 @@ }, "files": [ "dist", - "style.css", - "style.css.map" + "style.css" ], "repository": { "type": "git", @@ -127,7 +126,7 @@ "react-dnd-test-backend": "3.0.2", "react-dnd-touch-backend": "0.4.0", "react-dom": "^16.4.0", - "react-hot-loader": "^4.2.0", + "react-hot-loader": "^4.3.0", "react-sortable-tree-theme-file-explorer": "^1.1.2", "react-test-renderer": "^16.4.0", "rimraf": "^2.6.2", @@ -135,7 +134,8 @@ "rollup-plugin-babel": "^3.0.4", "rollup-plugin-commonjs": "^9.1.3", "rollup-plugin-node-resolve": "^3.3.0", - "rollup-plugin-uglify": "^3.0.0", + "rollup-plugin-postcss": "^1.6.2", + "rollup-plugin-uglify": "^4.0.0", "standard-version": "^4.4.0", "style-loader": "^0.21.0", "webpack": "^4.10.2", diff --git a/rollup.config.js b/rollup.config.js index d24fffe7..30e9b418 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -1,11 +1,13 @@ import nodeResolve from 'rollup-plugin-node-resolve'; import commonjs from 'rollup-plugin-commonjs'; import babel from 'rollup-plugin-babel'; -import uglify from 'rollup-plugin-uglify'; +import postcss from 'rollup-plugin-postcss'; +import { uglify } from 'rollup-plugin-uglify'; export default { input: './src/index.js', output: { + exports: 'named', file: 'dist/umd/react-sortable-tree.js', format: 'umd', name: 'ReactSortableTree', @@ -14,9 +16,19 @@ export default { 'react-dom': 'ReactDOM', }, }, - external: ['react', 'react-dom'], + external: [ + 'react', + 'react-dom', + 'react-dnd', + 'prop-types', + 'react-dnd-html5-backend', + 'react-dnd-scrollzone', + 'react-virtualized', + 'lodash.isequal', + ], plugins: [ nodeResolve(), + postcss({ extract: './style.css' }), commonjs({ include: 'node_modules/**', }), diff --git a/webpack.config.js b/webpack.config.js index 407784ef..e7863f45 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -1,12 +1,9 @@ const path = require('path'); const webpack = require('webpack'); const autoprefixer = require('autoprefixer'); -const nodeExternals = require('webpack-node-externals'); const HtmlWebpackPlugin = require('html-webpack-plugin'); -const UglifyJSPlugin = require('uglifyjs-webpack-plugin'); -const ExtractTextPlugin = require('extract-text-webpack-plugin'); -const target = process.env.TARGET || 'umd'; +const env = process.env.NODE_ENV; const styleLoader = { loader: 'style-loader', @@ -32,31 +29,15 @@ const cssLoader = { }, }; -const defaultCssLoaders = [cssLoader, postcssLoader]; - -const cssLoaders = - target !== 'development' && target !== 'demo' - ? ExtractTextPlugin.extract({ - fallback: styleLoader, - use: defaultCssLoaders, - }) - : [styleLoader, ...defaultCssLoaders]; +const cssLoaders = [styleLoader, cssLoader, postcssLoader]; const config = { - mode: 'production', - entry: { 'dist/umd/react-sortable-tree': './src/index' }, + devtool: 'source-map', + entry: './examples/basic-example/index', output: { - path: __dirname, - filename: '[name].js', - libraryTarget: 'umd', - library: 'ReactSortableTree', + path: path.join(__dirname, 'build'), + filename: 'static/[name].js', }, - devtool: 'source-map', - plugins: [ - new webpack.EnvironmentPlugin({ NODE_ENV: 'production' }), - new webpack.optimize.OccurrenceOrderPlugin(), - new ExtractTextPlugin('style.css'), - ], module: { rules: [ { @@ -67,67 +48,30 @@ const config = { { test: /\.css$/, use: cssLoaders, - exclude: [path.join(__dirname, 'examples')], }, { - test: /\.css$/, - use: [styleLoader, ...defaultCssLoaders], - include: path.join(__dirname, 'examples'), + test: /\.(jpe?g|png|gif|ico|svg)$/, + use: [fileLoader], + exclude: path.join(__dirname, 'node_modules'), }, ], }, + plugins: [ + new HtmlWebpackPlugin({ + inject: true, + template: './examples/basic-example/index.html', + }), + ], }; -switch (target) { - case 'umd': - // Exclude library dependencies from the bundle - config.externals = [ - nodeExternals({ - // load non-javascript files with extensions, presumably via loaders - whitelist: [/\.(?!(?:jsx?|json)$).{1,5}$/i], - }), - ]; - - // Keep the minimizer from mangling variable names - // (we keep minimization enabled to remove dead code) - config.optimization = { - minimizer: [ - new UglifyJSPlugin({ - uglifyOptions: { - mangle: false, - compress: { - warnings: false, - }, - output: { - beautify: true, - comments: true, - }, - }, - }), - ], - }; - break; +switch (env) { case 'development': config.mode = 'development'; config.devtool = 'eval-source-map'; - config.module.rules.push({ - test: /\.(jpe?g|png|gif|ico|svg)$/, - use: [fileLoader], - exclude: path.join(__dirname, 'node_modules'), - }); - config.entry = ['react-hot-loader/patch', './examples/basic-example/index']; - config.output = { - path: path.join(__dirname, 'build'), - filename: 'static/[name].js', - }; - config.plugins = [ - new HtmlWebpackPlugin({ - inject: true, - template: './examples/basic-example/index.html', - }), + config.plugins.push( new webpack.EnvironmentPlugin({ NODE_ENV: 'development' }), - new webpack.NoEmitOnErrorsPlugin(), - ]; + new webpack.NoEmitOnErrorsPlugin() + ); config.devServer = { contentBase: path.join(__dirname, 'build'), port: process.env.PORT || 3001, @@ -135,25 +79,11 @@ switch (target) { }; break; - case 'demo': - config.module.rules.push({ - test: /\.(jpe?g|png|gif|ico|svg)$/, - use: [fileLoader], - exclude: path.join(__dirname, 'node_modules'), - }); - config.entry = './examples/basic-example/index'; - config.output = { - path: path.join(__dirname, 'build'), - filename: 'static/[name].js', - }; - config.plugins = [ - new HtmlWebpackPlugin({ - inject: true, - template: './examples/basic-example/index.html', - }), - new webpack.EnvironmentPlugin({ NODE_ENV: 'production' }), - ]; - + case 'production': + config.mode = 'production'; + config.plugins.push( + new webpack.EnvironmentPlugin({ NODE_ENV: 'production' }) + ); break; default: } diff --git a/yarn.lock b/yarn.lock index 3ca7b422..ff2eecdd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20,6 +20,12 @@ dependencies: "@babel/highlight" "7.0.0-beta.47" +"@babel/code-frame@^7.0.0-beta.47": + version "7.0.0-beta.49" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.49.tgz#becd805482734440c9d137e46d77340e64d7f51b" + dependencies: + "@babel/highlight" "7.0.0-beta.49" + "@babel/generator@7.0.0-beta.44": version "7.0.0-beta.44" resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.0.0-beta.44.tgz#c7e67b9b5284afcf69b309b50d7d37f3e5033d42" @@ -74,6 +80,14 @@ esutils "^2.0.2" js-tokens "^3.0.0" +"@babel/highlight@7.0.0-beta.49": + version "7.0.0-beta.49" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.49.tgz#96bdc6b43e13482012ba6691b1018492d39622cc" + dependencies: + chalk "^2.0.0" + esutils "^2.0.2" + js-tokens "^3.0.0" + "@babel/template@7.0.0-beta.44": version "7.0.0-beta.44" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.0.0-beta.44.tgz#f8832f4fdcee5d59bf515e595fc5106c529b394f" @@ -380,6 +394,20 @@ dependencies: redux "*" +"@vue/component-compiler-utils@^1.0.0": + version "1.3.1" + resolved "https://registry.yarnpkg.com/@vue/component-compiler-utils/-/component-compiler-utils-1.3.1.tgz#686f0b913d59590ae327b2a1cb4b6d9b931bbe0e" + dependencies: + consolidate "^0.15.1" + hash-sum "^1.0.2" + lru-cache "^4.1.2" + merge-source-map "^1.1.0" + postcss "^6.0.20" + postcss-selector-parser "^3.1.1" + prettier "^1.13.0" + source-map "^0.5.6" + vue-template-es2015-compiler "^1.6.0" + "@webassemblyjs/ast@1.4.3": version "1.4.3" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.4.3.tgz#3b3f6fced944d8660273347533e6d4d315b5934a" @@ -2119,7 +2147,7 @@ bl@^1.0.0: readable-stream "^2.3.5" safe-buffer "^5.1.1" -bluebird@^3.5.0, bluebird@^3.5.1: +bluebird@^3.1.1, bluebird@^3.5.0, bluebird@^3.5.1: version "3.5.1" resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9" @@ -2937,6 +2965,12 @@ concat-stream@^1.4.10, concat-stream@^1.5.0, concat-stream@^1.6.0: readable-stream "^2.2.2" typedarray "^0.0.6" +concat-with-sourcemaps@^1.0.5: + version "1.1.0" + resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.1.0.tgz#d4ea93f05ae25790951b99e7b3b09e3908a4082e" + dependencies: + source-map "^0.6.1" + configstore@^3.0.0: version "3.1.2" resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" @@ -2962,6 +2996,12 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" +consolidate@^0.15.1: + version "0.15.1" + resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7" + dependencies: + bluebird "^3.1.1" + constants-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75" @@ -3305,6 +3345,17 @@ css-loader@^0.28.11: postcss-value-parser "^3.3.0" source-list-map "^2.0.0" +css-modules-loader-core@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/css-modules-loader-core/-/css-modules-loader-core-1.1.0.tgz#5908668294a1becd261ae0a4ce21b0b551f21d16" + dependencies: + icss-replace-symbols "1.1.0" + postcss "6.0.1" + postcss-modules-extract-imports "1.1.0" + postcss-modules-local-by-default "1.2.0" + postcss-modules-scope "1.1.0" + postcss-modules-values "1.3.0" + css-select@^1.1.0, css-select@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/css-select/-/css-select-1.2.0.tgz#2b3a110539c5355f1cd8d314623e870b121ec858" @@ -3780,7 +3831,7 @@ dot-prop@^3.0.0: dependencies: is-obj "^1.0.0" -dot-prop@^4.1.0: +dot-prop@^4.1.0, dot-prop@^4.1.1: version "4.2.0" resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" dependencies: @@ -4748,6 +4799,14 @@ fs-extra@^4.0.2: jsonfile "^4.0.0" universalify "^0.1.0" +fs-extra@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-minipass@^1.2.5: version "1.2.5" resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" @@ -4811,6 +4870,12 @@ gauge@~2.7.3: strip-ansi "^3.0.1" wide-align "^1.1.0" +generic-names@^1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/generic-names/-/generic-names-1.0.3.tgz#2d786a121aee508876796939e8e3bff836c20917" + dependencies: + loader-utils "^0.2.16" + genfun@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/genfun/-/genfun-4.0.1.tgz#ed10041f2e4a7f1b0a38466d17a5c3e27df1dfc1" @@ -5265,6 +5330,10 @@ hash-base@^3.0.0: inherits "^2.0.1" safe-buffer "^5.0.1" +hash-sum@^1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/hash-sum/-/hash-sum-1.0.2.tgz#33b40777754c6432573c120cc3808bbd10d47f04" + hash.js@^1.0.0, hash.js@^1.0.3: version "1.1.3" resolved "https://registry.yarnpkg.com/hash.js/-/hash.js-1.1.3.tgz#340dedbe6290187151c1ea1d777a3448935df846" @@ -5481,7 +5550,7 @@ iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@~0.4.13: dependencies: safer-buffer ">= 2.1.2 < 3" -icss-replace-symbols@^1.1.0: +icss-replace-symbols@1.1.0, icss-replace-symbols@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" @@ -5517,6 +5586,18 @@ immutable@^3.8.1: version "3.8.2" resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3" +import-cwd@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-cwd/-/import-cwd-2.1.0.tgz#aa6cf36e722761285cb371ec6519f53e2435b0a9" + dependencies: + import-from "^2.1.0" + +import-from@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1" + dependencies: + resolve-from "^3.0.0" + import-lazy@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43" @@ -7031,7 +7112,7 @@ lowercase-keys@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f" -lru-cache@^4.0.1, lru-cache@^4.1.1: +lru-cache@^4.0.1, lru-cache@^4.1.1, lru-cache@^4.1.2: version "4.1.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c" dependencies: @@ -7191,6 +7272,12 @@ merge-descriptors@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61" +merge-source-map@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/merge-source-map/-/merge-source-map-1.1.0.tgz#2fdde7e6020939f70906a68f2d7ae685e4c8c646" + dependencies: + source-map "^0.6.1" + merge-stream@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1" @@ -7940,6 +8027,10 @@ p-map@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b" +p-queue@^2.4.2: + version "2.4.2" + resolved "https://registry.yarnpkg.com/p-queue/-/p-queue-2.4.2.tgz#03609826682b743be9a22dba25051bd46724fc34" + p-reduce@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa" @@ -8388,33 +8479,48 @@ postcss-minify-selectors@^2.0.4: postcss "^5.0.14" postcss-selector-parser "^2.0.0" +postcss-modules-extract-imports@1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.1.0.tgz#b614c9720be6816eaee35fb3a5faa1dba6a05ddb" + dependencies: + postcss "^6.0.1" + postcss-modules-extract-imports@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85" dependencies: postcss "^6.0.1" -postcss-modules-local-by-default@^1.2.0: +postcss-modules-local-by-default@1.2.0, postcss-modules-local-by-default@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069" dependencies: css-selector-tokenizer "^0.7.0" postcss "^6.0.1" -postcss-modules-scope@^1.1.0: +postcss-modules-scope@1.1.0, postcss-modules-scope@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90" dependencies: css-selector-tokenizer "^0.7.0" postcss "^6.0.1" -postcss-modules-values@^1.3.0: +postcss-modules-values@1.3.0, postcss-modules-values@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20" dependencies: icss-replace-symbols "^1.1.0" postcss "^6.0.1" +postcss-modules@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/postcss-modules/-/postcss-modules-1.1.0.tgz#c9f94f76ff6addf7c35b842e69ed442118156bb0" + dependencies: + css-modules-loader-core "^1.1.0" + generic-names "^1.0.2" + postcss "^6.0.1" + string-hash "^1.1.1" + postcss-normalize-charset@^1.1.0: version "1.1.1" resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1" @@ -8466,6 +8572,14 @@ postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2: indexes-of "^1.0.1" uniq "^1.0.1" +postcss-selector-parser@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865" + dependencies: + dot-prop "^4.1.1" + indexes-of "^1.0.1" + uniq "^1.0.1" + postcss-svgo@^2.1.1: version "2.1.6" resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d" @@ -8495,6 +8609,14 @@ postcss-zindex@^2.0.1: postcss "^5.0.4" uniqs "^2.0.0" +postcss@6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.1.tgz#000dbd1f8eef217aa368b9a212c5fc40b2a8f3f2" + dependencies: + chalk "^1.1.3" + source-map "^0.5.6" + supports-color "^3.2.3" + postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.6, postcss@^5.0.8, postcss@^5.2.16: version "5.2.18" resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5" @@ -8504,7 +8626,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0 source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.22: +postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.20, postcss@^6.0.21, postcss@^6.0.22: version "6.0.22" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.22.tgz#e23b78314905c3b90cbd61702121e7a78848f2a3" dependencies: @@ -8532,6 +8654,10 @@ prettier@^1.12.1: version "1.12.1" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.12.1.tgz#c1ad20e803e7749faf905a409d2367e06bbe7325" +prettier@^1.13.0: + version "1.13.4" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.4.tgz#31bbae6990f13b1093187c731766a14036fa72e6" + prettier@^1.13.3: version "1.13.3" resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.3.tgz#e74c09a7df6519d472ca6febaa37cf7addb48a20" @@ -8600,6 +8726,10 @@ promise.prototype.finally@^3.1.0: es-abstract "^1.9.0" function-bind "^1.1.1" +promise.series@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/promise.series/-/promise.series-0.2.0.tgz#2cc7ebe959fc3a6619c04ab4dbdc9e452d864bbd" + promise@^7.1.1: version "7.3.1" resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf" @@ -8930,9 +9060,9 @@ react-fuzzy@^0.5.2: fuse.js "^3.0.1" prop-types "^15.5.9" -react-hot-loader@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.2.0.tgz#4a2ec79114f872e28ea786e04889d643ad3dfb7c" +react-hot-loader@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/react-hot-loader/-/react-hot-loader-4.3.0.tgz#3d417797acd6f78bd0291ee225828f5dd78a3829" dependencies: fast-levenshtein "^2.0.6" global "^4.3.0" @@ -9441,6 +9571,10 @@ requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" +reserved-words@^0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/reserved-words/-/reserved-words-0.1.2.tgz#00a0940f98cd501aeaaac316411d9adc52b31ab1" + resolve-cwd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-2.0.0.tgz#00a9f7387556e27038eae232caa372a6a59b665a" @@ -9557,11 +9691,33 @@ rollup-plugin-node-resolve@^3.3.0: is-module "^1.0.0" resolve "^1.1.6" -rollup-plugin-uglify@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-uglify/-/rollup-plugin-uglify-3.0.0.tgz#a34eca24617709c6bf1778e9653baafa06099b86" +rollup-plugin-postcss@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/rollup-plugin-postcss/-/rollup-plugin-postcss-1.6.2.tgz#f3422a56dab21bcb2e9b7182763733d4ff2c1b4c" + dependencies: + "@vue/component-compiler-utils" "^1.0.0" + chalk "^2.0.0" + concat-with-sourcemaps "^1.0.5" + cssnano "^3.10.0" + fs-extra "^5.0.0" + import-cwd "^2.1.0" + p-queue "^2.4.2" + pify "^3.0.0" + postcss "^6.0.21" + postcss-load-config "^1.2.0" + postcss-modules "^1.1.0" + promise.series "^0.2.0" + reserved-words "^0.1.2" + resolve "^1.5.0" + rollup-pluginutils "^2.0.1" + style-inject "^0.3.0" + +rollup-plugin-uglify@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-uglify/-/rollup-plugin-uglify-4.0.0.tgz#6eb471738f1ce9ba7d9d4bc43b71cba02417c8fb" dependencies: - uglify-es "^3.3.7" + "@babel/code-frame" "^7.0.0-beta.47" + uglify-js "^3.3.25" rollup-pluginutils@^1.5.0: version "1.5.2" @@ -10143,6 +10299,10 @@ strict-uri-encode@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713" +string-hash@^1.1.1: + version "1.1.3" + resolved "https://registry.yarnpkg.com/string-hash/-/string-hash-1.1.3.tgz#e8aafc0ac1855b4666929ed7dd1275df5d6c811b" + string-length@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/string-length/-/string-length-2.0.0.tgz#d40dbb686a3ace960c1cffca562bf2c45f8363ed" @@ -10246,6 +10406,10 @@ strip-json-comments@~2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a" +style-inject@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/style-inject/-/style-inject-0.3.0.tgz#d21c477affec91811cc82355832a700d22bf8dd3" + style-loader@^0.21.0: version "0.21.0" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852" @@ -10535,7 +10699,7 @@ ua-parser-js@^0.7.9: version "0.7.18" resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed" -uglify-es@^3.3.4, uglify-es@^3.3.7: +uglify-es@^3.3.4: version "3.3.9" resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677" dependencies: @@ -10558,6 +10722,13 @@ uglify-js@^2.6: optionalDependencies: uglify-to-browserify "~1.0.0" +uglify-js@^3.3.25: + version "3.4.0" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.0.tgz#796762282b5b5f0eafe7d5c8c708d1d7bd5ba11d" + dependencies: + commander "~2.15.0" + source-map "~0.6.1" + uglify-to-browserify@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" @@ -10861,6 +11032,10 @@ vm-browserify@0.0.4: dependencies: indexof "0.0.1" +vue-template-es2015-compiler@^1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz#dc42697133302ce3017524356a6c61b7b69b4a18" + w3c-hr-time@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045" From 1173310cf96b9717e5bc80cf64c7d0de290b0b3c Mon Sep 17 00:00:00 2001 From: Wei-Wei Wu Date: Wed, 6 Jun 2018 00:22:26 -0700 Subject: [PATCH 8/9] updated hot module reloading --- .babelrc.js | 1 + examples/basic-example/app.js | 3 ++- examples/basic-example/index.js | 20 ++++---------------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/.babelrc.js b/.babelrc.js index 5c6cc067..6d4b36cc 100755 --- a/.babelrc.js +++ b/.babelrc.js @@ -23,6 +23,7 @@ if (env === 'rollup') { if (env === 'development') { module.exports = { presets: ['react', 'stage-2'], + plugins: ['react-hot-loader/babel'], }; } diff --git a/examples/basic-example/app.js b/examples/basic-example/app.js index 2241e198..912c2a9f 100644 --- a/examples/basic-example/app.js +++ b/examples/basic-example/app.js @@ -1,4 +1,5 @@ import React, { Component } from 'react'; +import { hot } from 'react-hot-loader'; // eslint-disable-line import/no-extraneous-dependencies import { SortableTreeWithoutDndContext as SortableTree, toggleExpandedForAll, @@ -351,4 +352,4 @@ class App extends Component { } } -export default App; +export default hot(module)(App); diff --git a/examples/basic-example/index.js b/examples/basic-example/index.js index cb6c097a..276ae885 100644 --- a/examples/basic-example/index.js +++ b/examples/basic-example/index.js @@ -1,23 +1,11 @@ import React from 'react'; import ReactDOM from 'react-dom'; -import { AppContainer } from 'react-hot-loader'; // eslint-disable-line import/no-extraneous-dependencies import { DragDropContext as dragDropContext } from 'react-dnd'; import HTML5Backend from 'react-dnd-html5-backend'; +import App from './app'; const rootEl = document.getElementById('app'); -const render = Component => { - const wrap = dragDropContext(HTML5Backend); - const Wrapped = wrap(Component); - ReactDOM.render( - - - , - rootEl - ); -}; +const wrap = dragDropContext(HTML5Backend); +const Wrapped = wrap(App); -/* eslint-disable global-require, import/newline-after-import */ -render(require('./app').default); -if (module.hot) - module.hot.accept('./app', () => render(require('./app').default)); -/* eslint-enable global-require, import/newline-after-import */ +ReactDOM.render(, rootEl); From 4edf51cce4100ae56cd199457e8f98195bda9725 Mon Sep 17 00:00:00 2001 From: Wei-Wei Wu Date: Wed, 6 Jun 2018 00:32:49 -0700 Subject: [PATCH 9/9] make readme better --- README.md | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index cd107caf..6813af38 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ -# React Sortable Tree +
+ +
-[![tree200](https://cloud.githubusercontent.com/assets/4413963/18860410/26f64de8-84b8-11e6-9284-350308eed30a.png)](https://frontend-collective.github.io/react-sortable-tree/) +# React Sortable Tree ![NPM version](https://img.shields.io/npm/v/react-sortable-tree.svg?style=flat) ![NPM license](https://img.shields.io/npm/l/react-sortable-tree.svg?style=flat) @@ -9,9 +11,11 @@ [![Build Status](https://travis-ci.org/frontend-collective/react-sortable-tree.svg?branch=master)](https://travis-ci.org/frontend-collective/react-sortable-tree) [![Coverage Status](https://coveralls.io/repos/github/frontend-collective/react-sortable-tree/badge.svg?branch=master)](https://coveralls.io/github/frontend-collective/react-sortable-tree?branch=master) -A React component for Drag-and-drop sortable representation of hierarchical data. Checkout [the demo](https://frontend-collective.github.io/react-sortable-tree/) for some examples. Checkout [the storybook](https://frontend-collective.github.io/react-sortable-tree/storybook/index.html) for advanced usage. Play with the code on an [example on CodeSandbox](https://codesandbox.io/s/wkxvy3z15w). +> A React component for Drag-and-drop sortable representation of hierarchical data. Checkout [the demo](https://frontend-collective.github.io/react-sortable-tree/) for some examples. Checkout the [storybook](https://frontend-collective.github.io/react-sortable-tree/storybook/index.html) for advanced usage. Play with the code on [CodeSandbox.io](https://codesandbox.io/s/wkxvy3z15w). -[![demo](https://cloud.githubusercontent.com/assets/4413963/19334888/2be8261c-913a-11e6-9508-4b347ae114b4.gif)](https://frontend-collective.github.io/react-sortable-tree/) +
+ +
## Getting started @@ -33,6 +37,12 @@ import SortableTree from 'react-sortable-tree'; // Or you can import the tree without the dnd context as a named export. eg import { SortableTreeWithoutDndContext as SortableTree } from 'react-sortable-tree'; + +// Importing from commonjs (default) +import SortableTree from 'react-sortable-tree/dist/commonjs'; + +// Importing from es +import SortableTree from 'react-sortable-tree/dist/es'; ``` You can also use a global-friendly UMD build: