updated scripts to use submodule

.gitmodules

@@ -1,4 +1,3 @@
-[submodule "apps/www/ui"]
-	path = apps/www/ui
+[submodule "ui"]
+	path = ui
 	url = [email protected]:shadcn-ui/ui.git
-	shallow = true

apps/www/.scripts/gen-default-demos.mjs

@@ -10,7 +10,9 @@ import { format } from "prettier"
 
 import prettierConfig from "../.prettierrc.cjs"
 
-const demoFiles = await globby("./ui/apps/www/content/docs/components/*.mdx")
+const demoFiles = await globby(
+	"../../ui/apps/www/content/docs/components/*.mdx",
+)
 
 const demosContent = await Promise.all(
 	demoFiles.map(async (demoFile) => {

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@lshay/ui-root",
 	"scripts": {
-		"format": "prettier --write --check . '!packages/**' '!apps/**' && turbo run format",
+		"format": "prettier --write --check . '!packages/**' '!apps/**' '!ui/**' && turbo run format",
 		"lint": "turbo run lint",
 		"lint:fix": "turbo run lint:fix",
 		"build": "turbo run build",

packages/ui/.scripts/build.sh

@@ -11,10 +11,10 @@ pnpm add --save-peer @radix-ui/react-icons@latest lucide-react@latest react@^18.
 pnpm add --save-dev @types/react @types/react-dom
 
 if [[ -z "${SKIP_UPDATE}" ]]; then
-  rm -rf src-gen
-  ./.scripts/update-components.mjs
+	rm -rf src-gen
+	./.scripts/update-components.mjs
 else
-  echo "__SCRIPTS__: Skipping update"
+	echo "__SCRIPTS__: Skipping update"
 fi
 
 pnpm tsup-node ./src-gen/**/* --target es2020 --format esm --clean --tsconfig tsconfig.json --out-dir ./dist/esm --minify --treeshake recommended

packages/ui/.scripts/update-components.mjs

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
 import { globby } from "globby"
-import { mkdir, readFile, rm, writeFile } from "node:fs/promises"
+import { execSync } from "node:child_process"
+import { cp, mkdir, readFile, rm, writeFile } from "node:fs/promises"
 import { resolve } from "node:path"
 
-import { execAsync } from "./lib/node.mjs"
+import shadcnPackageJson from "../../../ui/apps/www/package.json" assert { type: "json" }
 import { fetchComponents, fetchStyles } from "./lib/registry.mjs"
-import { createComponentsConfig } from "./lib/utils.mjs"
 
 const INSTALL_DIR = resolve("src-gen", "components")
 
@@ -20,25 +20,34 @@ await mkdir("./src-gen/lib", {
 	recursive: true,
 })
 
-const components = await fetchComponents()
 const styles = await fetchStyles()
+const components = await fetchComponents()
+
+execSync(
+	`pnpm i ${components
+		.flatMap((comp) => comp.dependencies)
+		.map((dep) => `${dep}@${shadcnPackageJson.dependencies[dep] ?? "latest"}`)
+		.join(" ")}`,
+)
 
 await writeFile(
 	"./src-gen/lib/styles.ts",
 	// eslint-disable-next-line @typescript-eslint/no-magic-numbers
 	`export const styles = ${JSON.stringify(styles, undefined, 2)};`,
 )
 
-// eslint-disable-next-line fp/no-loops
 for (const { name } of styles) {
-	// eslint-disable-next-line no-await-in-loop
-	await createComponentsConfig(name)
+	await mkdir(`src-gen/components/${name}/ui`, {
+		force: true,
+		recursive: true,
+	})
 
-	// eslint-disable-next-line no-await-in-loop
-	await execAsync(
-		`npx shadcn-ui@latest add --yes --overwrite --path ./src-gen/components/${name} ${components
-			.map((component) => component.name)
-			.join(" ")}`,
+	await cp(
+		`../../ui/apps/www/registry/${name}/ui`,
+		`src-gen/components/${name}/ui`,
+		{
+			recursive: true,
+		},
 	)
 }
 
@@ -48,18 +57,19 @@ await Promise.all(
 	initialPaths
 		.filter((path) => path.includes("components") && path.includes("ui"))
 		.map(async (path) => {
-			if (path.includes("components") && path.includes("ui")) {
-				const contentsBuffer = await readFile(path)
-				const contents = contentsBuffer.toString("utf8")
+			const contentsBuffer = await readFile(path)
+			const contents = contentsBuffer
+				.toString("utf8")
+				// eslint-disable-next-line unicorn/prefer-string-replace-all
+				.replace(/@\/registry\/(default|new-york)\/ui/gu, ".")
 
-				// BUG: Add the React import if it's missing. This is a bug in ui.shadcn.com.
-				await writeFile(
-					path,
-					contents.includes('import * as React from "react"')
-						? contents
-						: `import * as React from "react";\n${contents}`,
-				)
-			}
+			// BUG: Add the React import if it's missing. This is a bug in ui.shadcn.com.
+			await writeFile(
+				path,
+				contents.includes('import * as React from "react"')
+					? contents
+					: `import * as React from "react";\n${contents}`,
+			)
 		}),
 )