diff --git a/packages/config/package.json b/packages/config/package.json index 28c218fb24a..389742849cf 100644 --- 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 index 088d461d9d1..d2f95ec8149 100644 --- 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 index 07baf4ecf98..8045d99deac 100644 --- 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.base.json b/packages/config/tsconfig.json similarity index 90% rename from packages/config/tsconfig.base.json rename to packages/config/tsconfig.json index 91f7fca543f..d38939c98be 100644 --- a/packages/config/tsconfig.base.json +++ b/packages/config/tsconfig.json @@ -14,6 +14,7 @@ "resolveJsonModule": true, "types": [ "node" - ] + ], + "declaration": true } } \ No newline at end of file diff --git a/packages/errors/package.json b/packages/errors/package.json index 843ba84b1cf..a45b3ecb534 100644 --- 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 index 088d461d9d1..d2f95ec8149 100644 --- 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 index 07baf4ecf98..8045d99deac 100644 --- 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.base.json b/packages/errors/tsconfig.json similarity index 81% rename from packages/errors/tsconfig.base.json rename to packages/errors/tsconfig.json index 07531751164..575815ee83b 100644 --- a/packages/errors/tsconfig.base.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 index e335562003d..db5ec8146d6 100644 --- 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 index 6bfc1fc875c..58f54cfca4e 100644 --- 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.base.json b/packages/icons/tsconfig.json similarity index 100% rename from packages/icons/tsconfig.base.json rename to packages/icons/tsconfig.json diff --git a/packages/network-tools/tsconfig.cjs.json b/packages/network-tools/tsconfig.cjs.json index 709d6e27fca..0a511b9a029 100644 --- 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 index 970560cc72e..9fd03f42bfd 100644 --- 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.base.json b/packages/network-tools/tsconfig.json similarity index 100% rename from packages/network-tools/tsconfig.base.json rename to packages/network-tools/tsconfig.json diff --git a/packages/network/tsconfig.cjs.json b/packages/network/tsconfig.cjs.json index 709d6e27fca..0a511b9a029 100644 --- 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 index 970560cc72e..9fd03f42bfd 100644 --- 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.base.json b/packages/network/tsconfig.json similarity index 100% rename from packages/network/tsconfig.base.json rename to packages/network/tsconfig.json diff --git a/packages/resolve-dist/lib/index.ts b/packages/resolve-dist/lib/index.ts index 809e42773b1..dd600d574a6 100644 --- 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 index bf07fa74bbf..ab0c7fc4c83 100644 --- 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 index 709d6e27fca..0a511b9a029 100644 --- 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 index 970560cc72e..9fd03f42bfd 100644 --- 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.base.json b/packages/resolve-dist/tsconfig.json similarity index 70% rename from packages/resolve-dist/tsconfig.base.json rename to packages/resolve-dist/tsconfig.json index e1b677af4d9..4006792a71f 100644 --- a/packages/resolve-dist/tsconfig.base.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 index 1d6efaa980c..1620c614987 100644 --- 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. \ No newline at end of file +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. \ No newline at end of file diff --git a/packages/scaffold-config/package.json b/packages/scaffold-config/package.json index 8227dcf2157..80c5cef645b 100644 --- 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 index 88c8e2564fb..30085a6eeb8 100644 --- 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 index 088d461d9d1..d2f95ec8149 100644 --- 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 index de3a92db55a..6907e821a17 100644 --- 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.base.json b/packages/scaffold-config/tsconfig.json similarity index 85% rename from packages/scaffold-config/tsconfig.base.json rename to packages/scaffold-config/tsconfig.json index 2b3ddd11d6e..aea93b4cd07 100644 --- a/packages/scaffold-config/tsconfig.base.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 index c089d7c2d54..fab6d494972 100644 --- 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 index 809e3c30977..582ff86a497 100644 --- 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 index 618894c0ec2..e938789a737 100644 --- 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 index 98c9c43ed46..434b47b3668 100644 --- 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.base.json b/packages/telemetry/tsconfig.json similarity index 100% rename from packages/telemetry/tsconfig.base.json rename to packages/telemetry/tsconfig.json diff --git a/packages/types/package.json b/packages/types/package.json index cbd9212f726..78319c3092b 100644 --- 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 index 088d461d9d1..d2f95ec8149 100644 --- 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 index 07baf4ecf98..8045d99deac 100644 --- 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.base.json b/packages/types/tsconfig.json similarity index 94% rename from packages/types/tsconfig.base.json rename to packages/types/tsconfig.json index 279d4875b7c..bc3ae3d4258 100644 --- a/packages/types/tsconfig.base.json +++ b/packages/types/tsconfig.json @@ -14,6 +14,7 @@ "ignoreDeprecations": "5.0", "importsNotUsedAsValues": "error", "skipLibCheck": true, + "declaration": true, "resolveJsonModule": true, "types": [ "mocha",