Merge branch 'hotfix/1.1.1'

SolarLiner · Jan 13, 2019 · 5321e34 · 5321e34
2 parents d3d5f85 + ce39bbe
commit 5321e34
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 18 deletions.
diff --git a/index.js b/index.js
@@ -13,7 +13,10 @@ module.exports = (api, projectOptions) => {
 
 function chain(api, projectOptions) {
   return config => {
-    const options = createOptions(api, projectOptions);
+    const options = createPluginOptions(api, projectOptions);
+    if (options.onlyProduction && process.env.NODE_ENV !== "production") {
+      return;
+    }
     const renderer = createRenderer(api, projectOptions);
     const paths = resolvePaths(api, projectOptions.outputDir, projectOptions.assetsDir);
     const prerenderOptions = {
@@ -31,16 +34,18 @@ function chain(api, projectOptions) {
       }
     };
     config.plugin("pre-render").use(PrerenderSPAPlugin, [prerenderOptions]);
-    config.plugin("html").tap(args => {
-      args[0].template = api.resolve("public/index.html");
-      args[0].filename = "app.html";
-      return args;
-    });
+    if (process.env.NODE_ENV === "production") {
+      config.plugin("html").tap(args => {
+        args[0].template = api.resolve("public/index.html");
+        args[0].filename = "app.html";
+        return args;
+      });
+    }
   };
 }
 
 function createRenderer(api, projectOptions) {
-  const rendererConfig = createConfig(api, projectOptions);
+  const rendererConfig = createRendererConfig(api, projectOptions);
   const renderer = new Renderer(rendererConfig);
   renderer.preServer = Prerenderer => {
     if (projectOptions.baseUrl) {
@@ -70,11 +75,8 @@ function createRenderer(api, projectOptions) {
   return renderer;
 }
 
-function createConfig(api, projectOptions) {
-  let options = createOptions(api, projectOptions);
-  if (options.onlyProduction && process.env.NODE_ENV !== "production") {
-    return;
-  }
+function createRendererConfig(api, projectOptions) {
+  let options = createPluginOptions(api, projectOptions);
   let rendererConfig = {
     headless: options.headless,
     maxConcurrentRoutes: options.parallel ? 4 : 1
@@ -88,29 +90,29 @@ function createConfig(api, projectOptions) {
   return rendererConfig;
 }
 
-function createOptions(api, projectOptions) {
+function createPluginOptions(api, projectOptions) {
   let options;
   let oldConfigPath = api.resolve(".prerender-spa.json");
   try {
     options = pickle(projectOptions, CONFIG_OBJ_PATH);
     if (existsSync(oldConfigPath)) {
       Object.assign(options, JSON.parse(readFileSync(oldConfigPath).toString("utf-8")));
     }
-  }
-  catch {
+  } catch {
     if (existsSync(oldConfigPath)) {
       options = JSON.parse(readFileSync(oldConfigPath).toString("utf-8"));
     }
   }
-  return options;
+  // return options; // TODO: Fix #16 permanently
+  return Object.assign(options, { onlyProduction: true }); // Force disable on development build, workaround for #16
 }
 
 function resolvePaths(api, baseUrl, assetsDir) {
   return {
     outputDir: api.resolve(baseUrl),
     staticDir: api.resolve(baseUrl),
     assetsDir: api.resolve(path.join(baseUrl, assetsDir)),
-    indexPath: api.resolve(path.join(baseUrl, "app.html"))
+    indexPath: api.resolve(path.join(baseUrl, process.env.NODE_ENV === "production" ? "app.html" : "index.html"))
   };
 }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-cli-plugin-prerender-spa",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Vue CLI plugin to add prerendering to your application",
   "main": "index.js",
   "author": {