Merge branch 'release/1.1.3'

Author: SolarLiner

.babelrc

@@ -0,0 +1,3 @@
+{
+  "presets": [["@babel/preset-env", { "targets": { "node": "8.9" } }]]
+}

.gitignore

@@ -71,3 +71,6 @@ typings/
 
 # Serverless directories
 .serverless
+
+# Babel files output
+/*.js

README.md

@@ -2,6 +2,11 @@
 
 Add `prerender-spa-plugin` into your Vue application with zero configuration.
 
+![](https://img.shields.io/david/solarliner/vue-cli-plugin-prerender-spa.svg)
+![](https://img.shields.io/david/dev/solarliner/vue-cli-plugin-prerender-spa.svg)
+![](https://img.shields.io/npm/v/vue-cli-plugin-prerender-spa.svg)
+![](https://img.shields.io/github/commits-since/solarliner/vue-cli-plugin-prerender-spa/1.1.3.svg)
+
 **Looking for a co-maintainer**: I'm continuing to maintain this project, hoever
 I still would like help on some of the issues, and generally to help me keep this
 plugin going as it's getting more and more popular. If you think you can help,

package.json

@@ -1,12 +1,16 @@
 {
   "name": "vue-cli-plugin-prerender-spa",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Vue CLI plugin to add prerendering to your application",
   "main": "index.js",
   "author": {
     "name": "Nathan Graule",
     "email": "[email protected]"
   },
+  "scripts": {
+    "build": "babel src --out-dir .",
+    "prepack": "yarn build"
+  },
   "license": "MIT",
   "repository": "https://github.com/SolarLiner/vue-cli-plugin-prerender-spa",
   "keywords": [
@@ -25,7 +29,14 @@
   ],
   "private": false,
   "dependencies": {
-    "javascript-stringify": "^1.6.0",
     "prerender-spa-plugin": "^3.2.1"
+  },
+  "devDependencies": {
+    "@babel/cli": "^7.2.3",
+    "@babel/core": "^7.2.2",
+    "@babel/preset-env": "^7.2.3"
+  },
+  "engines": {
+    "node": ">=8.9"
   }
 }

generator/index.js renamed to src/generator.js

@@ -1,4 +1,7 @@
-module.exports = (api, options) => {
+export default generate;
+module.exports = generate;
+
+function generate(api, options) {
   api.onCreateComplete(() => {
     const fs = require("fs");
 

index.js renamed to src/index.js

@@ -1,15 +1,18 @@
 //@ts-check
-const { exists, existsSync, readFileSync } = require("fs");
-const path = require("path");
+import { exists, existsSync, readFileSync } from "fs";
+import { extname, join, basename } from "path";
 
-const PrerenderSPAPlugin = require("prerender-spa-plugin");
-const Renderer = PrerenderSPAPlugin.PuppeteerRenderer;
+import PrerenderSPAPlugin, { PuppeteerRenderer } from "prerender-spa-plugin";
+const Renderer = PuppeteerRenderer;
 
 const CONFIG_OBJ_PATH = "pluginOptions.prerenderSpa";
 
-module.exports = (api, projectOptions) => {
+export default entry;
+module.exports = entry;
+
+function entry(api, projectOptions) {
   api.chainWebpack(chain(api, projectOptions));
-};
+}
 
 function chain(api, projectOptions) {
   return config => {
@@ -25,8 +28,8 @@ function chain(api, projectOptions) {
       renderer,
       postProcess: renderedRoute => {
         const route = renderedRoute.route;
-        if (route[route.length - 1] !== "/" && path.extname(route) === "") {
-          renderedRoute.outputPath = path.join(paths.outputDir || paths.staticDir, `${route}.html`);
+        if (route[route.length - 1] !== "/" && extname(route) === "") {
+          renderedRoute.outputPath = join(paths.outputDir || paths.staticDir, `${route}.html`);
         }
         const userPostProcess =
           options.postProcess && typeof options.postProcess === "function" ? options.postProcess : noop;
@@ -48,8 +51,9 @@ function createRenderer(api, projectOptions) {
   const rendererConfig = createRendererConfig(api, projectOptions);
   const renderer = new Renderer(rendererConfig);
   renderer.preServer = Prerenderer => {
-    if (projectOptions.baseUrl) {
-      const prefix = projectOptions.baseUrl;
+    const publicPath = projectOptions.publicPath || projectOptions.baseUrl;
+    if (publicPath) {
+      const prefix = publicPath;
       const server = Prerenderer._server._expressServer;
       server.use((req, res, next) => {
         if (req.url.indexOf(prefix) === 0) {
@@ -61,9 +65,9 @@ function createRenderer(api, projectOptions) {
     if (projectOptions.pages) {
       const server = Prerenderer._server._expressServer;
       server.get("*", (req, res, next) => {
-        if (!path.extname(req.url)) {
+        if (!extname(req.url)) {
           const filePath = api.resolve(
-            `${projectOptions.outputDir}${req.url}${path.basename(req.url) ? ".html" : "index.html"}`
+            `${projectOptions.outputDir}${req.url}${basename(req.url) ? ".html" : "index.html"}`
           );
           exists(filePath, exists => (exists ? res.sendFile(filePath) : next()));
           return;
@@ -111,8 +115,8 @@ 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, process.env.NODE_ENV === "production" ? "app.html" : "index.html"))
+    assetsDir: api.resolve(join(baseUrl, assetsDir)),
+    indexPath: api.resolve(join(baseUrl, process.env.NODE_ENV === "production" ? "app.html" : "index.html"))
   };
 }
 

prompts.js renamed to src/prompts.js

@@ -1,4 +1,4 @@
-module.exports = [
+const prompts = [
   {
     name: "renderRoutes",
     type: "input",
@@ -32,3 +32,6 @@ module.exports = [
     default: true
   }
 ];
+
+export default prompts;
+module.exports = prompts;