You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by jo...@apache.org on 2023/04/06 22:37:00 UTC
[royale-asjs] 03/03: Switch to dart-sass-maven-plugin because the old plugin for Sass stopped working with newer JDKs and isn't maintained anymore
This is an automated email from the ASF dual-hosted git repository.
joshtynjala pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 5fa54b45ed0652de75df18e3bcabb878d19f0feb
Author: Josh Tynjala <jo...@apache.org>
AuthorDate: Thu Apr 6 15:36:50 2023 -0700
Switch to dart-sass-maven-plugin because the old plugin for Sass stopped working with newer JDKs and isn't maintained anymore
---
.../src/main/resources/archetype-resources/pom.xml | 22 ++++-------
.../src/main/resources/archetype-resources/pom.xml | 23 ++++-------
.../archetype-resources/__application__/pom.xml | 11 ++++--
.../archetype-resources/__module__/pom.xml | 29 ++++++++------
.../src/main/resources/archetype-resources/pom.xml | 22 ++++-------
examples/crux/AppWithLib/pom.xml | 22 ++++-------
examples/crux/SampleLib/pom.xml | 23 ++++-------
examples/crux/todomvc-jewel-crux/pom.xml | 23 ++++-------
examples/jewel/todomvc/pom.xml | 22 ++++-------
frameworks/projects/Jewel/pom.xml | 26 +++++-------
.../projects/Jewel/src/main/resources/defaults.css | 44 ++++++++-------------
frameworks/themes/pom.xml | 46 ++++------------------
pom.xml | 6 +--
13 files changed, 110 insertions(+), 209 deletions(-)
diff --git a/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml
index 6e6b4553f6..ddd81beea9 100644
--- a/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/royale-jewel-application-archetype/src/main/resources/archetype-resources/pom.xml
@@ -73,27 +73,19 @@
</dependencies>
</plugin>
<plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
- <version>3.7.2</version>
+ <groupId>io.github.cleydyr</groupId>
+ <artifactId>dart-sass-maven-plugin</artifactId>
+ <version>0.3.0</version>
<configuration>
- <resources>
- <resource>
- <source>
- <directory>${dollar}{basedir}/src/main/sass</directory>
- <includes>
- <include>**/*.sass</include>
- </includes>
- </source>
- <destination>${dollar}{basedir}/src/main/resources</destination>
- </resource>
- </resources>
+ <inputFolder>${dollar}{basedir}/src/main/sass</inputFolder>
+ <outputFolder>${dollar}{basedir}/src/main/resources</outputFolder>
</configuration>
<executions>
<execution>
<id>generate-css-using-sass</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>update-stylesheets</goal>
+ <goal>compile-sass</goal>
</goals>
</execution>
</executions>
diff --git a/archetypes/royale-jewel-library-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/royale-jewel-library-archetype/src/main/resources/archetype-resources/pom.xml
index 1da576d130..fbee324356 100644
--- a/archetypes/royale-jewel-library-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/royale-jewel-library-archetype/src/main/resources/archetype-resources/pom.xml
@@ -145,29 +145,20 @@
</dependencies>
</plugin>
<plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
- <version>3.7.2</version>
+ <groupId>io.github.cleydyr</groupId>
+ <artifactId>dart-sass-maven-plugin</artifactId>
+ <version>0.3.0</version>
<configuration>
- <resources>
- <resource>
- <source>
- <directory>${dollar}{basedir}/src/main/sass</directory>
- <includes>
- <include>**/*.sass</include>
- </includes>
- </source>
- <destination>${dollar}{basedir}/src/main/resources</destination>
- </resource>
- </resources>
+ <inputFolder>${dollar}{basedir}/src/main/sass</inputFolder>
+ <outputFolder>${dollar}{basedir}/src/main/resources</outputFolder>
</configuration>
<executions>
<execution>
<id>generate-css-using-sass</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>update-stylesheets</goal>
+ <goal>compile-sass</goal>
</goals>
- <phase>generate-resources</phase>
</execution>
</executions>
</plugin>
diff --git a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml
index d784333cac..b095767ab4 100644
--- a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml
+++ b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__application__/pom.xml
@@ -61,13 +61,18 @@
</configuration>
</plugin>
<plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
+ <groupId>io.github.cleydyr</groupId>
+ <artifactId>dart-sass-maven-plugin</artifactId>
+ <configuration>
+ <inputFolder>${dollar}{basedir}/src/main/sass</inputFolder>
+ <outputFolder>${dollar}{basedir}/src/main/resources</outputFolder>
+ </configuration>
<executions>
<execution>
<id>generate-css-using-sass</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>update-stylesheets</goal>
+ <goal>compile-sass</goal>
</goals>
</execution>
</executions>
diff --git a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml
index 3700718421..4bf42eca25 100644
--- a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml
+++ b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/__module__/pom.xml
@@ -59,18 +59,23 @@
</additionalCompilerOptions>
</configuration>
</plugin>
- <plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>generate-css-using-sass</id>
- <goals>
- <goal>update-stylesheets</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <groupId>io.github.cleydyr</groupId>
+ <artifactId>dart-sass-maven-plugin</artifactId>
+ <configuration>
+ <inputFolder>${dollar}{basedir}/src/main/sass</inputFolder>
+ <outputFolder>${dollar}{basedir}/src/main/resources</outputFolder>
+ </configuration>
+ <executions>
+ <execution>
+ <id>generate-css-using-sass</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>compile-sass</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
<!-- copy module files from Module target folder to Application target folder-->
<plugin>
diff --git a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/pom.xml b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/pom.xml
index 37c8276288..960f3acd78 100644
--- a/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/archetypes/royale-jewel-module-application-archetype/src/main/resources/archetype-resources/pom.xml
@@ -72,27 +72,19 @@
</dependencies>
</plugin>
<plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
- <version>3.7.2</version>
+ <groupId>io.github.cleydyr</groupId>
+ <artifactId>dart-sass-maven-plugin</artifactId>
+ <version>0.3.0</version>
<configuration>
- <resources>
- <resource>
- <source>
- <directory>${dollar}{basedir}/src/main/sass</directory>
- <includes>
- <include>**/*.sass</include>
- </includes>
- </source>
- <destination>${dollar}{basedir}/src/main/resources</destination>
- </resource>
- </resources>
+ <inputFolder>${dollar}{basedir}/src/main/sass</inputFolder>
+ <outputFolder>${dollar}{basedir}/src/main/resources</outputFolder>
</configuration>
<executions>
<execution>
<id>generate-css-using-sass</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>update-stylesheets</goal>
+ <goal>compile-sass</goal>
</goals>
</execution>
</executions>
diff --git a/examples/crux/AppWithLib/pom.xml b/examples/crux/AppWithLib/pom.xml
index 2419c2407c..6468631814 100644
--- a/examples/crux/AppWithLib/pom.xml
+++ b/examples/crux/AppWithLib/pom.xml
@@ -68,27 +68,19 @@
</dependencies>
</plugin>
<plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
- <version>3.7.2</version>
+ <groupId>io.github.cleydyr</groupId>
+ <artifactId>dart-sass-maven-plugin</artifactId>
+ <version>0.3.0</version>
<configuration>
- <resources>
- <resource>
- <source>
- <directory>${basedir}/src/main/sass</directory>
- <includes>
- <include>**/*.sass</include>
- </includes>
- </source>
- <destination>${basedir}/src/main/resources</destination>
- </resource>
- </resources>
+ <inputFolder>${basedir}/src/main/sass</inputFolder>
+ <outputFolder>${basedir}/src/main/resources</outputFolder>
</configuration>
<executions>
<execution>
<id>generate-css-using-sass</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>update-stylesheets</goal>
+ <goal>compile-sass</goal>
</goals>
</execution>
</executions>
diff --git a/examples/crux/SampleLib/pom.xml b/examples/crux/SampleLib/pom.xml
index 7e20ba95f8..da861719e0 100644
--- a/examples/crux/SampleLib/pom.xml
+++ b/examples/crux/SampleLib/pom.xml
@@ -145,29 +145,20 @@
</dependencies>
</plugin>
<plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
- <version>3.7.2</version>
+ <groupId>io.github.cleydyr</groupId>
+ <artifactId>dart-sass-maven-plugin</artifactId>
+ <version>0.3.0</version>
<configuration>
- <resources>
- <resource>
- <source>
- <directory>${basedir}/src/main/sass</directory>
- <includes>
- <include>**/*.sass</include>
- </includes>
- </source>
- <destination>${basedir}/src/main/resources</destination>
- </resource>
- </resources>
+ <inputFolder>${basedir}/src/main/sass</inputFolder>
+ <outputFolder>${basedir}/src/main/resources</outputFolder>
</configuration>
<executions>
<execution>
<id>generate-css-using-sass</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>update-stylesheets</goal>
+ <goal>compile-sass</goal>
</goals>
- <phase>generate-resources</phase>
</execution>
</executions>
</plugin>
diff --git a/examples/crux/todomvc-jewel-crux/pom.xml b/examples/crux/todomvc-jewel-crux/pom.xml
index 6ec88c2057..a827769bff 100644
--- a/examples/crux/todomvc-jewel-crux/pom.xml
+++ b/examples/crux/todomvc-jewel-crux/pom.xml
@@ -58,32 +58,23 @@
</plugin>
<!-- SASS compilation -->
<plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
- <version>3.7.2</version>
+ <groupId>io.github.cleydyr</groupId>
+ <artifactId>dart-sass-maven-plugin</artifactId>
+ <version>0.3.0</version>
<configuration>
- <resources>
- <resource>
- <source>
- <directory>${basedir}/src/main/sass</directory>
- <includes>
- <include>**/*.sass</include>
- </includes>
- </source>
- <destination>${basedir}/src/main/resources</destination>
- </resource>
- </resources>
+ <inputFolder>${basedir}/src/main/sass</inputFolder>
+ <outputFolder>${basedir}/src/main/resources</outputFolder>
</configuration>
<executions>
<execution>
<id>generate-css-using-sass</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>update-stylesheets</goal>
+ <goal>compile-sass</goal>
</goals>
</execution>
</executions>
</plugin>
- </plugins>
</build>
<dependencies>
diff --git a/examples/jewel/todomvc/pom.xml b/examples/jewel/todomvc/pom.xml
index 5f29b53870..308621fe5e 100644
--- a/examples/jewel/todomvc/pom.xml
+++ b/examples/jewel/todomvc/pom.xml
@@ -55,27 +55,19 @@
</plugin>
<!-- SASS compilation -->
<plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
- <version>3.7.2</version>
+ <groupId>io.github.cleydyr</groupId>
+ <artifactId>dart-sass-maven-plugin</artifactId>
+ <version>0.3.0</version>
<configuration>
- <resources>
- <resource>
- <source>
- <directory>${basedir}/src/main/sass</directory>
- <includes>
- <include>**/*.sass</include>
- </includes>
- </source>
- <destination>${basedir}/src/main/resources</destination>
- </resource>
- </resources>
+ <inputFolder>${basedir}/src/main/sass</inputFolder>
+ <outputFolder>${basedir}/src/main/resources</outputFolder>
</configuration>
<executions>
<execution>
<id>generate-css-using-sass</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>update-stylesheets</goal>
+ <goal>compile-sass</goal>
</goals>
</execution>
</executions>
diff --git a/frameworks/projects/Jewel/pom.xml b/frameworks/projects/Jewel/pom.xml
index 60fbe4e6a9..67189c3905 100644
--- a/frameworks/projects/Jewel/pom.xml
+++ b/frameworks/projects/Jewel/pom.xml
@@ -68,28 +68,20 @@
</configuration>
</plugin>
<plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
+ <groupId>io.github.cleydyr</groupId>
+ <artifactId>dart-sass-maven-plugin</artifactId>
+ <version>0.3.0</version>
<configuration>
- <resources>
- <resource>
- <source>
- <directory>${basedir}/src/main/sass</directory>
- <includes>
- <include>**/*.sass</include>
- </includes>
- </source>
- <destination>${basedir}/src/main/resources</destination>
- </resource>
- </resources>
+ <inputFolder>${basedir}/src/main/sass</inputFolder>
+ <outputFolder>${basedir}/src/main/resources</outputFolder>
</configuration>
<executions>
<execution>
- <id>generate-css-using-sass</id>
- <goals>
- <goal>update-stylesheets</goal>
- </goals>
+ <id>generate-css-using-sass</id>
<phase>generate-resources</phase>
+ <goals>
+ <goal>compile-sass</goal>
+ </goals>
</execution>
</executions>
</plugin>
diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css
index 0231e4e238..05e417b80f 100644
--- a/frameworks/projects/Jewel/src/main/resources/defaults.css
+++ b/frameworks/projects/Jewel/src/main/resources/defaults.css
@@ -1,19 +1,19 @@
/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+ * * Licensed to the Apache Software Foundation (ASF) under one or more
+ * * contributor license agreements. See the NOTICE file distributed with
+ * * this work for additional information regarding copyright ownership.
+ * * The ASF licenses this file to You under the Apache License, Version 2.0
+ * * (the "License"); you may not use this file except in compliance with
+ * * the License. You may obtain a copy of the License at
+ * *
+ * * http://www.apache.org/licenses/LICENSE-2.0
+ * *
+ * * Unless required by applicable law or agreed to in writing, software
+ * * distributed under the License is distributed on an "AS IS" BASIS,
+ * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * * See the License for the specific language governing permissions and
+ * * limitations under the License.
+ * */
@namespace j "library://ns.apache.org/royale/jewel";
@namespace "http://www.w3.org/1999/xhtml";
*, *:before, *:after {
@@ -181,7 +181,6 @@ hr {
bottom: 0;
height: 50px;
}
-
@media all and (-ms-high-contrast: none) {
.jewel.alert {
display: table;
@@ -651,7 +650,6 @@ j|VirtualDataGridColumnList {
content: " ";
position: absolute;
}
-
j|DateChooser {
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.DateChooserModel");
IBeadView: ClassReference("org.apache.royale.jewel.beads.views.DateChooserView");
@@ -1023,7 +1021,6 @@ j|FormItem {
border-style: none;
padding: 0px;
}
-
j|ImageButton {
IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ImageModel");
}
@@ -3362,7 +3359,6 @@ j|Label {
.visible-phone {
display: flex !important;
}
-
.hidden-phone {
display: none !important;
}
@@ -3371,7 +3367,6 @@ j|Label {
.visible-tablet {
display: flex !important;
}
-
.hidden-tablet {
display: none !important;
}
@@ -3380,7 +3375,6 @@ j|Label {
.visible-desktop {
display: flex !important;
}
-
.hidden-desktop {
display: none !important;
}
@@ -3389,7 +3383,6 @@ j|Label {
.visible-widescreen {
display: flex !important;
}
-
.hidden-widescreen {
display: none !important;
}
@@ -3823,7 +3816,6 @@ j|HSlider {
z-index: 40;
justify-content: center;
}
-
.jewel.snackbar-content {
max-width: 568px;
min-width: 288px;
@@ -4042,7 +4034,6 @@ j|Table {
.jewel.tableitem.selectable {
cursor: pointer;
}
-
.empty-cell {
pointer-events: none;
}
@@ -4090,8 +4081,8 @@ j|TableRow {
overflow: hidden;
}
.jewel.textinput::before {
- top: calc(50% - 100%);
- left: calc(50% - 100%);
+ top: -50%;
+ left: -50%;
width: 200%;
height: 200%;
z-index: 1;
@@ -4249,7 +4240,6 @@ j|TitleBar {
left: 50%;
border-top: 0;
}
-
.jewel.topappbar {
display: inline-flex;
flex: 1 1 auto;
diff --git a/frameworks/themes/pom.xml b/frameworks/themes/pom.xml
index f8cef6f49b..44ee48aa17 100644
--- a/frameworks/themes/pom.xml
+++ b/frameworks/themes/pom.xml
@@ -219,28 +219,19 @@
<build>
<plugins>
<plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
- <version>3.7.2</version>
+ <groupId>io.github.cleydyr</groupId>
+ <artifactId>dart-sass-maven-plugin</artifactId>
+ <version>0.3.0</version>
<configuration>
- <resources>
- <!-- Depends on JewelTheme SASS framework files-->
- <resource>
- <source>
- <directory>${basedir}/src/main/sass</directory>
- <includes>
- <include>defaults.sass</include>
- </includes>
- </source>
- <destination>${basedir}/src/main/resources</destination>
- </resource>
- </resources>
+ <inputFolder>${basedir}/src/main/sass</inputFolder>
+ <outputFolder>${basedir}/src/main/resources</outputFolder>
</configuration>
<executions>
<execution>
<id>generate-css-using-sass</id>
+ <phase>generate-resources</phase>
<goals>
- <goal>update-stylesheets</goal>
+ <goal>compile-sass</goal>
</goals>
</execution>
</executions>
@@ -248,29 +239,6 @@
</plugins>
</build>
</profile>
- <!--
- This is a self-activating profile that causes the sass plugin
- to not be executed if there is no src/main/sass directory.
- -->
- <profile>
- <id>_skip-sass-compilation</id>
- <activation>
- <file>
- <missing>src/main/sass</missing>
- </file>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
- <configuration>
- <skip>true</skip>
- </configuration>
- </plugin>
- </plugins>
- </build>
- </profile>
</profiles>
</project>
diff --git a/pom.xml b/pom.xml
index decbb6a874..d67bc5b37c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -190,9 +190,9 @@
</plugin>
<plugin>
- <groupId>nl.geodienstencentrum.maven</groupId>
- <artifactId>sass-maven-plugin</artifactId>
- <version>3.7.2</version>
+ <groupId>io.github.cleydyr</groupId>
+ <artifactId>dart-sass-maven-plugin</artifactId>
+ <version>0.3.0</version>
</plugin>
<plugin>