testblocks 0.4.0 → 0.6.0

package/dist/cli/index.js

@@ -230,7 +230,7 @@ program
                 'test:junit': 'testblocks run tests/**/*.testblocks.json -r junit -o reports',
             },
             devDependencies: {
-                testblocks: '^0.4.0',
+                testblocks: '^0.6.0',
             },
         };
         fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2));

package/dist/server/plugins.js

@@ -54,7 +54,20 @@ exports.getServerPlugins = getServerPlugins;
 exports.isPluginLoaded = isPluginLoaded;
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const jiti_1 = require("jiti");
 const core_1 = require("../core");
+// Create jiti instance for loading TypeScript plugins at runtime
+// Configure it to resolve modules from the user's working directory
+const jiti = (0, jiti_1.createJiti)(__filename, {
+    interopDefault: true,
+    moduleCache: false,
+    alias: {
+        // Allow plugins to import from 'testblocks' even if they use old relative paths
+        '../../src/core': path.join(__dirname, '..', 'core'),
+        '../src/core': path.join(__dirname, '..', 'core'),
+        './src/core': path.join(__dirname, '..', 'core'),
+    },
+});
 // Track initialization
 let pluginsInitialized = false;
 // List of registered plugins
@@ -135,12 +148,13 @@ async function loadPlugin(pluginName) {
     const jsPath = path.join(pluginsDirectory, `${pluginName}.js`);
     const tsPath = path.join(pluginsDirectory, `${pluginName}.ts`);
     let pluginPath = null;
+    let isTypeScript = false;
     if (fs.existsSync(jsPath)) {
         pluginPath = jsPath;
     }
     else if (fs.existsSync(tsPath)) {
-        // For TypeScript files, require ts-node or esbuild-register
         pluginPath = tsPath;
+        isTypeScript = true;
     }
     if (!pluginPath) {
         console.error(`Plugin not found: ${pluginName} (looked in ${pluginsDirectory})`);
@@ -148,8 +162,14 @@ async function loadPlugin(pluginName) {
     }
     try {
         console.log(`Loading plugin: ${pluginName} from ${pluginPath}`);
-        // Dynamic import
-        const module = await Promise.resolve(`${pluginPath}`).then(s => __importStar(require(s)));
+        // Use jiti for TypeScript files, dynamic import for JavaScript
+        let module;
+        if (isTypeScript) {
+            module = jiti(pluginPath);
+        }
+        else {
+            module = await Promise.resolve(`${pluginPath}`).then(s => __importStar(require(s)));
+        }
         // Look for default export or named export matching plugin name
         const plugin = module.default ||
             module[pluginName.replace(/-./g, x => x[1].toUpperCase()) + 'Plugin'] ||

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "testblocks",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "Visual test automation tool with Blockly - API and Playwright testing",
   "author": "Roy de Kleijn",
   "license": "MIT",
@@ -70,6 +70,7 @@
     "cors": "^2.8.5",
     "express": "^4.21.2",
     "glob": "^11.0.0",
+    "jiti": "^2.6.1",
     "jsonpath-plus": "^10.3.0",
     "otpauth": "^9.4.1",
     "playwright": "^1.49.1",
@@ -79,7 +80,6 @@
     "xpath": "^0.0.34"
   },
   "devDependencies": {
-    "@vitest/coverage-v8": "^2.1.8",
     "@eslint/js": "^9.39.2",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
@@ -90,6 +90,7 @@
     "@typescript-eslint/eslint-plugin": "^8.51.0",
     "@typescript-eslint/parser": "^8.51.0",
     "@vitejs/plugin-react": "^4.3.4",
+    "@vitest/coverage-v8": "^2.1.8",
     "concurrently": "^8.2.2",
     "eslint": "^9.39.2",
     "eslint-plugin-react": "^7.37.5",