Invoke shared scripts directly from other packages

passlock-dev · Aug 16, 2024 · 9c9b24b · 9c9b24b
1 parent 6499709
commit 9c9b24b
Show file tree

Hide file tree

Showing 23 changed files with 34 additions and 149 deletions.
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -46,15 +46,15 @@
   ],
   "scripts": {
     "clean": "rimraf ./dist",
-    "typecheck": "tsc --project tsconfig.build.json --noEmit",
+    "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "test:watch": "vitest dev",
     "test:ui": "vitest --coverage.enabled=true --ui",
     "test:coverage": "vitest run --coverage",
-    "build": "tsc --project tsconfig.build.json",
+    "build": "tsc --build",
     "build:clean": "pnpm run clean && pnpm run build",
-    "build:readme": "LATEST=${npm_package_version} tsx scripts/replace-readme-tokens.ts",
-    "replaceTokens": "LATEST=${npm_package_version} tsx scripts/replace-tokens.ts",
+    "build:readme": "LATEST=${npm_package_version} tsx ../shared/scripts/replace-readme-tokens.ts ./packages/client",
+    "replaceTokens": "LATEST=${npm_package_version} tsx ../shared/scripts/replace-tokens.ts ./packages/client",
     "build:production": "pnpm run build:clean && pnpm run replaceTokens && echo '' && publint",
     "format": "prettier --write \"(src|scripts)/**/*.+(js|ts|json)\"",
     "lint": "eslint ./src",

diff --git a/packages/client/scripts/replace-readme-tokens.ts b/packages/client/scripts/replace-readme-tokens.ts
diff --git a/packages/client/scripts/replace-tokens.ts b/packages/client/scripts/replace-tokens.ts
diff --git a/packages/client/tsconfig.build.json b/packages/client/tsconfig.build.json
diff --git a/packages/client/tsconfig.json b/packages/client/tsconfig.json
@@ -7,7 +7,6 @@
   "include": [
     "./src/**/*.ts",
     "./src/**/*.json",
-    "./scripts/**/*.ts"
   ],
   "exclude": ["./node_modules/**"]
 }
diff --git a/packages/create-sveltekit/package.json b/packages/create-sveltekit/package.json
@@ -39,11 +39,11 @@
   ],
   "scripts": {
     "clean": "rimraf ./dist",
-    "typecheck": "tsc --project tsconfig.build.json --noEmit",
-    "build": "tsc --project tsconfig.build.json",
+    "typecheck": "tsc --noEmit",
+    "build": "tsc --build",
     "build:clean": "pnpm run clean && pnpm run build",
-    "build:readme": "LATEST=${npm_package_version} tsx scripts/replace-readme-tokens.ts",
-    "replaceTokens": "LATEST=${npm_package_version} tsx scripts/replace-readme-tokens.ts",
+    "build:readme": "LATEST=${npm_package_version} tsx ../shared/scripts/replace-readme-tokens.ts ./packages/create-sveltekit",
+    "replaceTokens": "LATEST=${npm_package_version} tsx ../shared/scripts/replace-tokens.ts ./packages/create-sveltekit",
     "build:production": "pnpm run build:clean && pnpm run replaceTokens && echo '' && publint",
     "format": "prettier --write \"(src|scripts)/**/*.+(js|ts|json)\"",
     "lint": "eslint ./src",

diff --git a/packages/create-sveltekit/scripts/replace-readme-tokens.ts b/packages/create-sveltekit/scripts/replace-readme-tokens.ts
diff --git a/packages/create-sveltekit/tsconfig.build.json b/packages/create-sveltekit/tsconfig.build.json
diff --git a/packages/create-sveltekit/tsconfig.json b/packages/create-sveltekit/tsconfig.json
@@ -8,7 +8,6 @@
   "include": [
     "./src/**/*.ts",
     "./src/**/*.json",
-    "./scripts/**/*.ts"
   ],
   "exclude": ["./node_modules/**"]
 }
