web-extend-plugin-vue2 0.3.7 → 0.3.8

package/dist/index.mjs

@@ -39,8 +39,8 @@ const defaultManifestFetchCache = {
 };
 const routeSynthNamePrefix = '__wep_';
 const defaultWebExtendPluginRuntime = {
-    manifestBase: '/fp-api',
-    manifestListPath: '/api/frontend-plugins',
+    manifestBase: '/dev-api',
+    manifestListPath: '/web-plugin',
     manifestFetchCredentials: 'include',
     devPingPath: '/__web_plugin_dev_ping',
     devReloadSsePath: '/__web_plugin_reload_stream',
@@ -50,7 +50,7 @@ const defaultWebExtendPluginRuntime = {
     allowedScriptHosts: ['localhost', '127.0.0.1', '::1'],
     bridgeAllowedPathPrefixes: ['/api/'],
     pluginMountPath: '/plugin',
-    devFallbackStaticManifestUrl: '/web-plugins/plugins.manifest.json'
+    devFallbackStaticManifestUrl: ''
 };
 
 /**
@@ -330,7 +330,7 @@ function resolveDevManifestFallback(dev, manifestMode, isDev) {
     if (envFlag === '1' || envFlag === 'true') {
         return true;
     }
-    return isDev;
+    return false;
 }
 function resolveRuntimeOptions$1(user = {}) {
     const manifest = resolveManifestInput(user);
@@ -392,7 +392,7 @@ function resolveRuntimeOptions$1(user = {}) {
         manifestListPath,
         manifestMode,
         staticManifestUrl,
-        devManifestFallback: resolveDevManifestFallback(dev, manifestMode, isDev),
+        devManifestFallback: resolveDevManifestFallback(dev, manifestMode),
         devFallbackStaticManifestUrl,
         manifestFetchCredentials: resolveManifestCredentials(manifest.credentials, EK.manifestCredentials, DEF.manifestFetchCredentials),
         isDev,
@@ -4156,6 +4156,14 @@ function resolveManifestRequest(opts) {
         manifestUrl: `${base}${opts.manifestListPath}`
     };
 }
+function isResolvedRuntimeOptions(input) {
+    return !!(input &&
+        typeof input === 'object' &&
+        !Array.isArray(input) &&
+        ('manifestBase' in input ||
+            'manifestListPath' in input ||
+            'fetchManifest' in input));
+}
 async function bootstrapPlugins$1(
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 router, 
@@ -4167,7 +4175,7 @@ createHostApiFactory, runtimeOptions) {
     }
     printRuntimeBannerOnce();
     clearActivatedPluginIds();
-    const opts = resolveRuntimeOptions$1(runtimeOptions);
+    const opts = isResolvedRuntimeOptions(runtimeOptions) ? runtimeOptions : resolveRuntimeOptions$1(runtimeOptions);
     const showBootstrapSummary = shouldShowBootstrapSummary(opts);
     setPluginBootstrapRouter(router);
     ensurePluginHostRoute$1(router, opts);
@@ -4999,22 +5007,6 @@ function installWebExtendPluginVue2(Vue, router, options) {
     return bootstrapPlugins$1(router, createHostApi, runtime);
 }
 
-function resolveManifestPathUnderApiBase(manifestUrl, apiBase) {
-    const base = String(apiBase !== undefined
-        ? apiBase
-        : typeof process !== 'undefined' && process.env && process.env.VUE_APP_BASE_API
-            ? String(process.env.VUE_APP_BASE_API)
-            : '').replace(/\/$/, '');
-    if (typeof window === 'undefined') {
-        return '/api/frontend-plugins';
-    }
-    const url = new URL(manifestUrl, window.location.origin);
-    let path = url.pathname + url.search;
-    if (base && path.startsWith(base)) {
-        path = path.slice(base.length) || '/';
-    }
-    return path;
-}
 function bridgePrefixesFromVueCliEnv() {
     const base = (typeof process !== 'undefined' && process.env && process.env.VUE_APP_BASE_API
         ? String(process.env.VUE_APP_BASE_API)
@@ -5033,17 +5025,13 @@ function createVueCliAxiosInstallOptions(deps, extra = {}) {
     const manifest = asRecord(extra.manifest) || {};
     const host = asRecord(extra.host) || {};
     const mergedHost = { ...host };
-    const envBase = (typeof process !== 'undefined' && process.env && process.env.VUE_APP_BASE_API
-        ? String(process.env.VUE_APP_BASE_API)
-        : '').replace(/\/$/, '');
-    const userBase = manifest.baseUrl !== undefined && String(manifest.baseUrl).trim() !== ''
-        ? String(manifest.baseUrl).replace(/\/$/, '')
-        : '';
-    const stripBase = userBase || envBase;
     const fetchManifestApi = async (ctx) => {
         try {
+            const manifestRequestUrl = typeof window !== 'undefined'
+                ? new URL(String(ctx.manifestUrl), window.location.origin).toString()
+                : String(ctx.manifestUrl);
             const body = await request({
-                url: resolveManifestPathUnderApiBase(ctx.manifestUrl, stripBase),
+                url: manifestRequestUrl,
                 method: 'get'
             });
             const data = unwrapNestedManifestBody(body);
@@ -5075,7 +5063,9 @@ function createVueCliAxiosInstallOptions(deps, extra = {}) {
         ...extra,
         manifest: {
             ...manifest,
-            baseUrl: stripBase || undefined,
+            baseUrl: manifest.baseUrl !== undefined && String(manifest.baseUrl).trim() !== ''
+                ? String(manifest.baseUrl).replace(/\/$/, '')
+                : undefined,
             listPath: manifest.listPath !== undefined ? manifest.listPath : listPath,
             source: manifestSource,
             staticUrl,