diff --git a/package.json b/package.json index 6e7b678..e1a9c4f 100644 --- a/package.json +++ b/package.json @@ -10,9 +10,9 @@ "scripts": { "build": "yarn build:js && yarn build:scss", "build:examples": "webpack --color --progress", - "build:js": "rollup -c", "build:scss": "yarn run task:scss & yarn run task:autoprefix", - "build:watch": "rollup -c -w", + "build:js:watch": "tsc --outDir lib/ -w", + "build:js": "tsc --outDir lib/", "precommit": "pretty-quick --staged", "publish:examples": "NODE_ENV=production yarn build:examples && gh-pages -d examples/dist -r $GITHUB_REPO_URL", @@ -25,11 +25,9 @@ "test": "echo" }, "dependencies": { - "array-from": "^2.1.1", "babel-runtime": "^6.26.0", "classnames": "^2.2.5", "dot-prop-immutable": "^1.4.0", - "es6-set": "^0.1.5", "rc-tooltip": "^3.7.0" }, "devDependencies": { @@ -60,15 +58,12 @@ "react-codemirror2": "^4.0.0", "react-dom": "^16.2.0", "react-select": "^1.1.0", - "rollup": "^0.52.0", - "rollup-plugin-postcss": "^0.5.5", - "rollup-plugin-typescript2": "^0.8.4", "sass-loader": "^6.0.6", "style-loader": "^0.19.0", "ts-loader": "^3.2.0", "tslint": "^5.8.0", "tslint-eslint-rules": "^4.1.1", - "typescript": "^2.6.2", + "typescript": "^2.9.1", "webpack": "^3.9.1", "webpack-dev-server": "^2.9.5" }, diff --git a/rollup.config.js b/rollup.config.js deleted file mode 100644 index 7699637..0000000 --- a/rollup.config.js +++ /dev/null @@ -1,44 +0,0 @@ -import typescript from 'rollup-plugin-typescript2' - -const external = ['react', 'classnames', 'rc-tooltip', 'dot-prop-immutable'] - -export default [ - { - input: './src/index.tsx', - output: { - file: './es/index.js', - format: 'es', - }, - external, - plugins: [ - typescript({ - typescript: require('typescript'), - tsconfigOverride: { - compilerOptions: { - target: 'es2015', - }, - }, - }), - ], - }, - { - input: './src/index.tsx', - output: { - file: './lib/index.js', - format: 'cjs', - name: 'index.js', - }, - external, - plugins: [ - typescript({ - typescript: require('typescript'), - tsconfigOverride: { - compilerOptions: { - target: 'es5', - lib: ['es6', 'dom'], - }, - }, - }), - ], - }, -] diff --git a/src/utils.ts b/src/utils.ts index 41ff363..716e21f 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -1,8 +1,6 @@ import { IReactFormConfig } from './types' const dot = require('dot-prop-immutable') -const set = require('es6-set') -const arrayFrom = require('array-from') const getNewState = ( callback: (val: any) => void, @@ -48,13 +46,13 @@ const getNewState = ( config.simpleValues && existingValue.split ? existingValue.split(config.separator || ',') : existingValue - const valuesSet = new set(existingValueArray) + const valuesSet = new Set(existingValueArray) if (valuesSet.has(value)) { valuesSet.delete(value) } else { valuesSet.add(value) } - const valueArray = arrayFrom(valuesSet) + const valueArray = [...valuesSet] return config.simpleValues ? valueArray.join(config.separator || ',') : valueArray diff --git a/yarn.lock b/yarn.lock index 02ada28..a086a6a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -226,10 +226,6 @@ array-flatten@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.1.tgz#426bb9da84090c1838d812c8150af20a8331e296" -array-from@^2.1.1: - version "2.1.1" - resolved "https://registry.npmjs.org/array-from/-/array-from-2.1.1.tgz#cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195" - array-includes@^3.0.3: version "3.0.3" resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.0.3.tgz#184b48f62d92d7452bb31b323165c7f8bd02266d" @@ -1152,12 +1148,6 @@ concat-stream@^1.6.0: readable-stream "^2.2.2" typedarray "^0.0.6" -concat-with-sourcemaps@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/concat-with-sourcemaps/-/concat-with-sourcemaps-1.0.4.tgz#f55b3be2aeb47601b10a2d5259ccfb70fd2f1dd6" - dependencies: - source-map "^0.5.1" - configstore@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.1.tgz#094ee662ab83fad9917678de114faaea8fcdca90" @@ -1768,7 +1758,7 @@ es6-promise@^3.3.1: version "3.3.1" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.3.1.tgz#a08cdde84ccdbf34d027a1451bc91d4bcd28a613" -es6-set@^0.1.5, es6-set@~0.1.5: +es6-set@~0.1.5: version "0.1.5" resolved "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1" dependencies: @@ -1892,10 +1882,6 @@ 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.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa" - esutils@^1.1.6: version "1.1.6" resolved "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz#c01ccaa9ae4b897c6d0c3e210ae52f3c7a844375" @@ -2215,14 +2201,6 @@ from@~0: version "0.1.7" resolved "https://registry.yarnpkg.com/from/-/from-0.1.7.tgz#83c60afc58b9c56997007ed1a768b3ab303a44fe" -fs-extra@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^3.0.0" - universalify "^0.1.0" - fs-extra@^4.0.1, fs-extra@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b" @@ -3108,12 +3086,6 @@ json5@^0.5.0, json5@^0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/json5/-/json5-0.5.1.tgz#1eade7acc012034ad84e2396767ead9fa5495821" -jsonfile@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" - optionalDependencies: - graceful-fs "^4.1.6" - jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -4908,10 +4880,6 @@ requires-port@1.0.x, requires-port@1.x.x, 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.1: - 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" @@ -4926,7 +4894,7 @@ resolve-from@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" -resolve@^1.3.2, resolve@^1.5.0: +resolve@^1.3.2: version "1.5.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36" dependencies: @@ -4958,38 +4926,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^2.0.0" inherits "^2.0.1" -rollup-plugin-postcss@^0.5.5: - version "0.5.5" - resolved "https://registry.yarnpkg.com/rollup-plugin-postcss/-/rollup-plugin-postcss-0.5.5.tgz#4ec4a52fd3259b94622805058174ffdfb497d407" - dependencies: - chalk "^1.1.3" - concat-with-sourcemaps "^1.0.4" - fs-extra "^3.0.1" - postcss "^6.0.1" - reserved-words "^0.1.1" - rollup-pluginutils "^2.0.1" - style-inject "^0.1.0" - -rollup-plugin-typescript2@^0.8.4: - version "0.8.4" - resolved "https://registry.yarnpkg.com/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.8.4.tgz#46b51cb15b4fb24a0b1c49e08f03253462c9b163" - dependencies: - fs-extra "^4.0.2" - resolve "^1.5.0" - rollup-pluginutils "^2.0.1" - tslib "^1.8.0" - -rollup-pluginutils@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0" - dependencies: - estree-walker "^0.3.0" - micromatch "^2.3.11" - -rollup@^0.52.0: - version "0.52.0" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.52.0.tgz#cdb6927f53bf7b7fb09af3a936b9c8ee49b161e2" - run-async@^2.2.0: version "2.3.0" resolved "https://registry.npmjs.org/run-async/-/run-async-2.3.0.tgz#0371ab4ae0bdd720d4166d7dfda64ff7a445a6c0" @@ -5221,7 +5157,7 @@ source-map-support@^0.4.15: dependencies: source-map "^0.5.6" -source-map@0.5.x, source-map@^0.5.1, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1: +source-map@0.5.x, source-map@^0.5.3, source-map@^0.5.6, source-map@~0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" @@ -5406,10 +5342,6 @@ 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.1.0: - version "0.1.2" - resolved "https://registry.yarnpkg.com/style-inject/-/style-inject-0.1.2.tgz#664127b65f40e5181a47e713b4c476002b7274ff" - style-loader@^0.19.0: version "0.19.0" resolved "https://registry.npmjs.org/style-loader/-/style-loader-0.19.0.tgz#7258e788f0fee6a42d710eaf7d6c2412a4c50759" @@ -5574,10 +5506,6 @@ tslib@^1.0.0, tslib@^1.7.1: version "1.8.1" resolved "https://registry.npmjs.org/tslib/-/tslib-1.8.1.tgz#6946af2d1d651a7b1863b531d6e5afa41aa44eac" -tslib@^1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.8.0.tgz#dc604ebad64bcbf696d613da6c954aa0e7ea1eb6" - tslint-eslint-rules@^4.1.1: version "4.1.1" resolved "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-4.1.1.tgz#7c30e7882f26bc276bff91d2384975c69daf88ba" @@ -5647,9 +5575,9 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -typescript@^2.6.2: - version "2.6.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.6.2.tgz#3c5b6fd7f6de0914269027f03c0946758f7673a4" +typescript@^2.9.1: + version "2.9.1" + resolved "https://registry.npmjs.org/typescript/-/typescript-2.9.1.tgz#fdb19d2c67a15d11995fd15640e373e09ab09961" ua-parser-js@^0.7.9: version "0.7.17"