diff --git a/packages/node/package.json b/packages/node/package.json
@@ -39,15 +39,15 @@
   ],
   "scripts": {
     "clean": "rimraf ./dist",
-    "typecheck": "tsc --project tsconfig.build.json --noEmit",
+    "typecheck": "tsc --noEmit",
     "test": "vitest run",
     "test:watch": "vitest dev",
     "test:ui": "vitest --coverage.enabled=true --ui",
     "test:coverage": "vitest run --coverage",
-    "build": "tsc --project tsconfig.build.json",
+    "build": "tsc --build",
     "build:clean": "pnpm run clean && pnpm run build",
-    "build:readme": "LATEST=${npm_package_version} tsx scripts/replace-readme-tokens.ts",
-    "replaceTokens": "LATEST=${npm_package_version} tsx scripts/replace-tokens.ts",
+    "build:readme": "LATEST=${npm_package_version} tsx ../shared/scripts/replace-readme-tokens.ts ./packages/node",
+    "replaceTokens": "LATEST=${npm_package_version} tsx ../shared/scripts/replace-tokens.ts ./packages/node",
     "build:production": "pnpm run build:clean && pnpm run replaceTokens && echo '' && publint",
     "format": "prettier --write \"(src|scripts)/**/*.+(js|ts|json)\"",
     "lint": "eslint ./src",

diff --git a/packages/node/scripts/replace-readme-tokens.ts b/packages/node/scripts/replace-readme-tokens.ts
diff --git a/packages/node/scripts/replace-tokens.ts b/packages/node/scripts/replace-tokens.ts
diff --git a/packages/node/tsconfig.build.json b/packages/node/tsconfig.build.json
diff --git a/packages/node/tsconfig.json b/packages/node/tsconfig.json
@@ -8,7 +8,6 @@
   "include": [
     "./src/**/*.ts",
     "./src/**/*.json",
-    "./scripts/**/*.ts"
   ],
   "exclude": ["./node_modules/**"]
 }
diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -32,8 +32,8 @@
     "typecheck": "tsc --project tsconfig.build.json --noEmit",
     "build": "tsc --project tsconfig.build.json",
     "build:clean": "pnpm run clean && pnpm run build",
-    "build:readme": "LATEST=${npm_package_version} tsx scripts/replace-readme-tokens.ts",
-    "replaceTokens": "LATEST=${npm_package_version} tsx scripts/replace-tokens.ts",
+    "build:readme": "LATEST=${npm_package_version} tsx scripts/replace-readme-tokens.ts ./packages/shared",
+    "replaceTokens": "LATEST=${npm_package_version} tsx scripts/replace-tokens.ts ./packages/shared",
     "build:production": "pnpm run build:clean && pnpm run replaceTokens && echo '' && publint",
     "format": "prettier --write \"(src|scripts)/**/*.+(js|ts|json)\"",
     "lint": "eslint ./src",

diff --git a/packages/shared/scripts/common.ts b/packages/shared/scripts/common.ts
@@ -34,10 +34,11 @@ export const disableConsole = () => {
   return _console
 }
 
