diff --git a/configs/tsconfig-devtools/tsconfig.common.json b/configs/tsconfig-devtools/tsconfig.common.json index a50761dd..f4f5af21 100644 --- a/configs/tsconfig-devtools/tsconfig.common.json +++ b/configs/tsconfig-devtools/tsconfig.common.json @@ -1,5 +1,6 @@ { "compilerOptions": { + "outDir": "${configDir}/dist", "allowJs": false, "esModuleInterop": true, "downlevelIteration": true, @@ -14,5 +15,7 @@ "sourceMap": true, "strict": true, "target": "ES2021" - } + }, + "include": ["${configDir}/src/**/*"], + "exclude": ["${configDir}/src/**/*.spec.*"] } diff --git a/packages/device-id/tsconfig.json b/packages/device-id/tsconfig.json index 836d247a..4e6d1b8b 100644 --- a/packages/device-id/tsconfig.json +++ b/packages/device-id/tsconfig.json @@ -1,8 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist" - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/devtools-connect/tsconfig.json b/packages/devtools-connect/tsconfig.json index 629bddcf..415b3a29 100644 --- a/packages/devtools-connect/tsconfig.json +++ b/packages/devtools-connect/tsconfig.json @@ -4,12 +4,6 @@ "target": "es2020", "lib": ["es2020", "DOM"], "module": "commonjs", - "moduleResolution": "node", - "outDir": "./dist", - "allowJs": true, - "strict": true, - "jsx": "react" - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "moduleResolution": "node" + } } diff --git a/packages/devtools-proxy-support/tsconfig.json b/packages/devtools-proxy-support/tsconfig.json index 156674a5..4e6d1b8b 100644 --- a/packages/devtools-proxy-support/tsconfig.json +++ b/packages/devtools-proxy-support/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/dl-center/tsconfig.json b/packages/dl-center/tsconfig.json index 156674a5..4e6d1b8b 100644 --- a/packages/dl-center/tsconfig.json +++ b/packages/dl-center/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/download-url/.depcheckrc b/packages/download-url/.depcheckrc index 8a4a4b63..48bf9af6 100644 --- a/packages/download-url/.depcheckrc +++ b/packages/download-url/.depcheckrc @@ -5,4 +5,4 @@ ignores: - '@types/sinon-chai' - 'sinon' ignore-patterns: - - 'lib' + - 'dist' diff --git a/packages/download-url/.eslintignore b/packages/download-url/.eslintignore index e46ee694..85a8a75e 100644 --- a/packages/download-url/.eslintignore +++ b/packages/download-url/.eslintignore @@ -1,2 +1,2 @@ .nyc-output -lib +dist diff --git a/packages/download-url/.gitignore b/packages/download-url/.gitignore index 34b004ba..83dae01f 100644 --- a/packages/download-url/.gitignore +++ b/packages/download-url/.gitignore @@ -6,7 +6,6 @@ npm-debug.log coverage/ package-lock.json -.esm-wrapper.mjs -lib/ +dist/ .nyc_output tmp-*/ diff --git a/packages/download-url/.prettierignore b/packages/download-url/.prettierignore index 2a9ac589..4d28df66 100644 --- a/packages/download-url/.prettierignore +++ b/packages/download-url/.prettierignore @@ -1,3 +1,3 @@ .nyc_output -lib +dist coverage diff --git a/packages/download-url/bin/mongodb-download-url.js b/packages/download-url/bin/mongodb-download-url.js index fa80df6d..1f47ceea 100755 --- a/packages/download-url/bin/mongodb-download-url.js +++ b/packages/download-url/bin/mongodb-download-url.js @@ -1,2 +1,2 @@ #!/usr/bin/env node -require('../lib/bin.js'); +require('../dist/bin.js'); diff --git a/packages/download-url/package.json b/packages/download-url/package.json index 4c1046eb..afdec28b 100644 --- a/packages/download-url/package.json +++ b/packages/download-url/package.json @@ -5,7 +5,7 @@ "scripts": { "bootstrap": "npm run compile", "prepublishOnly": "npm run compile", - "compile": "tsc -p tsconfig.json && gen-esm-wrapper . ./.esm-wrapper.mjs && prettier --write .esm-wrapper.mjs", + "compile": "tsc -p tsconfig.json && gen-esm-wrapper . ./dist/.esm-wrapper.mjs", "typecheck": "tsc --noEmit", "eslint": "eslint", "prettier": "prettier", @@ -20,16 +20,16 @@ "test-ci": "npm run test-cov", "reformat": "npm run prettier -- --write ." }, - "main": "lib/index.js", - "types": "lib/index.d.ts", + "main": "dist/index.js", + "types": "dist/index.d.ts", "exports": { "require": { - "default": "./lib/index.js", - "types": "./lib/index.d.ts" + "default": "./dist/index.js", + "types": "./dist/index.d.ts" }, "import": { - "default": "./.esm-wrapper.mjs", - "types": "./lib/index.d.ts" + "default": "./dist/.esm-wrapper.mjs", + "types": "./dist/index.d.ts" } }, "bin": { diff --git a/packages/download-url/tsconfig-lint.json b/packages/download-url/tsconfig-lint.json index eda2ec11..6bdef84f 100644 --- a/packages/download-url/tsconfig-lint.json +++ b/packages/download-url/tsconfig-lint.json @@ -1,5 +1,5 @@ { "extends": "./tsconfig.json", "include": ["**/*"], - "exclude": ["node_modules", "lib"] + "exclude": ["node_modules", "dist"] } diff --git a/packages/download-url/tsconfig.json b/packages/download-url/tsconfig.json index b878cde9..a2728245 100644 --- a/packages/download-url/tsconfig.json +++ b/packages/download-url/tsconfig.json @@ -1,11 +1,8 @@ { "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", "compilerOptions": { - "outDir": "./lib", "target": "es2019", "lib": ["es2019"], "moduleResolution": "node" - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + } } diff --git a/packages/get-os-info/tsconfig.json b/packages/get-os-info/tsconfig.json index 836d247a..4e6d1b8b 100644 --- a/packages/get-os-info/tsconfig.json +++ b/packages/get-os-info/tsconfig.json @@ -1,8 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist" - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/mongodb-build-info/tsconfig.json b/packages/mongodb-build-info/tsconfig.json index d9f9753f..4e6d1b8b 100644 --- a/packages/mongodb-build-info/tsconfig.json +++ b/packages/mongodb-build-info/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*", "test/**/*"], - "exclude": ["./src/**/*.spec.*", "./test/**/*.ts"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/mongodb-cloud-info/tsconfig.json b/packages/mongodb-cloud-info/tsconfig.json index 156674a5..4e6d1b8b 100644 --- a/packages/mongodb-cloud-info/tsconfig.json +++ b/packages/mongodb-cloud-info/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/mongodb-constants/tsconfig.json b/packages/mongodb-constants/tsconfig.json index 836d247a..4e6d1b8b 100644 --- a/packages/mongodb-constants/tsconfig.json +++ b/packages/mongodb-constants/tsconfig.json @@ -1,8 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist" - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/mongodb-downloader/tsconfig.json b/packages/mongodb-downloader/tsconfig.json index ac8a77a5..f029e4a0 100644 --- a/packages/mongodb-downloader/tsconfig.json +++ b/packages/mongodb-downloader/tsconfig.json @@ -1,12 +1,7 @@ { "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true, "target": "es2020", "lib": ["es2020"] - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + } } diff --git a/packages/mongodb-log-writer/tsconfig.json b/packages/mongodb-log-writer/tsconfig.json index 836d247a..4e6d1b8b 100644 --- a/packages/mongodb-log-writer/tsconfig.json +++ b/packages/mongodb-log-writer/tsconfig.json @@ -1,8 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist" - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/mongodb-ns/tsconfig.json b/packages/mongodb-ns/tsconfig.json index 836d247a..4e6d1b8b 100644 --- a/packages/mongodb-ns/tsconfig.json +++ b/packages/mongodb-ns/tsconfig.json @@ -1,8 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist" - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/mongodb-redact/tsconfig.json b/packages/mongodb-redact/tsconfig.json index 8e035c84..4e6d1b8b 100644 --- a/packages/mongodb-redact/tsconfig.json +++ b/packages/mongodb-redact/tsconfig.json @@ -1,11 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true, - "esModuleInterop": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/mongodb-runner/tsconfig.json b/packages/mongodb-runner/tsconfig.json index ac8a77a5..f029e4a0 100644 --- a/packages/mongodb-runner/tsconfig.json +++ b/packages/mongodb-runner/tsconfig.json @@ -1,12 +1,7 @@ { "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true, "target": "es2020", "lib": ["es2020"] - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + } } diff --git a/packages/mongodb-ts-autocomplete/tsconfig.json b/packages/mongodb-ts-autocomplete/tsconfig.json index a44c27bf..a235ebc8 100644 --- a/packages/mongodb-ts-autocomplete/tsconfig.json +++ b/packages/mongodb-ts-autocomplete/tsconfig.json @@ -2,12 +2,6 @@ "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", "compilerOptions": { "module": "NodeNext", - "moduleResolution": "NodeNext", - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/types/*"], - "exclude": ["./src/**/*.spec.*"] + "moduleResolution": "NodeNext" + } } diff --git a/packages/monorepo-tools/tsconfig.json b/packages/monorepo-tools/tsconfig.json index 156674a5..4e6d1b8b 100644 --- a/packages/monorepo-tools/tsconfig.json +++ b/packages/monorepo-tools/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/mql-typescript/tsconfig.json b/packages/mql-typescript/tsconfig.json index 156674a5..4e6d1b8b 100644 --- a/packages/mql-typescript/tsconfig.json +++ b/packages/mql-typescript/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/native-machine-id/tsconfig.json b/packages/native-machine-id/tsconfig.json index a2af0408..4e6d1b8b 100644 --- a/packages/native-machine-id/tsconfig.json +++ b/packages/native-machine-id/tsconfig.json @@ -1,8 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist" - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*", "scripts/benchmark.ts"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/node-webpack-startup-snapshot-checker/tsconfig.json b/packages/node-webpack-startup-snapshot-checker/tsconfig.json index 156674a5..4e6d1b8b 100644 --- a/packages/node-webpack-startup-snapshot-checker/tsconfig.json +++ b/packages/node-webpack-startup-snapshot-checker/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/oidc-http-server-pages/tsconfig.json b/packages/oidc-http-server-pages/tsconfig.json index 874b0c25..6bc53a59 100644 --- a/packages/oidc-http-server-pages/tsconfig.json +++ b/packages/oidc-http-server-pages/tsconfig.json @@ -1,11 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true, - "jsx": "react" - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.react.json" } diff --git a/packages/oidc-mock-provider/tsconfig.json b/packages/oidc-mock-provider/tsconfig.json index 156674a5..4e6d1b8b 100644 --- a/packages/oidc-mock-provider/tsconfig.json +++ b/packages/oidc-mock-provider/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/query-parser/tsconfig.json b/packages/query-parser/tsconfig.json index 156674a5..4e6d1b8b 100644 --- a/packages/query-parser/tsconfig.json +++ b/packages/query-parser/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/saslprep/tsconfig.json b/packages/saslprep/tsconfig.json index 156674a5..4e6d1b8b 100644 --- a/packages/saslprep/tsconfig.json +++ b/packages/saslprep/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/sbom-tools/tsconfig.json b/packages/sbom-tools/tsconfig.json index 156674a5..4e6d1b8b 100644 --- a/packages/sbom-tools/tsconfig.json +++ b/packages/sbom-tools/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/shell-bson-parser/tsconfig.json b/packages/shell-bson-parser/tsconfig.json index 156674a5..4e6d1b8b 100644 --- a/packages/shell-bson-parser/tsconfig.json +++ b/packages/shell-bson-parser/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/signing-utils/tsconfig.json b/packages/signing-utils/tsconfig.json index 156674a5..4e6d1b8b 100644 --- a/packages/signing-utils/tsconfig.json +++ b/packages/signing-utils/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/packages/ts-autocomplete/tsconfig.json b/packages/ts-autocomplete/tsconfig.json index 156674a5..4e6d1b8b 100644 --- a/packages/ts-autocomplete/tsconfig.json +++ b/packages/ts-autocomplete/tsconfig.json @@ -1,10 +1,3 @@ { - "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json", - "compilerOptions": { - "outDir": "dist", - "allowJs": true, - "strict": true - }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*"] + "extends": "@mongodb-js/tsconfig-devtools/tsconfig.common.json" } diff --git a/scripts/src/create-workspace.js b/scripts/src/create-workspace.js index da6d9e77..a3ad8c70 100755 --- a/scripts/src/create-workspace.js +++ b/scripts/src/create-workspace.js @@ -258,13 +258,6 @@ async function main(argv) { const tsconfigContent = JSON.stringify( { extends: '@mongodb-js/tsconfig-devtools/tsconfig.common.json', - compilerOptions: { - outDir: 'dist', - allowJs: true, - strict: true, - }, - include: ['src/**/*'], - exclude: ['./src/**/*.spec.*'], }, null, 2,