@typed/vite-plugin 0.13.0 → 0.15.0

package/dist/vite-plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAMA,OAAO,EAA6B,KAAK,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAGjF,OAAO,KAAK,EAAa,MAAM,EAAE,YAAY,EAA6B,MAAM,MAAM,CAAA;AAItF,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAE5C;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;IAEjC;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAE1B;;OAEG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAEhC;;OAEG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAEvC;;OAEG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAEvC;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAE1C;;;OAGG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;IAExB;;OAEG;IACH,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAEvC;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CACjC;AAID,MAAM,WAAW,eAAgB,SAAQ,MAAM;IAC7C,QAAQ,CAAC,IAAI,EAAE,OAAO,WAAW,CAAA;IACjC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAA;CAC1C;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,YAAY,EAAE,CAiL/E;AAED,wBAAgB,cAAc,CAAC,EAC7B,eAAe,EAAE,SAAe,EAChC,QAAQ,EACR,cAAc,EACd,qBAAqB,EACrB,qBAAqB,EACrB,aAAa,EACb,KAAa,EACb,oBAA4B,EAC5B,aAAmD,GACpD,EAAE,aAAa,GAAG,eAAe,CAsCjC;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAC5C,UAAU,EAAE,SAAS,MAAM,EAAE,GAC5B,SAAS,MAAM,EAAE,CAUnB;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,MAKhE"}
+{"version":3,"file":"vite-plugin.d.ts","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAa,MAAM,EAAE,YAAY,EAAc,MAAM,MAAM,CAAA;AAIvE,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAA;AAEzD;;;GAGG;AACH,MAAM,WAAW,aAAa;IAC5B;;;OAGG;IACH,QAAQ,CAAC,eAAe,CAAC,EAAE,MAAM,CAAA;IAEjC;;OAEG;IACH,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;IAE1B;;OAEG;IACH,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAA;IAEhC;;OAEG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAEvC;;OAEG;IACH,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAEvC;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;IAE1C;;;OAGG;IACH,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAA;IAExB;;OAEG;IACH,QAAQ,CAAC,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAEvC;;OAEG;IACH,QAAQ,CAAC,aAAa,CAAC,EAAE,OAAO,CAAA;CACjC;AAID,MAAM,WAAW,eAAgB,SAAQ,MAAM;IAC7C,QAAQ,CAAC,IAAI,EAAE,OAAO,WAAW,CAAA;IACjC,QAAQ,CAAC,eAAe,EAAE,eAAe,CAAA;CAC1C;AAED,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,aAAa,EAAE,aAAa,GAAG,YAAY,EAAE,CA6J/E;AAED,wBAAgB,cAAc,CAAC,EAC7B,eAAe,EAAE,SAAe,EAChC,QAAQ,EACR,cAAc,EACd,qBAAqB,EACrB,qBAAqB,EACrB,aAAa,EACb,KAAa,EACb,oBAA4B,EAC5B,aAAmD,GACpD,EAAE,aAAa,GAAG,eAAe,CAsCjC;AAED,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,EAC5C,UAAU,EAAE,SAAS,MAAM,EAAE,GAC5B,SAAS,MAAM,EAAE,CAUnB;AAED,wBAAgB,gBAAgB,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,MAKhE"}

package/dist/vite-plugin.js

@@ -1,10 +1,9 @@
-import { existsSync, writeFileSync } from 'fs';
-import { EOL } from 'os';
-import { basename, join, resolve } from 'path';
+import { existsSync } from 'fs';
+import { basename, join, relative, resolve } from 'path';
 import { pipe } from '@effect/data/Function';
 import * as Option from '@effect/data/Option';
-import { Compiler, getRelativePath } from '@typed/compiler';
 import glob from 'fast-glob';
+import { visualizer } from 'rollup-plugin-visualizer';
 import vavite from 'vavite';
 import compression from 'vite-plugin-compression';
 import tsconfigPaths from 'vite-tsconfig-paths';
