(royale-compiler) branch develop updated: CSSManager: ignore .css added with new -js-include-css option

[joshtynjala]

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-compiler.git


The following commit(s) were added to refs/heads/develop by this push:
     new 6885bcc50 CSSManager: ignore .css added with new -js-include-css option
6885bcc50 is described below

commit 6885bcc50212869d1dfb04d47e79907402834868
Author: Josh Tynjala <joshtynj...@apache.org>
AuthorDate: Wed Apr 2 09:16:14 2025 -0700

    CSSManager: ignore .css added with new -js-include-css option
    
    This CSS is not meant to be processed by the compiler. It simply gets 
copied to the output directory and referenced with <link>
---
 .../java/org/apache/royale/compiler/internal/css/CSSManager.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git 
a/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSManager.java
 
b/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSManager.java
index 92524d545..1e611791f 100644
--- 
a/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSManager.java
+++ 
b/compiler/src/main/java/org/apache/royale/compiler/internal/css/CSSManager.java
@@ -281,7 +281,12 @@ public class CSSManager implements ICSSManager
                     for (String fileName : fileNames)
                     {
                        String suffix = FilenameUtils.getExtension(fileName);
-                       if ("css".equalsIgnoreCase(suffix) && 
!fileName.contains("default"))
+                       if ("css".equalsIgnoreCase(suffix)
+                                && !fileName.contains("default")
+                                // ignore .css files bundled with 
-js-include-css
+                                // because they are simply added as <link> 
tags in HTML
+                                && !fileName.startsWith("js/css/")
+                                && !fileName.startsWith("js\\css\\"))
                        {
                             final CacheStoreKeyBase key = 
CSSDocumentCache.createKey(swc, fileName);
                             final ICSSDocument extracss = cssCache.get(key);