aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build.gradle22
-rw-r--r--package.json12
-rw-r--r--src/main/java/com/juick/server/api/Messages.java2
-rw-r--r--src/main/java/com/juick/server/api/Notifications.java12
-rw-r--r--src/main/java/com/juick/server/api/PM.java6
-rw-r--r--src/main/java/com/juick/server/api/Post.java4
-rw-r--r--src/main/java/com/juick/server/api/Tags.java2
-rw-r--r--src/main/java/com/juick/server/api/Users.java8
-rw-r--r--src/main/java/com/juick/server/api/activity/Profile.java2
-rw-r--r--src/main/resources/application.properties1
-rw-r--r--src/test/java/com/juick/FormatterTest.java8
-rw-r--r--src/test/java/com/juick/MessageTest.java8
-rw-r--r--src/test/java/com/juick/server/tests/ServerTests.java25
-rw-r--r--yarn.lock24
14 files changed, 70 insertions, 66 deletions
diff --git a/build.gradle b/build.gradle
index b637ae6c..bc0f3d0e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,12 +6,12 @@ buildscript {
jcenter()
}
dependencies {
- classpath 'com.github.ben-manes:gradle-versions-plugin:0.27.0'
+ classpath 'com.github.ben-manes:gradle-versions-plugin:0.25.0'
classpath 'io.github.swagger2markup:swagger2markup-gradle-plugin:1.3.3'
}
}
plugins {
- id 'org.springframework.boot' version '2.2.0.RELEASE' apply false
+ id 'org.springframework.boot' version '2.1.8.RELEASE' apply false
id("org.asciidoctor.convert") version "2.3.0" apply false
}
@@ -149,19 +149,25 @@ dependencies {
compile "javax.xml.bind:jaxb-api:2.3.1"
runtime 'org.glassfish.jaxb:jaxb-runtime:2.3.2'
+
+ compileOnly 'io.springfox:springfox-core:2.9.2'
+
+ compile 'org.apache.commons:commons-email:1.5'
+ compile 'com.github.scribejava:scribejava-apis:6.8.1'
+ compile 'com.github.pengrad:java-telegram-bot-api:4.4.0'
+ compile 'com.twelvemonkeys.imageio:imageio-jpeg:3.4.2'
+ compile 'org.imgscalr:imgscalr-lib:4.2'
+ compile 'org.twitter4j:twitter4j-core:4.0.7'
+
compile 'rocks.xmpp:xmpp-core-client:0.8.1'
compile 'rocks.xmpp:xmpp-extensions-client:0.8.1'
compile 'com.rometools:rome:1.12.2'
compile 'com.rometools:rome-modules:1.12.2'
- compileOnly 'io.springfox:springfox-core:2.9.2'
-
- compile 'com.github.scribejava:scribejava-apis:6.9.0'
- compile 'com.github.pengrad:java-telegram-bot-api:4.4.0'
- compile 'org.twitter4j:twitter4j-core:4.0.7'
+ compile 'org.flywaydb:flyway-core:5.2.4'
- runtime 'org.mariadb.jdbc:mariadb-java-client:2.5.1'
+ runtime 'org.mariadb.jdbc:mariadb-java-client:2.4.4'
runtime 'net.java.dev.jna:jna:5.4.0'
runtime 'net.java.dev.jna:jna-platform:5.4.0'
runtime 'com.h2database:h2:1.4.199'
diff --git a/package.json b/package.json
index 521d7de4..cbc043f5 100644
--- a/package.json
+++ b/package.json
@@ -23,12 +23,12 @@
]
},
"devDependencies": {
- "@babel/core": "^7.6.4",
- "@babel/preset-env": "^7.6.3",
+ "@babel/core": "^7.6.2",
+ "@babel/preset-env": "^7.6.2",
"babel-loader": "^8.0.6",
"core-js": "^3.3.3",
"css-loader": "^3.2.0",
- "eslint": "6.5.1",
+ "eslint": "6.5.0",
"eslint-loader": "3.0.2",
"eslint-plugin-only-ascii": "0.0.0",
"mini-css-extract-plugin": "^0.8.0",
@@ -37,10 +37,10 @@
"postcss-preset-env": "^6.7.0",
"regenerator-runtime": "^0.13.3",
"style-loader": "^1.0.0",
- "stylelint": "^11.1.1",
+ "stylelint": "^11.0.0",
"stylelint-config-standard": "^19.0.0",
- "url-loader": "^2.2.0",
- "webpack": "^4.41.2",
+ "url-loader": "^2.1.0",
+ "webpack": "^4.41.0",
"webpack-cli": "^3.3.9"
},
"dependencies": {
diff --git a/src/main/java/com/juick/server/api/Messages.java b/src/main/java/com/juick/server/api/Messages.java
index f7b8c156..1c9e37ad 100644
--- a/src/main/java/com/juick/server/api/Messages.java
+++ b/src/main/java/com/juick/server/api/Messages.java
@@ -49,7 +49,7 @@ import java.util.stream.Collectors;
* @author ugnich
*/
@RestController
-@RequestMapping(produces = MediaType.APPLICATION_JSON_VALUE)
+@RequestMapping(produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public class Messages {
private static final ResponseEntity<List<com.juick.Message>> NOT_FOUND = ResponseEntity
diff --git a/src/main/java/com/juick/server/api/Notifications.java b/src/main/java/com/juick/server/api/Notifications.java
index 72988298..f2c2d712 100644
--- a/src/main/java/com/juick/server/api/Notifications.java
+++ b/src/main/java/com/juick/server/api/Notifications.java
@@ -84,7 +84,7 @@ public class Notifications {
}
@ApiIgnore
- @RequestMapping(value = "/api/notifications", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/notifications", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseEntity<List<User>> doGet(
@Visitor User visitor,
@RequestParam(required = false, defaultValue = "0") int uid,
@@ -119,7 +119,7 @@ public class Notifications {
}
@ApiIgnore
- @RequestMapping(value = "/api/notifications", method = RequestMethod.DELETE, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/notifications", method = RequestMethod.DELETE, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseEntity<Status> doDelete(
@Visitor User visitor,
@RequestBody List<ExternalToken> list) {
@@ -145,7 +145,7 @@ public class Notifications {
return ResponseEntity.ok(Status.OK);
}
@ApiIgnore
- @RequestMapping(value = "/api/notifications/delete", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/notifications/delete", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public ResponseEntity<Status> doDeleteTokens(
@Visitor User visitor,
@RequestBody List<ExternalToken> list) {
@@ -172,7 +172,7 @@ public class Notifications {
}
@ApiIgnore
- @RequestMapping(value = "/api/notifications", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/notifications", method = RequestMethod.PUT, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Status doPut(
@Visitor User visitor,
@RequestBody List<ExternalToken> list) throws IOException {
@@ -195,7 +195,7 @@ public class Notifications {
}
@Deprecated
- @RequestMapping(value = "/api/android/register", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/android/register", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Status doAndroidRegister(
@Visitor User visitor,
@RequestParam(name = "regid") String regId) {
@@ -204,7 +204,7 @@ public class Notifications {
}
@Deprecated
- @RequestMapping(value = "/api/winphone/register", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/winphone/register", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public Status doWinphoneRegister(
@Visitor User visitor,
@RequestParam(name = "url") String regId) {
diff --git a/src/main/java/com/juick/server/api/PM.java b/src/main/java/com/juick/server/api/PM.java
index 6e6cdcac..4a408dce 100644
--- a/src/main/java/com/juick/server/api/PM.java
+++ b/src/main/java/com/juick/server/api/PM.java
@@ -55,7 +55,7 @@ public class PM {
@Inject
private WebApp webApp;
- @RequestMapping(value = "/api/pm", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/pm", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public List<com.juick.Message> doGetPM(
@Visitor User visitor,
@RequestParam(required = false) String uname) {
@@ -73,7 +73,7 @@ public class PM {
return msgs;
}
- @RequestMapping(value = "/api/pm", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/pm", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public com.juick.Message doPostPM(
@Visitor User visitor,
@RequestParam String uname,
@@ -105,7 +105,7 @@ public class PM {
}
throw new HttpBadRequestException();
}
- @RequestMapping(value = "/api/groups_pms", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/groups_pms", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public PrivateChats doGetGroupsPMs(
@Visitor User visitor,
@RequestParam(defaultValue = "5") int cnt) {
diff --git a/src/main/java/com/juick/server/api/Post.java b/src/main/java/com/juick/server/api/Post.java
index 59bd05a7..10e19faf 100644
--- a/src/main/java/com/juick/server/api/Post.java
+++ b/src/main/java/com/juick/server/api/Post.java
@@ -67,7 +67,7 @@ public class Post {
@Inject
CommandsManager commandsManager;
- @RequestMapping(value = "/api/post", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/post", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
@ResponseStatus(value = HttpStatus.OK)
public CommandResult doPostMessage(
@Visitor User visitor,
@@ -99,7 +99,7 @@ public class Post {
return commandsManager.processCommand(visitor, body, attachmentFName);
}
- @RequestMapping(value = "/api/comment", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/comment", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public CommandResult doPostComment(
@Visitor User visitor,
@RequestParam(defaultValue = "0") int mid,
diff --git a/src/main/java/com/juick/server/api/Tags.java b/src/main/java/com/juick/server/api/Tags.java
index 2862d883..35f2bc66 100644
--- a/src/main/java/com/juick/server/api/Tags.java
+++ b/src/main/java/com/juick/server/api/Tags.java
@@ -38,7 +38,7 @@ public class Tags {
@Inject
private TagService tagService;
- @RequestMapping(value = "/api/tags", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/tags", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public List<TagStats> tags(
@Visitor User visitor,
@RequestParam(required = false, defaultValue = "0") int user_id
diff --git a/src/main/java/com/juick/server/api/Users.java b/src/main/java/com/juick/server/api/Users.java
index 6d7c7a45..74a720d4 100644
--- a/src/main/java/com/juick/server/api/Users.java
+++ b/src/main/java/com/juick/server/api/Users.java
@@ -81,12 +81,12 @@ public class Users {
@Inject
private EmailManager emailManager;
- @RequestMapping(value = "/api/auth", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/auth", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public String getAuthToken(@Visitor User visitor) {
return userService.getHashByUID(visitor.getUid());
}
- @RequestMapping(value = "/api/users", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/users", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public List<User> doGetUsers(
@Visitor User visitor,
@RequestParam(value = "uname", required = false) List<String> unames) {
@@ -190,7 +190,7 @@ public class Users {
}
}
- @RequestMapping(value = "/api/users/read", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/users/read", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public List<User> doGetUserRead(
@Visitor User visitor,
@RequestParam String uname) {
@@ -214,7 +214,7 @@ public class Users {
throw new HttpNotFoundException();
}
- @RequestMapping(value = "/api/users/readers", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+ @RequestMapping(value = "/api/users/readers", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public List<User> doGetUserReaders(
@Visitor User visitor,
@RequestParam String uname) {
diff --git a/src/main/java/com/juick/server/api/activity/Profile.java b/src/main/java/com/juick/server/api/activity/Profile.java
index 88c76a93..77945d6b 100644
--- a/src/main/java/com/juick/server/api/activity/Profile.java
+++ b/src/main/java/com/juick/server/api/activity/Profile.java
@@ -388,7 +388,7 @@ public class Profile {
}
return new ResponseEntity<>(CommandResult.fromString("Can not authenticate"), HttpStatus.UNAUTHORIZED);
}
- @PostMapping(value = "/u/", produces = MediaType.APPLICATION_JSON_VALUE)
+ @PostMapping(value = "/u/", produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
public User fetchUser(@RequestParam URI uri) {
return activityPubManager.personToUser(uri);
}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e9d9b77f..e89670fa 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -3,4 +3,3 @@ spring.jackson.default-property-inclusion=non_default
spring.jackson.serialization.write-dates-as-timestamps=false
spring.h2.console.enabled=true
spring.datasource.platform=h2
-spring.http.encoding.force=true
diff --git a/src/test/java/com/juick/FormatterTest.java b/src/test/java/com/juick/FormatterTest.java
index 8a6bf83f..da9f5d26 100644
--- a/src/test/java/com/juick/FormatterTest.java
+++ b/src/test/java/com/juick/FormatterTest.java
@@ -39,13 +39,13 @@ public class FormatterTest {
public void forAnyDateFormatterShouldReturnNotEmptyString() throws Exception {
Instant ts = Instant.now();
- assertThat(DateFormattersHolder.getMessageFormatterInstance().format(ts), not(emptyOrNullString()));
- assertThat(DateFormattersHolder.getRssFormatterInstance().format(ts), not(emptyOrNullString()));
+ assertThat(DateFormattersHolder.getMessageFormatterInstance().format(ts), not(isEmptyOrNullString()));
+ assertThat(DateFormattersHolder.getRssFormatterInstance().format(ts), not(isEmptyOrNullString()));
ts = Instant.ofEpochMilli(RandomUtils.nextLong(1, Long.MAX_VALUE / 10000));
- assertThat(DateFormattersHolder.getMessageFormatterInstance().format(ts), not(emptyOrNullString()));
- assertThat(DateFormattersHolder.getRssFormatterInstance().format(ts), not(emptyOrNullString()));
+ assertThat(DateFormattersHolder.getMessageFormatterInstance().format(ts), not(isEmptyOrNullString()));
+ assertThat(DateFormattersHolder.getRssFormatterInstance().format(ts), not(isEmptyOrNullString()));
}
@Test
diff --git a/src/test/java/com/juick/MessageTest.java b/src/test/java/com/juick/MessageTest.java
index 64d19e13..b4c5f4ab 100644
--- a/src/test/java/com/juick/MessageTest.java
+++ b/src/test/java/com/juick/MessageTest.java
@@ -129,20 +129,20 @@ public class MessageTest {
public void tagsStringShouldBeEmptyIfNoTags() {
Message message = new Message();
- assertThat(MessageUtils.getTagsString(message), is(emptyString()));
+ assertThat(MessageUtils.getTagsString(message), isEmptyString());
message.FriendsOnly = true;
- assertThat(MessageUtils.getTagsString(message), is(emptyString()));
+ assertThat(MessageUtils.getTagsString(message), isEmptyString());
message.Hidden = true;
message.ReadOnly = true;
- assertThat(MessageUtils.getTagsString(message), is(emptyString()));
+ assertThat(MessageUtils.getTagsString(message), isEmptyString());
message.setTags(MessageUtils.parseTags(" "));
- assertThat(MessageUtils.getTagsString(message), is(emptyString()));
+ assertThat(MessageUtils.getTagsString(message), isEmptyString());
}
@Test
diff --git a/src/test/java/com/juick/server/tests/ServerTests.java b/src/test/java/com/juick/server/tests/ServerTests.java
index e6c394d2..644ff096 100644
--- a/src/test/java/com/juick/server/tests/ServerTests.java
+++ b/src/test/java/com/juick/server/tests/ServerTests.java
@@ -504,7 +504,7 @@ public class ServerTests {
get("/api/home")
.with(httpBasic(ugnichName, ugnichPassword)))
.andExpect(status().isOk())
- .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+ .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
.andExpect(jsonPath("$[0].mid", is(msg.getMid())))
.andExpect(jsonPath("$[0].timestamp",
is(DateFormattersHolder.getMessageFormatterInstance().format(msg.getCreated()))))
@@ -574,7 +574,7 @@ public class ServerTests {
.param("uname", "ugnich")
.param("uname", "freefd"))
.andExpect(status().isOk())
- .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+ .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
.andExpect(jsonPath("$", hasSize(2)));
}
@@ -593,7 +593,7 @@ public class ServerTests {
mockMvc.perform(get("/api/messages?"+ "hash=" + userIdHash))
.andDo(print())
.andExpect(status().isOk())
- .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+ .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
.andExpect((jsonPath("$[0].reactions[?(@.id == 3)].count",
is(Collections.singletonList(1)))))
.andExpect((jsonPath("$[0].reactions[?(@.id == 2)].count",
@@ -601,7 +601,7 @@ public class ServerTests {
mockMvc.perform(get("/api/reactions?hash=" + userIdHash))
.andExpect(status().isOk())
- .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+ .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
.andExpect(jsonPath("$.length()", is(7)));
}
@@ -660,7 +660,7 @@ public class ServerTests {
String token = "123456";
ExternalToken registration = new ExternalToken(null, "apns", token, null);
mockMvc.perform(put("/api/notifications").with(httpBasic(ugnichName, ugnichPassword))
- .contentType(MediaType.APPLICATION_JSON)
+ .contentType(MediaType.APPLICATION_JSON_UTF8)
.content(jsonMapper.writeValueAsBytes(Collections.singletonList(registration))))
.andExpect(status().isOk());
MvcResult result = mockMvc.perform(get("/api/notifications")
@@ -685,10 +685,10 @@ public class ServerTests {
public void notificationsTokensTest() throws Exception {
List<ExternalToken> tokens = Collections.singletonList(new ExternalToken(null, "gcm", "123456", null));
mockMvc.perform(delete("/api/notifications").with(httpBasic(ugnichName, ugnichPassword))
- .contentType(MediaType.APPLICATION_JSON)
+ .contentType(MediaType.APPLICATION_JSON_UTF8)
.content(jsonMapper.writeValueAsBytes(tokens))).andExpect(status().isForbidden());
mockMvc.perform(delete("/api/notifications").with(httpBasic(juickName, juickPassword))
- .contentType(MediaType.APPLICATION_JSON)
+ .contentType(MediaType.APPLICATION_JSON_UTF8)
.content(jsonMapper.writeValueAsBytes(tokens))).andExpect(status().isOk());
}
@Test
@@ -1135,8 +1135,7 @@ public class ServerTests {
.andExpect(status().isOk())
.andReturn();
List<Message> fromApi = jsonMapper.readValue(apiResult.getResponse().getContentAsString(),
- new TypeReference<>() {
- });
+ new TypeReference<List<Message>>() {});
assertThat(fromApi.get(0).getTags(), is(tags));
}
@Test
@@ -1672,7 +1671,7 @@ public class ServerTests {
public void appAssociationsTest() throws Exception {
mockMvc.perform((get("/.well-known/apple-app-site-association")))
.andExpect(status().isOk())
- .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+ .andExpect(content().contentType(MediaType.APPLICATION_JSON_UTF8))
.andExpect(jsonPath("$.webcredentials.apps[0]", is(appId)));
}
@Test
@@ -1706,7 +1705,7 @@ public class ServerTests {
@Test
public void swaggerOutput() throws Exception {
MvcResult result = mockMvc.perform(get("/v2/api-docs")
- .accept(MediaType.APPLICATION_JSON))
+ .accept(MediaType.APPLICATION_JSON_UTF8))
.andExpect(status().isOk())
.andReturn();
String outputDir = System.getProperty("io.springfox.staticdocs.outputDir");
@@ -1835,9 +1834,9 @@ public class ServerTests {
URI testuserkeyUri = URI.create("https://example.com/u/testuser#main-key");
MockRestServiceServer restServiceServer = MockRestServiceServer.createServer(apClient);
restServiceServer.expect(times(3), requestTo(testuserUri))
- .andRespond(withSuccess(testuserResponseString, MediaType.APPLICATION_JSON));
+ .andRespond(withSuccess(testuserResponseString, MediaType.APPLICATION_JSON_UTF8));
restServiceServer.expect(times(3), requestTo(testuserkeyUri))
- .andRespond(withSuccess(testuserResponseString, MediaType.APPLICATION_JSON));
+ .andRespond(withSuccess(testuserResponseString, MediaType.APPLICATION_JSON_UTF8));
Person testuser = (Person)signatureManager.getContext(testuserUri).get();
Assert.assertThat(testuser.getPublicKey().getPublicKeyPem(), is(testKeystoreManager.getPublicKeyPem()));
Instant now2 = Instant.now();
diff --git a/yarn.lock b/yarn.lock
index 68381a48..6a290002 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9,7 +9,7 @@
dependencies:
"@babel/highlight" "^7.0.0"
-"@babel/core@>=7.2.2", "@babel/core@^7.6.4":
+"@babel/core@>=7.2.2", "@babel/core@^7.6.2":
version "7.6.4"
resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.6.4.tgz#6ebd9fe00925f6c3e177bb726a188b5f578088ff"
integrity sha512-Rm0HGw101GY8FTzpWSyRbki/jzq+/PkNQJ+nSulrdY6gFGOsNseCqD6KHRYe2E+EdzuBdr2pxCp6s4Uk6eJ+XQ==
@@ -548,7 +548,7 @@
"@babel/helper-regex" "^7.4.4"
regexpu-core "^4.6.0"
-"@babel/preset-env@^7.6.3":
+"@babel/preset-env@^7.6.2":
version "7.6.3"
resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.6.3.tgz#9e1bf05a2e2d687036d24c40e4639dc46cef2271"
integrity sha512-CWQkn7EVnwzlOdR5NOm2+pfgSNEZmvGjOhlCHBDq0J8/EStr+G+FvPEiz9B56dR6MoiUFjXhfE4hjLoAKKJtIQ==
@@ -2233,10 +2233,10 @@ eslint-visitor-keys@^1.1.0:
resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
-eslint@6.5.1:
- version "6.5.1"
- resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.5.1.tgz#828e4c469697d43bb586144be152198b91e96ed6"
- integrity sha512-32h99BoLYStT1iq1v2P9uwpyznQ4M2jRiFB6acitKz52Gqn+vPaMDUTB1bYi1WN4Nquj2w+t+bimYUG83DC55A==
+eslint@6.5.0:
+ version "6.5.0"
+ resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.5.0.tgz#304623eec903969dd5c9f2d61c6ce3d6ecec8750"
+ integrity sha512-IIbSW+vKOqMatPmS9ayyku4tvWxHY2iricSRtOz6+ZA5IPRlgXzEL0u/j6dr4eha0ugmhMwDTqxtmNu3kj9O4w==
dependencies:
"@babel/code-frame" "^7.0.0"
ajv "^6.10.0"
@@ -4000,9 +4000,9 @@ node-pre-gyp@^0.12.0:
tar "^4"
node-releases@^1.1.36:
- version "1.1.36"
- resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.36.tgz#44b7cb8254138e87bdbfa47761d0f825e20900b4"
- integrity sha512-ggXhX6QGyJSjj3r+6ml2LqqC28XOWmKtpb+a15/Zpr9V3yoNazxJNlcQDS9bYaid5FReEWHEgToH1mwoUceWwg==
+ version "1.1.37"
+ resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.37.tgz#af787db03833a7cda5d197cbb8262d5527270bd8"
+ integrity sha512-0EOsAEdn6S2vQdDGBWBpmClm5BCkXVkVOURdnhfg7//rxI2XbleRdKig87WuBrk+0PHZ4OhO58fRm9mzWW4jNw==
dependencies:
semver "^6.3.0"
@@ -6080,7 +6080,7 @@ stylelint-config-standard@^19.0.0:
dependencies:
stylelint-config-recommended "^3.0.0"
-stylelint@^11.1.1:
+stylelint@^11.0.0:
version "11.1.1"
resolved "https://registry.yarnpkg.com/stylelint/-/stylelint-11.1.1.tgz#6dbbb348036576ac6b033ddfedba72a877c1d6bb"
integrity sha512-Vx6TAJsxG6qksiFvxQTKriQhp1CqUWdpTDITEkAjTR+l+8Af7qNlvrUDXfpuFJgXh/ayF8xdMSKE+SstcsPmMA==
@@ -6504,7 +6504,7 @@ urix@^0.1.0:
resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
-url-loader@^2.2.0:
+url-loader@^2.1.0:
version "2.2.0"
resolved "https://registry.yarnpkg.com/url-loader/-/url-loader-2.2.0.tgz#af321aece1fd0d683adc8aaeb27829f29c75b46e"
integrity sha512-G8nk3np8ZAnwhHXas1JxJEwJyQdqFXAKJehfgZ/XrC48volFBRtO+FIKtF2u0Ma3bw+4vnDVjHPAQYlF9p2vsw==
@@ -6642,7 +6642,7 @@ webpack-sources@^1.1.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1:
source-list-map "^2.0.0"
source-map "~0.6.1"
-webpack@^4.41.2:
+webpack@^4.41.0:
version "4.41.2"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.2.tgz#c34ec76daa3a8468c9b61a50336d8e3303dce74e"
integrity sha512-Zhw69edTGfbz9/8JJoyRQ/pq8FYUoY0diOXqW0T6yhgdhCv6wr0hra5DwwWexNRns2Z2+gsnrNcbe9hbGBgk/A==
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 11:29:15 +0000