@slicemachine/init 0.1.1-dev-plugins.13 → 0.1.1-dev-plugins-validation.1

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@slicemachine/init",
-	"version": "0.1.1-dev-plugins.13",
+	"version": "0.1.1-dev-plugins-validation.1",
 	"description": "Init Prismic Slice Machine in your project",
 	"keywords": [
 		"typescript",
@@ -41,53 +41,54 @@
 		"dev": "vite build --watch",
 		"format": "prettier --write .",
 		"lint": "eslint --ext .js,.ts .",
-		"prepare": "npm run build",
+		"//prepare": "npm run build",
 		"size": "size-limit",
 		"test": "npm run lint && npm run types && npm run unit && npm run build && npm run size",
 		"types": "tsc --noEmit",
 		"unit": "vitest run --coverage",
 		"unit:watch": "vitest watch",
-		"depcheck": "depcheck --config=.depcheckrc"
+		"depcheck": "depcheck --config=.depcheckrc",
+		"audit": "better-npm-audit audit -l high -p"
 	},
 	"dependencies": {
-		"@antfu/ni": "^0.18.8",
+		"@antfu/ni": "^0.20.0",
 		"@lihbr/listr-update-renderer": "^0.5.3",
-		"@slicemachine/manager": "0.1.1-dev-plugins.13",
+		"@slicemachine/manager": "0.1.1-dev-plugins-validation.1",
 		"chalk": "^4.1.2",
-		"execa": "^6.1.0",
 		"globby": "^13.1.3",
 		"listr": "^0.14.3",
 		"log-symbols": "^4.1.0",
 		"meow": "^11.0.0",
-		"open": "^8.4.0",
+		"open": "^8.4.2",
 		"prompts": "^2.4.2",
 		"semver": "^7.3.8"
 	},
 	"devDependencies": {
-		"@size-limit/preset-small-lib": "^8.1.0",
-		"@slicemachine/plugin-kit": "0.1.8-dev-plugins.13",
+		"@size-limit/preset-small-lib": "^8.2.4",
+		"@slicemachine/plugin-kit": "0.1.8-dev-plugins-validation.1",
 		"@types/listr": "^0.14.4",
-		"@types/prompts": "^2.4.2",
+		"@types/prompts": "^2.4.3",
 		"@types/semver": "^7.3.13",
-		"@typescript-eslint/eslint-plugin": "^5.47.0",
-		"@typescript-eslint/parser": "^5.47.0",
-		"@vitest/coverage-c8": "^0.26.0",
-		"eslint": "^8.30.0",
-		"eslint-config-prettier": "^8.5.0",
+		"@typescript-eslint/eslint-plugin": "^5.55.0",
+		"@typescript-eslint/parser": "^5.55.0",
+		"@vitest/coverage-c8": "^0.27.3",
+		"better-npm-audit": "^3.7.3",
+		"eslint": "^8.36.0",
+		"eslint-config-prettier": "^8.7.0",
 		"eslint-plugin-prettier": "^4.2.1",
 		"eslint-plugin-tsdoc": "^0.2.17",
+		"execa": "^7.1.1",
 		"hook-std": "^3.0.0",
 		"memfs": "^3.4.13",
 		"mock-stdin": "^1.0.0",
-		"msw": "^0.49.2",
+		"msw": "^1.1.0",
 		"parse-multipart-data": "^1.5.0",
 		"prettier-plugin-jsdoc": "^0.4.2",
-		"rollup-plugin-rename-node-modules": "^1.3.1",
-		"size-limit": "^8.1.0",
-		"typescript": "^4.9.4",
-		"vite": "^4.0.2",
-		"vite-plugin-sdk": "^0.1.0",
-		"vitest": "^0.26.1"
+		"size-limit": "^8.2.4",
+		"typescript": "^4.9.5",
+		"vite": "^4.1.4",
+		"vite-plugin-sdk": "^0.1.1",
+		"vitest": "^0.27.3"
 	},
-	"gitHead": "e368e5e7b09008aaffdc28bbadaa8a495d7396b9"
+	"gitHead": "be509347c1cfaed23c9b9f714051a38436d4d9de"
 }

package/src/SliceMachineInitProcess.ts

@@ -2,7 +2,7 @@ import * as fs from "node:fs/promises";
 import * as path from "node:path";
 
 import chalk from "chalk";
-import { ExecaChildProcess } from "execa";
+import type { ExecaChildProcess } from "execa";
 import open from "open";
 import logSymbols from "log-symbols";
 import { globby } from "globby";
@@ -12,16 +12,12 @@ import {
 	PrismicUserProfile,
 	PrismicRepository,
 	SliceMachineManager,
+	PackageManager,
 } from "@slicemachine/manager";
 
 import { detectFramework, Framework } from "./lib/framework";
