zero-com 1.2.0 → 1.3.0

package/lib/index.d.ts

@@ -0,0 +1 @@
+export * from './runtime';

package/{index.js → lib/index.js}

@@ -14,4 +14,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./lib/runtime"), exports);
+__exportStar(require("./runtime"), exports);

package/lib/webpack-loader.d.ts

@@ -0,0 +1,6 @@
+import type { LoaderContext } from 'webpack';
+import { ServerFuncRegistry } from './common';
+export interface ZeroComLoaderOptions {
+    registry: ServerFuncRegistry;
+}
+export default function zeroComLoader(this: LoaderContext<ZeroComLoaderOptions>, source: string): string;

package/lib/webpack-loader.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = zeroComLoader;
+const common_1 = require("./common");
+function zeroComLoader(source) {
+    const options = this.getOptions();
+    const filePath = this.resourcePath;
+    const result = (0, common_1.transformSourceFile)(filePath, source, options.registry);
+    if (!result.transformed) {
+        return source;
+    }
+    const jsContent = (0, common_1.emitToJs)(filePath, result.content);
+    console.log(`[ZeroComWebpackPlugin] Transformed: ${filePath}`);
+    return jsContent;
+}

package/lib/webpack.js

@@ -1,11 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ZeroComWebpackPlugin = void 0;
-const fs_1 = __importDefault(require("fs"));
-const path_1 = __importDefault(require("path"));
 const common_1 = require("./common");
 class ZeroComWebpackPlugin {
     constructor(options = {}) {
@@ -21,23 +16,18 @@ class ZeroComWebpackPlugin {
             (0, common_1.buildRegistry)(compiler.context, this.registry);
             console.log(`[ZeroComWebpackPlugin] Found ${this.registry.size} files with server functions`);
         });
-        // Transform files during module resolution
-        compiler.hooks.normalModuleFactory.tap(pluginName, (nmf) => {
-            nmf.hooks.beforeResolve.tap(pluginName, (resolveData) => {
-                if (!resolveData.request.startsWith('.') && !resolveData.request.startsWith('/'))
-                    return;
-                const resolvedPath = (0, common_1.resolveFilePath)(path_1.default.resolve(resolveData.context, resolveData.request));
-                if (!resolvedPath || !fs_1.default.existsSync(resolvedPath))
-                    return;
-                const content = fs_1.default.readFileSync(resolvedPath, 'utf8');
-                const result = (0, common_1.transformSourceFile)(resolvedPath, content, this.registry);
-                if (!result.transformed)
-                    return;
-                const jsContent = (0, common_1.emitToJs)(resolvedPath, result.content);
-                resolveData.request = `data:text/javascript,${encodeURIComponent(jsContent)}`;
-                console.log(`[ZeroComWebpackPlugin] Transformed: ${path_1.default.relative(compiler.context, resolvedPath)}`);
-            });
-        });
+        // Add loader rule for TypeScript/JavaScript files
+        const loaderPath = require.resolve('./webpack-loader');
+        const loaderRule = {
+            test: new RegExp(`\\.(${common_1.FILE_EXTENSIONS.slice(1).map(e => e.slice(1)).join('|')})$`),
+            exclude: /node_modules/,
+            enforce: 'pre',
+            use: [{
+                    loader: loaderPath,
+                    options: { registry: this.registry }
+                }]
+        };
+        compiler.options.module.rules.unshift(loaderRule);
         // Production: minify global names
         if (this.options.development)
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zero-com",
-  "version": "1.2.0",
+  "version": "1.3.0",
   "main": "index.js",
   "repository": "https://github.com/yosbelms/zero-com",
   "keywords": [

package/tsconfig.json

@@ -105,7 +105,7 @@
     "skipLibCheck": true, /* Skip type checking all .d.ts files. */
     "paths": {
       "zero-com": [
-        "./index.ts"
+        "./lib/index.ts"
       ]
     }
   }

package/index.d.ts

@@ -1 +0,0 @@
-export * from './lib/runtime';