@salifbiaye/create-boutique 0.1.1 → 0.1.3

package/cli/dist/commands.js

@@ -4,7 +4,7 @@ import path from "node:path";
 import pc from "picocolors";
 import { compose, composeOutput, isRunning } from "./docker.js";
 import { composeYaml, readEnv, refreshEnv, writeCampaignFiles, writeReadme } from "./generate.js";
-import { copyDir, TEMPLATES, templateVersion } from "./paths.js";
+import { copyTemplate, templateVersion } from "./paths.js";
 import { nextFreePort, reservedByOthers, reservePorts } from "./ports.js";
 import { currencies, effective, readProject, validateProject, writeJsonSchema, writeProject, ProjectError, SLUG } from "./project.js";
 import { listThemes } from "./themes.js";
@@ -166,7 +166,7 @@ export async function update(dir, opts) {
     const to = templateVersion();
     for (const part of ["storefront", "backend"]) {
         fs.rmSync(path.join(target, part), { recursive: true, force: true });
-        copyDir(path.join(TEMPLATES, part), path.join(target, part));
+        copyTemplate(part, target);
     }
     p.templateVersion = to;
     writeProject(target, p);

package/cli/dist/create.js

@@ -5,7 +5,7 @@ import pc from "picocolors";
 import { z } from "zod";
 import { composeYaml, writeCampaignFiles, writeEnv, writeReadme } from "./generate.js";
 import { writeGuides } from "./guide.js";
-import { copyDir, TEMPLATES, templateVersion } from "./paths.js";
+import { copyDir, copyTemplate, templateVersion } from "./paths.js";
 import { nextFreePort, reservedByOthers, reservePorts } from "./ports.js";
 import { validateProject, writeJsonSchema, writeProject, ProjectError } from "./project.js";
 import { listThemes, themeIds } from "./themes.js";
@@ -75,7 +75,14 @@ async function ask(a, dirName, yes) {
     }
     const extra = [...(a.boutiques ?? [])];
     if (!a.boutiques) {
-        while (cancelled(await p.confirm({ message: "Ajouter une autre boutique ?", initialValue: false }))) {
+        const none = () => chosen.length === 0 && extra.length === 0;
+        const more = async () => {
+            if (!none())
+                return cancelled(await p.confirm({ message: "Ajouter une autre boutique ?", initialValue: false }));
+            p.log.warn("Aucun thème coché : ajoute au moins une boutique.");
+            return true;
+        };
+        while (await more()) {
             const slug = cancelled(await p.text({ message: "Nom (slug) de la boutique", validate: (v) => (/^[a-z0-9]+(?:-[a-z0-9]+)*$/.test(v ?? "") ? undefined : "minuscules, chiffres et tirets") }));
             const theme = cancelled(await p.select({ message: "Thème", options: themes.map((t) => ({ value: t.id, label: t.id })) }));
             extra.push(`${slug}:${theme}`);
@@ -83,8 +90,16 @@ async function ask(a, dirName, yes) {
     }
     const stripePk = a.stripePk ?? (cancelled(await p.text({ message: "Clé Stripe publique (vide = paiement manuel)", placeholder: "pk_test_…", defaultValue: "" })) || undefined);
     const stripeSk = stripePk ? (a.stripeSk ?? (cancelled(await p.password({ message: "Clé Stripe secrète" })) || undefined)) : a.stripeSk;
-    const products = a.products ?? (cancelled(await p.text({ message: "Fichier produits (CSV, optionnel)", defaultValue: "" })) || undefined);
-    const images = a.images ?? (cancelled(await p.text({ message: "Dossier images (optionnel)", defaultValue: "" })) || undefined);
+    const exists = (kind) => (v) => {
+        if (!v?.trim())
+            return undefined;
+        const st = fs.statSync(path.resolve(v.trim()), { throwIfNoEntry: false });
+        if (!st)
+            return "introuvable (laisser vide pour passer)";
+        return (kind === "file" ? st.isFile() : st.isDirectory()) ? undefined : kind === "file" ? "ce n'est pas un fichier" : "ce n'est pas un dossier";
+    };
+    const products = a.products ?? (cancelled(await p.text({ message: "Fichier produits (CSV, optionnel)", defaultValue: "", validate: exists("file") })).trim() || undefined);
+    const images = a.images ?? (cancelled(await p.text({ message: "Dossier images (optionnel)", defaultValue: "", validate: exists("dir") })).trim() || undefined);
     return { ...a, name, email, currency, country, language, themes: chosen, boutiques: extra, stripePk, stripeSk, products, images };
 }
 export async function create(dir, input, opts) {
@@ -160,8 +175,8 @@ export async function create(dir, input, opts) {
         }
     }
     // Écriture du projet
-    copyDir(path.join(TEMPLATES, "storefront"), path.join(target, "storefront"));
-    copyDir(path.join(TEMPLATES, "backend"), path.join(target, "backend"));
+    copyTemplate("storefront", target);
+    copyTemplate("backend", target);
     writeProject(target, proj);
     writeJsonSchema(target);
     writeCampaignFiles(target, proj, a.language);

package/cli/dist/index.js

@@ -147,7 +147,7 @@ async function main() {
 }
 main().catch((e) => {
     if (e instanceof ProjectError)
-        console.error(pc.red("✖ config invalide, rien n'a été modifié :\n") + e.message);
+        console.error(pc.red("✖ rien n'a été créé ni modifié :\n") + e.message);
     else if (e instanceof z.ZodError)
         console.error(pc.red("✖ options invalides :\n") + z.prettifyError(e));
     else

package/cli/dist/paths.js

@@ -27,3 +27,14 @@ export function copyDir(from, to) {
             fs.copyFileSync(src, dst);
     }
 }
+/** npm retire toujours les `.npmrc` d'un package publié : on les réécrit ici (le Dockerfile les copie). */
+const NPMRC = {
+    backend: "save-exact=true\nlegacy-peer-deps=true\n",
+    storefront: "save-exact=true\n",
+};
+/** Copie templates/<part> dans <target>/<part>, avec ses fichiers que npm ne publie pas. */
+export function copyTemplate(part, target) {
+    const to = path.join(target, part);
+    copyDir(path.join(TEMPLATES, part), to);
+    fs.writeFileSync(path.join(to, ".npmrc"), NPMRC[part]);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salifbiaye/create-boutique",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Usine à Boutiques : génère un projet complet (backend Medusa + une boutique Next.js par campagne) prêt pour docker compose",
   "type": "module",
   "repository": { "type": "git", "url": "git+https://github.com/salifbiaye/create-boutique.git" },

package/templates/storefront/src/lib/boutique/fonts/LICENSE.txt

@@ -0,0 +1,3 @@
+Polices auto-hébergées (sous-ensemble latin), sous licence SIL Open Font License 1.1 :
+Inter, Plus Jakarta Sans, Oswald, Outfit, Sora, Space Grotesk (versions variables), Poppins.
+Source : paquets Fontsource (@fontsource-variable/*, @fontsource/poppins). https://openfontlicense.org

package/templates/storefront/src/lib/boutique/fonts.ts

@@ -1,16 +1,25 @@
-import { Inter, Oswald, Outfit, Plus_Jakarta_Sans, Poppins, Sora, Space_Grotesk } from "next/font/google"
+import localFont from "next/font/local"
 import type { FontId, Theme } from "./schema"
 
-// Polices des presets (design/bundle.css). Servies par next/font (auto-hébergées) :
-// seules les 2 polices du thème de l'instance sont appliquées.
+// Polices des presets (design/bundle.css), fichiers woff2 dans ./fonts (licence OFL, voir fonts/LICENSE.txt) :
+// aucun accès à Google Fonts au build ni à l'exécution. Seules les 2 polices du thème de l'instance sont appliquées.
 // Chaque police expose --nf-<id>, repris par --font-<id> dans styles/ub/fonts.css.
-const inter = Inter({ subsets: ["latin"], weight: ["400", "500", "600", "700"], variable: "--nf-inter", preload: false })
-const jakarta = Plus_Jakarta_Sans({ subsets: ["latin"], weight: ["500", "700", "800"], variable: "--nf-jakarta", preload: false })
-const oswald = Oswald({ subsets: ["latin"], weight: ["500", "700"], variable: "--nf-oswald", preload: false })
-const outfit = Outfit({ subsets: ["latin"], weight: ["400", "500", "600", "700"], variable: "--nf-outfit", preload: false })
-const poppins = Poppins({ subsets: ["latin"], weight: ["400", "500", "600", "700"], variable: "--nf-poppins", preload: false })
-const sora = Sora({ subsets: ["latin"], weight: ["400", "600", "700"], variable: "--nf-sora", preload: false })
-const spaceGrotesk = Space_Grotesk({ subsets: ["latin"], weight: ["500", "700"], variable: "--nf-space-grotesk", preload: false })
+const inter = localFont({ src: "./fonts/inter.woff2", weight: "100 900", variable: "--nf-inter", preload: false })
+const jakarta = localFont({ src: "./fonts/plus-jakarta-sans.woff2", weight: "200 800", variable: "--nf-jakarta", preload: false })
+const oswald = localFont({ src: "./fonts/oswald.woff2", weight: "200 700", variable: "--nf-oswald", preload: false })
+const outfit = localFont({ src: "./fonts/outfit.woff2", weight: "100 900", variable: "--nf-outfit", preload: false })
+const poppins = localFont({
+  src: [
+    { path: "./fonts/poppins-400.woff2", weight: "400" },
+    { path: "./fonts/poppins-500.woff2", weight: "500" },
+    { path: "./fonts/poppins-600.woff2", weight: "600" },
+    { path: "./fonts/poppins-700.woff2", weight: "700" },
+  ],
+  variable: "--nf-poppins",
+  preload: false,
+})
+const sora = localFont({ src: "./fonts/sora.woff2", weight: "100 800", variable: "--nf-sora", preload: false })
+const spaceGrotesk = localFont({ src: "./fonts/space-grotesk.woff2", weight: "300 700", variable: "--nf-space-grotesk", preload: false })
 
 const fonts: Partial<Record<FontId, { variable: string }>> = {
   inter,