Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
@javidjamae
javidjamae authored Jan 30, 2018
2 parents 3be77c2 + 8259467 commit 49ab2bd
Show file tree
Hide file tree
Showing 12 changed files with 54 additions and 37 deletions.
2 changes: 1 addition & 1 deletion app/angular/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
"shelljs": "^0.8.1",
"style-loader": "^0.20.1",
"ts-loader": "^2.2.2",
"uglifyjs-webpack-plugin": "^1.1.6",
"uglifyjs-webpack-plugin": "^1.1.7",
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"uuid": "^3.2.1",
Expand Down
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 @@ -62,7 +62,7 @@
"react-native-iphone-x-helper": "^1.0.1",
"shelljs": "^0.8.1",
"style-loader": "^0.20.1",
"uglifyjs-webpack-plugin": "^1.1.6",
"uglifyjs-webpack-plugin": "^1.1.7",
"url-loader": "^0.6.2",
"url-parse": "^1.1.9",
"util-deprecate": "^1.0.2",
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 @@ -75,7 +75,7 @@
"serve-favicon": "^2.4.5",
"shelljs": "^0.8.1",
"style-loader": "^0.20.1",
"uglifyjs-webpack-plugin": "^1.1.6",
"uglifyjs-webpack-plugin": "^1.1.7",
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"uuid": "^3.2.1",
Expand Down
2 changes: 1 addition & 1 deletion app/vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"serve-favicon": "^2.4.5",
"shelljs": "^0.8.1",
"style-loader": "^0.20.1",
"uglifyjs-webpack-plugin": "^1.1.6",
"uglifyjs-webpack-plugin": "^1.1.7",
"url-loader": "^0.6.2",
"util-deprecate": "^1.0.2",
"uuid": "^3.2.1",
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,14 @@
"babel-preset-react": "^6.24.1",
"babel-preset-stage-0": "^6.24.1",
"bootstrap": "^3.3.7",
"gatsby": "^1.9.171",
"gatsby": "^1.9.174",
"gatsby-link": "^1.6.35",
"gatsby-plugin-sharp": "^1.6.27",
"gatsby-remark-autolink-headers": "^1.4.11",
"gatsby-remark-copy-linked-files": "^1.5.25",
"gatsby-remark-images": "^1.5.41",
"gatsby-remark-smartypants": "^1.4.10",
"gatsby-source-filesystem": "^1.5.15",
"gatsby-source-filesystem": "^1.5.16",
"gatsby-transformer-remark": "^1.7.30",
"gh-pages": "^1.1.0",
"global": "^4.3.2",
Expand Down
33 changes: 19 additions & 14 deletions docs/yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4352,9 +4352,9 @@ gatsby-1-config-css-modules@^1.0.8:
dependencies:
babel-runtime "^6.26.0"

gatsby-cli@^1.1.32:
version "1.1.32"
resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-1.1.32.tgz#5591b343a1ef4c4643a05c85ca711043dcd487c7"
gatsby-cli@^1.1.33:
version "1.1.33"
resolved "https://registry.yarnpkg.com/gatsby-cli/-/gatsby-cli-1.1.33.tgz#a79337d73f88ef1157aceefd245242ec0d463680"
dependencies:
babel-code-frame "^6.26.0"
babel-runtime "^6.26.0"
Expand Down Expand Up @@ -4407,9 +4407,9 @@ gatsby-plugin-sharp@^1.6.27:
sharp "^0.19.0"
svgo "^0.7.2"

gatsby-react-router-scroll@^1.0.8:
version "1.0.8"
resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-1.0.8.tgz#6cc9d80c139e58ed5189dd35146ac37b46846cd5"
gatsby-react-router-scroll@^1.0.9:
version "1.0.9"
resolved "https://registry.yarnpkg.com/gatsby-react-router-scroll/-/gatsby-react-router-scroll-1.0.9.tgz#0a321e7ae8c69ac6ba9528abf5b7be4e549a943f"
dependencies:
babel-runtime "^6.26.0"
scroll-behavior "^0.9.1"
Expand Down Expand Up @@ -4458,9 +4458,9 @@ gatsby-remark-smartypants@^1.4.10:
retext-smartypants "^2.0.0"
unist-util-visit "^1.1.1"

