diff --git a/.gitignore b/.gitignore index 8ec88947dcc..8f921dace85 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ config/*/.npmrc .sbom .logs .evergreen/logs + +# Typescript incremental build info +*.tsbuildinfo diff --git a/packages/compass-components/.eslintrc.js b/packages/compass-components/.eslintrc.js index 9c3ab95632f..f64a0ab086d 100644 --- a/packages/compass-components/.eslintrc.js +++ b/packages/compass-components/.eslintrc.js @@ -4,6 +4,6 @@ module.exports = { extends: ['@mongodb-js/eslint-config-compass'], parserOptions: { tsconfigRootDir: __dirname, - project: ['./tsconfig-lint.json'], + project: ['./tsconfig.json'], }, }; diff --git a/packages/compass-components/.gitignore b/packages/compass-components/.gitignore index 7951405f85a..e69de29bb2d 100644 --- a/packages/compass-components/.gitignore +++ b/packages/compass-components/.gitignore @@ -1 +0,0 @@ -lib \ No newline at end of file diff --git a/packages/compass-components/package.json b/packages/compass-components/package.json index 5d536ea00a3..c0f0a8594ba 100644 --- a/packages/compass-components/package.json +++ b/packages/compass-components/package.json @@ -3,21 +3,20 @@ "version": "1.34.0", "description": "React Components used in Compass", "license": "SSPL", - "main": "lib/index.js", + "main": "dist/index.js", "compass:main": "src/index.ts", "compass:exports": { ".": "./src/index.ts" }, - "types": "./lib/index.d.ts", + "types": "./dist/index.d.ts", "files": [ - "lib" + "dist" ], "scripts": { "bootstrap": "npm run compile", "prepublishOnly": "npm run compile && compass-scripts check-exports-exist", - "clean": "node -e \"fs.rmSync('lib', { recursive: true, force: true })\" || true", - "precompile": "npm run clean", - "compile": "tsc -p tsconfig.json", + "clean": "tsc --build --clean", + "compile": "tsc --build", "eslint": "eslint", "prettier": "prettier", "lint": "npm run eslint . && npm run prettier -- --check .", diff --git a/packages/compass-components/tsconfig-lint.json b/packages/compass-components/tsconfig-lint.json deleted file mode 100644 index eda2ec11aa5..00000000000 --- a/packages/compass-components/tsconfig-lint.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "extends": "./tsconfig.json", - "include": ["**/*"], - "exclude": ["node_modules", "lib"] -} diff --git a/packages/compass-components/tsconfig.json b/packages/compass-components/tsconfig.json index 29bc42505ac..4a005fbbaf6 100644 --- a/packages/compass-components/tsconfig.json +++ b/packages/compass-components/tsconfig.json @@ -1,8 +1,10 @@ { "extends": "@mongodb-js/tsconfig-compass/tsconfig.react.json", "compilerOptions": { - "outDir": "lib" + "composite": true, + "outDir": "dist", + "rootDir": "src" }, - "include": ["src/**/*"], - "exclude": ["./src/**/*.spec.*", "./src/**/*.test.*"] + "include": ["src"], + "exclude": ["src/**/*.spec.*", "./src/**/*.test.*"] } diff --git a/packages/connection-form/src/components/advanced-options-tabs/csfle-tab/csfle-tab.spec.tsx b/packages/connection-form/src/components/advanced-options-tabs/csfle-tab/csfle-tab.spec.tsx index 7a4375824cf..8e8bc439537 100644 --- a/packages/connection-form/src/components/advanced-options-tabs/csfle-tab/csfle-tab.spec.tsx +++ b/packages/connection-form/src/components/advanced-options-tabs/csfle-tab/csfle-tab.spec.tsx @@ -18,8 +18,10 @@ import { Binary } from 'bson'; import ConnectionForm from '../../../'; import { getNextKmsProviderName } from './kms-provider-content'; -import { FileInputBackendProvider } from '@mongodb-js/compass-components'; -import { createJSDomFileInputDummyBackend } from '@mongodb-js/compass-components/lib/components/file-input'; +import { + FileInputBackendProvider, + createJSDomFileInputDummyBackend, +} from '@mongodb-js/compass-components'; const openAdvancedTab = async ( tabId: 'general' | 'authentication' | 'tls' | 'proxy' | 'advanced' | 'csfle' diff --git a/packages/connection-form/src/components/advanced-options-tabs/ssh-tunnel-tab/ssh-tunnel-identity.spec.tsx b/packages/connection-form/src/components/advanced-options-tabs/ssh-tunnel-tab/ssh-tunnel-identity.spec.tsx index a8199d2bcb4..ce1db83fdd9 100644 --- a/packages/connection-form/src/components/advanced-options-tabs/ssh-tunnel-tab/ssh-tunnel-identity.spec.tsx +++ b/packages/connection-form/src/components/advanced-options-tabs/ssh-tunnel-tab/ssh-tunnel-identity.spec.tsx @@ -7,8 +7,10 @@ import type { SSHConnectionOptions } from '../../../utils/connection-ssh-handler import SSHTunnelIdentity from './ssh-tunnel-identity'; import type { ConnectionFormError } from '../../../utils/validation'; import { errorMessageByFieldName } from '../../../utils/validation'; -import { FileInputBackendProvider } from '@mongodb-js/compass-components'; -import { createJSDomFileInputDummyBackend } from '@mongodb-js/compass-components/lib/components/file-input'; +import { + FileInputBackendProvider, + createJSDomFileInputDummyBackend, +} from '@mongodb-js/compass-components'; const formFields: { key: keyof SSHConnectionOptions; diff --git a/packages/connection-form/src/components/advanced-options-tabs/tls-ssl-tab/tls-ssl-tab.spec.tsx b/packages/connection-form/src/components/advanced-options-tabs/tls-ssl-tab/tls-ssl-tab.spec.tsx index eb92a9a73ad..8e7f6ec056a 100644 --- a/packages/connection-form/src/components/advanced-options-tabs/tls-ssl-tab/tls-ssl-tab.spec.tsx +++ b/packages/connection-form/src/components/advanced-options-tabs/tls-ssl-tab/tls-ssl-tab.spec.tsx @@ -10,8 +10,10 @@ import sinon from 'sinon'; import ConnectionStringUrl from 'mongodb-connection-string-url'; import SSLTab, { getTLSOptionForConnectionString } from './tls-ssl-tab'; -import { FileInputBackendProvider } from '@mongodb-js/compass-components'; -import { createJSDomFileInputDummyBackend } from '@mongodb-js/compass-components/lib/components/file-input'; +import { + FileInputBackendProvider, + createJSDomFileInputDummyBackend, +} from '@mongodb-js/compass-components'; describe('SchemaInput', function () { let updateConnectionFormFieldSpy: sinon.SinonSpy;