diff --git a/.travis.yml b/.travis.yml index 8906f72e..b6efe5b8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,7 +22,6 @@ jobs: node_js: node script: - npm run build - - npm run postbuild - npx semantic-release env: - secure: qnh8WGy9H9unaWYWl6YdJcSDvcN7XaQ1hCxbxIGEaNttoRhBmBL+mwxIiChqMSJYa0M/m7nZFVafbfc6EcHEwUarWG2IGPNKscE36c1iEXtaEfau0OfFk+0fjO0K7MWuhkXHSl2g4IKoV587Bpikdark6JC89OHnJNOLG2a7QtYQQDIM9cVk+U3s1zhuDZ980iJ+4VqJMUy04c9bx6RuSHH6pL+pjxJ7Lg5RKgzfHzpYop+RDLI1la2yoEKip/AKwW2fewZOptSKYOLlxhAcDzZMiWmqswr6uPqEQcVSKB5kEk58j7st25bOAMRE2hdh4Baq5b0qBaQwpEXEKY/h37VGf7+kUe/NZay/bcoWPuoFUCzfpfAag6vFDsS4bqENN10nzALmU9gvVY/o7R66fFR+PDf4lBFz67o94zEtV+r0TWYaIrz9ZCqtmDJ4+vRN0wSUIgnw/oOj5NrCjdOW5Fi6SyJG3He9KtVpK4HAmKCUkuRVBoIlHSeJZjmjmY8Q2Koe4SZmXrahCNRbkBLaIQ+La6tttid1UBo2ZaJznFeueU8mEYabwcRh6PJ8Y8vD2O9YhfTgQ+mvC5DwkX4INpU0OGi7d0JMFsOwniDAAqR1/D/QVBqzTt/HWKXTLnPpOgdNh7pa07nrK50/T79UXymoaHqQvB96DgLvjHWNnVw= diff --git a/package.json b/package.json index d71d8c74..df3d9d21 100644 --- a/package.json +++ b/package.json @@ -6,9 +6,6 @@ "module": "es/styled-breakpoints.es.js", "scripts": { "build": "npx rollup -c", - "postbuild:cjs": "npx flow gen-flow-files src/index.js > lib/styled-breakpoints.cjs.js.flow", - "postbuild:es": "npx flow gen-flow-files src/index.js > es/styled-breakpoints.es.js.flow", - "postbuild": "npm run postbuild:cjs && npm run postbuild:es", "clean": "rimraf lib es", "commit": "git-cz", "coverage": "cat ./coverage/lcov.info | coveralls", @@ -31,11 +28,6 @@ "url": "https://github.com/mg901/styled-breakpoints/issues" }, "author": "Maxim Alyoshin (https://github.com/mg901)", - "contributors": [ - "Maxim Alyoshin (https://github.com/mg901)", - "Sergey Sova (https://sergeysova.com)", - "Abu Shamsutdinov (https://github.com/yakotika)" - ], "keywords": [ "media", "react", @@ -93,6 +85,7 @@ "rollup-plugin-babel": "4.3.0", "rollup-plugin-commonjs": "9.2.0", "rollup-plugin-flow": "1.1.1", + "rollup-plugin-flow-entry": "0.2.0", "rollup-plugin-node-resolve": "4.0.0", "rollup-plugin-replace": "2.1.0", "rollup-plugin-terser": "4.0.2", diff --git a/rollup.config.js b/rollup.config.js index 5f915208..2a943ea9 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -5,6 +5,7 @@ import { uglify } from 'rollup-plugin-uglify'; import babel from 'rollup-plugin-babel'; import { terser } from 'rollup-plugin-terser'; import replace from 'rollup-plugin-replace'; +import flowEntry from 'rollup-plugin-flow-entry'; import pkg from './package.json'; const configuredFlow = flow({ all: true, pretty: true }); @@ -23,7 +24,14 @@ export default [ ...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {}), ], - plugins: [configuredFlow, babel(), uglify(), resolve(), commonjs()], + plugins: [ + configuredFlow, + babel(), + uglify(), + resolve(), + commonjs(), + flowEntry(), + ], }, // ES @@ -39,7 +47,14 @@ export default [ ...Object.keys(pkg.dependencies || {}), ...Object.keys(pkg.peerDependencies || {}), ], - plugins: [configuredFlow, resolve(), babel(), terser(), commonjs()], + plugins: [ + configuredFlow, + resolve(), + babel(), + terser(), + commonjs(), + flowEntry(), + ], }, // ES for Browsers @@ -61,6 +76,7 @@ export default [ }), terser(), commonjs(), + flowEntry(), ], }, ]; diff --git a/src/media-queries.js b/src/media-queries.js index 884fad8c..381c0fdd 100644 --- a/src/media-queries.js +++ b/src/media-queries.js @@ -2,7 +2,6 @@ import { Right, Left } from 'igogo'; import { makeErrorMessage, getBreakNames, errorReport } from './helpers'; - import { type BreakpointsMap } from './models'; export const eitherGetBreakVal = (breaks: BreakpointsMap, breakVal: string) => diff --git a/yarn.lock b/yarn.lock index d0ee775d..00b896ef 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2561,6 +2561,13 @@ expand-tilde@^1.2.2: dependencies: os-homedir "^1.0.1" +expand-tilde@^2.0.0, expand-tilde@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502" + integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI= + dependencies: + homedir-polyfill "^1.0.1" + expect@^23.6.0: version "23.6.0" resolved "https://registry.yarnpkg.com/expect/-/expect-23.6.0.tgz#1e0c8d3ba9a581c87bd71fb9bc8862d443425f98" @@ -3046,6 +3053,15 @@ global-modules@^0.2.3: global-prefix "^0.1.4" is-windows "^0.2.0" +global-modules@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea" + integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg== + dependencies: + global-prefix "^1.0.1" + is-windows "^1.0.1" + resolve-dir "^1.0.0" + global-prefix@^0.1.4: version "0.1.5" resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-0.1.5.tgz#8d3bc6b8da3ca8112a160d8d496ff0462bfef78f" @@ -3055,6 +3071,17 @@ global-prefix@^0.1.4: is-windows "^0.2.0" which "^1.2.12" +global-prefix@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe" + integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4= + dependencies: + expand-tilde "^2.0.2" + homedir-polyfill "^1.0.1" + ini "^1.3.4" + is-windows "^1.0.1" + which "^1.2.14" + globals@^11.1.0, globals@^11.7.0: version "11.10.0" resolved "https://registry.yarnpkg.com/globals/-/globals-11.10.0.tgz#1e09776dffda5e01816b3bb4077c8b59c24eaa50" @@ -3148,6 +3175,13 @@ has-flag@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" +has-glob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/has-glob/-/has-glob-1.0.0.tgz#9aaa9eedbffb1ba3990a7b0010fb678ee0081207" + integrity sha1-mqqe7b/7G6OZCnsAEPtnjuAIEgc= + dependencies: + is-glob "^3.0.0" + has-symbols@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44" @@ -3196,7 +3230,7 @@ home-or-tmp@^2.0.0: os-homedir "^1.0.0" os-tmpdir "^1.0.1" -homedir-polyfill@^1.0.0: +homedir-polyfill@^1.0.0, homedir-polyfill@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/homedir-polyfill/-/homedir-polyfill-1.0.1.tgz#4c2bbc8a758998feebf5ed68580f76d46768b4bc" dependencies: @@ -3583,7 +3617,7 @@ is-glob@^2.0.0, is-glob@^2.0.1: dependencies: is-extglob "^1.0.0" -is-glob@^3.1.0: +is-glob@^3.0.0, is-glob@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-3.1.0.tgz#7ba5ae24217804ac70707b96922567486cc3e84a" dependencies: @@ -3720,11 +3754,16 @@ is-utf8@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72" +is-valid-glob@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-1.0.0.tgz#29bf3eff701be2d4d315dbacc39bc39fe8f601aa" + integrity sha1-Kb8+/3Ab4tTTFdusw5vDn+j2Aao= + is-windows@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c" -is-windows@^1.0.2: +is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" @@ -4738,6 +4777,17 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" +matched@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/matched/-/matched-2.0.1.tgz#9060e364dda426f569281a176cbd5ea77387a591" + integrity sha512-2aidSwg5/8qzUSFx2HuU3tIwY0yyRKA126l67CWIBHhXZlCvA8jjD7C7DqvuTJNzNbbmK/ETRFx3aNEgOFjuzA== + dependencies: + arr-union "^3.1.0" + glob "^7.1.2" + has-glob "^1.0.0" + is-valid-glob "^1.0.0" + resolve-dir "^1.0.1" + matcher@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/matcher/-/matcher-1.1.1.tgz#51d8301e138f840982b338b116bb0c09af62c1c2" @@ -6305,6 +6355,14 @@ resolve-dir@^0.1.0: expand-tilde "^1.2.2" global-modules "^0.2.3" +resolve-dir@^1.0.0, resolve-dir@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43" + integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M= + dependencies: + expand-tilde "^2.0.0" + global-modules "^1.0.0" + resolve-from@4.0.0, resolve-from@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" @@ -6382,6 +6440,14 @@ rollup-plugin-commonjs@9.2.0: resolve "^1.8.1" rollup-pluginutils "^2.3.3" +rollup-plugin-flow-entry@0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-flow-entry/-/rollup-plugin-flow-entry-0.2.0.tgz#5e4c0cf9afa485748a4aa52d52542f88c3e1d1f5" + integrity sha512-EMrL1ZEYrrO6PuYhKGu1RLomerIW8XNCrf2CFR2iajSDeHJuNHTwJubE+fCIZ0IYTtZRXHE3pZnqt12aWsSm+Q== + dependencies: + matched "^2.0.1" + pify "^3.0.0" + rollup-plugin-flow@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/rollup-plugin-flow/-/rollup-plugin-flow-1.1.1.tgz#6ce568f1dd559666b77ab76b4bae251407528db6" @@ -7394,7 +7460,7 @@ which-module@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a" -which@1, which@^1.2.10, which@^1.2.12, which@^1.2.9, which@^1.3.0, which@^1.3.1: +which@1, which@^1.2.10, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0, which@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" dependencies: