From 0a7c6be7f495f2ed7f1609294b9007ee5fee5d04 Mon Sep 17 00:00:00 2001 From: Garet McKinley Date: Thu, 8 Dec 2016 12:38:15 -0500 Subject: [PATCH] fix: add support for json loading in rollup (#16) * chore(package): version bump 0.2.0 * chore(package): add babel-preset-es2015-rollup * chore(rollup): add support for json importing * restrict babel loader to only js files * chore(package): version bump 0.2.1 --- package.json | 3 ++- rollup.config.js | 10 +++++++++- yarn.lock | 36 +++++++++++++++++++++++++++--------- 3 files changed, 38 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 24bd1f7..a346455 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "uigradients", - "version": "0.1.2", + "version": "0.2.1", "description": "a uigradients.com generator react & styled-components.", "main": "dist/uigradients.js", "scripts": { @@ -31,6 +31,7 @@ "babel-loader": "^6.2.7", "babel-plugin-add-module-exports": "^0.2.1", "babel-plugin-external-helpers": "^6.18.0", + "babel-preset-es2015-rollup": "^1.2.0", "babel-preset-latest": "^6.16.0", "babel-preset-react": "^6.16.0", "babel-preset-stage-2": "^6.18.0", diff --git a/rollup.config.js b/rollup.config.js index df5ce92..657df18 100755 --- a/rollup.config.js +++ b/rollup.config.js @@ -34,6 +34,7 @@ const plugins = [ }, }, babel({ + include: 'src/**/*js', exclude: 'node_modules/**', babelrc: false, presets: [ @@ -49,7 +50,14 @@ const plugins = [ inject({ process: processShim, }), - json(), + json({ + // All JSON files will be parsed by default, + // but you can also specifically include/exclude files + include: 'src/**/*.json', // Default: undefined + exclude: [ + 'node_modules/**', + ], // Default: undefined + }), nodeResolve(), replace({ 'process.env.NODE_ENV': JSON.stringify(prod ? 'production' : 'development'), diff --git a/yarn.lock b/yarn.lock index 9cc0e47..a773cab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -534,7 +534,7 @@ babel-plugin-check-es2015-constants@^6.3.13: dependencies: babel-runtime "^6.0.0" -babel-plugin-external-helpers@^6.18.0: +babel-plugin-external-helpers@^6.18.0, babel-plugin-external-helpers@^6.4.0: version "6.18.0" resolved "https://registry.yarnpkg.com/babel-plugin-external-helpers/-/babel-plugin-external-helpers-6.18.0.tgz#c6bbf87a4448eb49616f24a8b8088503863488da" dependencies: @@ -935,7 +935,15 @@ babel-preset-env@0.0.6: babel-plugin-transform-regenerator "^6.6.0" browserslist "^1.4.0" -babel-preset-es2015@^6.16.0: +babel-preset-es2015-rollup: + version "1.2.0" + resolved "https://registry.yarnpkg.com/babel-preset-es2015-rollup/-/babel-preset-es2015-rollup-1.2.0.tgz#feedf80346e01fa22d4de15e72cde1cefc59bf67" + dependencies: + babel-plugin-external-helpers "^6.4.0" + babel-preset-es2015 "^6.3.13" + modify-babel-preset "^2.1.1" + +babel-preset-es2015@^6.16.0, babel-preset-es2015@^6.3.13: version "6.18.0" resolved "https://registry.yarnpkg.com/babel-preset-es2015/-/babel-preset-es2015-6.18.0.tgz#b8c70df84ec948c43dcf2bf770e988eb7da88312" dependencies: @@ -2995,6 +3003,12 @@ mobx@^2.3.4: version "2.6.2" resolved "https://registry.yarnpkg.com/mobx/-/mobx-2.6.2.tgz#55722706e485b56d88be2ff1811267b1e6703f5a" +modify-babel-preset@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/modify-babel-preset/-/modify-babel-preset-2.1.1.tgz#2d3190162ee62fb67aaa3325c242f026322ebbac" + dependencies: + require-relative "^0.8.7" + ms@0.7.1: version "0.7.1" resolved "https://registry.yarnpkg.com/ms/-/ms-0.7.1.tgz#9cd13c03adbff25b65effde7ce864ee952017098" @@ -3944,6 +3958,10 @@ require-from-string@^1.1.0: version "1.2.1" resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-1.2.1.tgz#529c9ccef27380adfec9a2f965b649bbee636418" +require-relative@^0.8.7: + version "0.8.7" + resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de" + require-uncached@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" @@ -3982,6 +4000,12 @@ ripemd160@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-0.2.0.tgz#2bf198bde167cacfa51c0a928e84b68bbe171fce" +rollup: + version "0.36.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.36.4.tgz#a224494c5386c1d73d38f7bb86f69f5eb011a3d2" + dependencies: + source-map-support "^0.4.0" + rollup-plugin-babel@^2.6.1: version "2.6.1" resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-2.6.1.tgz#470b03486337045d7e8a3e43fc5fc00e8db82c26" @@ -4010,7 +4034,7 @@ rollup-plugin-inject@^2.0.0: magic-string "^0.16.0" rollup-pluginutils "^1.2.0" -rollup-plugin-json@^2.0.2: +rollup-plugin-json: version "2.0.2" resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-2.0.2.tgz#de2ed32fe056ee00f13bfc6f56466d3564f4a6f3" dependencies: @@ -4045,12 +4069,6 @@ rollup-pluginutils@^1.2.0, rollup-pluginutils@^1.5.0, rollup-pluginutils@^1.5.1, estree-walker "^0.2.1" minimatch "^3.0.2" -rollup@^0.36.3: - version "0.36.3" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.36.3.tgz#c89ac479828924ff8f69c1d44541cb4ea2fc11fc" - dependencies: - source-map-support "^0.4.0" - run-async@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/run-async/-/run-async-0.1.0.tgz#c8ad4a5e110661e402a7d21b530e009f25f8e389"