@omnia/tooling-vue 8.0.16-vnext → 8.0.17-dev

package/internal-do-not-import-from-here/tasks/vendor.js

@@ -5,7 +5,6 @@ const $ = tslib_1.__importStar(require("../variables"));
 const ts_loader_1 = tslib_1.__importDefault(require("../webpack-loaders/ts-loader"));
 const ExtractTextPlugin = require('mini-css-extract-plugin');
 const fsExtra = require('fs-extra');
-fsExtra.copySync('wwwroot/scripts/vue-class-component/vue-class-component.esm.custom.js', 'node_modules/vue-class-component/dist/vue-class-component.esm.js');
 const extractCSS = new ExtractTextPlugin({
     filename: "omnia.vendor.css",
 });
@@ -123,7 +122,7 @@ $.webpack({
         $.tooling.log('omnia shared vendor generated');
     }
 });
-$.tooling.log('omnia vendor running...');
+$.tooling.log('omnia vendor devlopment running...');
 $.webpack({
     mode: 'production',
     devtool: false,
@@ -132,11 +131,9 @@ $.webpack({
         extensions: ['.ts', '.js', '.css'],
         alias: {
             'typestyle$': 'typestyle/lib.es2015/index.js',
-            //'vue$': 'vue/dist/vue.runtime.esm-browser.js', // vuetify have not working fully 100% with vue runtime browser only, so temp to full bundle vue now.
-            'vue$': 'vue/dist/vue.esm-bundler.js',
-            // 'rope-sequence$': 'rope-sequence/dist/index.js',
-            //'w3c-keyname$': $.path.resolve($.tooling.utils.root(""), 'node_modules/w3c-keyname/index.es.js'),
-            //'orderedmap$': 'orderedmap/index.js',
+            // vuetify have not working fully 100% with vue runtime browser only, so temp to full bundle vue now.
+            //'vue$': 'vue/dist/vue.runtime.esm-browser.js',
+            'vue$': 'vue/dist/vue.runtime.esm-bundler.js',
         },
     },
     optimization: {
@@ -149,7 +146,161 @@ $.webpack({
     },
     module: {
         rules: [
-            ...(0, ts_loader_1.default)(false),
+            ...(0, ts_loader_1.default)(),
+            {
+                test: /\.css(\?|$)/,
+                use: [
+                    {
+                        loader: ExtractTextPlugin.loader,
+                        options: {
+                            publicPath: '../css'
+                        }
+                    },
+                    'css-loader',
+                ]
+            },
+            {
+                test: /\.(woff2?|eot|ttf|otf|svg)(\?.*)?$/,
+                use: [{
+                        loader: 'file-loader',
+                        options: {
+                            name: '[name].[ext]',
+                            outputPath: '../fonts/'
+                        }
+                    }]
+            }
+        ]
+    },
+    entry: {
+        vendor: [
+            "tslib",
+            "./client/fx/vue/VueBundler",
+            "typestyle",
+            "csx",
+            "zepto-webpack",
+            "mousetrap",
+            "mousetrap-global-bind",
+            "dayjs",
+            "dayjs/plugin/utc",
+            "dayjs/plugin/timezone",
+            'dayjs/plugin/duration',
+            'dayjs/plugin/relativeTime',
+            "dayjs/locale/da.js",
+            "dayjs/locale/de.js",
+            "dayjs/locale/et.js",
+            "dayjs/locale/fr.js",
+            "dayjs/locale/lt.js",
+            "dayjs/locale/lv.js",
+            "dayjs/locale/pl.js",
+            "dayjs/locale/sv.js",
+            "dayjs/locale/nb.js",
+            "dayjs/locale/fi.js",
+            "dayjs/locale/es.js",
+            "dayjs/locale/nl.js",
+            "./wwwroot/scripts/zepto.extras.js",
+            // "@material/material-color-utilities"
+        ]
+    },
+    output: {
+        path: $.path.join($.tooling.utils.root(""), outDir),
+        filename: 'omnia.[name].js',
+        library: {
+            name: 'omniaVendor',
+            type: 'window',
+        }
+    },
+    plugins: [
+        new $.webpack.ContextReplacementPlugin(/moment[\/\\]locale$/, /ignore/),
+        extractCSS,
+        new $.omniaWebpackPlugins.NamedModulesPlugin(),
+        new $.omniaWebpackPlugins.ModifyContent([
+            {
+                pattern: /var omniaVendor;omniaVendor/i,
+                replacement: "window['omniaVendor'] "
+            },
+            {
+                pattern: /# sourceMappingURL=\s*(\S+)/g,
+                replacement: '# ignore'
+            },
+            {
+                pattern: /__webpack_module_cache__/g,
+                replacement: '__omnia_webpack_module_cache__'
+            },
+            {
+                pattern: "const key = `f${stringHash(pid)}`;",
+                replacement: `
+// <<omnia custom>> support prefix displayname in styleflow
+` + "const key = `f${stringHash(pid)}`;" +
+                    `  if (!styles.$displayName)
+return key;
+` + "return `${styles.$displayName}_${key}`;"
+            },
+        ]),
+        new $.webpack.DllPlugin({
+            path: $.path.resolve(__dirname, "../config/omnia.[name].manifest.json"),
+            name: 'omniaVendor',
+            entryOnly: false
+        }),
+        new $.webpack.DefinePlugin({
+            //process: { env: { NODE_ENV: JSON.stringify('production') } }
+            // temp bundle vue vendor in development mode for support HMR
+            // process: { env: { NODE_ENV: JSON.stringify('development') } },
+            'process.env.NODE_ENV': JSON.stringify('development'),
+            __VUE_OPTIONS_API__: true,
+            __VUE_PROD_DEVTOOLS__: true
+        })
+    ]
+})
+    .run((err, stats) => {
+    if (err || stats.hasErrors()) {
+        //console.log(stats.toJson({
+        //    assets: false,
+        //    hash: true
+        //}))
+        $.tooling.log('Omnia vendor have  error : \r\n', $.tooling.LogTypes.Error);
+        if (err) {
+            $.tooling.log(err.stack || err, $.tooling.LogTypes.Error);
+        }
+        else {
+            stats.toJson().errors.forEach(err => {
+                $.tooling.log(err.stack || err, $.tooling.LogTypes.Error);
+            });
+        }
+    }
+    else {
+        // generate omnia vendor metadata
+        var manifestPath = $.path.resolve(__dirname, "../config/omnia.vendor.manifest.json");
+        var manifestJson = require(manifestPath);
+        manifestJson.content["./node_modules/webpack/buildin/module.js"] = undefined;
+        $.fs.writeFileSync(manifestPath, JSON.stringify(manifestJson));
+        $.tooling.log('omnia vendor devlopment generated');
+    }
+});
+$.tooling.log('omnia vendor prod running...');
+$.webpack({
+    mode: 'production',
+    devtool: false,
+    context: $.tooling.utils.root(""),
+    resolve: {
+        extensions: ['.ts', '.js', '.css'],
+        alias: {
+            'typestyle$': 'typestyle/lib.es2015/index.js',
+            // vuetify have not working fully 100% with vue runtime browser only, so temp to full bundle vue now.
+            'vue$': 'vue/dist/vue.runtime.esm-bundler.js',
+            //'vue$': 'vue/dist/vue.esm-bundler.js',
+        },
+    },
+    optimization: {
+        minimize: false,
+        usedExports: false,
+        providedExports: true,
+        removeAvailableModules: false,
+        mangleExports: false,
+        concatenateModules: true,
+    },
+    module: {
+        rules: [
+            ...(0, ts_loader_1.default)(),
             {
                 test: /\.css(\?|$)/,
                 use: [
@@ -178,13 +329,6 @@ $.webpack({
         vendor: [
             "tslib",
             "./client/fx/vue/VueBundler",
-            // "vue-class-component",
-            // "vue-property-decorator",
-            // "vue-tsx-support",
-            // "vue-tsx-support/enable-check",
-            // "vue-tsx-support/lib/vca",
-            // "@vue/babel-helper-vue-jsx-merge-props",
-            //    "@vue/composition-api",
             "typestyle",
             "csx",
             "zepto-webpack",
@@ -209,7 +353,7 @@ $.webpack({
     },
     output: {
         path: $.path.join($.tooling.utils.root(""), outDir),
-        filename: 'omnia.[name].js',
+        filename: 'omnia.[name].prod.js',
         library: {
             name: 'omniaVendor',
             type: 'window',
@@ -248,9 +392,12 @@ return key;
             entryOnly: false
         }),
         new $.webpack.DefinePlugin({
-            //process: { env: { NODE_ENV: JSON.stringify('production') } }
+            //process: { env: { NODE_ENV: JSON.stringify('production') } },
             // temp bundle vue vendor in development mode for support HMR
-            process: { env: { NODE_ENV: JSON.stringify('development') } }
+            // process: { env: { NODE_ENV: JSON.stringify('development') } },
+            'process.env.NODE_ENV': JSON.stringify('production'),
+            __VUE_OPTIONS_API__: true,
+            __VUE_PROD_DEVTOOLS__: false
         })
     ]
 })
@@ -276,7 +423,7 @@ return key;
         var manifestJson = require(manifestPath);
         manifestJson.content["./node_modules/webpack/buildin/module.js"] = undefined;
         $.fs.writeFileSync(manifestPath, JSON.stringify(manifestJson));
-        $.tooling.log('omnia vendor generated');
+        $.tooling.log('omnia vendor prod generated');
     }
 });
 //  bundle omnia worker vendor

package/internal-do-not-import-from-here/variables.d.ts

@@ -5,6 +5,7 @@ import * as composers from "@omnia/tooling-composers";
 import * as enums from "../composers/models/Enums";
 import * as composer from '../composers/task';
 import { core, utils } from '@omnia/tooling';
+import { isExtensionEnv } from "./shared";
 import merge from 'webpack-merge';
 import webpack from 'webpack';
 declare var tooling: {
@@ -16,5 +17,4 @@ declare var tooling: {
     LogTypes: typeof utils.LogTypes;
 };
 declare var basePathProcess: string;
-declare var isExtensionEnv: boolean;
 export { omniaWebpackPlugins, basePathProcess, isExtensionEnv, tooling, webpack, chalk, timestamp, path, fs, extend, merge, del, md5File, composers, enums };

package/internal-do-not-import-from-here/variables.js

@@ -28,6 +28,8 @@ const enums = tslib_1.__importStar(require("@omnia/tooling-composers/internal-do
 exports.enums = enums;
 const composer = tslib_1.__importStar(require("@omnia/tooling-composers/internal-do-not-import-from-here/task"));
 const tooling_1 = require("@omnia/tooling");
+const shared_1 = require("./shared");
+Object.defineProperty(exports, "isExtensionEnv", { enumerable: true, get: function () { return shared_1.isExtensionEnv; } });
 const webpack_merge_1 = tslib_1.__importDefault(require("webpack-merge"));
 exports.merge = webpack_merge_1.default;
 const webpack_1 = tslib_1.__importDefault(require("webpack"));
@@ -36,5 +38,3 @@ var tooling = { composer, core: tooling_1.core, utils: tooling_1.utils, log: too
 exports.tooling = tooling;
 var basePathProcess = process.cwd();
 exports.basePathProcess = basePathProcess;
-var isExtensionEnv = fs.existsSync(basePathProcess + "/node_modules/@omnia/tooling-vue/package.json");
-exports.isExtensionEnv = isExtensionEnv;

package/internal-do-not-import-from-here/vite/hmr/graph.js

@@ -10,6 +10,8 @@ const utils_1 = require("./utils");
 const manifest_1 = require("./manifest");
 const vueJsx_1 = require("./vueJsx");
 const $ = tslib_1.__importStar(require("../../variables"));
+const shared_1 = require("../../shared");
+const doc_1 = require("../../tasks/doc");
 let fileGraphs = {};
 let manifests = {};
 const initialManifests = [
@@ -18,7 +20,7 @@ const initialManifests = [
     fx_models_1.OmniaResourceManifests.FxWorkers.toString()
 ];
 const esbuildTransformOptions = {
-    target: 'es2022',
+    target: 'es2020',
     jsx: 'preserve',
     sourcemap: false,
     legalComments: 'inline'
@@ -151,6 +153,7 @@ async function buildFileGraph(unknownId, code) {
         return { fileGraph, code };
     }
     fileGraph.js.scanned = true;
+    code = (0, shared_1.modifyComponent)(code, fileGraph.id);
     const esbuildTransformResult = await (0, vite_1.transformWithEsbuild)(code, id, esbuildTransformOptions);
     code = esbuildTransformResult.code;
     // d.ts or interface only
@@ -163,6 +166,7 @@ async function buildFileGraph(unknownId, code) {
     }
     fileGraph.js.metadata = utils_1.moduleAnalysis.analyze(code, id);
     ensureDependencies(id, fileGraph.js.metadata);
+    code = (0, doc_1.importSnippetCode)(code, fileGraph.id);
     return { fileGraph, code, esbuildTransformResult };
 }
 exports.buildFileGraph = buildFileGraph;

package/internal-do-not-import-from-here/vite/hmr/manifest.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPreBundleInfo = exports.validatePreBundles = exports.getManifest = exports.clearManifestCollection = exports.getManifestCollection = exports.entriesResolver = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
-const globby_1 = tslib_1.__importDefault(require("globby"));
+const globby_1 = require("globby");
 const $ = tslib_1.__importStar(require("../../variables"));
 const fx_models_1 = require("@omnia/fx-models");
 const utils_1 = require("./utils");
@@ -61,7 +61,7 @@ exports.entriesResolver = new ManifestBuildEntriesResolver();
 let _manifestCollection;
 function getManifestCollection() {
     if (!_manifestCollection) {
-        _manifestCollection = $.tooling.composer.getManifestData();
+        _manifestCollection = $.tooling.composer.getManifestsJson();
     }
     return _manifestCollection;
 }
@@ -84,9 +84,9 @@ function getManifest(resourceId) {
 exports.getManifest = getManifest;
 async function validatePreBundles(fileNames) {
     const preBundleDir = utils_1.envUtils.getBundleOutputDirPath();
-    const filePaths = fileNames.map(fileName => path_1.default.join(preBundleDir, fileName));
+    const filePaths = fileNames.map(fileName => path_1.default.join(preBundleDir, fileName).replace(/\\/g, '/'));
     return new Promise((resolve, reject) => {
-        (0, globby_1.default)(filePaths).then(result => {
+        (0, globby_1.globby)(filePaths).then(result => {
             resolve(result);
         }).catch(reject);
     });
@@ -95,7 +95,7 @@ exports.validatePreBundles = validatePreBundles;
 function getPreBundleInfo() {
     return exports.entriesResolver.getPreBundleEntries().then(entries => {
         const serviceId = $.tooling.composer.getServiceId();
-        const manifests = $.tooling.composer.getManifestData();
+        const manifests = $.tooling.composer.getManifestsJson();
         return Object.keys(entries).reduce((array, fileName) => {
             const resourceId = utils_1.manifestUtils.getResourceIdFromEntryKey(fileName);
             const filePaths = entries[fileName];

package/internal-do-not-import-from-here/vite/hmr/runtime.js

@@ -43,9 +43,9 @@ function setupHmrPlugin(options, config) {
     };
     _runtimeContext = runtimeContext;
     const resolvers = config.resolvers.filter(item => !!item);
-    const omniaPackagesPathPattern = (0, vite_1.normalizePath)(path_1.default.join(utils_1.envUtils.getRootDirPath(), 'node_modules/@omnia/*/*'));
-    const omniaPackagesDeepImports = (0, globby_1.sync)(omniaPackagesPathPattern).map(p => p.replace((0, vite_1.normalizePath)(path_1.default.join(utils_1.envUtils.getRootDirPath(), 'node_modules/')), ''));
-    const { dependencies, devDependencies } = require(path_1.default.join(utils_1.envUtils.getRootDirPath(), 'package.json'));
+    const omniaPackagesPathPattern = (0, vite_1.normalizePath)(path_1.default.join(utils_1.envUtils.getRootDirPath(), 'node_modules/@omnia/*/*').replace(/\\/g, '/'));
+    const omniaPackagesDeepImports = (0, globby_1.globbySync)(omniaPackagesPathPattern).map(p => p.replace((0, vite_1.normalizePath)(path_1.default.join(utils_1.envUtils.getRootDirPath(), 'node_modules/')), ''));
+    const dep = require(path_1.default.join(utils_1.envUtils.getRootDirPath(), 'package.json'));
     clearCacheAssets();
     // Manifests changed
     // entriesResolver.registerManifestEventHandler(() => {
@@ -55,8 +55,8 @@ function setupHmrPlugin(options, config) {
         config: () => ({
             optimizeDeps: {
                 exclude: [
-                    ...Object.keys(dependencies),
-                    ...Object.keys(devDependencies),
+                    ...Object.keys(dep.dependencies || {}),
+                    ...Object.keys(dep.devDependencies || {}),
                     ...omniaPackagesDeepImports
                 ]
             },

package/internal-do-not-import-from-here/vite/hmr/transformers/internal/dynamicBundle.js

@@ -32,6 +32,7 @@ exports.dynamicBundle = (0, base_1.defineTransformer)("omnia-bundle", () => {
             return utils_1.pathUtils.isJavaScriptSuperset(id);
         },
         async transform(code, id, fileGraph, ctx, fromWorker) {
+            //id.indexOf("wwwroot/docs/") === -1 && 
             const dynamicModules = filterDynamicModules(fileGraph, ctx);
             const bundledModules = dynamicModules.filter(item => item.resolved);
             const unBundledModules = dynamicModules.filter(item => !item.resolved);
@@ -223,7 +224,12 @@ function ensureBundleInjection(code, resourceId) {
 function filterBareImport(item, ctx) {
     const depFileGraph = ctx.getFileGraph(item.path);
     // skip omnia packages since they only contain typing files
-    return depFileGraph && depFileGraph.id.startsWith('@omnia') == false && !ctx.alias[depFileGraph.id] && depFileGraph.bareImport && depFileGraph.js;
+    return depFileGraph
+        && depFileGraph.id.startsWith('./wwwroot/docs/') == false
+        && depFileGraph.id.startsWith('@omnia') == false
+        && !ctx.alias[depFileGraph.id]
+        && depFileGraph.bareImport
+        && depFileGraph.js;
 }
 function isBareImportResolved(item, ctx) {
     const depFileGraph = ctx.getFileGraph(item.path);

package/internal-do-not-import-from-here/vite/hmr/utils/manifest.js

@@ -15,8 +15,8 @@ const vendors = [
 ];
 let internalManifestReferences;
 const externalManifestReferences = (function () {
-    const externalManifestRefPathPattern = (0, vite_1.normalizePath)(path_1.default.join(envUtils.getRootDirPath(), 'node_modules/@omnia/*/internal-do-not-import-from-here/manifests/*.json'));
-    const manifestFilePaths = (0, globby_1.sync)(externalManifestRefPathPattern);
+    const externalManifestRefPathPattern = (0, vite_1.normalizePath)(path_1.default.join(envUtils.getRootDirPath(), 'node_modules/@omnia/*/internal-do-not-import-from-here/manifests/*.json').replace(/\\/g, '/'));
+    const manifestFilePaths = (0, globby_1.globbySync)(externalManifestRefPathPattern);
     if (manifestFilePaths.length == 0) {
         return [];
     }
@@ -73,6 +73,6 @@ function getEntryKeyFromManifest(manifest) {
     if (!!manifest.resourceName) {
         return `${manifest.resourceName}_${manifest.resourceId}`;
     }
-    return manifest.resourceId;
+    return manifest.resourceId.toString();
 }
 exports.getEntryKeyFromManifest = getEntryKeyFromManifest;

package/internal-do-not-import-from-here/vite/hmr/utils/path.js

@@ -143,21 +143,22 @@ function modify(value) {
 exports.modify = modify;
 function resolveModulePath(modulePath, external) {
     let pattern = null;
+    const path = modulePath.replace(/\\/g, '/');
     if (external) {
-        pattern = [modulePath + '.js', modulePath + '/index.js', modulePath + '.ts', modulePath + '.tsx', modulePath + '/index.ts'];
+        pattern = [path + '.js', path + '/index.js', path + '.ts', path + '.tsx', path + '/index.ts'];
     }
-    else if (modulePath.endsWith('.css')) {
-        pattern = [modulePath + '.ts', modulePath];
+    else if (path.endsWith('.css')) {
+        pattern = [path + '.ts', path];
     }
     else {
-        pattern = [modulePath + '.ts', modulePath + '.tsx', modulePath + '/index.ts'];
+        pattern = [path + '.ts', path + '.tsx', path + '/index.ts'];
     }
-    const result = (0, globby_1.sync)(pattern);
+    const result = (0, globby_1.globbySync)(pattern);
     if (result.length == 1) {
         return result[0];
     }
     if (result.length > 1) {
-        if (modulePath.endsWith('.css')) {
+        if (path.endsWith('.css')) {
             // priority typestyle
             let filePath = result.find(p => p.endsWith('.css.ts'));
             // then raw css

package/internal-do-not-import-from-here/vite/hmr/utils/webpack.js

@@ -10,7 +10,7 @@ function createWebpackConfig(entries, option) {
     let bundleOptions = bundler.getBuildOption().bundleOptions;
     let outputDir = envUtils.getBundleOutputDirPath().replace(envUtils.getRootDirPath(), '');
     if (bundleOptions && bundleOptions.commonsChunk) {
-        let config = bundler.createVueWebpackConfig(null, entries, outputDir, false, option);
+        let config = bundler.createVueWebpackConfig(null, entries, outputDir, option);
         config.stats = {
             entrypoints: false,
             chunks: false,
@@ -26,7 +26,7 @@ function createWebpackConfig(entries, option) {
         configs = Object.keys(entries).map(key => {
             var entry = {};
             entry[key] = entries[key];
-            let config = bundler.createVueWebpackConfig(entry, entries, outputDir, false, option);
+            let config = bundler.createVueWebpackConfig(entry, entries, outputDir, option);
             config.stats = 'errors-only';
             config.watchOptions = {
                 aggregateTimeout: 200

package/internal-do-not-import-from-here/vite/index.js

@@ -10,6 +10,7 @@ const del_1 = tslib_1.__importDefault(require("del"));
 const tooling_composers_1 = require("@omnia/tooling-composers");
 const tooling_1 = require("@omnia/tooling");
 const plugins_1 = require("./plugins");
+const vite_plugin_inspect_1 = tslib_1.__importDefault(require("vite-plugin-inspect"));
 async function createViteServer() {
     const hosting = (0, tooling_composers_1.getHosting)();
     let plugins = [
@@ -17,6 +18,9 @@ async function createViteServer() {
             hosting: hosting
         })
     ];
+    if (hosting.enableProfiling) {
+        plugins.push((0, vite_plugin_inspect_1.default)());
+    }
     let https = hosting.https || await getCert();
     let serverConfig = {
         configFile: false,

package/internal-do-not-import-from-here/vite/middlewares/HmrMiddleware.js

@@ -119,7 +119,9 @@ function registerHmrMiddleware(server) {
             //res.end(content);
         }
         else if (ext === "css") {
-            content = `import { updateStyle as __vite__updateStyle} from "/@vite/client"; __vite__updateStyle("${bundleFileName}", \`${content}\`)`;
+            content = `import { updateStyle as __vite__updateStyle} from "/@vite/client"; 
+            const __vite__css = ${JSON.stringify(content)}
+            __vite__updateStyle("${bundleFileName}", __vite__css)`;
             // req.url = `/omnia/dist/hmr/bundles/${bundleFileName}`;
             // console.log("Hmr middleware", req.url)
             // next();
@@ -290,12 +292,7 @@ const manifestResolvePromise = new Promise(function (resolve) {
     resolveManifest = resolve;
 });
 
-omniaLoader['${serviceId}']['${resourceId}'] = function (preBundle) {
-    if (preBundle && !preBundleLoader) {
-        preBundleLoader = preBundle;
-        return;
-    }
-
+omniaLoader['${serviceId}']['${resourceId}'] = function () {
     if (triggered) {
         return manifestResolvePromise;
     }
@@ -323,8 +320,8 @@ omniaLoader['${serviceId}']['${resourceId}'] = function (preBundle) {
 
     // pre-bundle exports
     let preBundleWebpackRequire;
-    if (preBundleLoader) {
-        preBundleLoader();
+    if (typeof hmrPreBundle === "function") {
+        hmrPreBundle();
     }
 
     function require(moduleId) {
@@ -342,7 +339,7 @@ omniaLoader['${serviceId}']['${resourceId}'] = function (preBundle) {
     }
 
     ${fromWorker ?
-        `const { href } = new URL('${host}${utils_1.pathUtils.HMR_ESM_REQUEST}/${resourceId}${fromWorker ? `?${utils_1.pathUtils.WORKER_IDENTIFIER}` : ''}', location.href);
+        `const { href } = new URL('${host}${utils_1.pathUtils.HMR_ESM_REQUEST}/${resourceId}?${utils_1.pathUtils.WORKER_IDENTIFIER}', location.href);
     __shimport__.load(href).then(function () {
         if (omniaWebpackJsonp['${serviceId}']['${resourceId}']) {
             preBundleWebpackRequire = omniaWebpackJsonp['${serviceId}']['${resourceId}'];
@@ -351,7 +348,7 @@ omniaLoader['${serviceId}']['${resourceId}'] = function (preBundle) {
         omniaWebpackJsonp['${serviceId}']['${resourceId}'] = require;
         resolveManifest();
     });` :
-        `import('${host}${utils_1.pathUtils.HMR_ESM_REQUEST}/${resourceId}${fromWorker ? `?${utils_1.pathUtils.WORKER_IDENTIFIER}` : ''}').then(function () {
+        `import('${utils_1.pathUtils.HMR_ESM_REQUEST}/${resourceId}').then(function () {
         if (omniaWebpackJsonp['${serviceId}']['${resourceId}']) {
             preBundleWebpackRequire = omniaWebpackJsonp['${serviceId}']['${resourceId}'];
         }
@@ -362,9 +359,7 @@ omniaLoader['${serviceId}']['${resourceId}'] = function (preBundle) {
 
     return manifestResolvePromise;
 }
-
 ${preBundleContent}
-
 ${forGroupManifest ? 'return manifestResolvePromise;' : `${$.composers.LoadableManifestRegistry.isDefineWithNoDependency(resourceId) ? `omniaLoader['${serviceId}']['${resourceId}']();` : ''}`}
 `;
     return template.trim();