chore: unify migrated packages (#32819)

AtofStryker · web-flow · commit d5cc26de3d87 · 2025-10-27T20:07:46.000-04:00
* add readme note in root

* use declarations instead of src root and ship it with package. also use tsconfig.json instead of tsconfig.base as it has better IDE support. Also add a watcher

* use declarations instead of src root and ship it with package. also use tsconfig.json instead of tsconfig.base as it has better IDE support. Also add a watcher

* use declarations instead of src root and ship it with package. also use tsconfig.json instead of tsconfig.base as it has better IDE support. Also add a watcher

* use declarations instead of src root and ship it with package. also use tsconfig.json instead of tsconfig.base as it has better IDE support. Also add a watcher

* use declarations instead of src root and ship it with package. also use tsconfig.json instead of tsconfig.base as it has better IDE support. Also add a watcher

* use declarations instead of src root and ship it with package. also use tsconfig.json instead of tsconfig.base as it has better IDE support. Also add a watcher

* use declarations instead of src root and ship it with package. also use tsconfig.json instead of tsconfig.base as it has better IDE support. Also add a watcher

* use declarations instead of src root and ship it with package. also use tsconfig.json instead of tsconfig.base as it has better IDE support. Also add a watcher

* use declarations instead of src root and ship it with package. also use tsconfig.json instead of tsconfig.base as it has better IDE support. Also add a watcher
diff --git a/packages/config/package.json b/packages/config/package.json
@@ -18,7 +18,8 @@
     "test-debug": "vitest --inspect-brk --no-file-parallelism --test-timeout=0",
     "test-unit": "vitest run",
     "test:clean": "find ./test/__fixtures__ -depth -name 'output.*' -type f -exec rm {} \\;",
-    "tslint": "tslint --config ../ts/tslint.json --project ."
+    "tslint": "tslint --config ../ts/tslint.json --project .",
+    "watch": "yarn build:cjs --watch & yarn build:esm --watch"
   },
   "dependencies": {
     "@babel/core": "^7.28.0",
@@ -53,7 +54,7 @@
     "cjs/*",
     "esm/*"
   ],
-  "types": "src/index.ts",
+  "types": "cjs/index.d.ts",
   "module": "esm/index.js",
   "nx": {}
 }
diff --git a/packages/config/tsconfig.cjs.json b/packages/config/tsconfig.cjs.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./cjs",
diff --git a/packages/config/tsconfig.esm.json b/packages/config/tsconfig.esm.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./esm",
diff --git a/packages/config/tsconfig.json b/packages/config/tsconfig.json
@@ -14,6 +14,7 @@
     "resolveJsonModule": true,
     "types": [
       "node"
-    ]
+    ],
+    "declaration": true
   }
 }
diff --git a/packages/errors/package.json b/packages/errors/package.json
@@ -9,7 +9,7 @@
     "cjs/*",
     "esm/*"
   ],
-  "types": "src/index.ts",
+  "types": "cjs/index.d.ts",
   "scripts": {
     "build": "yarn build:esm && yarn build:cjs",
     "build-prod": "yarn build",
@@ -21,7 +21,9 @@
     "test": "yarn test-unit",
     "test-unit": "vitest run",
     "test-debug": "vitest --inspect-brk --no-file-parallelism --test-timeout=0",
-    "tslint": "tslint --config ../ts/tslint.json --project ."
+    "tslint": "tslint --config ../ts/tslint.json --project .",
+    "watch": "yarn build:cjs --watch & yarn build:esm --watch"
+
   },
   "dependencies": {
     "ansi_up": "5.0.0",
diff --git a/packages/errors/tsconfig.cjs.json b/packages/errors/tsconfig.cjs.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./cjs",
diff --git a/packages/errors/tsconfig.esm.json b/packages/errors/tsconfig.esm.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./esm",
diff --git a/packages/errors/tsconfig.json b/packages/errors/tsconfig.json
@@ -9,6 +9,7 @@
     "noUncheckedIndexedAccess": true,
     "skipLibCheck": true,
     "resolveJsonModule": true,
-    "esModuleInterop": true
+    "esModuleInterop": true,
+    "declaration": true
   }
 }
diff --git a/packages/icons/tsconfig.cjs.json b/packages/icons/tsconfig.cjs.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "include": [
     "index.ts"
   ],
