GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-04 16:11:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into v5-style-refinements

Browse Source 
# Conflicts:
#	lib/ui/package.json
This commit is contained in:
Norbert de Langen 2019-02-07 01:17:32 +01:00
commit 55d55463d7
9 changed files with 34 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/polymer/package.json
View File

@ -35,12 +35,12 @@
"webpack": "^4.29.0"
},
"devDependencies": {
"lit-html": "^0.14.0",
"lit-html": "^1.0.0",
"polymer-webpack-loader": "^2.0.3"
},
"peerDependencies": {
"babel-loader": "^7.0.0 || ^8.0.0",
"lit-html": "0.10.0",
"lit-html": "^1.0.0",
"polymer-webpack-loader": "^2.0.2"
},
"publishConfig": {

2
examples/cra-kitchen-sink/package.json
View File

@ -37,7 +37,7 @@
"enzyme-adapter-react-16": "^1.9.0",
"enzyme-to-json": "^3.3.4",
"jest": "^23.6.0",
"jest-emotion": "^10.0.5",
"jest-emotion": "^10.0.7",
"react-scripts": "^2.1.3"
}
}

2
examples/ember-cli/package.json
View File

@ -45,7 +45,7 @@
"ember-source": "~3.7.2",
"loader.js": "^4.2.3",
"webpack": "^4.29.0",
"webpack-cli": "^3.2.1"
"webpack-cli": "^3.2.3"
},
"engines": {
"node": "^4.5 || 6.* || >= 7.*"

2
examples/official-storybook/package.json
View File

@ -44,7 +44,7 @@
"format-json": "^1.0.3",
"global": "^4.3.2",
"graphql": "^14.1.1",
"jest-emotion": "^10.0.5",
"jest-emotion": "^10.0.7",
"paths.macro": "^2.0.2",
"prop-types": "^15.6.2",
"react": "^16.7.0",

2
examples/polymer-cli/package.json
View File

@ -20,7 +20,7 @@
"@storybook/polymer": "5.0.0-beta.1",
"@webcomponents/webcomponentsjs": "^1.2.0",
"global": "^4.3.2",
"lit-html": "^0.14.0",
"lit-html": "^1.0.0",
"polymer-webpack-loader": "^2.0.3",
"webpack": "^4.29.0"
},

2
lib/core/package.json
View File

