@emailmaker/emailmaker 1.0.116 → 1.0.117-alpha.2

package/vite/index.js

@@ -12,6 +12,34 @@ const ESM_PACKAGE_ENTRY_NAME = `${APP_NAME}-esm.js`;
 const DEFAULT_OUTPUT_FOLDER = `/${APP_NAME}`;
 const DEFAULT_MODULES_PATH = 'node_modules';
 
+/** Strip leading/trailing slashes so the output folder is a single pathname segment. */
+function normalizeOutputFolderSegment(outputFolder) {
+  return String(outputFolder ?? '').replace(/^\/+|\/+$/g, '');
+}
+
+/**
+ * Build the runtime publicPath string for inject. Do not use path.posix.join with http(s) URLs — it breaks https://.
+ */
+function buildInjectedPublicPath(publicPath, outputFolderOption) {
+  const raw = outputFolderOption !== undefined && outputFolderOption !== null && outputFolderOption !== ''
+    ? String(outputFolderOption)
+    : DEFAULT_OUTPUT_FOLDER;
+  const folder = normalizeOutputFolderSegment(raw);
+  const base = (publicPath || '').trim();
+
+  if (!base) {
+    return `/${folder}/`;
+  }
+
+  if (/^https?:\/\//i.test(base)) {
+    const baseUrl = base.endsWith('/') ? base : `${base}/`;
+    return new URL(`${folder}/`, baseUrl).href;
+  }
+
+  const normalized = `${base.replace(/\/+$/, '')}/${folder}/`;
+  return normalized;
+}
+
 const IGNORED_PATTERNS = [
   /.*\.npmignore/,
   /.*\.gitignore/,
@@ -38,9 +66,11 @@ const ViteServePlugin = (options) => {
     apply: 'serve',
 
     transform: (code, id) => {
-      return code.indexOf(PACKAGE_PATH) >= 0 ?
-          `var ${ENVIRONMENT_VARIABLE}= { publicPath: "${options.outputFolder || DEFAULT_OUTPUT_FOLDER}/"}; ${code}`
-        : code;
+      if (code.indexOf(PACKAGE_PATH) < 0) {
+        return code;
+      }
+      const dir = buildInjectedPublicPath(options.publicPath || '', options.outputFolder);
+      return `var ${ENVIRONMENT_VARIABLE}= { publicPath: ${JSON.stringify(dir)} }; ${code}`;
     },
 
     configureServer: (server) => {
@@ -96,8 +126,8 @@ const ViteBuildPlugin = (options) => {
     transform: (code, id) => {
       id = cleanUrl(id);
       if (id.endsWith(PACKAGE_ENTRY_NAME) || id.endsWith(ESM_PACKAGE_ENTRY_NAME)) {
-        const dir = path.posix.join(publicPath, options.outputFolder || DEFAULT_OUTPUT_FOLDER);
-        return `let ${ENVIRONMENT_VARIABLE}= { publicPath: "${dir}/"}; ${code}`;
+        const dir = buildInjectedPublicPath(publicPath, options.outputFolder);
+        return `let ${ENVIRONMENT_VARIABLE}= { publicPath: ${JSON.stringify(dir)} }; ${code}`;
       } else {
         return code;
       }

package/webpack/index.js

@@ -19,6 +19,23 @@ const DEFAULT_MODULES_PATH = `node_modules`;
 const ESM_PACKAGE_ENTRY_NAME = `${APP_NAME}-esm.js`;
 const ENVIRONMENT_VARIABLE = `${toPascalCase(APP_NAME)}Environment`;
 
+function normalizeWebpackOutputFolder(folder) {
+  return String(folder).replace(/^\/+|\/+$/g, '');
+}
+
+function buildWebpackInjectedPublicPath(publicPath, outputFolderBare) {
+  const pp = (publicPath || '').trim();
+  const f = normalizeWebpackOutputFolder(outputFolderBare);
+  if (!pp) {
+    return `/${f}/`;
+  }
+  if (/^https?:\/\//i.test(pp)) {
+    const base = pp.endsWith('/') ? pp : `${pp}/`;
+    return new URL(`${f}/`, base).href;
+  }
+  return `${pp.replace(/\/+$/, '')}/${f}/`;
+}
+
 const IGNORED_PATTERNS = [
   /.*\.npmignore/,
   /.*\.gitignore/,
@@ -44,7 +61,9 @@ class WebpackPlugin {
   _sources = null;
   constructor(options = {}) {
     if (options.outputFolder !== undefined) {
-      this._outputFolder = options.outputFolder;
+      this._outputFolder = normalizeWebpackOutputFolder(options.outputFolder);
+    } else {
+      this._outputFolder = normalizeWebpackOutputFolder(DEFAULT_OUTPUT_FOLDER);
     }
     if (options.modulesPath !== undefined) {
       this._modulesPath = options.modulesPath;
@@ -86,7 +105,8 @@ class WebpackPlugin {
   apply(compiler) {
     const optionsPublicPath = compiler.options.output.publicPath || '';
     const publicPath = this._publicPath === undefined ? optionsPublicPath : this._publicPath;
-    const initFragment = `var ${ENVIRONMENT_VARIABLE} = { publicPath: "${publicPath + (publicPath.endsWith('/') ? '' : '/')}${this._outputFolder}/"};`;
+    const injected = buildWebpackInjectedPublicPath(publicPath, this._outputFolder);
+    const initFragment = `var ${ENVIRONMENT_VARIABLE} = { publicPath: ${JSON.stringify(injected)} };`;
     const webpack = compiler.webpack;
     const javascript = webpack.javascript;
     this._sources = webpack.sources;

package/iframe/iframe-eblock.612f5e3292f38c64ed91.html

@@ -1 +0,0 @@
-<!doctype html><html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/><script defer="defer" src="js/667.25c21b63.js?612f5e3292f38c64ed91"></script><script defer="defer" src="sandbox-eblock.js?612f5e3292f38c64ed91"></script></head><body></body></html>

package/iframe/iframe.612f5e3292f38c64ed91.html

@@ -1 +0,0 @@
-<!doctype html><html><head><meta http-equiv="Content-Type" content="text/html;charset=UTF-8"/><script defer="defer" src="js/667.25c21b63.js?612f5e3292f38c64ed91"></script><script defer="defer" src="js/525.5461ecf3.js?612f5e3292f38c64ed91"></script><script defer="defer" src="js/882.de4b06e1.js?612f5e3292f38c64ed91"></script></head><body></body></html>