diff --git a/packages/icons/tsconfig.esm.json b/packages/icons/tsconfig.esm.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "include": [
     "index.mts"
   ],
diff --git a/packages/icons/tsconfig.json b/packages/icons/tsconfig.json
diff --git a/packages/network-tools/tsconfig.cjs.json b/packages/network-tools/tsconfig.cjs.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./lib",
     "outDir": "./cjs",
diff --git a/packages/network-tools/tsconfig.esm.json b/packages/network-tools/tsconfig.esm.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./lib",
     "outDir": "./esm",
diff --git a/packages/network-tools/tsconfig.json b/packages/network-tools/tsconfig.json
diff --git a/packages/network/tsconfig.cjs.json b/packages/network/tsconfig.cjs.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./lib",
     "outDir": "./cjs",
diff --git a/packages/network/tsconfig.esm.json b/packages/network/tsconfig.esm.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./lib",
     "outDir": "./esm",
diff --git a/packages/network/tsconfig.json b/packages/network/tsconfig.json
diff --git a/packages/resolve-dist/lib/index.ts b/packages/resolve-dist/lib/index.ts
@@ -1,6 +1,5 @@
 import path from 'path'
-
-let fs: typeof import('fs-extra')
+import fs from 'fs-extra'
 
 export type RunnerPkg = 'app' | 'runner'
 
@@ -11,8 +10,6 @@ export const resolveFromPackages = (...args: string[]) => {
 }
 
 const getRunnerContents = (filename: string) => {
-  fs ??= require('fs-extra') as typeof import('fs-extra')
-
   return fs.readFile(getPathToDist('runner', filename))
 }
 
diff --git a/packages/resolve-dist/package.json b/packages/resolve-dist/package.json
@@ -23,7 +23,7 @@
     "cjs/*",
     "esm/*"
   ],
-  "types": "./lib/index.ts",
+  "types": "./cjs/index.d.ts",
   "module": "esm/index.js",
   "nx": {}
 }
diff --git a/packages/resolve-dist/tsconfig.cjs.json b/packages/resolve-dist/tsconfig.cjs.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./lib",
     "outDir": "./cjs",
diff --git a/packages/resolve-dist/tsconfig.esm.json b/packages/resolve-dist/tsconfig.esm.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./lib",
     "outDir": "./esm",
diff --git a/packages/resolve-dist/tsconfig.json b/packages/resolve-dist/tsconfig.json
@@ -5,6 +5,7 @@
   "compilerOptions": {
     "allowJs": false,
     "esModuleInterop": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "declaration": true
   }
 }
diff --git a/packages/root/README.md b/packages/root/README.md
@@ -2,4 +2,6 @@
 
 Bundles the monorepo root `package.json` as an installable package, allowing `@packages/root` to be installed in any context without having an absolute reference to the root `package.json`
 
-In order to accomplish this, `rollup` is used to bundle the `package.json`, as packages may be interpreted in place or be installed inside the `node_modules` directory. This package builds an `index.mjs` file for packages using `vite`/ ES Modules and an `index.js` file for any CommonJS entry points.
+In order to accomplish this, `rollup` is used to bundle the `package.json`, as packages may be interpreted in place or be installed inside the `node_modules` directory. This package builds an `index.mjs` file for packages using `vite`/ ES Modules and an `index.js` file for any CommonJS entry points.
+
+We currently don't use a watcher for this package because it is so small, so if any changes happen to the `package.json` in the root you will need to manually retrigger the build of this package.
diff --git a/packages/scaffold-config/package.json b/packages/scaffold-config/package.json
@@ -15,7 +15,8 @@
     "lint": "eslint --ext .js,.jsx,.ts,.tsx,.json, .",
     "test": "vitest run",
     "test-debug": "vitest --inspect-brk --no-file-parallelism --test-timeout=0",
-    "tslint": "tslint --config ../ts/tslint.json --project ."
+    "tslint": "tslint --config ../ts/tslint.json --project .",
+    "watch": "yarn build:cjs --watch & yarn build:esm --watch"
   },
   "dependencies": {
     "compare-versions": "4.1.3",
@@ -38,7 +39,7 @@
     "cjs/*",
     "esm/*"
   ],
-  "types": "src/index.ts",
+  "types": "cjs/index.d.ts",
   "module": "esm/index.js",
   "nx": {}
 }
