chore(user-data, workspaces): add missing dependencies; always exclud…

…e electron from bundle; fix exports paths COMPASS-7361 (#5024) * chore(user-data): fix package dependencies * chore(webpack-config): always externalize electron package * chore(workspace): check that exports exist; fix missing export paths
mongodb-js · Oct 26, 2023 · 02aa0f0 · 02aa0f0
1 parent e35c177
commit 02aa0f0
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 34 deletions.
diff --git a/configs/webpack-config-compass/src/externals.ts b/configs/webpack-config-compass/src/externals.ts
@@ -1,6 +1,9 @@
 import { execSync } from 'child_process';
 
 export const sharedExternals: string[] = [
+  // Electron should always stay external. For electron webpack target this
+  // happens automatically, for other targets we should never try to bundle it
+  'electron',
   // Native Modules are very hard to bundle correctly with Webpack (and there is
   // not much reason to do so) so to make our lives easier, we will always
   // externalize them from the bulid

diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/atlas-service/package.json b/packages/atlas-service/package.json
@@ -19,7 +19,11 @@
     "url": "https://github.com/mongodb-js/compass.git"
   },
   "files": [
-    "dist"
+    "dist",
+    "main.js",
+    "main.d.ts",
+    "renderer.js",
+    "renderer.d.ts"
   ],
   "license": "SSPL",
   "exports": {
@@ -32,7 +36,7 @@
   },
   "scripts": {
     "bootstrap": "npm run compile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "tsc -p tsconfig.json",
     "typecheck": "tsc -p tsconfig-lint.json --noEmit",
     "eslint": "eslint",

diff --git a/packages/compass-app-stores/package.json b/packages/compass-app-stores/package.json
@@ -32,7 +32,7 @@
   "types": "./dist/src/index.d.ts",
   "scripts": {
     "bootstrap": "npm run postcompile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "npm run webpack -- --mode production",
     "webpack": "webpack-compass",
     "postcompile": "tsc --emitDeclarationOnly",

diff --git a/packages/compass-connection-import-export/package.json b/packages/compass-connection-import-export/package.json
@@ -35,7 +35,7 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "bootstrap": "npm run compile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "tsc -p tsconfig.json && gen-esm-wrapper . ./dist/.esm-wrapper.mjs",
     "typecheck": "tsc -p tsconfig-lint.json --noEmit",
     "eslint": "eslint",

diff --git a/packages/compass-editor/package.json b/packages/compass-editor/package.json
@@ -30,7 +30,7 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "bootstrap": "npm run compile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "tsc -p tsconfig.json",
     "typecheck": "tsc -p tsconfig-lint.json --noEmit",
     "eslint": "eslint",

diff --git a/packages/compass-export-to-language/package.json b/packages/compass-export-to-language/package.json
@@ -35,7 +35,7 @@
   },
   "scripts": {
     "bootstrap": "npm run postcompile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "npm run webpack -- --mode production",
     "webpack": "webpack-compass",
     "postcompile": "tsc --emitDeclarationOnly",

diff --git a/packages/compass-field-store/package.json b/packages/compass-field-store/package.json
@@ -32,7 +32,7 @@
   "types": "./dist/src/index.d.ts",
   "scripts": {
     "bootstrap": "npm run postcompile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "npm run webpack -- --mode production",
     "webpack": "webpack-compass",
     "postcompile": "tsc --emitDeclarationOnly",

diff --git a/packages/compass-generative-ai/package.json b/packages/compass-generative-ai/package.json
@@ -35,7 +35,7 @@
   "types": "./dist/src/index.d.ts",
   "scripts": {
     "bootstrap": "npm run postcompile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "npm run webpack -- --mode production",
     "webpack": "webpack-compass",
     "postcompile": "tsc --emitDeclarationOnly",

diff --git a/packages/compass-import-export/package.json b/packages/compass-import-export/package.json
@@ -61,6 +61,7 @@
     "@mongodb-js/compass-utils": "^0.5.2",
     "bson": "^6.0.0",
     "compass-preferences-model": "^2.15.3",
+    "electron": "^25.8.4",
     "hadron-document": "^8.4.2",
     "react": "^17.0.2"
   },
@@ -71,6 +72,7 @@
     "@mongodb-js/compass-utils": "^0.5.2",
     "bson": "^6.0.0",
     "compass-preferences-model": "^2.15.3",
+    "electron": "^25.8.4",
     "hadron-document": "^8.4.2"
   },
   "devDependencies": {
@@ -97,7 +99,6 @@
     "chai-as-promised": "^7.1.1",
     "debug": "^4.2.0",
     "depcheck": "^1.4.1",
-    "electron": "^25.8.4",
     "eslint": "^7.25.0",
     "hadron-app-registry": "^9.0.12",
     "lodash": "^4.17.21",

diff --git a/packages/compass-maybe-protect-connection-string/package.json b/packages/compass-maybe-protect-connection-string/package.json
@@ -35,7 +35,7 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "bootstrap": "npm run compile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "tsc -p tsconfig.json && gen-esm-wrapper . ./dist/.esm-wrapper.mjs",
     "typecheck": "tsc -p tsconfig-lint.json --noEmit",
     "eslint": "eslint",

diff --git a/packages/compass-settings/package.json b/packages/compass-settings/package.json
@@ -24,7 +24,7 @@
   "license": "SSPL",
   "main": "dist/index.js",
   "compass:main": "src/index.ts",
-  "types": "dist/index.d.ts",
+  "types": "dist/src/index.d.ts",
   "exports": {
     "require": "./dist/index.js",
     "browser": "./dist/browser.js"
@@ -34,7 +34,7 @@
   },
   "scripts": {
     "bootstrap": "npm run postcompile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "npm run webpack -- --mode production",
     "webpack": "webpack-compass",
     "postcompile": "tsc --emitDeclarationOnly",

diff --git a/packages/compass-test-server/package.json b/packages/compass-test-server/package.json
@@ -34,7 +34,7 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "bootstrap": "npm run compile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "tsc -p tsconfig.json && gen-esm-wrapper . ./dist/.esm-wrapper.mjs",
     "typecheck": "tsc -p tsconfig-lint.json --noEmit",
     "eslint": "eslint",

diff --git a/packages/compass-user-data/package.json b/packages/compass-user-data/package.json
@@ -33,7 +33,7 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "bootstrap": "npm run compile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "tsc -p tsconfig.json && gen-esm-wrapper . ./dist/.esm-wrapper.mjs",
     "typecheck": "tsc -p tsconfig-lint.json --noEmit",
     "eslint": "eslint",
@@ -48,6 +48,10 @@
     "test-ci": "npm run test-cov",
     "reformat": "npm run prettier -- --write . && npm run eslint . --fix"
   },
+  "dependencies": {
+    "write-file-atomic": "^5.0.1",
+    "zod": "^3.22.3"
+  },
   "devDependencies": {
     "@mongodb-js/compass-logging": "^1.2.3",
     "@mongodb-js/compass-utils": "^0.5.2",
@@ -67,8 +71,6 @@
     "nyc": "^15.1.0",
     "prettier": "^2.7.1",
     "sinon": "^9.2.3",
-    "typescript": "^5.0.4",
-    "write-file-atomic": "^5.0.1",
-    "zod": "^3.22.3"
+    "typescript": "^5.0.4"
   }
 }
diff --git a/packages/compass-utils/package.json b/packages/compass-utils/package.json
@@ -35,7 +35,7 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "bootstrap": "npm run compile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "tsc -p tsconfig.json && gen-esm-wrapper . ./dist/.esm-wrapper.mjs",
     "typecheck": "tsc -p tsconfig-lint.json --noEmit",
     "eslint": "eslint",

diff --git a/packages/compass-welcome/package.json b/packages/compass-welcome/package.json
@@ -35,7 +35,7 @@
   },
   "scripts": {
     "bootstrap": "npm run postcompile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "npm run webpack -- --mode production",
     "webpack": "webpack-compass",
     "postcompile": "tsc --emitDeclarationOnly",

diff --git a/packages/connection-storage/package.json b/packages/connection-storage/package.json
@@ -36,7 +36,7 @@
   },
   "scripts": {
     "bootstrap": "npm run compile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "tsc -p tsconfig.json",
     "typecheck": "tsc -p tsconfig-lint.json --noEmit",
     "eslint": "eslint",

diff --git a/packages/mongodb-query-util/package.json b/packages/mongodb-query-util/package.json
@@ -34,7 +34,7 @@
   "types": "./dist/index.d.ts",
   "scripts": {
     "bootstrap": "npm run compile",
-    "prepublishOnly": "npm run compile",
+    "prepublishOnly": "npm run compile && compass-scripts check-exports-exist",
     "compile": "tsc -p tsconfig.json && gen-esm-wrapper . ./dist/.esm-wrapper.mjs",
     "typecheck": "tsc -p tsconfig-lint.json --noEmit",
     "eslint": "eslint",

diff --git a/scripts/create-workspace.js b/scripts/create-workspace.js
@@ -257,7 +257,7 @@ async function createWorkspace({
     types: isPlugin ? './dist/src/index.d.ts' : './dist/index.d.ts',
     scripts: {
       bootstrap: 'npm run compile',
-      prepublishOnly: 'npm run compile',
+      prepublishOnly: 'npm run compile && compass-scripts check-exports-exist',
       // For normal packages we are just compiling code with typescript, for
       // plugins (but only for them) we are using webpack to create independent
       // plugin packages