gatsby-source-filesystem@^1.5.15:
version "1.5.15"
resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-1.5.15.tgz#26278e00101f03c279f4f0bdd285420ff561e8b2"
gatsby-source-filesystem@^1.5.16:
version "1.5.16"
resolved "https://registry.yarnpkg.com/gatsby-source-filesystem/-/gatsby-source-filesystem-1.5.16.tgz#1439093b6ad53322667870ca4ed636ad0e2121b0"
dependencies:
babel-cli "^6.26.0"
babel-runtime "^6.26.0"
Expand Down Expand Up @@ -4499,9 +4499,9 @@ gatsby-transformer-remark@^1.7.30:
unist-util-select "^1.5.0"
unist-util-visit "^1.1.1"

gatsby@^1.9.171:
version "1.9.172"
resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.172.tgz#2d3719b85fcce392415a654e7bdad1369d12726b"
gatsby@^1.9.174:
version "1.9.175"
resolved "https://registry.yarnpkg.com/gatsby/-/gatsby-1.9.175.tgz#a0e1f9a66202f5821abfc1fdbcf3673c3dfa5b4c"
dependencies:
async "^2.1.2"
babel-code-frame "^6.22.0"
Expand Down Expand Up @@ -4541,10 +4541,10 @@ gatsby@^1.9.171:
front-matter "^2.1.0"
fs-extra "^4.0.1"
gatsby-1-config-css-modules "^1.0.8"
gatsby-cli "^1.1.32"
gatsby-cli "^1.1.33"
gatsby-link "^1.6.35"
gatsby-module-loader "^1.0.9"
gatsby-react-router-scroll "^1.0.8"
gatsby-react-router-scroll "^1.0.9"
glob "^7.1.1"
graphql "^0.11.7"
graphql-relay "^0.5.1"
Expand Down Expand Up @@ -4589,6 +4589,7 @@ gatsby@^1.9.171:
relay-compiler "^1.4.1"
remote-redux-devtools "^0.5.7"
serve "^6.4.0"
shallow-compare "^1.2.2"
sift "^3.2.6"
signal-exit "^3.0.2"
slash "^1.0.0"
Expand Down Expand Up @@ -9835,6 +9836,10 @@ sha.js@^2.4.0, sha.js@^2.4.8:
inherits "^2.0.1"
safe-buffer "^5.0.1"

shallow-compare@^1.2.2:
version "1.2.2"
resolved "https://registry.yarnpkg.com/shallow-compare/-/shallow-compare-1.2.2.tgz#fa4794627bf455a47c4f56881d8a6132d581ffdb"

shallowequal@^0.2.2:
version "0.2.2"
resolved "https://registry.yarnpkg.com/shallowequal/-/shallowequal-0.2.2.tgz#1e32fd5bcab6ad688a4812cb0cc04efc75c7014e"
Expand Down
1 change: 0 additions & 1 deletion examples/vue-kitchen-sink/src/stories/index.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,6 @@ storiesOf('Addon Knobs', module)
const salutation = nice ? 'Nice to meet you!' : 'Leave me alone!';
const dateOptions = { year: 'numeric', month: 'long', day: 'numeric', timeZone: 'UTC' };


button('Arbitrary action', action('You clicked it!'));

