Update for standalone wiki previewer

Author: Su5eD

src/main/java/org/moddedmc/wiki/toolkit/WikiToolkitPlugin.java

@@ -37,37 +37,17 @@ public void apply(Project target) {
 
         Provider<ProcessExecutorService> serviceProvider = target.getGradle().getSharedServices().registerIfAbsent(ProcessExecutorService.NAME, ProcessExecutorService.class);
 
-        File workDir = target.getLayout().getBuildDirectory().file("previewDocs").get().getAsFile();
-        target.getTasks().register("setupDocsPreview", SetupLocalWikiInstanceTask.class, t -> {
-            t.setDescription("Setup local Wiki instance");
-            t.getWorkDir().set(workDir);
-            t.getOrigin().set(extension.getOrigin());
-        });
+        File workDir = target.getLayout().getBuildDirectory().file("wiki-previewer").get().getAsFile();
 
-        // TODO Check if pnpm is installed
-        TaskProvider<InstallDependenciesTask> installDepsTask = target.getTasks().register("installDocsDependencies", InstallDependenciesTask.class, t -> {
-            t.usesService(serviceProvider);
-            t.getExecService().convention(serviceProvider);
-
-            t.doNotTrackState("NPM tracks the state");
-            t.getSilentStdOut().set(true);
-            t.getWorkingDir().set(workDir);
-
-            t.dependsOn("setupDocsPreview");
-        });
-
-        // TODO File watcher
         target.getTasks().register("previewDocs", RunLocalWikiInstanceTask.class, t -> {
             t.setGroup("documentation");
-            t.setDescription("Runs a local Wiki instance");
+            t.setDescription("Runs a local Wiki Previewer instance");
 
             t.usesService(serviceProvider);
             t.getExecService().convention(serviceProvider);
 
             t.getWorkingDir().set(workDir);
             t.getDocumentationRoots().convention(extension.getDocs());
-
-            t.dependsOn(installDepsTask);
         });
 
         Task revalidateDocsTask = target.getTasks().create("revalidateDocs", t -> {

src/main/java/org/moddedmc/wiki/toolkit/task/ExecuteCommandTask.java

@@ -12,6 +12,9 @@
 import org.slf4j.Logger;
 
 import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -42,6 +45,11 @@ public ExecuteCommandTask() {
     public void execute() throws Exception {
         Logger logger = getLogger();
         File workDir = getWorkingDir().get().getAsFile();
+        try {
+            Files.createDirectories(workDir.toPath());
+        } catch (IOException e) {
+            throw new UncheckedIOException("Failed to create working directory", e);
+        }
 
         boolean isWindows = OperatingSystem.current().isWindows();
         List<String> cmd = new ArrayList<>();
@@ -53,6 +61,8 @@ public void execute() throws Exception {
         ProcessExecutorService execService = getExecService().get();
         Map<String, String> env = new HashMap<>(getEnvironment().get());
         modifyEnvironment(env);
+
+        logger.info("Executing command: {}", String.join(" ", cmd));
         Process process = execService.executeCommand(this, workDir, env, cmd, getSilentStdOut().get());
         process.waitFor();
 
@@ -63,5 +73,6 @@ public void execute() throws Exception {
         }
     }
 
-    protected void modifyEnvironment(Map<String, String> env) {}
+    protected void modifyEnvironment(Map<String, String> env) {
+    }
 }

src/main/java/org/moddedmc/wiki/toolkit/task/InstallDependenciesTask.java

@@ -11,22 +11,20 @@
 
 @DisableCachingByDefault
 public abstract class RunLocalWikiInstanceTask extends ExecuteCommandTask {
-    public static final String LOCAL_PREVIEW_ENV = "ENABLE_LOCAL_PREVIEW";
     public static final String LOCAL_DOCS_ROOTS = "LOCAL_DOCS_ROOTS";
-    public static final String PREVIEW_TASK = "preview";
+    public static final String PKG_NAME = "@sinytra/wiki-previewer@latest";
 
     @Input
     public abstract SetProperty<DocumentationRoot> getDocumentationRoots();
 
     public RunLocalWikiInstanceTask() {
         if (OperatingSystem.current().isLinux()) {
-            getCommand().addAll("bash", "-ci", "pnpm run " + PREVIEW_TASK);
+            getCommand().addAll("bash", "-ci", "npx -y " + PKG_NAME);
         } else if (OperatingSystem.current().isMacOsX()) {
-            getCommand().addAll("bash", "-c", "pnpm run " + PREVIEW_TASK);
+            getCommand().addAll("bash", "-c", "npx -y " + PKG_NAME);
         } else {
-            getCommand().addAll("pnpm", "run", PREVIEW_TASK);
+            getCommand().addAll("npx", "-y", PKG_NAME);
         }
-        getEnvironment().put(LOCAL_PREVIEW_ENV, "true");
     }
 
     @Override