Skip to content

Commit

Permalink
Merge branch 'master' into dependencies.io-update-build-401.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
Leonya committed Oct 18, 2018
2 parents 1c41571 + c606c67 commit d414f98
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 16 deletions.
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jetbrains/ring-ui",
"version": "1.0.9",
"version": "1.0.10",
"description": "JetBrains UI library",
"author": "JetBrains",
"license": "Apache-2.0",
Expand Down Expand Up @@ -64,7 +64,7 @@
"@babel/cli": "7.1.2",
"@babel/polyfill": "7.0.0",
"@jetbrains/eslint-config": "4.0.3",
"@jetbrains/generator-ring-ui": "^1.0.9",
"@jetbrains/generator-ring-ui": "^1.0.10",
"@jetbrains/stylelint-config": "^1.3.4",
"angular": "1.7.5",
"angular-mocks": "1.7.5",
Expand Down Expand Up @@ -166,7 +166,7 @@
"react-virtualized": "9.20.1",
"react-waypoint": "8.0.3",
"remark-breaks": "1.0.1",
"sass": "1.14.2",
"sass": "1.14.3",
"sass-loader": "7.1.0",
"scrollbar-width": "3.1.1",
"simply-uuid": "1.0.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/docs/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/docs/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@ring-ui/docs",
"version": "0.1.24",
"version": "0.1.25",
"description": "Docs site for Ring UI library",
"author": "JetBrains",
"license": "Apache-2.0",
Expand All @@ -23,7 +23,7 @@
"start": "node --max_old_space_size=2500 ./node_modules/.bin/webpack-dev-server --env.server --disable-host-check"
},
"devDependencies": {
"@jetbrains/ring-ui": "^1.0.9",
"@jetbrains/ring-ui": "^1.0.10",
"extract-text-webpack-plugin": "2.1.2",
"webpack": "2.7.0",
"webpack-dev-server": "2.11.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/generator/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions packages/generator/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@jetbrains/generator-ring-ui",
"version": "1.0.9",
"version": "1.0.10",
"description": "Generator for Ring UI frontend apps",
"author": "JetBrains",
"license": "Apache-2.0",
Expand All @@ -25,7 +25,7 @@
"yeoman-option-or-prompt": "^2.0.1"
},
"devDependencies": {
"@jetbrains/ring-ui": "^1.0.9",
"@jetbrains/ring-ui": "^1.0.10",
"yo": "2.0.5"
}
}

0 comments on commit d414f98

Please sign in to comment.