@ -20,7 +20,7 @@
},
"dependencies": {
"@babel/plugin-proposal-class-properties": "^7.3.0",
"@babel/plugin-proposal-object-rest-spread": "^7.3.1",
"@babel/plugin-proposal-object-rest-spread": "^7.3.2",
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"@babel/plugin-transform-react-constant-elements": "^7.2.0",
"@babel/preset-env": "^7.3.1",

2
lib/ui/package.json
View File

@ -29,7 +29,7 @@
"@storybook/theming": "5.0.0-beta.1",
"eventemitter3": "^3.1.0",
"fast-deep-equal": "^2.0.1",
"fuse.js": "^3.3.0",
"fuse.js": "^3.3.1",
"fuzzy-search": "^3.0.1",
"global": "^4.3.2",
"history": "^4.7.2",

4
package.json
View File

@ -100,7 +100,7 @@
"eslint-plugin-prettier": "^3.0.1",
"eslint-plugin-react": "^7.12.4",
"eslint-teamcity": "^2.1.0",
"esm": "^3.2.0",
"esm": "^3.2.1",
"github-release-from-changelog": "^1.3.2",
"glob": "^7.1.3",
"husky": "^1.3.1",
@ -109,7 +109,7 @@
"jest-cli": "^23.6.0",
"jest-config": "^24.0.0",
"jest-diff": "^24.0.0",
"jest-emotion": "^10.0.5",
"jest-emotion": "^10.0.7",
"jest-environment-jsdom": "^24.0.0",
"jest-enzyme": "^7.0.0",
"jest-image-snapshot": "^2.6.0",

53
yarn.lock
View File

@ -498,9 +498,10 @@
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-object-rest-spread" "^7.0.0"
"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.3.1":
version "7.3.1"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.1.tgz#f69fb6a1ea6a4e1c503994a91d9cf76f3c4b36e8"
"@babel/plugin-proposal-object-rest-spread@^7.0.0", "@babel/plugin-proposal-object-rest-spread@^7.3.1", "@babel/plugin-proposal-object-rest-spread@^7.3.2":
version "7.3.2"
resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.3.2.tgz#6d1859882d4d778578e41f82cc5d7bf3d5daf6c1"
integrity sha512-DjeMS+J2+lpANkYLLO+m6GjoTMygYglKmRe6cDTbFv3L9i6mmiE8fe6B8MtCSLZpVXscD5kn7s6SgtHrDoBWoA==
dependencies:
"@babel/helper-plugin-utils" "^7.0.0"
"@babel/plugin-syntax-object-rest-spread" "^7.2.0"
@ -8533,10 +8534,10 @@ eslint@^5.12.1:
table "^5.0.2"
text-table "^0.2.0"
esm@^3.2.0:
version "3.2.0"
resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.0.tgz#089011156cf817ccdae38c877cbe03301df04136"
integrity sha512-yK4IiHmmInOk9q4xbJXdUfPV0ju7GbRCbhtpe5/gH7nRiD6RAb12Ix7zfsqQkDL5WERwzFlq/eT6zTXDWwIk+w==
esm@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/esm/-/esm-3.2.1.tgz#bd7c7dadad902ef167db93b266796e9cece587c7"
integrity sha512-+gxDed1gELD6mCn0P4TRPpknVJe7JvLtg3lJ9sRlLSpfw6J47QMGa5pi+10DN20VQ5z6OtbxjFoD9Z6PM+zb6Q==
espree@^3.4.3:
version "3.5.4"
@ -9601,9 +9602,10 @@ functional-red-black-tree@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
fuse.js@^3.3.0:
version "3.3.0"
resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.3.0.tgz#1e4fe172a60687230fb54a5cb247eb96e2e7e885"
fuse.js@^3.3.1:
version "3.3.1"
resolved "https://registry.yarnpkg.com/fuse.js/-/fuse.js-3.3.1.tgz#6e4762b1e1219f41bac8b7b723204d2b1d4cb8cf"
integrity sha512-Ranlb3nqh4Scw1ev5HvMoBUNHnhLceTGImSVf7ug87exLI75CfjhpCV5lFr1vHrAEn7fS80KZFaHCOznlGAG4A==
fuzzy-search@^3.0.1:
version "3.0.1"
@ -9851,10 +9853,6 @@ global-dirs@^0.1.0:
dependencies:
ini "^1.3.4"
global-modules-path@^2.3.0:
version "2.3.1"
resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.1.tgz#e541f4c800a1a8514a990477b267ac67525b9931"
global-modules@1.0.0, global-modules@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@ -11725,9 +11723,10 @@ jest-each@^24.0.0:
jest-util "^24.0.0"
pretty-format "^24.0.0"
jest-emotion@^10.0.5:
version "10.0.6"
resolved "https://registry.yarnpkg.com/jest-emotion/-/jest-emotion-10.0.6.tgz#6a49b82984b098c284347497f56eca3be22a4c34"
jest-emotion@^10.0.7:
version "10.0.7"
resolved "https://registry.yarnpkg.com/jest-emotion/-/jest-emotion-10.0.7.tgz#c882f6e201cf62c025245f863b8e5ff473d2cef0"
integrity sha512-uR6KIw/jnlqVOFBHpeRMirpnWggnUluqzKYSmlp/TpoNaRxSYTGj9+RVrS7kngtyFyn0F0rOJ73CaPRuxL5ebg==
dependencies:
"@types/jest" "^23.0.2"
chalk "^2.4.1"
@ -12875,10 +12874,6 @@ lie@~3.1.0:
dependencies:
immediate "~3.0.5"
lightercollective@^0.1.0:
version "0.1.0"
resolved "https://registry.yarnpkg.com/lightercollective/-/lightercollective-0.1.0.tgz#70df102c530dcb8d0ccabfe6175a8d00d5f61300"
lines-and-columns@^1.1.6:
version "1.1.6"
resolved "https://registry.yarnpkg.com/lines-and-columns/-/lines-and-columns-1.1.6.tgz#1c00c743b433cd0a4e80758f7b64a57440d9ff00"
@ -12963,9 +12958,10 @@ listr@^0.14.2:
p-map "^2.0.0"
rxjs "^6.3.3"
lit-html@^0.14.0:
version "0.14.0"
resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-0.14.0.tgz#d6830e8f55fb923b0f5824decf7da082a1d22997"
lit-html@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.0.0.tgz#3dc3781a8ca68a9b5c2ff2a61e263662b9b2267b"
integrity sha512-oeWlpLmBW3gFl7979Wol2LKITpmKTUFNn7PnFbh6YNynF61W74l6x5WhwItAwPRSATpexaX1egNnRzlN4GOtfQ==
livereload-js@^2.3.0:
version "2.4.0"
@ -21226,19 +21222,18 @@ webidl-conversions@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"
webpack-cli@^3.2.1:
version "3.2.1"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.2.1.tgz#779c696c82482491f0803907508db2e276ed3b61"
webpack-cli@^3.2.3:
version "3.2.3"
resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.2.3.tgz#13653549adfd8ccd920ad7be1ef868bacc22e346"
integrity sha512-Ik3SjV6uJtWIAN5jp5ZuBMWEAaP5E4V78XJ2nI+paFPh8v4HPSwo/myN0r29Xc/6ZKnd2IdrAlpSgNOu2CDQ6Q==
dependencies:
chalk "^2.4.1"
cross-spawn "^6.0.5"
enhanced-resolve "^4.1.0"
findup-sync "^2.0.0"
global-modules "^1.0.0"
global-modules-path "^2.3.0"
import-local "^2.0.0"
interpret "^1.1.0"
lightercollective "^0.1.0"
loader-utils "^1.1.0"
supports-color "^5.5.0"
v8-compile-cache "^2.0.2"