@@ -12,24 +11,23 @@ import { PLUGIN_NAME } from './constants.js';
 const cwd = process.cwd();
 export default function makePlugin(pluginOptions) {
     const options = resolveOptions(pluginOptions);
-    let compiler;
-    let devServer;
-    let isSsr = false;
+    // let devServer: ViteDevServer
+    // let isSsr = false
     const plugins = [
         tsconfigPaths({
             projects: [options.tsConfig],
         }),
+        visualizer({
+            emitFile: true,
+            filename: 'bundle-visualizer.html',
+            gzipSize: true,
+            brotliSize: true,
+        }),
         ...pipe(options.serverFilePath, Option.filter(() => !options.isStaticBuild), Option.map((serverEntry) => vavite({
             serverEntry,
             serveClientAssetsInDev: true,
         })), Option.toArray),
     ];
-    const getCompiler = () => {
-        if (compiler) {
-            return compiler;
-        }
-        return (compiler = new Compiler(PLUGIN_NAME, options));
-    };
     const virtualModulePlugin = {
         name: PLUGIN_NAME,
         get resolvedOptions() {
@@ -39,7 +37,7 @@ export default function makePlugin(pluginOptions) {
          * Configures our production build using vavite
          */
         config(config, env) {
-            isSsr = env.ssrBuild ?? false;
+            // isSsr = env.ssrBuild ?? false
             if (!config.root) {
                 config.root = options.sourceDirectory;
             }
@@ -49,6 +47,7 @@ export default function makePlugin(pluginOptions) {
                     outDir: options.clientOutputDirectory,
                     rollupOptions: {
                         input: buildClientInput(options.htmlFiles),
+                        external: ['happy-dom'],
                     },
                 };
                 const clientConfig = {
@@ -78,68 +77,56 @@ export default function makePlugin(pluginOptions) {
         configResolved(config) {
             // Ensure final options has the correct base path
             Object.assign(options, { base: config.base });
-            getCompiler().parseInput(config.build.rollupOptions.input);
         },
         /**
          * Configures our dev server to watch for changes to our input files
          * and exposes the dev server to our compiler methods
          */
-        configureServer(server) {
-            devServer = server;
-            server.watcher.on('all', (event, path) => {
-                if (event === 'change') {
-                    getCompiler().handleFileChange(path, 'update', server);
-                }
-                else if (event === 'add') {
-                    getCompiler().handleFileChange(path, 'create', server);
-                }
-                else if (event === 'unlink') {
-                    getCompiler().handleFileChange(path, 'delete', server);
-                }
-            });
-        },
+        // configureServer(server) {
+        //   devServer = server
+        // },
         /**
          * Handles file changes
          */
-        async watchChange(path, { event }) {
-            getCompiler().handleFileChange(path, event, devServer);
-        },
+        // async watchChange(path, { event }) {},
         /**
          * Type-check our project and fail the build if there are any errors.
          * If successful, save our manifest to disk.
          */
-        async closeBundle() {
-            const { manifest, throwDiagnostics } = getCompiler();
-            // Throw any diagnostics that were collected during the build
-            throwDiagnostics();
-            if (Object.keys(manifest).length > 0 && !options.isStaticBuild) {
-                writeFileSync(resolve(isSsr ? options.serverOutputDirectory : options.clientOutputDirectory, 'typed-manifest.json'), JSON.stringify(manifest, null, 2) + EOL);
-            }
-        },
+        // async closeBundle() {},
         /**
          * Resolve and build our virtual modules
          */
-        async resolveId(id, importer) {
-            return await getCompiler().resolveId(id, importer, devServer);
+        async resolveId(id) {
+            if (id === 'typed:config') {
+                return id;
+            }
+            return null;
         },
         /**
          * Load our virtual modules
          */
         load(id) {
-            return getCompiler().load(id);
+            if (id === 'typed:config') {
+                return Object.entries(options).reduce((acc, [key, value]) => {
+                    acc += `export const ${key} = ${JSON.stringify(value)}\n`;
+                    return acc;
+                }, '');
+            }
+            return null;
         },
         /**
          * Transorm TypeScript modules
          */
-        transform(text, id) {
-            return getCompiler().transpileTsModule(text, id, devServer);
-        },
+        // transform(text: string, id: string) {
+        //   return getCompiler().transpileTsModule(text, id, devServer)
+        // },
         /**
          * Transform HTML files
          */
-        transformIndexHtml(html) {
-            return getCompiler().transformHtml(html);
-        },
+        // transformIndexHtml(html: string) {
+        //   return getCompiler().transformHtml(html)
+        // },
     };
     plugins.push(virtualModulePlugin);
     return plugins;
@@ -185,4 +172,11 @@ export function findHtmlFiles(directory, htmlFileGlobs, exclusions) {
 export function buildClientInput(htmlFilePaths) {
     return htmlFilePaths.reduce((acc, htmlFilePath) => ({ ...acc, [basename(htmlFilePath, '.html')]: htmlFilePath }), {});
 }
+function getRelativePath(from, to) {
+    const path = relative(from, to);
+    if (path.startsWith('.')) {
+        return path;
+    }
+    return './' + path;
+}
 //# sourceMappingURL=vite-plugin.js.map

package/dist/vite-plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"vite-plugin.js","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,IAAI,CAAA;AAC9C,OAAO,EAAE,GAAG,EAAE,MAAM,IAAI,CAAA;AACxB,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,MAAM,CAAA;AAE9C,OAAO,EAAE,IAAI,EAAE,MAAM,uBAAuB,CAAA;AAC5C,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAA;AAC7C,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAwB,MAAM,iBAAiB,CAAA;AACjF,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,MAAM,MAAM,QAAQ,CAAA;AAE3B,OAAO,WAAW,MAAM,yBAAyB,CAAA;AACjD,OAAO,aAAa,MAAM,qBAAqB,CAAA;AAE/C,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAuD5C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAA;AAOzB,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,aAA4B;IAC7D,MAAM,OAAO,GAAoB,cAAc,CAAC,aAAa,CAAC,CAAA;IAC9D,IAAI,QAAkB,CAAA;IACtB,IAAI,SAAwB,CAAA;IAC5B,IAAI,KAAK,GAAG,KAAK,CAAA;IAEjB,MAAM,OAAO,GAAmB;QAC9B,aAAa,CAAC;YACZ,QAAQ,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC;SAC7B,CAAiB;QAClB,GAAG,IAAI,CACL,OAAO,CAAC,cAAc,EACtB,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,EAC3C,MAAM,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,EAAE,CACzB,MAAM,CAAC;YACL,WAAW;YACX,sBAAsB,EAAE,IAAI;SAC7B,CAAC,CACH,EACD,MAAM,CAAC,OAAO,CACf;KACF,CAAA;IAED,MAAM,WAAW,GAAG,GAAG,EAAE;QACvB,IAAI,QAAQ,EAAE;YACZ,OAAO,QAAQ,CAAA;SAChB;QAED,OAAO,CAAC,QAAQ,GAAG,IAAI,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAA;IACxD,CAAC,CAAA;IAED,MAAM,mBAAmB,GAAoB;QAC3C,IAAI,EAAE,WAAW;QACjB,IAAI,eAAe;YACjB,OAAO,OAAO,CAAA;QAChB,CAAC;QACD;;WAEG;QACH,MAAM,CAAC,MAAkB,EAAE,GAAc;YACvC,KAAK,GAAG,GAAG,CAAC,QAAQ,IAAI,KAAK,CAAA;YAE7B,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE;gBAChB,MAAM,CAAC,IAAI,GAAG,OAAO,CAAC,eAAe,CAAA;aACtC;YAED,iDAAiD;YACjD,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,EAAE;gBAC7B,MAAM,WAAW,GAAqC;oBACpD,MAAM,EAAE,OAAO,CAAC,qBAAqB;oBACrC,aAAa,EAAE;wBACb,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,SAAS,CAAC;qBAC3C;iBACF,CAAA;gBAED,MAAM,YAAY,GAAG;oBACnB,IAAI,EAAE,QAAQ;oBACd,oEAAoE;oBACpE,MAAM,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC,EAAE;iBACzD,CAAA;gBAED,MAAM,YAAY,GAAG,IAAI,CACvB,OAAO,CAAC,cAAc,EACtB,MAAM,CAAC,GAAG,CACR,CAAC,KAAK,EAAoC,EAAE,CAAC,CAAC;oBAC5C,GAAG,EAAE,IAAI;oBACT,MAAM,EAAE,OAAO,CAAC,qBAAqB;oBACrC,aAAa,EAAE;wBACb,KAAK,EAAE;4BACL,KAAK;yBACN;qBACF;iBACF,CAAC,CACH,EACD,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC,EAC3E,MAAM,CAAC,OAAO,CACf,CAAA;gBAED,gDAAgD;gBAChD,MAAM,gBAAgB,GAAG,MAAa,CAAA;gBAEtC,uDAAuD;gBACvD,gBAAgB,CAAC,UAAU,GAAG,CAAC,gBAAgB,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,MAAM,CACtE,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CACpC,CAAA;aACF;QACH,CAAC;QAED;;;WAGG;QACH,cAAc,CAAC,MAAM;YACnB,iDAAiD;YACjD,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAA;YAE7C,WAAW,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;QAC5D,CAAC;QAED;;;WAGG;QACH,eAAe,CAAC,MAAM;YACpB,SAAS,GAAG,MAAM,CAAA;YAElB,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;gBACvC,IAAI,KAAK,KAAK,QAAQ,EAAE;oBACtB,WAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;iBACvD;qBAAM,IAAI,KAAK,KAAK,KAAK,EAAE;oBAC1B,WAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;iBACvD;qBAAM,IAAI,KAAK,KAAK,QAAQ,EAAE;oBAC7B,WAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAA;iBACvD;YACH,CAAC,CAAC,CAAA;QACJ,CAAC;QAED;;WAEG;QACH,KAAK,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE;YAC/B,WAAW,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,KAAK,EAAE,SAAS,CAAC,CAAA;QACxD,CAAC;QAED;;;WAGG;QACH,KAAK,CAAC,WAAW;YACf,MAAM,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,WAAW,EAAE,CAAA;YAEpD,6DAA6D;YAC7D,gBAAgB,EAAE,CAAA;YAElB,IAAI,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,EAAE;gBAC9D,aAAa,CACX,OAAO,CACL,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC,CAAC,OAAO,CAAC,qBAAqB,EACrE,qBAAqB,CACtB,EACD,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,GAAG,CACxC,CAAA;aACF;QACH,CAAC;QAED;;WAEG;QACH,KAAK,CAAC,SAAS,CAAC,EAAU,EAAE,QAAiB;YAC3C,OAAO,MAAM,WAAW,EAAE,CAAC,SAAS,CAAC,EAAE,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAA;QAC/D,CAAC;QAED;;WAEG;QACH,IAAI,CAAC,EAAU;YACb,OAAO,WAAW,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAC/B,CAAC;QAED;;WAEG;QACH,SAAS,CAAC,IAAY,EAAE,EAAU;YAChC,OAAO,WAAW,EAAE,CAAC,iBAAiB,CAAC,IAAI,EAAE,EAAE,EAAE,SAAS,CAAC,CAAA;QAC7D,CAAC;QAED;;WAEG;QACH,kBAAkB,CAAC,IAAY;YAC7B,OAAO,WAAW,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAA;QAC1C,CAAC;KACF,CAAA;IAED,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAA;IAEjC,OAAO,OAAO,CAAA;AAChB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,EAC7B,eAAe,EAAE,SAAS,GAAG,GAAG,EAChC,QAAQ,EACR,cAAc,EACd,qBAAqB,EACrB,qBAAqB,EACrB,aAAa,EACb,KAAK,GAAG,KAAK,EACb,oBAAoB,GAAG,KAAK,EAC5B,aAAa,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,KAAK,MAAM,GACrC;IACd,mBAAmB;IACnB,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IAC/C,MAAM,gBAAgB,GAAG,OAAO,CAAC,eAAe,EAAE,QAAQ,IAAI,eAAe,CAAC,CAAA;IAC9E,MAAM,sBAAsB,GAAG,OAAO,CAAC,eAAe,EAAE,cAAc,IAAI,WAAW,CAAC,CAAA;IACtF,MAAM,YAAY,GAAG,UAAU,CAAC,sBAAsB,CAAC,CAAA;IACvD,MAAM,6BAA6B,GAAG,OAAO,CAC3C,eAAe,EACf,qBAAqB,IAAI,aAAa,CACvC,CAAA;IACD,MAAM,6BAA6B,GAAG,OAAO,CAC3C,eAAe,EACf,qBAAqB,IAAI,aAAa,CACvC,CAAA;IAED,MAAM,UAAU,GAAG;QACjB,eAAe,CAAC,eAAe,EAAE,IAAI,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC;QAC9E,eAAe,CAAC,eAAe,EAAE,IAAI,CAAC,6BAA6B,EAAE,OAAO,CAAC,CAAC;QAC9E,oBAAoB;KACrB,CAAA;IAED,MAAM,eAAe,GAAoB;QACvC,IAAI,EAAE,GAAG;QACT,qBAAqB,EAAE,6BAA6B;QACpD,KAAK;QACL,UAAU;QACV,SAAS,EAAE,aAAa,CAAC,eAAe,EAAE,aAAa,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAC7E,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC,CAC5B;QACD,aAAa;QACb,oBAAoB;QACpB,cAAc,EAAE,YAAY,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE;QAClF,qBAAqB,EAAE,6BAA6B;QACpD,eAAe;QACf,QAAQ,EAAE,gBAAgB;KAC3B,CAAA;IAED,OAAO,eAAe,CAAA;AACxB,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,SAAiB,EACjB,aAA4C,EAC5C,UAA6B;IAE7B,IAAI,aAAa,EAAE;QACjB,6DAA6D;QAC7D,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,aAAa,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAA;KAC5F;IAED,6DAA6D;IAC7D,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,WAAW,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE;QACjE,GAAG,EAAE,SAAS;KACf,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,UAAU,gBAAgB,CAAC,aAAgC;IAC/D,OAAO,aAAa,CAAC,MAAM,CACzB,CAAC,GAAG,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,OAAO,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EACpF,EAAE,CACH,CAAA;AACH,CAAC"}
+{"version":3,"file":"vite-plugin.js","sourceRoot":"","sources":["../src/vite-plugin.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed/vite-plugin",
-  "version": "0.13.0",
+  "version": "0.15.0",
   "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.js",
@@ -19,20 +19,23 @@
     }
   },
   "dependencies": {
-    "@effect/data": "^0.12.2",
-    "@typed/compiler": "0.13.0",
-    "fast-glob": "^3.2.12",
-    "vavite": "^1.7.1",
-    "vite": "^4.3.7",
+    "@effect/data": "^0.16.0",
+    "fast-glob": "^3.3.0",
+    "rollup-plugin-visualizer": "^5.9.2",
+    "vavite": "^2.0.1",
+    "vite": "^4.4.5",
     "vite-plugin-compression": "^0.5.1",
     "vite-tsconfig-paths": "^4.2.0"
   },
   "peerDependencies": {
     "vite-node": "^0.28.3"
   },
-  "gitHead": "14059cee732408d38a141b5295a999c43c6aa94b",
+  "gitHead": "dac206ae9c9c6762dd958ae95438aaee0e29baa6",
   "publishConfig": {
     "access": "public"
   },
-  "sideEffects": false
+  "sideEffects": false,
+  "devDependencies": {
+    "vitest": "0.33.0"
+  }
 }

package/src/resolveTypedConfig.test.ts

@@ -3,10 +3,9 @@ import { dirname, join } from 'path'
 import { fileURLToPath } from 'url'
 
 import { isSome, some } from '@effect/data/Option'
-import type { ResolvedOptions } from '@typed/compiler'
 import { describe, it } from 'vitest'
 
-import { resolveTypedConfig } from './resolveTypedConfig.js'
+import { ResolvedOptions, resolveTypedConfig } from './resolveTypedConfig.js'
 
 const vitePluginSrcDirectory = dirname(fileURLToPath(import.meta.url))
 const rootDirectory = dirname(dirname(dirname(vitePluginSrcDirectory)))

package/src/resolveTypedConfig.ts

@@ -1,5 +1,4 @@
 import { none, some, type Option } from '@effect/data/Option'
-import type { ResolvedOptions } from '@typed/compiler'
 import { resolveConfig } from 'vite'
 
 import { PLUGIN_NAME } from './constants.js'
@@ -19,3 +18,17 @@ export async function resolveTypedConfig(
 }
 
 type ArgsOf<T> = T extends (...args: infer A) => any ? A : never
+
+export interface ResolvedOptions {
+  readonly base: string
+  readonly clientOutputDirectory: string
+  readonly debug: boolean
+  readonly exclusions: readonly string[]
+  readonly htmlFiles: readonly string[]
+  readonly isStaticBuild: boolean
+  readonly saveGeneratedModules: boolean
+  readonly serverFilePath: Option<string>
+  readonly serverOutputDirectory: string
+  readonly sourceDirectory: string
+  readonly tsConfig: string
+}

package/src/vite-plugin.ts

@@ -1,17 +1,17 @@
-import { existsSync, writeFileSync } from 'fs'
-import { EOL } from 'os'
-import { basename, join, resolve } from 'path'
+import { existsSync } from 'fs'
+import { basename, join, relative, resolve } from 'path'
 
 import { pipe } from '@effect/data/Function'
 import * as Option from '@effect/data/Option'
-import { Compiler, getRelativePath, type ResolvedOptions } from '@typed/compiler'
 import glob from 'fast-glob'
+import { visualizer } from 'rollup-plugin-visualizer'
 import vavite from 'vavite'
-import type { ConfigEnv, Plugin, PluginOption, UserConfig, ViteDevServer } from 'vite'
+import type { ConfigEnv, Plugin, PluginOption, UserConfig } from 'vite'
 import compression from 'vite-plugin-compression'
 import tsconfigPaths from 'vite-tsconfig-paths'
 
 import { PLUGIN_NAME } from './constants.js'
+import { ResolvedOptions } from './resolveTypedConfig.js'
 
 /**
  * The Configuration for the Typed Plugin. All file paths can be relative to sourceDirectory or
@@ -75,14 +75,19 @@ export interface TypedVitePlugin extends Plugin {
 
 export default function makePlugin(pluginOptions: PluginOptions): PluginOption[] {
   const options: ResolvedOptions = resolveOptions(pluginOptions)
-  let compiler: Compiler
-  let devServer: ViteDevServer
-  let isSsr = false
+  // let devServer: ViteDevServer
+  // let isSsr = false
 
   const plugins: PluginOption[] = [
     tsconfigPaths({
       projects: [options.tsConfig],
     }) as PluginOption,
+    visualizer({
+      emitFile: true,
+      filename: 'bundle-visualizer.html',
+      gzipSize: true,
+      brotliSize: true,
+    }),
     ...pipe(
       options.serverFilePath,
       Option.filter(() => !options.isStaticBuild),
@@ -96,14 +101,6 @@ export default function makePlugin(pluginOptions: PluginOptions): PluginOption[]
     ),
   ]
 
-  const getCompiler = () => {
-    if (compiler) {
-      return compiler
-    }
-
-    return (compiler = new Compiler(PLUGIN_NAME, options))
-  }
-
   const virtualModulePlugin: TypedVitePlugin = {
     name: PLUGIN_NAME,
     get resolvedOptions() {
@@ -113,7 +110,7 @@ export default function makePlugin(pluginOptions: PluginOptions): PluginOption[]
      * Configures our production build using vavite
      */
     config(config: UserConfig, env: ConfigEnv) {
-      isSsr = env.ssrBuild ?? false
+      // isSsr = env.ssrBuild ?? false
 
       if (!config.root) {
         config.root = options.sourceDirectory
@@ -125,6 +122,7 @@ export default function makePlugin(pluginOptions: PluginOptions): PluginOption[]
           outDir: options.clientOutputDirectory,
           rollupOptions: {
             input: buildClientInput(options.htmlFiles),
+            external: ['happy-dom'],
           },
         }
 
@@ -168,83 +166,65 @@ export default function makePlugin(pluginOptions: PluginOptions): PluginOption[]
     configResolved(config) {
       // Ensure final options has the correct base path
       Object.assign(options, { base: config.base })
-
-      getCompiler().parseInput(config.build.rollupOptions.input)
     },
 
     /**
      * Configures our dev server to watch for changes to our input files
      * and exposes the dev server to our compiler methods
      */
-    configureServer(server) {
-      devServer = server
-
-      server.watcher.on('all', (event, path) => {
-        if (event === 'change') {
-          getCompiler().handleFileChange(path, 'update', server)
-        } else if (event === 'add') {
-          getCompiler().handleFileChange(path, 'create', server)
-        } else if (event === 'unlink') {
-          getCompiler().handleFileChange(path, 'delete', server)
-        }
-      })
-    },
+    // configureServer(server) {
+    //   devServer = server
+    // },
 
     /**
      * Handles file changes
      */
-    async watchChange(path, { event }) {
-      getCompiler().handleFileChange(path, event, devServer)
-    },
+    // async watchChange(path, { event }) {},
 
     /**
      * Type-check our project and fail the build if there are any errors.
      * If successful, save our manifest to disk.
      */
-    async closeBundle() {
-      const { manifest, throwDiagnostics } = getCompiler()
-
-      // Throw any diagnostics that were collected during the build
-      throwDiagnostics()
-
-      if (Object.keys(manifest).length > 0 && !options.isStaticBuild) {
-        writeFileSync(
-          resolve(
-            isSsr ? options.serverOutputDirectory : options.clientOutputDirectory,
-            'typed-manifest.json',
-          ),
-          JSON.stringify(manifest, null, 2) + EOL,
-        )
-      }
-    },
+    // async closeBundle() {},
 
     /**
      * Resolve and build our virtual modules
      */
-    async resolveId(id: string, importer?: string) {
-      return await getCompiler().resolveId(id, importer, devServer)
+    async resolveId(id: string) {
+      if (id === 'typed:config') {
+        return id
+      }
+
+      return null
     },
 
     /**
      * Load our virtual modules
      */
     load(id: string) {
-      return getCompiler().load(id)
+      if (id === 'typed:config') {
+        return Object.entries(options).reduce((acc, [key, value]) => {
+          acc += `export const ${key} = ${JSON.stringify(value)}\n`
+          return acc
+        }, '')
+      }
+
+      return null
     },
 
     /**
      * Transorm TypeScript modules
      */
-    transform(text: string, id: string) {
-      return getCompiler().transpileTsModule(text, id, devServer)
-    },
+    // transform(text: string, id: string) {
+    //   return getCompiler().transpileTsModule(text, id, devServer)
+    // },
 
     /**
      * Transform HTML files
      */
-    transformIndexHtml(html: string) {
-      return getCompiler().transformHtml(html)
-    },
+    // transformIndexHtml(html: string) {
+    //   return getCompiler().transformHtml(html)
+    // },
   }
 
   plugins.push(virtualModulePlugin)
@@ -324,3 +304,13 @@ export function buildClientInput(htmlFilePaths: readonly string[]) {
     {},
   )
 }
+
+function getRelativePath(from: string, to: string) {
+  const path = relative(from, to)
+
+  if (path.startsWith('.')) {
+    return path
+  }
+
+  return './' + path
+}

package/tsconfig.build.json

@@ -1,4 +1,8 @@
 {
   "extends": "./tsconfig.json",
-  "exclude": ["src/**/*.test.ts"]
+  "exclude": [
+    "src/**/*.test.ts",
+    "src/**/*.test-d.ts",
+    "dist"
+  ]
 }