@jitar/plugin-vite 0.11.0 → 0.11.2

package/dist/index.js

@@ -1,10 +1,10 @@
-import fs from 'node:fs';
 import path from 'node:path';
 import { ConfigurationManager, BuildHelper } from 'jitar';
 import { normalizePath } from 'vite';
 const JITAR_SOURCE_ID = 'jitar';
 const JITAR_CLIENT_ID = 'jitar/client';
 const JITAR_BUNDLE_ID = 'jitar-bundle';
+const JITAR_BUNDLE_RESOLVE_ID = `\0${JITAR_BUNDLE_ID}`;
 function assureExtension(filename) {
     if (filename.endsWith('.js')) {
         return filename;
@@ -12,7 +12,7 @@ function assureExtension(filename) {
     return `${filename}.js`;
 }
 function createJitarBundle(middlewares, targetPath) {
-    const middlewareFiles = middlewares.map(name => assureExtension(`${targetPath}/${name}`));
+    const middlewareFiles = middlewares.map(name => assureExtension(path.join(targetPath, name)));
     const jitarImport = `import { ClientBuilder, HttpRemoteBuilder } from "${JITAR_CLIENT_ID}";`;
     const middlewareImports = middlewareFiles.map((filename, index) => `import { default as $M${index} } from "${filename}";`).join('');
     const imports = [jitarImport, middlewareImports].join('\n');
@@ -39,10 +39,10 @@ export default function viteJitar(pluginConfig) {
         jitar: { input: undefined, output: undefined }
     };
     let buildHelper;
-    let jitarBundleFilename;
-    let jitarBundleImported = false;
+    let jitarImported = false;
     return {
         name: 'jitar-plugin-vite',
+        enforce: 'pre',
         config() {
             return {
                 build: { target: 'esnext' },
@@ -52,11 +52,12 @@ export default function viteJitar(pluginConfig) {
         configResolved(resolvedConfig) {
             paths.vite.input = normalizePath(path.join(resolvedConfig.root));
             paths.vite.output = normalizePath(path.join(paths.vite.input, resolvedConfig.build.outDir));
-            paths.vite.assetOutput = normalizePath(path.join(paths.vite.input, resolvedConfig.build.assetsDir));
+            paths.vite.assetOutput = normalizePath(path.join(paths.vite.output, resolvedConfig.build.assetsDir));
             paths.project.root = normalizePath(path.join(paths.vite.input, pluginConfig.projectRoot));
             paths.project.source = normalizePath(path.join(paths.vite.input, pluginConfig.sourceRoot));
         },
         async buildStart() {
+            jitarImported = false;
             const configurationManager = new ConfigurationManager(paths.project.root);
             if (pluginConfig.environmentFile !== undefined) {
                 await configurationManager.configureEnvironment(pluginConfig.environmentFile);
@@ -67,37 +68,18 @@ export default function viteJitar(pluginConfig) {
             buildHelper = new BuildHelper(configuration);
             await buildHelper.readApplication();
         },
-        options(options) {
-            if (options.input === undefined) {
-                options.input = JITAR_BUNDLE_ID;
-            }
-            else if (typeof options.input === 'string') {
-                options.input = [options.input, JITAR_BUNDLE_ID];
-            }
-            else if (Array.isArray(options.input)) {
-                options.input.push(JITAR_BUNDLE_ID);
-            }
-            else if (typeof options.input === 'object') {
-                options.input.additionalEntry = JITAR_BUNDLE_ID;
+        resolveId(id) {
+            if (id === JITAR_BUNDLE_ID) {
+                return JITAR_BUNDLE_RESOLVE_ID;
             }
-            return options;
-        },
-        resolveId: {
-            order: 'pre',
-            async handler(source, importer) {
-                if (source === JITAR_BUNDLE_ID) {
-                    return source;
-                }
-                if (source === JITAR_SOURCE_ID) {
-                    if (importer?.endsWith('.segment.js') === false) {
-                        jitarBundleImported = true;
-                    }
-                    return JITAR_BUNDLE_ID;
-                }
+            if (id === JITAR_SOURCE_ID) {
+                return JITAR_BUNDLE_RESOLVE_ID;
             }
+            return null;
         },
         load(id) {
-            if (id === JITAR_BUNDLE_ID) {
+            if (id === JITAR_BUNDLE_RESOLVE_ID) {
+                jitarImported = true;
                 return createJitarBundle(middlewares, paths.vite.output);
             }
             if (id.startsWith(paths.project.source)) {
@@ -120,34 +102,14 @@ export default function viteJitar(pluginConfig) {
             }
             return null;
         },
-        generateBundle(options, bundle) {
-            const bundles = Object.entries(bundle);
-            for (const [fileName, chunk] of bundles) {
-                if (chunk.type === 'chunk' && chunk.name === JITAR_BUNDLE_ID) {
-                    jitarBundleFilename = fileName;
-                    break;
-                }
-            }
-        },
-        transformIndexHtml(html) {
-            if (jitarBundleImported === true) {
-                return html;
-            }
-            if (jitarBundleFilename === undefined) {
-                if (paths.vite.assetOutput === undefined) {
-                    console.warn('Output path not found!');
-                    return html;
-                }
-                const filenames = fs.readdirSync(paths.vite.assetOutput);
-                const jitarFilename = filenames.find(fileName => fileName.startsWith(JITAR_BUNDLE_ID) && fileName.endsWith('.js'));
-                if (jitarFilename === undefined) {
-                    console.warn('Jitar bundle not found! Did you build the application first?');
-                    return html;
-                }
-                const jitarBundle = fs.readFileSync(path.join(paths.vite.assetOutput, jitarFilename), 'utf-8');
-                return html.replace('<script', `<script type="module">${jitarBundle}</script>\n    <script`);
+        transform(code, id) {
+            const isFirstAppComponent = jitarImported === false
+                && id.startsWith(paths.project.source)
+                && (id.endsWith('.js') || id.endsWith('.ts') || id.endsWith('.jsx') || id.endsWith('.tsx'));
+            if (isFirstAppComponent) {
+                return `import '${JITAR_BUNDLE_ID}';\n${code}`;
             }
-            return html.replace('<script', `<script type="module" crossorigin src="/${jitarBundleFilename}"></script>\n    <script`);
+            return code;
         }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jitar/plugin-vite",
-  "version": "0.11.0",
+  "version": "0.11.2",
   "description": "Vite plugin for Jitar.",
   "author": "Masking Technology <info@masking.tech> (https://jitar.dev)",
   "license": "MIT",
@@ -32,7 +32,7 @@
   },
   "peerDependencies": {
     "jitar": "^0.11.0",
-    "vite": ">=4.0.0 || >=5.0.0 || >=6.0.0 || >=7.0.0"
+    "vite": ">=7"
   },
   "peerDependenciesMeta": {
     "vite": {