@tego/devkit 1.6.11 → 1.6.13-alpha.2

package/lib/__tests__/test-command.test.mjs

@@ -0,0 +1,53 @@
+// src/__tests__/test-command.test.ts
+import { Command } from "commander";
+import { execa } from "execa";
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import registerTestCommand from "../commands/test.mjs";
+vi.mock("execa", () => ({
+  execa: vi.fn()
+}));
+var mockedExeca = vi.mocked(execa);
+function createCli() {
+  const cli = new Command();
+  registerTestCommand(cli);
+  return cli;
+}
+async function runCli(args) {
+  const cli = createCli();
+  await cli.parseAsync(["node", "cli", ...args], { from: "node" });
+}
+describe("devkit test commands", () => {
+  beforeEach(() => {
+    mockedExeca.mockReset();
+  });
+  it("registers test, test:server, and test:client commands", () => {
+    const cli = createCli();
+    expect(cli.commands.map((command) => command.name())).toEqual(
+      expect.arrayContaining(["test", "test:server", "test:client"])
+    );
+  });
+  it("runs vitest with forwarded test arguments", async () => {
+    await runCli(["test", "--project", "server", "packages/foo.test.ts"]);
+    expect(mockedExeca).toHaveBeenCalledWith(
+      "pnpm",
+      ["exec", "vitest", "--project", "server", "packages/foo.test.ts"],
+      { stdio: "inherit" }
+    );
+  });
+  it("runs server tests with server project and forwarded arguments", async () => {
+    await runCli(["test:server", "--project", "custom", "packages/server.test.ts"]);
+    expect(mockedExeca).toHaveBeenCalledWith(
+      "pnpm",
+      ["exec", "vitest", "--project", "server", "--project", "custom", "packages/server.test.ts"],
+      { stdio: "inherit" }
+    );
+  });
+  it("runs client tests with client project and forwarded arguments", async () => {
+    await runCli(["test:client", "--project", "custom", "packages/client.test.ts"]);
+    expect(mockedExeca).toHaveBeenCalledWith(
+      "pnpm",
+      ["exec", "vitest", "--project", "client", "--project", "custom", "packages/client.test.ts"],
+      { stdio: "inherit" }
+    );
+  });
+});

package/lib/builder/build/buildEsm.mjs

@@ -19,9 +19,11 @@ async function buildEsm(cwd, userConfig, sourcemap = false, log) {
     const e2eEntry = path.join(cwd, "src/e2e/index.ts").replaceAll(/\\/g, "/");
     const e2eOutDir = path.resolve(cwd, "es/e2e");
     await build(cwd, e2eEntry, e2eOutDir, userConfig, sourcemap, log);
+    const vitestEntry = path.join(cwd, "src/vitest.ts").replaceAll(/\\/g, "/");
+    await build(cwd, vitestEntry, outDir, userConfig, sourcemap, log, "vitest", false);
   }
 }
