Skip to content

Commit

Permalink
Merge pull request #3852 from pelotom/use-react-dev-utils-next
Browse files Browse the repository at this point in the history 
Use react-dev-utils@next
  • Loading branch information
@ndelangen
ndelangen authored Jul 20, 2018
2 parents 0e565c0 + 211ee17 commit 1d0bad6
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 87 deletions.
2 changes: 1 addition & 1 deletion app/react-native/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"@storybook/channel-websocket": "4.0.0-alpha.14",
"@storybook/core": "4.0.0-alpha.14",
"@storybook/core-events": "4.0.0-alpha.14",
"@storybook/react-dev-utils": "^5.0.0",
"@storybook/ui": "4.0.0-alpha.14",
"babel-loader": "^7.1.4",
"babel-plugin-macros": "^2.2.2",
Expand All @@ -55,6 +54,7 @@
"json5": "^1.0.1",
"prop-types": "^15.6.1",
"raw-loader": "^0.5.1",
"react-dev-utils": "^6.0.0-next.3e165448",
"react-native-compat": "^1.0.0",
"react-native-iphone-x-helper": "^1.0.3",
"shelljs": "^0.8.2",
Expand Down
2 changes: 1 addition & 1 deletion app/react-native/src/server/config/webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import path from 'path';
import webpack from 'webpack';
import { getEnvironment } from 'universal-dotenv';
import Dotenv from 'dotenv-webpack';
import WatchMissingNodeModulesPlugin from '@storybook/react-dev-utils/WatchMissingNodeModulesPlugin';
import WatchMissingNodeModulesPlugin from 'react-dev-utils/WatchMissingNodeModulesPlugin';
import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
import HtmlWebpackPlugin from 'html-webpack-plugin';
import { indexHtmlPath } from '@storybook/core/server';
Expand Down
2 changes: 1 addition & 1 deletion app/react/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@
},
"dependencies": {
"@storybook/core": "4.0.0-alpha.14",
"@storybook/react-dev-utils": "^5.0.0",
"babel-plugin-react-docgen": "^2.0.0-rc.1",
"babel-preset-react": "^6.24.1",
"common-tags": "^1.8.0",
"emotion": "^9.1.3",
"global": "^4.3.2",
"lodash.flattendeep": "^4.4.0",
"prop-types": "^15.6.1",
"react-dev-utils": "^6.0.0-next.3e165448",
"react-emotion": "^9.1.3"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion lib/core/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"@storybook/client-logger": "4.0.0-alpha.14",
"@storybook/core-events": "4.0.0-alpha.14",
"@storybook/node-logger": "4.0.0-alpha.14",
"@storybook/react-dev-utils": "^5.0.0",
"@storybook/ui": "4.0.0-alpha.14",
"airbnb-js-shims": "^1.6.0",
"autoprefixer": "^8.6.0",
Expand Down Expand Up @@ -52,6 +51,7 @@
"prop-types": "^15.6.1",
"qs": "^6.5.2",
"raw-loader": "^0.5.1",
"react-dev-utils": "^6.0.0-next.3e165448",
"react-emotion": "^9.1.3",
"redux": "^4.0.0",
"serve-favicon": "^2.5.0",
Expand Down
4 changes: 2 additions & 2 deletions lib/core/src/server/config/webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import path from 'path';
import webpack from 'webpack';
import { getEnvironment } from 'universal-dotenv';
import Dotenv from 'dotenv-webpack';
import InterpolateHtmlPlugin from '@storybook/react-dev-utils/InterpolateHtmlPlugin';
import WatchMissingNodeModulesPlugin from '@storybook/react-dev-utils/WatchMissingNodeModulesPlugin';
import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
import WatchMissingNodeModulesPlugin from 'react-dev-utils/WatchMissingNodeModulesPlugin';
import CaseSensitivePathsPlugin from 'case-sensitive-paths-webpack-plugin';
import HtmlWebpackPlugin from 'html-webpack-plugin';

Expand Down
2 changes: 1 addition & 1 deletion lib/core/src/server/config/webpack.config.prod.js
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import webpack from 'webpack';
import { getEnvironment } from 'universal-dotenv';
import Dotenv from 'dotenv-webpack';
import InterpolateHtmlPlugin from '@storybook/react-dev-utils/InterpolateHtmlPlugin';
import InterpolateHtmlPlugin from 'react-dev-utils/InterpolateHtmlPlugin';
import HtmlWebpackPlugin from 'html-webpack-plugin';

import { version } from '../../../package.json';
Expand Down
134 changes: 54 additions & 80 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,18 +153,18 @@
dependencies:
tslib "^1.9.0"

"@babel/[email protected]":
version "7.0.0-beta.42"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.42.tgz#a9c83233fa7cd06b39dc77adbb908616ff4f1962"
dependencies:
"@babel/highlight" "7.0.0-beta.42"

"@babel/[email protected]":
version "7.0.0-beta.44"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.44.tgz#2a02643368de80916162be70865c97774f3adbd9"
dependencies:
"@babel/highlight" "7.0.0-beta.44"

"@babel/[email protected]":
version "7.0.0-beta.46"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.46.tgz#e0d002100805daab1461c0fcb32a07e304f3a4f4"
dependencies:
"@babel/highlight" "7.0.0-beta.46"

"@babel/code-frame@^7.0.0-beta.35":
version "7.0.0-beta.37"
resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.0.0-beta.37.tgz#2da1dd3b1b57bfdea777ddc378df7cd12fe40171"
Expand Down Expand Up @@ -210,17 +210,17 @@
dependencies:
"@babel/types" "7.0.0-beta.44"

"@babel/[email protected].42":
version "7.0.0-beta.42"
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.42.tgz#a502a1c0d6f99b2b0e81d468a1b0c0e81e3f3623"
"@babel/[email protected].44":
version "7.0.0-beta.44"
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
dependencies:
chalk "^2.0.0"
esutils "^2.0.2"
js-tokens "^3.0.0"

"@babel/[email protected].44":
version "7.0.0-beta.44"
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.44.tgz#18c94ce543916a80553edcdcf681890b200747d5"
"@babel/[email protected].46":
version "7.0.0-beta.46"
resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.0.0-beta.46.tgz#c553c51e65f572bdedd6eff66fc0bb563016645e"
dependencies:
chalk "^2.0.0"
esutils "^2.0.2"
Expand Down Expand Up @@ -381,33 +381,6 @@
babel-runtime "^6.11.6"
immutable "^3.8.1"

"@storybook/react-dev-utils@^5.0.0":
version "5.0.0"
resolved "https://registry.yarnpkg.com/@storybook/react-dev-utils/-/react-dev-utils-5.0.0.tgz#d33a6baf480a980e135c21ade859632aca20fe78"
dependencies:
"@babel/code-frame" "7.0.0-beta.42"
address "1.0.3"
browserslist "3.2.0"
chalk "2.3.2"
cross-spawn "6.0.5"
detect-port-alt "1.1.5"
escape-string-regexp "1.0.5"
filesize "3.6.0"
find-pkg "1.0.0"
global-modules "1.0.0"
globby "8.0.1"
gzip-size "4.1.0"
inquirer "5.1.0"
is-root "1.0.0"
opn "5.3.0"
pkg-up "2.0.0"
react-error-overlay "^4.0.0"
recursive-readdir "2.2.2"
shell-quote "1.6.1"
sockjs-client "1.1.4"
strip-ansi "4.0.0"
text-table "0.2.0"

"@storybook/react-komposer@^2.0.1":
version "2.0.3"
resolved "https://registry.yarnpkg.com/@storybook/react-komposer/-/react-komposer-2.0.3.tgz#f9e12a9586b2ce95c24c137eabb8b71527ddb369"
Expand Down Expand Up @@ -3407,12 +3380,12 @@ browserify@^9.0.3:
vm-browserify "~0.0.1"
xtend "^3.0.0"

[email protected].0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.0.tgz#3d4a99710c12101e4567c9aeedade49c958cb883"
[email protected].6, browserslist@^3.2.6:
version "3.2.6"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.6.tgz#138a44d04a9af64443679191d041f28ce5b965d5"
dependencies:
caniuse-lite "^1.0.30000815"
electron-to-chromium "^1.3.39"
caniuse-lite "^1.0.30000830"
electron-to-chromium "^1.3.42"

browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
version "1.7.7"
Expand All @@ -3428,13 +3401,6 @@ browserslist@^2.1.2, browserslist@^2.5.1:
caniuse-lite "^1.0.30000789"
electron-to-chromium "^1.3.30"

browserslist@^3.2.6:
version "3.2.6"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.6.tgz#138a44d04a9af64443679191d041f28ce5b965d5"
dependencies:
caniuse-lite "^1.0.30000830"
electron-to-chromium "^1.3.42"

browserslist@^3.2.8:
version "3.2.8"
resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6"
Expand Down Expand Up @@ -3706,10 +3672,6 @@ caniuse-lite@^1.0.30000748, caniuse-lite@^1.0.30000789:
version "1.0.30000791"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000791.tgz#8e35745efd483a3e23bb7d350990326d2319fc16"

caniuse-lite@^1.0.30000815:
version "1.0.30000820"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000820.tgz#6e36ee75187a2c83d26d6504a1af47cc580324d2"

caniuse-lite@^1.0.30000830:
version "1.0.30000830"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000830.tgz#cb96b8a2dd3cbfe04acea2af3c4e894249095328"
Expand Down Expand Up @@ -3789,9 +3751,9 @@ [email protected], chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
strip-ansi "^3.0.0"
supports-color "^2.0.0"

[email protected]:
version "2.3.2"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65"
chalk@2.4.1, chalk@^2.3.2, chalk@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
dependencies:
ansi-styles "^3.2.1"
escape-string-regexp "^1.0.5"
Expand All @@ -3813,14 +3775,6 @@ chalk@^2.3.1:
escape-string-regexp "^1.0.5"
supports-color "^5.2.0"

chalk@^2.3.2, chalk@^2.4.1:
version "2.4.1"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
dependencies:
ansi-styles "^3.2.1"
escape-string-regexp "^1.0.5"
supports-color "^5.3.0"

chalk@~0.4.0:
version "0.4.0"
resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.4.0.tgz#5199a3ddcd0c1efe23bc08c1b027b06176e0c64f"
Expand Down Expand Up @@ -5487,13 +5441,6 @@ detect-node@^2.0.3:
version "2.0.3"
resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.3.tgz#a2033c09cc8e158d37748fbde7507832bd6ce127"

[email protected]:
version "1.1.5"
resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.5.tgz#a1aa8fc805a4a5df9b905b7ddc7eed036bcce889"
dependencies:
address "^1.0.1"
debug "^2.6.0"

[email protected]:
version "1.1.6"
resolved "https://registry.yarnpkg.com/detect-port-alt/-/detect-port-alt-1.1.6.tgz#24707deabe932d4a3cf621302027c2b266568275"
Expand Down Expand Up @@ -5778,10 +5725,6 @@ electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.30:
dependencies:
electron-releases "^2.1.0"

electron-to-chromium@^1.3.39:
version "1.3.40"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.40.tgz#1fbd6d97befd72b8a6f921dc38d22413d2f6fddf"

electron-to-chromium@^1.3.42:
version "1.3.44"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.44.tgz#ef6b150a60d523082388cadad88085ecd2fd4684"
Expand Down Expand Up @@ -7030,9 +6973,9 @@ [email protected]:
version "3.5.11"
resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.5.11.tgz#1919326749433bb3cf77368bd158caabcc19e9ee"

[email protected].0:
version "3.6.0"
resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.0.tgz#22d079615624bb6fd3c04026120628a41b3f4efa"
[email protected].1:
version "3.6.1"
resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317"

fill-range@^2.1.0:
version "2.2.3"
Expand Down Expand Up @@ -14333,6 +14276,33 @@ react-dev-utils@^5.0.1:
strip-ansi "3.0.1"
text-table "0.2.0"

react-dev-utils@^6.0.0-next.3e165448:
version "6.0.0-next.3e165448"
resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-6.0.0-next.3e165448.tgz#d573ed0ba692f6cee23166f99204e5761df0897c"
dependencies:
"@babel/code-frame" "7.0.0-beta.46"
address "1.0.3"
browserslist "3.2.6"
chalk "2.4.1"
cross-spawn "6.0.5"
detect-port-alt "1.1.6"
escape-string-regexp "1.0.5"
filesize "3.6.1"
find-pkg "1.0.0"
global-modules "1.0.0"
globby "8.0.1"
gzip-size "4.1.0"
inquirer "5.1.0"
is-root "1.0.0"
opn "5.3.0"
pkg-up "2.0.0"
react-error-overlay "5.0.0-next.3e165448"
recursive-readdir "2.2.2"
shell-quote "1.6.1"
sockjs-client "1.1.4"
strip-ansi "4.0.0"
text-table "0.2.0"

[email protected]:
version "3.0.0"
resolved "https://registry.yarnpkg.com/react-devtools-core/-/react-devtools-core-3.0.0.tgz#f683e19f0311108f97dbb5b29d948323a1bf7c03"
Expand Down Expand Up @@ -14368,6 +14338,10 @@ react-emotion@^9.1.3:
babel-plugin-emotion "^9.1.2"
create-emotion-styled "^9.1.2"

[email protected]:
version "5.0.0-next.3e165448"
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-5.0.0-next.3e165448.tgz#2cbd10780c1fa9c7e35d6e443773e18948b7ee49"

react-error-overlay@^4.0.0:
version "4.0.0"
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-4.0.0.tgz#d198408a85b4070937a98667f500c832f86bd5d4"
Expand Down

0 comments on commit 1d0bad6

Please sign in to comment.