aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Vitaly Takmazov2018-04-22 17:33:40 +0300
committerGravatar Vitaly Takmazov2018-04-22 17:33:40 +0300
commit58b625dc6a5c0276541d2ee76ae06312e9c3fb36 (patch)
tree979a2575bcf3017ff5daf91697b69931a0c4b0ba
parent9cb64da672389d5eb7d73a1635bafddb857ed8dd (diff)
gradle wrapper and npm updates
-rw-r--r--gradle/wrapper/gradle-wrapper.jarbin54333 -> 54413 bytes
-rw-r--r--gradle/wrapper/gradle-wrapper.properties3
-rw-r--r--juick-www/package.json6
-rw-r--r--juick-www/yarn.lock22
4 files changed, 15 insertions, 16 deletions
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index c44b679a..91ca28c8 100644
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
Binary files differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 4d019d37..e6a30918 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Fri Mar 16 09:17:03 MSK 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.7-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.5.1-all.zip
diff --git a/juick-www/package.json b/juick-www/package.json
index 821add9a..de79b8db 100644
--- a/juick-www/package.json
+++ b/juick-www/package.json
@@ -23,14 +23,14 @@
"file-loader": "^1.1.11",
"globby": "^8.0.1",
"script-loader": "^0.7.2",
- "style-loader": "^0.20.3",
+ "style-loader": "^0.21.0",
"stylelint": "^9.2.0",
"stylelint-config-standard": "^18.2.0",
"stylelint-webpack-plugin": "^0.10.4",
"uglify-loader": "^2.0.0",
"url-loader": "^1.0.1",
- "webpack": "^4.5.0",
- "webpack-cli": "^2.0.14"
+ "webpack": "^4.6.0",
+ "webpack-cli": "^2.0.15"
},
"dependencies": {
"awesomplete": "^1.1.2",
diff --git a/juick-www/yarn.lock b/juick-www/yarn.lock
index a63784d6..730e76d1 100644
--- a/juick-www/yarn.lock
+++ b/juick-www/yarn.lock
@@ -5401,7 +5401,7 @@ sax@~1.2.1:
version "1.2.4"
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
-schema-utils@^0.4.2, schema-utils@^0.4.3, schema-utils@^0.4.5:
+schema-utils@^0.4.3, schema-utils@^0.4.4, schema-utils@^0.4.5:
version "0.4.5"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.5.tgz#21836f0608aac17b78f9e3e24daff14a5ca13a3e"
dependencies:
@@ -5766,9 +5766,9 @@ strip-json-comments@~2.0.1:
version "2.0.1"
resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-style-loader@^0.20.3:
- version "0.20.3"
- resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.20.3.tgz#ebef06b89dec491bcb1fdb3452e913a6fd1c10c4"
+style-loader@^0.21.0:
+ version "0.21.0"
+ resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.21.0.tgz#68c52e5eb2afc9ca92b6274be277ee59aea3a852"
dependencies:
loader-utils "^1.1.0"
schema-utils "^0.4.5"
@@ -6344,9 +6344,9 @@ webpack-addons@^1.1.5:
dependencies:
jscodeshift "^0.4.0"
-webpack-cli@^2.0.14:
- version "2.0.14"
- resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.0.14.tgz#71d03d8c10547c1dfd674f71ff3b0457c33a74cd"
+webpack-cli@^2.0.15:
+ version "2.0.15"
+ resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-2.0.15.tgz#7532066556b03bd3292285ac08537e28844616c2"
dependencies:
chalk "^2.3.2"
cross-spawn "^6.0.5"
@@ -6382,9 +6382,9 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0:
source-list-map "^2.0.0"
source-map "~0.6.1"
-webpack@^4.5.0:
- version "4.5.0"
- resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.5.0.tgz#1e6f71e148ead02be265ff2879c9cd6bb30b8848"
+webpack@^4.6.0:
+ version "4.6.0"
+ resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.6.0.tgz#363eafa733710eb0ed28c512b2b9b9f5fb01e69b"
dependencies:
acorn "^5.0.0"
acorn-dynamic-import "^3.0.0"
@@ -6400,7 +6400,7 @@ webpack@^4.5.0:
mkdirp "~0.5.0"
neo-async "^2.5.0"
node-libs-browser "^2.0.0"
- schema-utils "^0.4.2"
+ schema-utils "^0.4.4"
tapable "^1.0.0"
uglifyjs-webpack-plugin "^1.2.4"
watchpack "^1.5.0"