diff --git a/packages/scaffold-config/tsconfig.browser.json b/packages/scaffold-config/tsconfig.browser.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "include": [
     "src/dependencies.ts"
   ],
diff --git a/packages/scaffold-config/tsconfig.cjs.json b/packages/scaffold-config/tsconfig.cjs.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./cjs",
diff --git a/packages/scaffold-config/tsconfig.esm.json b/packages/scaffold-config/tsconfig.esm.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./esm",
diff --git a/packages/scaffold-config/tsconfig.json b/packages/scaffold-config/tsconfig.json
@@ -15,6 +15,7 @@
     "noUncheckedIndexedAccess": true,
     "esModuleInterop": true,
     "resolveJsonModule": true,
-    "skipLibCheck": true
+    "skipLibCheck": true,
+    "declaration": true
   }
 }
diff --git a/packages/telemetry/package.json b/packages/telemetry/package.json
@@ -17,7 +17,7 @@
     "test-debug": "vitest --inspect-brk --no-file-parallelism --test-timeout=0",
     "test-unit": "vitest run",
     "tslint": "tslint --config ../ts/tslint.json --project .",
-    "watch": "tsc --watch"
+    "watch": "yarn build:cjs --watch & yarn build:esm --watch & yarn build:browser -w"
   },
   "dependencies": {
     "@opentelemetry/api": "1.4.1",
diff --git a/packages/telemetry/tsconfig.browser.json b/packages/telemetry/tsconfig.browser.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "include": [
     "src/client.ts"
   ],
diff --git a/packages/telemetry/tsconfig.cjs.json b/packages/telemetry/tsconfig.cjs.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "include": [
     "src/**/*.ts"
   ],
diff --git a/packages/telemetry/tsconfig.esm.json b/packages/telemetry/tsconfig.esm.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "include": [
     "src/**/*.ts"
   ],
diff --git a/packages/telemetry/tsconfig.json b/packages/telemetry/tsconfig.json
diff --git a/packages/types/package.json b/packages/types/package.json
@@ -12,7 +12,8 @@
     "check-ts": "tsc -p tsconfig.cjs.json --noEmit",
     "clean": "rimraf cjs esm",
     "lint": "eslint --ext .js,.jsx,.ts,.tsx,.json, .",
-    "test": "vitest run"
+    "test": "vitest run",
+    "watch": "yarn build:cjs --watch & yarn build:esm --watch"
   },
   "dependencies": {
     "semver": "^7.7.1"
@@ -33,7 +34,7 @@
     "cjs/*",
     "esm/*"
   ],
-  "types": "src/index.ts",
+  "types": "cjs/index.d.ts",
   "module": "esm/index.js",
   "workspaces": {
     "nohoist": [
diff --git a/packages/types/tsconfig.cjs.json b/packages/types/tsconfig.cjs.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./cjs",
diff --git a/packages/types/tsconfig.esm.json b/packages/types/tsconfig.esm.json
@@ -1,5 +1,5 @@
 {
-  "extends": "./tsconfig.base.json",
+  "extends": "./tsconfig.json",
   "compilerOptions": {
     "rootDir": "./src",
     "outDir": "./esm",
diff --git a/packages/types/tsconfig.json b/packages/types/tsconfig.json
@@ -14,6 +14,7 @@
     "ignoreDeprecations": "5.0",
     "importsNotUsedAsValues": "error",
     "skipLibCheck": true,
+    "declaration": true,
     "resolveJsonModule": true,
     "types": [
       "mocha",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "extends": "./tsconfig.base.json",`
	`2`	`+ "extends": "./tsconfig.json",`
`3`	`3`	`"compilerOptions": {`
`4`	`4`	`"rootDir": "./src",`
`5`	`5`	`"outDir": "./cjs",`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`"resolveJsonModule": true,`
`15`	`15`	`"types": [`
`16`	`16`	`"node"`
`17`		`- ]`
	`17`	`+ ],`
	`18`	`+ "declaration": true`
`18`	`19`	`}`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`"noUncheckedIndexedAccess": true,`
`10`	`10`	`"skipLibCheck": true,`
`11`	`11`	`"resolveJsonModule": true,`
`12`		`- "esModuleInterop": true`
	`12`	`+ "esModuleInterop": true,`
	`13`	`+ "declaration": true`
`13`	`14`	`}`
`14`	`15`	`}`