Skip to content

Commit

Permalink
Merge branch 'master' into fs-extra-4.0.0-8.0.1-packages--create-reac…
Browse files Browse the repository at this point in the history
…t-kotlin-app
  • Loading branch information
Hypnosphi committed Dec 2, 2017
2 parents 2869295 + 65c18c2 commit 46f82ba
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,13 @@
"@jetbrains/kotlin-extensions": "^1.0.0-pre.14",
"@jetbrains/kotlin-react": "^16.2.0-pre.14",
"@jetbrains/kotlin-react-dom": "^16.2.0-pre.14",
"eslint": "4.12.0",
"eslint": "4.12.1",
"husky": "^0.14.3",
"kotlin": "^1.2.0",
"kotlinx-html": "^0.6.8",
"lerna": "^2.4.0",
"lerna-changelog": "^0.6.0",
"lint-staged": "^4.2.3",
"lerna-changelog": "^0.7.0",
"lint-staged": "^6.0.0",
"prettier": "^1.7.4",
"react": "^16.2.0",
"react-dom": "^16.2.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/create-react-kotlin-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@
"create-react-kotlin-app": "./index.js"
},
"dependencies": {
"chalk": "^1.1.1",
"chalk": "^2.3.0",
"commander": "^2.9.0",
"cross-spawn": "^4.0.0",
"cross-spawn": "^5.1.0",
"fs-extra": "^4.0.2",
"hyperquest": "^2.1.2",
"semver": "^5.0.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/kotlin-webpack-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
],
"dependencies": {
"@jetbrains/kotlinc-js-api": "^1.2.2",
"fs-extra": "3.0.1",
"fs-extra": "4.0.0",
"glob": "7.1.2",
"globby": "6.1.0",
"globby": "7.0.0",
"kotlin-compiler": "^1.2.1",
"read-dir-files": "^0.1.1"
},
Expand Down

0 comments on commit 46f82ba

Please sign in to comment.