@omnia/tooling-vue 8.0.151-dev → 8.0.153-dev

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

@@ -20,7 +20,7 @@ const initialManifests = [
     fx_models_1.OmniaResourceManifests.FxWorkers.toString()
 ];
 const esbuildTransformOptions = {
-    target: 'es2020',
+    target: 'es2022',
     jsx: 'preserve',
     sourcemap: false,
     legalComments: 'inline'
@@ -36,7 +36,7 @@ function toFileGraphId(unknownId) {
         id = utils_1.pathUtils.resolveTsPath(id);
     }
     if (path_1.default.isAbsolute(id)) {
-        return '.' + (0, vite_1.normalizePath)(id.replace((0, vite_1.normalizePath)(utils_1.envUtils.getRootDirPath()), ''));
+        return '.' + (0, vite_1.normalizePath)(utils_1.pathUtils.normalizeRelativePath(id));
     }
     if (id.startsWith('/')) {
         return '.' + id;
@@ -50,7 +50,7 @@ function toModuleId(unknownId) {
         id = utils_1.pathUtils.resolveTsPath(id);
     }
     if (path_1.default.isAbsolute(id)) {
-        return (0, vite_1.normalizePath)(id.replace((0, vite_1.normalizePath)(utils_1.envUtils.getRootDirPath()), ''));
+        return (0, vite_1.normalizePath)(utils_1.pathUtils.normalizeRelativePath(id));
     }
     if (id.startsWith('./')) {
         return id.substring(1);

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

@@ -101,7 +101,7 @@ function setupHmrPlugin(options, config) {
             const fileGraph = graph.getFileGraph(source);
             const resolver = resolvers.find(resolver => resolver.test(pathname, importer, fileGraph, runtimeContext, fromWorker));
             if (resolver) {
-                return resolver.resolve(pathname, importer, fileGraph, runtimeContext, fromWorker);
+                return utils_1.pathUtils.normalizeRelativePath(await resolver.resolve(pathname, importer, fileGraph, runtimeContext, fromWorker));
             }
             return source;
         },

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

@@ -4,7 +4,6 @@ exports.tempFix = exports.replaceWildcardDefaultExport = exports.replaceNameless
 const tslib_1 = require("tslib");
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const path_1 = tslib_1.__importDefault(require("path"));
-const vite_1 = require("vite");
 const envUtils = tslib_1.__importStar(require("./env"));
 const pathUtils = tslib_1.__importStar(require("./path"));
 const replacedDefaultVariable = '__default__';
@@ -159,7 +158,7 @@ function resolveRawPath(rawPath, id, external) {
         dependencyFilePath = pathUtils.resolveTsPath(rawPath);
     }
     if (dependencyFilePath) {
-        dependencyFilePath = dependencyFilePath.replace((0, vite_1.normalizePath)(envUtils.getRootDirPath()), '');
+        dependencyFilePath = pathUtils.normalizeRelativePath(dependencyFilePath);
         if (dependencyFilePath.startsWith('/')) {
             dependencyFilePath = '.' + dependencyFilePath;
         }

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

@@ -34,4 +34,5 @@ export declare function modify(value: string): {
 };
 export declare function resolveModulePath(modulePath: string, external?: boolean): string;
 export declare function resolveTsPath(importPath: string): string;
+export declare function normalizeRelativePath(value: string): string;
 export {};

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.resolveTsPath = exports.resolveModulePath = exports.modify = exports.parsePhysicalPath = exports.parseHmrDynamicBundlePath = exports.parseHmrEsmPath = exports.parseOmniaBundlePath = exports.isImageFilePath = exports.isPublicDirPath = exports.isNodeModulePath = exports.isTsPath = exports.isJavaScriptSuperset = exports.isSourceCodePath = exports.isEsmPath = exports.isBundlePath = exports.WORKER_IDENTIFIER = exports.HMR_DYNAMIC_BUNDLE_REQUEST = exports.HMR_ESM_REQUEST = exports.OMNIA_BUNDLE_REQUEST = void 0;
+exports.normalizeRelativePath = exports.resolveTsPath = exports.resolveModulePath = exports.modify = exports.parsePhysicalPath = exports.parseHmrDynamicBundlePath = exports.parseHmrEsmPath = exports.parseOmniaBundlePath = exports.isImageFilePath = exports.isPublicDirPath = exports.isNodeModulePath = exports.isTsPath = exports.isJavaScriptSuperset = exports.isSourceCodePath = exports.isEsmPath = exports.isBundlePath = exports.WORKER_IDENTIFIER = exports.HMR_DYNAMIC_BUNDLE_REQUEST = exports.HMR_ESM_REQUEST = exports.OMNIA_BUNDLE_REQUEST = void 0;
 const tslib_1 = require("tslib");
 const path_1 = tslib_1.__importDefault(require("path"));
 const vite_1 = require("vite");
@@ -11,11 +11,12 @@ exports.HMR_ESM_REQUEST = '/hmr/esm';
 exports.HMR_DYNAMIC_BUNDLE_REQUEST = '/hmr/dynamicbundles';
 exports.WORKER_IDENTIFIER = 'omniaworker';
 let _tsConfig;
+const rootDirPathLowerCase = envUtils.getRootDirPath().toLowerCase().replace(/\\/g, "/");
 function getTsConfig() {
     if (!_tsConfig) {
         const value = require(envUtils.getTsConfigPath());
         const resolvedBaseUrl = path_1.default.join(envUtils.getRootDirPath(), value.compilerOptions.baseUrl);
-        value.compilerOptions.baseUrl = (0, vite_1.normalizePath)(resolvedBaseUrl.replace(envUtils.getRootDirPath(), ''));
+        value.compilerOptions.baseUrl = (0, vite_1.normalizePath)(normalizeRelativePath(resolvedBaseUrl));
         _tsConfig = value;
     }
     return _tsConfig;
@@ -108,7 +109,7 @@ function parseHmrDynamicBundlePath(value) {
 }
 exports.parseHmrDynamicBundlePath = parseHmrDynamicBundlePath;
 function parsePhysicalPath(value) {
-    value = ensureRelativePath(value).replace(envUtils.getRootDirPath(), '');
+    value = ensureRelativePath(value);
     if (value.startsWith('/')) {
         value = value.substr(1);
     }
@@ -218,6 +219,13 @@ function resolveTsPath(importPath) {
     return loop();
 }
 exports.resolveTsPath = resolveTsPath;
+function normalizeRelativePath(value) {
+    if (value.toLowerCase().replace(/\\/g, "/").indexOf(rootDirPathLowerCase) === 0) {
+        return value.substring(rootDirPathLowerCase.length);
+    }
+    return value;
+}
+exports.normalizeRelativePath = normalizeRelativePath;
 function ensureRelativePath(value) {
     if (path_1.default.isAbsolute(value)) {
         value = value.replace(envUtils.getRootDirPath(), '/');

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

@@ -5,10 +5,11 @@ const tslib_1 = require("tslib");
 const envUtils = tslib_1.__importStar(require("./env"));
 const bundler = tslib_1.__importStar(require("../../../tasks/bundle"));
 const $ = tslib_1.__importStar(require("../../../variables"));
+const _1 = require(".");
 function createWebpackConfig(entries, option) {
     let configs = [];
     let bundleOptions = bundler.getBuildOption().bundleOptions;
-    let outputDir = envUtils.getBundleOutputDirPath().replace(envUtils.getRootDirPath(), '');
+    let outputDir = _1.pathUtils.normalizeRelativePath(envUtils.getBundleOutputDirPath()); //envUtils.getBundleOutputDirPath().replace(envUtils.getRootDirPath(), '');
     if (bundleOptions && bundleOptions.commonsChunk) {
         let config = bundler.createVueWebpackConfig(null, entries, outputDir, option);
         config.stats = {

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

@@ -23,6 +23,7 @@ async function createViteServer() {
     }
     let https = hosting.https || await getCert();
     let serverConfig = {
+        // root: "D:/omnia/dev/omnia/src/Omnia.Web.App",
         configFile: false,
         esbuild: false,
         optimizeDeps: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@omnia/tooling-vue",
   "license": "MIT",
-  "version": "8.0.151-dev",
+  "version": "8.0.153-dev",
   "description": "Used to bundle and serve manifests web component that build on Vue framework.",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -19,8 +19,8 @@
   ],
   "author": "Precio Fishbone",
   "dependencies": {
-    "@omnia/fx-models": "8.0.151-dev",
-    "@omnia/tooling-composers": "8.0.151-dev",
+    "@omnia/fx-models": "8.0.153-dev",
+    "@omnia/tooling-composers": "8.0.153-dev",
     "@types/mousetrap": "1.5.34",
     "@types/quill": "1.3.6",
     "@types/zepto": "1.0.29",
@@ -48,7 +48,7 @@
     "url-loader": "4.1.1",
     "webpack": "5.89.0",
     "webpack-core": "0.6.9",
-    "webpack-dev-middleware": "6.0.1",
+    "webpack-dev-middleware": "7.1.1",
     "webpack-merge": "5.8.0",
     "zepto-webpack": "1.2.1",
     "@swc/core": "1.3.52",