Skip to content

Commit 9a0f581

Browse files
committed
Import CSS from npm package
1 parent de6f3c4 commit 9a0f581

File tree

3 files changed

+11
-186
lines changed

3 files changed

+11
-186
lines changed

pom.xml

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>com.flowingcode.addons</groupId>
66
<artifactId>xterm-console</artifactId>
7-
<version>1.0.1-SNAPSHOT</version>
7+
<version>1.0.0-SNAPSHOT</version>
88
<name>XTerm Console Addon</name>
99
<description>Integration of xterm.js for Vaadin Flow</description>
1010

@@ -33,9 +33,9 @@
3333
</licenses>
3434

3535
<scm>
36-
<url>https://github.com/FlowingCode/XTermConsoleAddon</url>
37-
<connection>scm:git:git://github.com/FlowingCode/XTermConsoleAddon.git</connection>
38-
<developerConnection>scm:git:ssh://[email protected]:/FlowingCode/XTermConsoleAddon.git</developerConnection>
36+
<url>https://github.com/FlowingCode/XTermAddon</url>
37+
<connection>scm:git:git://github.com/FlowingCode/XTermAddon.git</connection>
38+
<developerConnection>scm:git:ssh://[email protected]:/FlowingCode/XTermAddon.git</developerConnection>
3939
<tag>HEAD</tag>
4040
</scm>
4141

@@ -66,13 +66,6 @@
6666
<version>1.18.10</version>
6767
</dependency>
6868

69-
<dependency>
70-
<groupId>javax.servlet</groupId>
71-
<artifactId>javax.servlet-api</artifactId>
72-
<scope>provided</scope>
73-
<version>4.0.1</version>
74-
</dependency>
75-
7669
<dependency>
7770
<groupId>com.vaadin</groupId>
7871
<artifactId>vaadin-core</artifactId>
@@ -158,9 +151,6 @@
158151
<configuration>
159152
<licenseName>apache_v2</licenseName>
160153
<addJavaLicenseAfterPackage>false</addJavaLicenseAfterPackage>
161-
<excludes>
162-
<exclude>**/xterm.css</exclude>
163-
</excludes>
164154
</configuration>
165155
</plugin>
166156

@@ -204,6 +194,12 @@
204194
the test package. -->
205195
<useTestScope>true</useTestScope>
206196
<webAppConfig>
197+
<!--
198+
<resourceBases>
199+
<resourceBase>src/test/resources/META-INF/resources</resourceBase>
200+
<resourceBase>src/main/resources/META-INF/resources</resourceBase>
201+
</resourceBases>
202+
-->
207203
</webAppConfig>
208204
<supportedPackagings>
209205
<supportedPackaging>jar</supportedPackaging>

src/main/java/com/flowingcode/vaadin/addons/xterm/XTerm.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
@NpmPackage(value = "xterm", version = "^4.3.0")
6464
@JsModule("./fc-xterm/xterm.js")
6565
@Tag("fc-xterm")
66-
@CssImport("./fc-xterm/xterm.css")
66+
@CssImport("xterm/css/xterm.css")
6767
public class XTerm extends Component implements ITerminal, ITerminalOptions, HasSize, HasEnabled {
6868

6969
private static final long serialVersionUID = 1L;

src/main/resources/META-INF/frontend/fc-xterm/xterm.css

Lines changed: 0 additions & 171 deletions
This file was deleted.

0 commit comments

Comments
 (0)