Merge branch 'hotfix/1.0.1'

Author: SolarLiner

README.md

@@ -73,7 +73,7 @@ covers a vast majority of projects where the main file isn't touched.
 ### Use a headless browser for rendering
 
 ```bash
-? Use a headless browser to render the application (recommended) Yes
+? Use a headless browser to render the application? (recommended) Yes
 ```
 
 This option is there for debugging purposes, but **should not be enabled**
@@ -83,7 +83,8 @@ Since the plugin configuration object isn't available, it is available here.
 
 #### What it does to your project
 
-The `headless` value of the configuration object is set to the answer to the question.
+The `headless` value of the configuration object is set to the answer to the
+question.
 
 ### Only pre-render for production builds
 
@@ -100,6 +101,38 @@ However, there may be cases where you want to test the pre-rendering itself,
 and switching to a production build isn't the solution - you may then turn off
 that option.
 
+### Indirect options
+
+#### Parallel / Mutli-threaded
+
+This option is configured from within the Vue CLI itself, but serves to a whole
+host of plugins to determine whether to turn on parallel jobs / multi-threading.
+
+This plugin uses it to tell `prerender-spa-plugin` to render pages concurently
+(meaning in parallel) or not by setting the `maxConcurrentRoutes` parameter to
+either 1 or 4, if the build is respectively single-threaded or multi-threaded.
+
+### Custom configuration
+
+After being invoked, the plugin saves a file named `.prerender-spa.json` in the
+root directory of the project; where you can specify custom options for the
+Puppeteer renderer. It will be merged, and its options will overwrite those set
+by the plugin itself.
+
+Exemple configuration:
+
+```json
+{
+  "renderRoutes": ["/", "/about"],
+  "useRenderEvent": true,
+  "headless": true,
+  "onlyProduction": true,
+  "customRendererConfig": {
+    "renderAfterDocumentEvent": "my-custom-event"
+  }
+}
+```
+
 ## Contributing
 
 You are very welcome to contribute. To ask for a feature, or submit a bug, use

generator.js

@@ -0,0 +1,34 @@
+module.exports = (api, options) => {
+  api.extendPackage({
+    devDependencies: {
+      "prerender-spa-plugin": "^3.2.1"
+    }
+  });
+
+  api.onCreateComplete(() => {
+    const fs = require("fs");
+    const configPath = api.resolve("./.prerender-spa.json");
+    fs.writeFileSync(configPath, JSON.stringify(options), {
+      encoding: "utf-8"
+    });
+
+    if (options.useRenderEvent) {
+      const ext = api.hasPlugin("typescript") ? "ts" : "js";
+      const mainPath = api.resolve(`./src/main.${ext}`);
+
+      const mainFileLines = fs
+        .readFileSync(mainPath, { encoding: "utf-8" })
+        .split(/\r?\n/g)
+        .reverse();
+      const vueRenderIndex = mainFileLines.findIndex(line =>
+        line.match(/render\:/)
+      );
+      if (!mainFileLines[vueRenderIndex].endsWith(","))
+        mainFileLines[vueRenderIndex] += ",";
+      mainFileLines[vueRenderIndex] += '\n  mounted: () => document.dispatchEvent(new Event("x-app-rendered")),';
+      fs.writeFileSync(mainPath, mainFileLines.reverse().join("\n"), {
+        encoding: "utf-8"
+      });
+    }
+  });
+};

generator/index.js

@@ -2,22 +2,37 @@ const path = require("path");
 const PrerenderSPAPlugin = require("prerender-spa-plugin");
 const Renderer = PrerenderSPAPlugin.PuppeteerRenderer;
 
-module.exports = api => {
+module.exports = (api, projectOptions) => {
+  const fs = require("fs");
+  const options = JSON.parse(
+    fs.readFileSync(api.resolve("./.prerender-spa.json", { encoding: "utf-8" }))
+  );
   api.chainWebpack(config => {
     if (options.onlyProduction && process.env.NODE_ENV !== "production") {
       return;
     }
     let rendererConfig = {
-      headless: config.headless,
-      maxConcurrentRoutes: config.parallel ? 4 : 1
+      headless: options.headless,
+      maxConcurrentRoutes: options.parallel ? 4 : 1
     };
-    if (config.useRenderEvent) {
+    if (options.useRenderEvent) {
       rendererConfig["renderAfterDocumentEvent"] = "x-app-rendered";
     }
 
+    if (options.customRendererConfig) {
+      Object.assign(rendererConfig, options.customRendererConfig);
+    }
+
     config.plugin("pre-render").use(PrerenderSPAPlugin, [
       {
-        staticDir: api.resolve('./dist'),
+        outputDir: api.resolve(projectOptions.outputDir),
+        staticDir: api.resolve(projectOptions.outputDir),
+        assetsDir: api.resolve(
+          path.join(projectOptions.outputDir, projectOptions.assetsDir)
+        ),
+        indexPath: api.resolve(
+          path.join(projectOptions.outputDir, projectOptions.indexPath)
+        ),
         routes: options.renderRoutes,
         renderer: new Renderer(rendererConfig)
       }

index.js

@@ -1,12 +1,13 @@
 {
   "name": "vue-cli-plugin-prerender-spa",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Vue CLI plugin to add prerendering to your application",
   "main": "index.js",
   "author": "Nathan Graule",
   "license": "MIT",
   "private": false,
   "dependencies": {
+    "javascript-stringify": "^1.6.0",
     "prerender-spa-plugin": "^3.2.1"
   }
 }

package.json

@@ -10,10 +10,7 @@ module.exports = [
     filter: input =>
       new Promise((resolve, reject) => {
         const dataArray = input.split(",").map(value => value.trim());
-        const dataUnique = dataArray.filter((value, pos, self) => {
-          return self.indexOf(value) === pos;
-        })
-        resolve(dataUnique);
+        resolve(dataArray);
       })
   },
   {

prompts.js

@@ -642,6 +642,10 @@ isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
 
+javascript-stringify@^1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/javascript-stringify/-/javascript-stringify-1.6.0.tgz#142d111f3a6e3dae8f4a9afd77d45855b5a9cce3"
+
 kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"