From 3dd1045082748c9ad45871dd99f3f88b5676250f Mon Sep 17 00:00:00 2001 From: Haijian Wang <30408303+haijian-vaadin@users.noreply.github.com> Date: Mon, 27 Sep 2021 11:03:03 +0300 Subject: [PATCH] fix: upgrade to lit 2.0.0 (#11898) (#11909) * fix: upgrade to lit 2.0.0 * upgrade fusion and common packages Co-authored-by: haijian Co-authored-by: Artur --- .../java/com/vaadin/flow/server/frontend/NodeUpdater.java | 2 +- .../flow/server/frontend/TaskRunPnpmInstallTest.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeUpdater.java b/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeUpdater.java index 88b31ce6fd5..7bf79dbc758 100644 --- a/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeUpdater.java +++ b/flow-server/src/main/java/com/vaadin/flow/server/frontend/NodeUpdater.java @@ -365,7 +365,7 @@ static Map getDefaultDependencies() { defaults.put("@polymer/polymer", POLYMER_VERSION); - defaults.put("lit", "2.0.0-rc.4"); + defaults.put("lit", "2.0.0"); // Constructable style sheets is only implemented for chrome, // polyfill needed for FireFox et.al. at the moment diff --git a/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java b/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java index 4903fff55e3..da657c67752 100644 --- a/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java +++ b/flow-server/src/test/java/com/vaadin/flow/server/frontend/TaskRunPnpmInstallTest.java @@ -419,7 +419,7 @@ public void generateVersionsJson_versionsGeneratedFromPackageJson_containsBothDe "{" + "\"vaadin\": {" + "\"dependencies\": {" - + "\"lit\": \"2.0.0-rc.4\"," + + "\"lit\": \"2.0.0\"," + "\"@vaadin/router\": \"1.7.4\"," + "\"@polymer/polymer\": \"3.2.0\"," + "}," @@ -429,7 +429,7 @@ public void generateVersionsJson_versionsGeneratedFromPackageJson_containsBothDe + "}" + "}," + "\"dependencies\": {" - + "\"lit\": \"2.0.0-rc.4\"," + + "\"lit\": \"2.0.0\"," + "\"@vaadin/router\": \"1.7.4\"," + "\"@polymer/polymer\": \"3.2.0\"," + "}," @@ -450,8 +450,7 @@ public void generateVersionsJson_versionsGeneratedFromPackageJson_containsBothDe final JsonObject versionsJson = Json.parse(FileUtils.readFileToString( generatedVersionsFile, StandardCharsets.UTF_8)); Assert.assertEquals( - "{" + "\"lit\":\"2.0.0-rc.4\"," - + "\"@vaadin/router\":\"1.7.4\"," + "{" + "\"lit\":\"2.0.0\"," + "\"@vaadin/router\":\"1.7.4\"," + "\"@polymer/polymer\":\"3.2.0\"," + "\"css-loader\":\"4.2.1\"," + "\"file-loader\":\"6.1.0\"" + "}",