return {
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/snapshots/sfc_vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
"@storybook/addon-actions": "^3.4.0-alpha.6",
"@storybook/addon-links": "^3.4.0-alpha.6",
"@storybook/addons": "^3.4.0-alpha.6",
"babel-preset-vue": "^2.0.0"
"babel-preset-vue": "^2.0.1"
},
"engines": {
"node": ">= 4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion lib/cli/test/snapshots/vue/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@
"@storybook/addon-actions": "^3.4.0-alpha.6",
"@storybook/addon-links": "^3.4.0-alpha.6",
"@storybook/addons": "^3.4.0-alpha.6",
"babel-preset-vue": "^2.0.0"
"babel-preset-vue": "^2.0.1"
}
}
2 changes: 1 addition & 1 deletion lib/core/src/client/preview/syncUrlWithStore.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ export default function syncUrlToStore(reduxStore) {
selectedKind,
selectedStory,
});
window.history.pushState({}, '', `?${queryString}`);
window.history.replaceState({}, '', `?${queryString}`);
});
}
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"chromatic": "npm --prefix examples/official-storybook run chromatic"
},
"devDependencies": {
"@types/lodash": "^4.14.97",
"@types/lodash": "^4.14.98",
"babel-cli": "^6.26.0",
"babel-core": "^6.26.0",
"babel-eslint": "^8.2.1",
Expand Down Expand Up @@ -71,7 +71,7 @@
"jest-config": "^22.1.4",
"jest-diff": "^22.1.0",
"jest-environment-jsdom": "^22.1.4",
"jest-enzyme": "^4.0.2",
"jest-enzyme": "^4.1.0",
"jest-image-snapshot": "^2.3.0",
"jest-jasmine2": "^22.1.4",
"jest-preset-angular": "^5.0.0",
Expand Down
35 changes: 24 additions & 11 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,9 +298,9 @@
version "4.14.92"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.92.tgz#6e3cb0b71a1e12180a47a42a744e856c3ae99a57"

"@types/lodash@^4.14.97":
version "4.14.97"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.97.tgz#7262d6d5fc5e87cdb3f68eb33accd4024f2b211e"
"@types/lodash@^4.14.98":
version "4.14.98"
resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.98.tgz#aaf012ae443e657e7885e605a4c1b340db160609"

"@types/mz@0.0.32":
version "0.0.32"
Expand Down Expand Up @@ -4547,9 +4547,9 @@ enzyme-adapter-utils@^1.3.0:
object.assign "^4.0.4"
prop-types "^15.6.0"

enzyme-matchers@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/enzyme-matchers/-/enzyme-matchers-4.0.2.tgz#3f4457d0d0da3e268af4bee9f222439dfca26214"
enzyme-matchers@^4.1.1:
version "4.1.1"
resolved "https://registry.yarnpkg.com/enzyme-matchers/-/enzyme-matchers-4.1.1.tgz#ce8c177f96f05e757a2c7b5ca4040450c3beb57c"
dependencies:
circular-json-es6 "^2.0.1"
deep-equal-ident "^1.1.1"
Expand Down Expand Up @@ -7847,11 +7847,11 @@ jest-environment-node@^22.1.4:
jest-mock "^22.1.0"
jest-util "^22.1.4"

jest-enzyme@^4.0.2:
version "4.0.2"
resolved "https://registry.yarnpkg.com/jest-enzyme/-/jest-enzyme-4.0.2.tgz#c3a87f311889819d51ae2639c9da412da07cfc4a"
jest-enzyme@^4.1.0:
version "4.1.1"
resolved "https://registry.yarnpkg.com/jest-enzyme/-/jest-enzyme-4.1.1.tgz#db080b3ff2f93ab7161715d69801d1d5f187ed13"
dependencies:
enzyme-matchers "^4.0.2"
enzyme-matchers "^4.1.1"
enzyme-to-json "^3.3.0"

jest-get-type@^21.2.0:
Expand Down Expand Up @@ -14677,7 +14677,7 @@ uglifyjs-webpack-plugin@^0.4.6:
uglify-js "^2.8.29"
webpack-sources "^1.0.1"

uglifyjs-webpack-plugin@^1.1.5, uglifyjs-webpack-plugin@^1.1.6:
uglifyjs-webpack-plugin@^1.1.5:
version "1.1.6"
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.6.tgz#f4ba8449edcf17835c18ba6ae99b9d610857fb19"
dependencies:
Expand All @@ -14690,6 +14690,19 @@ uglifyjs-webpack-plugin@^1.1.5, uglifyjs-webpack-plugin@^1.1.6:
webpack-sources "^1.1.0"
worker-farm "^1.5.2"

uglifyjs-webpack-plugin@^1.1.7:
version "1.1.8"
resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.1.8.tgz#1302fb9471a7daf3d0a5174da6d65f0f415e75ad"
dependencies:
cacache "^10.0.1"
find-cache-dir "^1.0.0"
schema-utils "^0.4.2"
serialize-javascript "^1.4.0"
source-map "^0.6.1"
uglify-es "^3.3.4"
webpack-sources "^1.1.0"
worker-farm "^1.5.2"

uid-number@0.0.6, uid-number@^0.0.6:
version "0.0.6"
resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81"
Expand Down

0 comments on commit 49ab2bd

Please sign in to comment.