-function build(cwd, entry, outDir, userConfig, sourcemap = false, log) {
+function build(cwd, entry, outDir, userConfig, sourcemap = false, log, fileName = "index", emptyOutDir = true) {
   const cwdWin = cwd.replaceAll(/\\/g, "/");
   const cwdUnix = cwd.replaceAll(/\//g, "\\");
   const external = function(id) {
@@ -42,12 +44,12 @@ function build(cwd, entry, outDir, userConfig, sourcemap = false, log) {
         minify: false,
         outDir,
         cssCodeSplit: true,
-        emptyOutDir: true,
+        emptyOutDir,
         sourcemap,
         lib: {
           entry,
           formats: ["es"],
-          fileName: "index"
+          fileName
         },
         target: ["node16"],
         rollupOptions: {

package/lib/commands/index.mjs

@@ -10,6 +10,7 @@ import global from "./global.mjs";
 import install from "./install.mjs";
 import postinstall from "./postinstall.mjs";
 import tar from "./tar.mjs";
+import test from "./test.mjs";
 import ui from "./ui.mjs";
 import upgrade from "./upgrade.mjs";
 var commands_default = async (cli) => {
@@ -21,6 +22,7 @@ var commands_default = async (cli) => {
   dev(cli);
   ui(cli);
   e2e(cli);
+  test(cli);
   clean(cli);
   upgrade(cli);
   install(cli);

package/lib/commands/test.mjs

@@ -0,0 +1,21 @@
+// src/commands/test.ts
+import { execa } from "execa";
+function runVitest(args) {
+  return execa("pnpm", ["exec", "vitest", ...args], {
+    stdio: "inherit"
+  });
+}
+function test(cli) {
+  cli.command("test").allowUnknownOption(true).allowExcessArguments(true).description("Run Vitest tests").action(async (_, command) => {
+    await runVitest(command.args);
+  });
+  cli.command("test:server").allowUnknownOption(true).allowExcessArguments(true).description("Run server Vitest tests").action(async (_, command) => {
+    await runVitest(["--project", "server", ...command.args]);
+  });
+  cli.command("test:client").allowUnknownOption(true).allowExcessArguments(true).description("Run client Vitest tests").action(async (_, command) => {
+    await runVitest(["--project", "client", ...command.args]);
+  });
+}
+export {
+  test as default
+};

package/lib/package-map-generator.mjs

@@ -1,15 +1,10 @@
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined") return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-
 // src/package-map-generator.ts
 import { existsSync as _existsSync, existsSync, mkdirSync, readFileSync, rmSync, watch, writeFileSync } from "fs";
+import { createRequire } from "module";
 import { dirname as _dirname, sep as _sep, join, relative, resolve, sep } from "path";
-import { sync } from "fast-glob";
-import { version } from "../package.json";
+import fastGlob from "fast-glob";
+var require2 = createRequire(import.meta.url);
+var { version } = require2("../package.json");
 var ProjectRoot = process.cwd();
 function getUmiConfig() {
   const { APP_PORT, API_BASE_URL, APP_PUBLIC_PATH } = process.env;
@@ -77,7 +72,7 @@ function getPackagePaths() {
     if (Object.hasOwnProperty.call(paths, key)) {
       for (let dir of paths[key]) {
         if (dir.includes("*")) {
-          const files = sync(dir, { cwd: ProjectRoot, onlyDirectories: true });
+          const files = fastGlob.sync(dir, { cwd: ProjectRoot, onlyDirectories: true });
           for (const file of files) {
             const dirname = resolve(ProjectRoot, file);
             if (existsSync(dirname)) {
@@ -179,7 +174,7 @@ export default function devDynamicImport(packageName: string): Promise<any> {
     });
   }
   getContent(pluginsPath) {
-    const pluginFolders = sync(["plugin-*/package.json", "module-*/package.json"], {
+    const pluginFolders = fastGlob.sync(["plugin-*/package.json", "module-*/package.json"], {
       cwd: pluginsPath,
       onlyFiles: true,
       absolute: true
@@ -189,7 +184,7 @@ export default function devDynamicImport(packageName: string): Promise<any> {
       const clientJs = join(dirname, "client.js");
       return _existsSync(clientJs);
     }).map((pluginPackageJsonPath) => {
-      const pluginPackageJson = __require(pluginPackageJsonPath);
+      const pluginPackageJson = require2(pluginPackageJsonPath);
       const pluginPathArr = pluginPackageJsonPath.replaceAll(_sep, "/").split("/");
       const hasNamespace = pluginPathArr[pluginPathArr.length - 3].startsWith("@");
       const pluginFileName = (hasNamespace ? `${pluginPathArr[pluginPathArr.length - 3].replace("@", "")}_${pluginPathArr[pluginPathArr.length - 2]}` : pluginPathArr[pluginPathArr.length - 2]).replaceAll("-", "_");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tego/devkit",
-  "version": "1.6.11",
+  "version": "1.6.13-alpha.2",
   "description": "",
   "homepage": "https://github.com/tegojs/tego#readme",
   "bugs": {
@@ -65,7 +65,7 @@
     "update-notifier": "^7.3.1",
     "vite": "^7.1.10",
     "vite-plugin-css-injected-by-js": "^3.5.2",
-    "@tachybase/test": "1.6.11"
+    "@tachybase/test": "1.6.13-alpha.2"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4",