-// callers should pass import.mata.url
-export const getPackageDir = (thisFileUrl: string) => {
-  const thisFilePath = fileURLToPath(thisFileUrl)
-  return path.resolve(path.dirname(thisFilePath), '../')
+// callers should pass something like packages/shared
+export const getPackageDir = (pathRelativeToRoot: string) => {
+  const thisFile = fileURLToPath(import.meta.url)
+  const root = path.resolve(thisFile, '../../../..')
+  return path.resolve(root, pathRelativeToRoot)
 }
 
 export const restoreConsole = (_console: ReturnType<typeof disableConsole>) => {

diff --git a/packages/shared/scripts/replace-code-tokens.ts b/packages/shared/scripts/replace-code-tokens.ts
@@ -4,15 +4,15 @@ import path from 'node:path'
 
 import { STATIC_VARS, disableConsole, getPackageDir, restoreConsole } from './common.js'
 
-export const replaceCodeTokens = async (thisFilePath: string) => {
+export const replaceCodeTokens = async (pathRelativeToRoot: string) => {
   // Replace the tokens
   const LATEST = process.env['LATEST']
   if (!LATEST) {
     console.error(kleur.red('Please set LATEST env variable'))
     process.exit(-1)
   }
 
-  const packageDirPath = getPackageDir(thisFilePath)
+  const packageDirPath = getPackageDir(pathRelativeToRoot)
   const distPath = path.resolve(packageDirPath, './dist')
 
   const vars = {

diff --git a/packages/shared/scripts/replace-readme-tokens.ts b/packages/shared/scripts/replace-readme-tokens.ts
@@ -5,9 +5,9 @@ import { fileURLToPath } from 'node:url'
 
 import { STATIC_VARS, copy, disableConsole, getPackageDir, restoreConsole } from './common.js'
 
-export const replaceReadmeTokens = async (thisFileUrl: string) => {
+export const replaceReadmeTokens = async (pathRelativeToRoot: string) => {
   console.log(kleur.yellow('Copying README.template.md to README.md'))
-  const packageDirPath = getPackageDir(thisFileUrl)
+  const packageDirPath = getPackageDir(pathRelativeToRoot)
 
   // Copy README.template.md to README.md and replace tokens
   const readmeTemplate = path.resolve(packageDirPath, './README.template.md')
@@ -37,8 +37,7 @@ export const replaceReadmeTokens = async (thisFileUrl: string) => {
   }
 }
 
-// see https://stackoverflow.com/a/60309682
-if (process.argv[1] === fileURLToPath(import.meta.url)) {
-  console.log('Replacing packages/shared tokens')
-  await replaceReadmeTokens(import.meta.url)
+if (process.argv[1] === fileURLToPath(import.meta.url) && process.argv[2]) {
+  console.log(`Replacing ${process.argv[2]} tokens`)
+  await replaceReadmeTokens(process.argv[2])
 }
diff --git a/packages/shared/scripts/replace-tokens.ts b/packages/shared/scripts/replace-tokens.ts
@@ -3,9 +3,8 @@ import { fileURLToPath } from 'node:url'
 import { replaceCodeTokens } from './replace-code-tokens.js'
 import { replaceReadmeTokens } from './replace-readme-tokens.js'
 
-// see https://stackoverflow.com/a/60309682
-if (process.argv[1] === fileURLToPath(import.meta.url)) {
-  console.log('Replacing packages/shared tokens')
-  await replaceReadmeTokens(import.meta.url)
-  await replaceCodeTokens(import.meta.url)
+if (process.argv[1] === fileURLToPath(import.meta.url) && process.argv[2]) {
+  console.log(`Replacing ${process.argv[2]} tokens`)
+  await replaceReadmeTokens(process.argv[2])
+  await replaceCodeTokens(process.argv[2])
 }
diff --git a/packages/sveltekit/package.json b/packages/sveltekit/package.json
@@ -43,9 +43,9 @@
 		"lint:fix": "pnpm run lint --fix",
 		"build": "pnpm run check:errors && svelte-package",
 		"build:clean": "pnpm run clean && pnpm run build",
-		"build:readme": "LATEST=${npm_package_version} tsx scripts/replace-readme-tokens.ts",
-		"replaceTokens": "LATEST=${npm_package_version} tsx scripts/replace-tokens.ts",
-		"build:production": "pnpm run build:clean && pnpm run replaceTokens && echo '' && publint",
+    "build:readme": "LATEST=${npm_package_version} tsx ../shared/scripts/replace-readme-tokens.ts ./packages/sveltekit",
+    "replaceTokens": "LATEST=${npm_package_version} tsx ../shared/scripts/replace-tokens.ts ./packages/sveltekit",
+    "build:production": "pnpm run build:clean && pnpm run replaceTokens && echo '' && publint",
 		"prepublishOnly": "pnpm run build:production",
 		"upgrade:deps": "ncu --peer -x effect -x @effect/* -u"
 	},

diff --git a/packages/sveltekit/scripts/replace-readme-tokens.ts b/packages/sveltekit/scripts/replace-readme-tokens.ts
diff --git a/packages/sveltekit/scripts/replace-tokens.ts b/packages/sveltekit/scripts/replace-tokens.ts
diff --git a/packages/sveltekit/tsconfig.json b/packages/sveltekit/tsconfig.json
@@ -10,25 +10,5 @@
 		"skipLibCheck": true,
 		"sourceMap": true,
 		"strict": true
-	},
-	"include": [
-		"ambient.d.ts",
-		"non-ambient.d.ts",
-		"./.svelte-kit/types/**/$types.d.ts",
-		"./vite.config.js",
-		"./vite.config.ts",
-		"./src/**/*.js",
-		"./src/**/*.ts",
-		"./src/**/*.svelte",
-		"./tests/**/*.js",
-		"./tests/**/*.ts",
-		"./tests/**/*.svelte",
-		"./scripts/**/*.ts"
-	],
-	"exclude": [
-		"./node_modules/**",
-		"./src/service-worker.js",
-		"./src/service-worker.ts",
-		"./src/service-worker.d.ts"
-	]
+	}
 }