Skip to content

Commit

Permalink
Merge branch 'master' into renovate/semantic-ui-react-0.x
Browse files Browse the repository at this point in the history
  • Loading branch information
rschlaefli authored Aug 28, 2017
2 parents 58c767f + 7b6f0b9 commit 2491494
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
16 changes: 9 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
"devDependencies": {
"@storybook/addon-actions": "3.2.6",
"@storybook/addon-info": "3.2.7",
"@storybook/addon-info": "3.2.9",
"@storybook/addon-knobs": "3.2.8",
"@storybook/addon-links": "3.2.6",
"@storybook/addon-storyshots": "3.2.8",
Expand Down Expand Up @@ -69,14 +69,16 @@
"scripts": {
"build": "next build src && node ./src/lib/defaultLang",
"debug": "cross-env NODE_ENV=production node --inspect server.js",
"dev": "nodemon -w server.js server.js",
"flow": "flow",
"format": "prettier-eslint --single-quote --no-semi --write 'src/**/*.js'",
"format:ci": "prettier-eslint --single-quote --no-semi --list-different 'src/**/*.js'",
"lint": "eslint 'src/**/*.js'",
"dev": "nodemon -w \"src/**/*.js\" -w .env -w package.json -w yarn.lock server.js",
"dev:inspect": "nodemon -w \"src/**/*.js\" -w .env -w package.json -w yarn.lock --inspect server.js",
"flow": "flow check",
"format": "prettier-eslint --single-quote --no-semi --write server.js \"src/**/*.js\"",
"format:ci": "prettier-eslint --single-quote --no-semi --list-different server.js \"src/**/*.js\"",
"lint": "eslint server.js \"src/**/*.js\"",
"start": "cross-env NODE_ENV=production node server.js",
"storybook": "start-storybook -p 6006",
"test": "jest"
"test": "jest",
"test:watch": "jest --watch"
},
"jest": {
"testEnvironment": "node",
Expand Down
8 changes: 4 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
react-inspector "^2.1.1"
uuid "^3.1.0"

"@storybook/[email protected].7":
version "3.2.7"
resolved "https://registry.yarnpkg.com/@storybook/addon-info/-/addon-info-3.2.7.tgz#1a12a4b6cd79747d706c223842c22b7442eafe85"
"@storybook/[email protected].9":
version "3.2.9"
resolved "https://registry.yarnpkg.com/@storybook/addon-info/-/addon-info-3.2.9.tgz#50daca12d216f8338843023f13030cd92ab9789e"
dependencies:
"@storybook/addons" "^3.2.6"
"@storybook/components" "^3.2.7"
Expand Down Expand Up @@ -1888,7 +1888,7 @@ caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
version "1.0.30000718"
resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000718.tgz#86cdd97987302554934c61e106f4e470f16f993c"

caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000718:
caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000718
version "1.0.30000718"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000718.tgz#0dd24290beb11310b2d80f6b70a823c2a65a6fad"

Expand Down

0 comments on commit 2491494

Please sign in to comment.