fix: use endsWith for publicPath

hiroppy · Jan 25, 2021 · b443dfa · b443dfa
1 parent 1a839b6
commit b443dfa
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 10 deletions.
diff --git a/packages/fusuma/src/configs/fusumarc.js b/packages/fusuma/src/configs/fusumarc.js
@@ -41,7 +41,7 @@ const config = {
   },
   build: {
     useCache: true,
-    publicPath: '/',
+    publicPath: '',
   },
 };
 

diff --git a/packages/fusuma/src/tasks/build.js b/packages/fusuma/src/tasks/build.js
@@ -9,9 +9,7 @@ const outputBuildInfo = require('../webpack/outputBuildInfo');
 const dynamicRenderingServer = require('../server/dynamicRenderingServer');
 
 async function build(config, isConsoleOutput = true) {
-  if (process.env.NODE_ENV === undefined) {
-    process.env.NODE_ENV = 'production';
-  }
+  process.env.NODE_ENV = 'production';
 
   const spinner = new Spinner();
   const { outputDirPath } = config.internal;

diff --git a/packages/fusuma/src/tasks/index.js b/packages/fusuma/src/tasks/index.js
@@ -28,7 +28,7 @@ async function tasks({ type, options }) {
       try {
         const { pathname } = new URL(config.meta.url);
 
-        config.build.publicPath = `${pathname}/`;
+        config.build.publicPath = pathname.endsWith('/') ? pathname : `${pathname}/`;
       } catch (e) {
         error('preparation', `meta.url specified isn't a URL`);
       }

diff --git a/packages/fusuma/src/tasks/start.js b/packages/fusuma/src/tasks/start.js
@@ -6,9 +6,7 @@ const { start: webpackStart } = require('../webpack');
 const { warn } = require('../cli/log');
 
 async function start(config) {
-  if (process.env.NODE_ENV === undefined) {
-    process.env.NODE_ENV = 'development';
-  }
+  process.env.NODE_ENV = 'development';
 
   const spinner = new Spinner();
 

diff --git a/packages/fusuma/src/webpack/webpack.config.js b/packages/fusuma/src/webpack/webpack.config.js
@@ -147,7 +147,7 @@ module.exports = (
         filename: 'index.html',
         title: title || 'slide',
         template: path.join(__dirname, 'template.ejs'),
-        image: thumbnail || `${url}/thumbnail.png`,
+        image: thumbnail || `${url.endsWith('/') ? url : `${url}/`}thumbnail.png`,
         siteName,
         description,
         math,

diff --git a/samples/intro/.fusumarc.yml b/samples/intro/.fusumarc.yml
@@ -1,5 +1,5 @@
 meta:
-  url: https://hiroppy.github.io/fusuma/intro
+  url: https://hiroppy.github.io/fusuma/intro/
   title: What's Fusuma?
   description: Introduce Fusuma
   siteName: hiroppy.me