Merge pull request #1916 from Haehnchen/feature/1536-manifest-json

Haehnchen · web-flow · commit bf8fbbcff982 · 2022-05-05T19:13:01.000+02:00
#1536 #1020 support manifest.json inside assets
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetDirectoryReader.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetDirectoryReader.java
@@ -6,6 +6,7 @@
 import com.intellij.openapi.vfs.VirtualFileVisitor;
 import com.intellij.psi.PsiDirectory;
 import fr.adrienbrault.idea.symfony2plugin.Settings;
+import fr.adrienbrault.idea.symfony2plugin.templating.webpack.SymfonyWebpackUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.SymfonyBundleUtil;
 import fr.adrienbrault.idea.symfony2plugin.util.dict.SymfonyBundle;
@@ -71,6 +72,14 @@ public boolean visitFile(@NotNull VirtualFile virtualFile) {
                     return super.visitFile(virtualFile);
                 }
             });
+
+            VirtualFile fileByRelativePath = webDirectory.findFileByRelativePath("build/manifest.json");
+            if (fileByRelativePath != null) {
+                SymfonyWebpackUtil.visitManifestJsonEntries(
+                    fileByRelativePath,
+                    pair -> files.add(AssetFile.createVirtualManifestEntry(fileByRelativePath, pair.getFirst()))
+                );
+            }
         }
 
         if(!this.includeBundleDir) {
@@ -116,7 +125,7 @@ public Collection<VirtualFile> resolveAssetFile(@NotNull Project project, @NotNu
         // TODO: '@SampleBundle/Resources/public/js/*'
         // TODO: '@SampleBundle/Resources/public/js/*.js'
         if(filename.startsWith("@")) {
-            Collection<VirtualFile> files = new ArrayList<>();
+            Collection<VirtualFile> files = new HashSet<>();
 
             int i = filename.indexOf("/");
             if(i > 0) {
@@ -144,7 +153,7 @@ public Collection<VirtualFile> resolveAssetFile(@NotNull Project project, @NotNu
             return files;
         }
 
-        Collection<VirtualFile> files = new ArrayList<>();
+        Collection<VirtualFile> files = new HashSet<>();
 
         for (VirtualFile webDirectory : getProjectAssetRoot(project)) {
             Matcher matcher = Pattern.compile("^(.*[/\\\\])\\*([.\\w+]*)$").matcher(assetName);
@@ -158,6 +167,18 @@ public Collection<VirtualFile> resolveAssetFile(@NotNull Project project, @NotNu
                 // "/*.js"
                 files.addAll(collectWildcardDirectories(matcher, webDirectory));
             }
+
+            VirtualFile fileByRelativePath = webDirectory.findFileByRelativePath("build/manifest.json");
+            if (fileByRelativePath != null) {
+                SymfonyWebpackUtil.visitManifestJsonEntries(
+                    fileByRelativePath,
+                    pair -> {
+                        if (filename.equalsIgnoreCase(pair.getFirst())) {
+                            files.add(fileByRelativePath);
+                        }
+                    }
+                );
+            }
         }
 
         return files;
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetFile.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/asset/AssetFile.java
@@ -19,6 +19,8 @@ public class AssetFile {
 
     private String prefix = "";
 
+    private String string = null;
+
     public AssetFile(@NotNull VirtualFile assetFile, @NotNull AssetEnum.Position assetPosition, @NotNull VirtualFile relativeFolder, @NotNull String prefix) {
         this(assetFile, assetPosition, relativeFolder);
         this.prefix = prefix;
@@ -30,6 +32,19 @@ public AssetFile(@NotNull VirtualFile assetFile, @NotNull AssetEnum.Position ass
         this.relativeFolder = relativeFolder;
     }
 
+    private AssetFile(@NotNull VirtualFile assetFile, @NotNull AssetEnum.Position assetPosition) {
+        this.assetFile = assetFile;
+        this.assetPosition = assetPosition;
+    }
+
+    public static AssetFile createVirtualManifestEntry(@NotNull VirtualFile manifestJson, @NotNull String name) {
+        AssetFile myAssetFile = new AssetFile(manifestJson, AssetEnum.Position.Web);
+
+        myAssetFile.string = name;
+
+        return myAssetFile;
+    }
+
     @NotNull
     public VirtualFile getFile() {
         return assetFile;
@@ -41,6 +56,8 @@ public AssetEnum.Position getAssetPosition() {
     }
 
     public String toString() {
-        return this.prefix + VfsUtil.getRelativePath(assetFile, relativeFolder, '/');
+        return this.string != null
+            ? this.string
+            : this.prefix + VfsUtil.getRelativePath(assetFile, relativeFolder, '/');
     }
 }
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/installer/SymfonyInstallerUtil.java
@@ -133,8 +133,6 @@ public static String getReleaseUrl() {
             }
         }
 
-        System.out.println(lastReleaseUrl);
-
         String contents;
         try {
             java.io.InputStream is = new java.net.URL(lastReleaseUrl + "?per_page=100").openStream();
diff --git a/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/webpack/SymfonyWebpackUtil.java b/src/main/java/fr/adrienbrault/idea/symfony2plugin/templating/webpack/SymfonyWebpackUtil.java
@@ -12,9 +12,11 @@
 import com.intellij.psi.search.FilenameIndex;
 import com.intellij.psi.search.GlobalSearchScope;
 import fr.adrienbrault.idea.symfony2plugin.util.ProjectUtil;
+import org.apache.commons.lang.StringUtils;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
+import java.util.Map;
 import java.util.function.Consumer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -42,6 +44,16 @@ public static void visitAllEntryFileTypes(@NotNull Project project, @NotNull Con
         }
     }
 
+    /**
+     * {
+     *     "build/app.js": "/build/app.123abc.js",
+     *     "build/dashboard.css": "/build/dashboard.a4bf2d.css"
+     * }
+     */
+    public static void visitManifestJsonEntries(@NotNull VirtualFile virtualFile, @NotNull Consumer<Pair<String, String>> consumer) {
+        visitManifestJson(virtualFile, consumer);
+    }
+
     /**
      * {
      *   "entrypoints": {
@@ -109,6 +121,38 @@ private static void visitWebpackConfiguration(@NotNull VirtualFile virtualFile,
         }
     }
 
+    /**
+     * {
+     *     "build/app.js": "/build/app.123abc.js",
+     *     "build/dashboard.css": "/build/dashboard.a4bf2d.css"
+     * }
+     */
+    private static void visitManifestJson(@NotNull VirtualFile virtualFile, @NotNull Consumer<Pair<String, String>> consumer) {
+        JsonElement jsonElement;
+        try {
+            String s = StreamUtil.readText(virtualFile.getInputStream(), "UTF-8");
+            jsonElement = JsonParser.parseString(s);
+        } catch (JsonSyntaxException | IOException e) {
+            return;
+        }
+
+        for (Map.Entry<String, JsonElement> entry : jsonElement.getAsJsonObject().entrySet()) {
+            String key = entry.getKey();
+            if (StringUtils.isBlank(key)) {
+                continue;
+            }
+
+            JsonElement value = entry.getValue();
+
+            String content = null;
+            if (value.isJsonPrimitive()) {
+                content = value.getAsString();
+            }
+
+            consumer.accept(Pair.create(key, content));
+        }
+    }
+
     private static boolean isTestFile(@NotNull Project project, @NotNull VirtualFile virtualFile) {
         // ignore: "vendor/symonfy/.../tests/fixtures/build/entrypoints.json"
         String path = VfsUtil.getRelativePath(virtualFile, ProjectUtil.getProjectDir(project), '/');
diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/webpack/SymfonyWebpackUtilTest.java b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/webpack/SymfonyWebpackUtilTest.java
@@ -1,5 +1,6 @@
 package fr.adrienbrault.idea.symfony2plugin.tests.templating.webpack;
 
+import com.intellij.openapi.vfs.VirtualFile;
 import fr.adrienbrault.idea.symfony2plugin.templating.webpack.SymfonyWebpackUtil;
 import fr.adrienbrault.idea.symfony2plugin.tests.SymfonyLightCodeInsightFixtureTestCase;
 
@@ -28,4 +29,13 @@ public void testVisitEntries() {
         SymfonyWebpackUtil.visitAllEntryFileTypes(myFixture.getProject(), pair -> entries.add(pair.second));
         assertContainsElements(entries, "foo", "foobar", "entry_foobar_2", "addStyleEntryFoobar");
     }
+
+    public void testVisitManifestJsonEntries() {
+        VirtualFile virtualFile = myFixture.copyFileToProject("manifest.json");
+
+        Set<String> entries = new HashSet<>();
+
+        SymfonyWebpackUtil.visitManifestJsonEntries(virtualFile, pair -> entries.add(pair.getFirst()));
+        assertContainsElements(entries, "build/app.js", "build/dashboard.css", "build/images/logo.png");
+    }
 }
diff --git a/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/webpack/fixtures/manifest.json b/src/test/java/fr/adrienbrault/idea/symfony2plugin/tests/templating/webpack/fixtures/manifest.json
@@ -0,0 +1,5 @@
+{
+  "build/app.js": "/build/app.123abc.js",
+  "build/dashboard.css": "/build/dashboard.a4bf2d.css",
+  "build/images/logo.png": "/build/images/logo.3eed42.png"
+}

Original file line number	Diff line number	Diff line change
`@@ -133,8 +133,6 @@ public static String getReleaseUrl() {`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`
`136`		`- System.out.println(lastReleaseUrl);`
`137`		`-`
`138`	`136`	`String contents;`
`139`	`137`	`try {`
`140`	`138`	`java.io.InputStream is = new java.net.URL(lastReleaseUrl + "?per_page=100").openStream();`