Skip to content

Commit

Permalink
Merge branch 'master' into angular-custom-styles
Browse files Browse the repository at this point in the history
  • Loading branch information
@igor-dv
igor-dv authored Jan 30, 2018
2 parents eebec84 + 8259467 commit 511e892
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 19 deletions.
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"
}
}

0 comments on commit 511e892

Please sign in to comment.