-import {
-	installDependencies,
-	detectPackageManager,
-	PackageManagerAgent,
-	getRunScriptCommand,
-	getExecuteCommand,
-} from "./lib/packageManager";
+import { getRunScriptCommand } from "./lib/getRunScriptCommand";
+import { getExecuteCommand } from "./lib/getExecuteCommand";
 import {
 	getRandomRepositoryDomain,
 	formatRepositoryDomain,
@@ -58,7 +54,7 @@ export const createSliceMachineInitProcess = (
 
 type SliceMachineInitProcessContext = {
 	framework?: Framework;
-	packageManager?: PackageManagerAgent;
+	packageManager?: PackageManager;
 	installProcess?: ExecaChildProcess;
 	userProfile?: PrismicUserProfile;
 	userRepositories?: PrismicRepository[];
@@ -231,22 +227,10 @@ export class SliceMachineInitProcess {
 						{
 							title: "Detecting package manager...",
 							task: async (_, task) => {
-								try {
-									this.context.packageManager = await detectPackageManager(
-										this.options.cwd,
-									);
-								} catch (error) {
-									// Default to NPM
-									if (
-										error instanceof Error &&
-										(error.message.match(/failed to detect/i) ||
-											error.message.match(/command failed/i))
-									) {
-										this.context.packageManager = "npm";
-									} else {
-										throw error;
-									}
-								}
+								this.context.packageManager =
+									await this.manager.project.detectPackageManager({
+										root: this.manager.cwd,
+									});
 
 								task.title = `Detected package manager ${chalk.cyan(
 									this.context.packageManager,
@@ -282,11 +266,16 @@ export class SliceMachineInitProcess {
 						"Project framework must be available through context to run `beginCoreDependenciesInstallation`",
 					);
 
-					const { execaProcess } = await installDependencies({
-						agent: this.context.packageManager,
-						dependencies: this.context.framework.devDependencies,
-						dev: true,
-					});
+					const { execaProcess } =
+						await this.manager.project.installDependencies({
+							packageManager: this.context.packageManager,
+							dependencies: this.context.framework.devDependencies,
+							dev: true,
+							// Picked up later
+							log: () => {
+								/* ... */
+							},
+						});
 
 					// Fail hard if process fails
 					execaProcess.catch(async (error) => {
@@ -1081,54 +1070,9 @@ ${chalk.cyan("?")} Your Prismic repository name`.replace("\n", ""),
 						}
 					};
 
-					// TODO: init hook
-					const { errors } = await this.manager.plugins.dangerouslyCallHook(
-						"command:init",
-						{
-							log: updateOutput,
-							installDependencies: async (args) => {
-								assertExists(
-									this.context.packageManager,
-									"Project package manager must be available through context to run `initializePlugins`",
-								);
-
-								try {
-									const { execaProcess } = await installDependencies({
-										...args,
-										agent: this.context.packageManager,
-									});
-
-									// Don't clutter console with logs when process is non TTY (CI, etc.)
-									if (process.stdout.isTTY || process.env.NODE_ENV === "test") {
-										execaProcess.stdout?.on("data", updateOutput);
-									}
-									execaProcess.stderr?.on("data", updateOutput);
-
-									await execaProcess;
-								} catch (error) {
-									if (
-										error instanceof Error &&
-										"shortMessage" in error &&
-										"stderr" in error
-									) {
-										throw new Error(
-											`\n\n${error.shortMessage}\n${error.stderr}\n\n${logSymbols.error} Plugins dependency installation failed`,
-											{ cause: error },
-										);
-									}
-
-									throw error;
-								}
-							},
-						},
-					);
-
-					if (errors.length > 0) {
-						// TODO: Provide better error message.
-						throw new Error(
-							`Failed to initialize plugins: ${errors.join(", ")}`,
-						);
-					}
+					await this.manager.project.initProject({
+						log: updateOutput,
+					});
 
 					task.title = "Initialized plugins";
 				},

package/src/lib/getExecuteCommand.ts

@@ -0,0 +1,9 @@
+import { parseNix } from "@antfu/ni";
+import { PackageManager } from "@slicemachine/manager";
+
+export const getExecuteCommand = async (args: {
+	agent: PackageManager;
+	script: string;
+}): Promise<string> => {
+	return (await parseNix(args.agent, [args.script])) || `npx ${args.script}`;
+};

package/src/lib/getRunScriptCommand.ts

@@ -0,0 +1,9 @@
+import { parseNr } from "@antfu/ni";
+import { PackageManager } from "@slicemachine/manager";
+
+export const getRunScriptCommand = async (args: {
+	agent: PackageManager;
+	script: string;
+}): Promise<string> => {
+	return (await parseNr(args.agent, [args.script])) || `npm run ${args.script}`;
+};

package/src/lib/repositoryDomain.ts

@@ -118,7 +118,8 @@ export const ValidationErrors = {
 	MoreThan30: "MoreThan30",
 	AlreadyExists: "AlreadyExists",
 } as const;
-type ValidationErrors = typeof ValidationErrors[keyof typeof ValidationErrors];
+type ValidationErrors =
+	(typeof ValidationErrors)[keyof typeof ValidationErrors];
 
 type ValidateRepositoryDomainArgs = { domain: string };
 type ValidateRepositoryDomainReturnType = Record<