silgi 0.28.10 → 0.28.11

package/dist/cli/dev.mjs

@@ -46,7 +46,6 @@ import 'silgi/runtime';
 import 'unstorage';
 import 'scule';
 import 'node:child_process';
-import 'picocolors';
 
 async function reloadScan(path, _stats) {
   const silgi = useSilgiCLI();

package/dist/cli/index.mjs

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 
-const version = "0.28.10";
+const version = "0.28.11";
 const packageJson = {
 	version: version};
 
@@ -24,9 +24,7 @@ const main = defineCommand({
     install: () => import('./install.mjs').then((m) => m.default),
     dev: () => import('./dev.mjs').then((m) => m.default)
   },
-  run({ args }) {
-    if (args.version)
-      console.warn("Silgi version:", packageJson.version);
+  run() {
   }
 });
 runMain(main);

package/dist/cli/init.mjs

@@ -42,7 +42,6 @@ import 'silgi/runtime';
 import 'unstorage';
 import 'scule';
 import 'node:child_process';
-import 'picocolors';
 import '../_chunks/silgiApp.mjs';
 import 'unctx';
 

package/dist/cli/install.mjs

@@ -4,11 +4,13 @@ import { defineCommand, runCommand } from 'citty';
 import { consola } from 'consola';
 import { resolve } from 'pathe';
 import { version } from 'silgi/meta';
+import { addNPMPackage, addTemplate } from 'silgi/kit';
+import { u as useSilgiCLI } from '../_chunks/silgiApp.mjs';
 import { a as commonArgs, c as command$1 } from './prepare.mjs';
 import { l as loadOptions } from './types.mjs';
+import 'unctx';
 import './silgi.mjs';
 import 'apiful/openapi';
-import 'silgi/kit';
 import 'node:fs/promises';
 import 'knitwork';
 import 'mlly';
@@ -35,9 +37,6 @@ import 'klona';
 import 'silgi/runtime';
 import 'unstorage';
 import 'scule';
-import 'picocolors';
-import '../_chunks/silgiApp.mjs';
-import 'unctx';
 import 'c12';
 import 'compatx';
 import 'klona/full';
@@ -46,6 +45,44 @@ import 'consola/utils';
 import 'escape-string-regexp';
 import 'pkg-types';
 
+async function installPackages(silgi = useSilgiCLI()) {
+  await addNPMPackage([
+    {
+      name: "@fastify/deepmerge",
+      isDev: false
+    },
+    {
+      name: "@silgi/ecosystem",
+      isDev: false
+    },
+    {
+      name: "unadapter",
+      isDev: false
+    }
+  ]);
+  const packages = {
+    dependencies: {
+      ...silgi.options.installPackages?.dependencies
+    },
+    devDependencies: {
+      ...silgi.options.installPackages?.devDependencies
+    }
+  };
+  if (silgi.options.preset === "npm-package") {
+    packages.devDependencies = {
+      ...packages.devDependencies,
+      ...packages.dependencies
+    };
+    packages.dependencies = {};
+  }
+  addTemplate({
+    filename: "install.json",
+    where: ".silgi",
+    write: true,
+    getContents: () => JSON.stringify(packages, null, 2)
+  });
+}
+
 const command = defineCommand({
   meta: {
     name: "install",
@@ -64,6 +101,7 @@ const command = defineCommand({
       rawArgs: []
     }).catch(() => {
     });
+    await installPackages();
     const silgiConfig = await loadOptions({});
     const commandArgs = process.argv.slice(process.argv.indexOf("install") + 1);
     const extraArgs = commandArgs.length ? ` ${commandArgs.join(" ")}` : "";

package/dist/cli/prepare.mjs

@@ -7,7 +7,6 @@ import { readFileSync } from 'node:fs';
 import * as p from '@clack/prompts';
 import { consola } from 'consola';
 import { createJiti } from 'dev-jiti';
-import color from 'picocolors';
 import { useSilgiCLI } from 'silgi';
 import { a as silgiCLIIClose } from '../_chunks/silgiApp.mjs';
 import { l as loadOptions } from './types.mjs';
@@ -59,7 +58,6 @@ const command$1 = defineCommand({
     }
     const silgi = useSilgiCLI();
     const tags = args.tag?.split(",").map((t) => t.trim());
-    p.intro(color.bold(`Silgi CLI ${color.green(`v${version}`)}`));
     const silgiConfig = await loadOptions({});
     const getCli = resolve(silgiConfig.build.dir, "cli.json");
     const cli = readFileSync(getCli, "utf-8");

package/dist/cli/silgi.mjs

@@ -1,7 +1,7 @@
 import { generateDTS } from 'apiful/openapi';
 import consola$1, { consola } from 'consola';
 import { join, resolve, dirname, isAbsolute, relative, basename, extname } from 'pathe';
-import { hasSilgiModule, addTemplate, normalizeTemplate, useLogger, genEnsureSafeVar, hash, relativeWithDot, writeFile, isDirectory, resolveAlias as resolveAlias$1, directoryToURL, hasError, parseServices, addNPMPackage, resolveSilgiPath } from 'silgi/kit';
+import { hasSilgiModule, addTemplate, normalizeTemplate, useLogger, genEnsureSafeVar, hash, relativeWithDot, writeFile, isDirectory, resolveAlias as resolveAlias$1, directoryToURL, hasError, parseServices, resolveSilgiPath } from 'silgi/kit';
 import { mkdirSync, existsSync, writeFileSync, promises, readFileSync } from 'node:fs';
 import { readdir, readFile } from 'node:fs/promises';
 import { genObjectFromRawEntries, genObjectFromRaw, genObjectFromValues } from 'knitwork';
@@ -2188,45 +2188,6 @@ async function createStorageCLI(silgi) {
   return storage;
 }
 
-async function installPackages(silgi) {
-  await addNPMPackage([
-    {
-      name: "@fastify/deepmerge",
-      isDev: false
-    },
-    {
-      name: "@silgi/ecosystem",
-      isDev: false
-    },
-    {
-      name: "unadapter",
-      isDev: false
-    }
-  ]);
-  const packages = {
-    dependencies: {
-      ...silgi.options.installPackages?.dependencies
-    },
-    devDependencies: {
-      ...silgi.options.installPackages?.devDependencies
-    }
-  };
-  console.log(packages);
-  if (silgi.options.preset === "npm-package") {
-    packages.devDependencies = {
-      ...packages.devDependencies,
-      ...packages.dependencies
-    };
-    packages.dependencies = {};
-  }
-  addTemplate({
-    filename: "install.json",
-    where: ".silgi",
-    write: true,
-    getContents: () => JSON.stringify(packages, null, 2)
-  });
-}
-
 function useCLIRuntimeConfig(silgi) {
   const safeRuntimeConfig = JSON.parse(JSON.stringify(silgi.options.runtimeConfig));
   silgi.hook("prepare:configs.ts", (data) => {
@@ -2403,7 +2364,6 @@ async function createSilgiCLI(config = {}, opts = {}) {
   await installModules(silgi);
   await silgi.hooks.callHook("scanFiles:done", silgi);
   await commands(silgi);
-  await installPackages(silgi);
   await generateApp(silgi);
   if (silgi.options.imports) {
     silgi.options.imports.dirs ??= [];

package/dist/kit/index.mjs

@@ -22,6 +22,7 @@ import 'unctx';
 import 'semver/functions/satisfies.js';
 import 'silgi/meta';
 
+const delay = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
 async function addNPMPackage(data) {
   const silgi = useSilgiCLI();
   for (const item of data) {
@@ -32,6 +33,11 @@ async function addNPMPackage(data) {
       `pnpm info ${item.name} version`,
       { encoding: "utf-8" }
     );
+    silgi.logger.withTag("add-npm").success(
+      "Checking package version",
+      item.name,
+      getPackageVersion.trim()
+    );
     let version = item.version || getPackageVersion.trim();
     version = `^${version}`;
     if (item.isDev) {
@@ -39,6 +45,7 @@ async function addNPMPackage(data) {
     } else {
       silgi.options.installPackages.dependencies[item.name] = version;
     }
+    await delay(50);
   }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "silgi",
   "type": "module",
-  "version": "0.28.10",
+  "version": "0.28.11",
   "private": false,
   "sideEffects": false,
   "exports": {