From 566ed56149188d1f1d45199dc65f877e68b81fed Mon Sep 17 00:00:00 2001 From: Konstantin Pschera Date: Sat, 1 Jul 2017 23:40:11 +0200 Subject: [PATCH] Update Rollup --- package.json | 2 +- rollup.config.js | 4 +--- yarn.lock | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 27147dca9..62580f50e 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,7 @@ "react-native": "^0.39.2", "react-primitives": "^0.4.2", "rimraf": "^2.6.1", - "rollup": "^0.37.0", + "rollup": "0.43.0", "rollup-plugin-babel": "^2.7.1", "rollup-plugin-commonjs": "^6.0.0", "rollup-plugin-flow": "^1.1.1", diff --git a/rollup.config.js b/rollup.config.js index ee4af58a1..3363f2462 100644 --- a/rollup.config.js +++ b/rollup.config.js @@ -8,9 +8,7 @@ import json from 'rollup-plugin-json' import flow from 'rollup-plugin-flow' import uglify from 'rollup-plugin-uglify' import visualizer from 'rollup-plugin-visualizer' - -// We need to use require here because import creates a parse error -const pkg = require('./package.json') +import pkg from './package.json' const processShim = '\0process-shim' diff --git a/yarn.lock b/yarn.lock index c4d6e8e85..edf731103 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2783,7 +2783,7 @@ glob-parent@^2.0.0: dependencies: is-glob "^2.0.0" -glob@7.1.2: +glob@7.1.2, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1: version "7.1.2" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15" dependencies: @@ -2804,7 +2804,7 @@ glob@^5.0.15, glob@~5.0.0: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.1: +glob@^7.0.0: version "7.1.1" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.1.tgz#805211df04faaf1c63a3600306cdf5ade50b2ec8" dependencies: @@ -4259,18 +4259,18 @@ min-document@^2.19.0: dependencies: dom-walk "^0.1.0" -"minimatch@2 || 3", minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3: - version "3.0.3" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" - dependencies: - brace-expansion "^1.0.0" - -minimatch@^3.0.4: +"minimatch@2 || 3", minimatch@^3.0.4: version "3.0.4" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083" dependencies: brace-expansion "^1.1.7" +minimatch@^3.0.0, minimatch@^3.0.2, minimatch@^3.0.3: + version "3.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.3.tgz#2a4e4090b96b2db06a9d7df01055a62a77c9b774" + dependencies: + brace-expansion "^1.0.0" + minimist@0.0.8, minimist@~0.0.1: version "0.0.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d" @@ -5469,9 +5469,9 @@ 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.37.0: - version "0.37.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.37.2.tgz#cc159d20a2f3615ccc2248a4385aacbb3d6d6042" +rollup@0.43.0: + version "0.43.0" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.43.0.tgz#b36bdb75fa5e0823b6de8aee18ff7b5655520543" dependencies: source-map-support "^0.4.0"