Skip to content

Commit

Permalink
Merge branch 'main' into atlas-cli
Browse files Browse the repository at this point in the history
  • Loading branch information
mcasimir authored Jul 19, 2024
2 parents a9ba18e + 10919e2 commit 4fc5ce0
Show file tree
Hide file tree
Showing 307 changed files with 8,875 additions and 6,674 deletions.
5 changes: 1 addition & 4 deletions .evergreen/compass_package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,8 @@ if [[ "$OSTYPE" == "cygwin" ]]; then
net start MSIServer
fi

# Ensure .sbom is always created with fresh data
rm -rvf .sbom && mkdir -pv .sbom

echo "Creating signed release build..."
npm run package-compass $COMPASS_DISTRIBUTION;
npm run package-compass-nocompile $COMPASS_DISTRIBUTION
npm run generate-first-party-deps-json

ls -la packages/compass/dist
Expand Down
37 changes: 28 additions & 9 deletions .evergreen/functions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -410,19 +410,15 @@ functions:
DEBUG: ${debug}
npm_config_loglevel: ${npm_loglevel}
COMPASS_DISTRIBUTION: ${compass_distribution}
SIGNING_SERVER_HOSTNAME: ${SIGNING_SERVER_HOSTNAME}
SIGNING_SERVER_PRIVATE_KEY: ${SIGNING_SERVER_PRIVATE_KEY}
SIGNING_SERVER_PRIVATE_KEY_CYGPATH: ${SIGNING_SERVER_PRIVATE_KEY_CYGPATH}
SIGNING_SERVER_USERNAME: ${SIGNING_SERVER_USERNAME}
SIGNING_SERVER_PORT: ${SIGNING_SERVER_PORT}
GITHUB_PR_NUMBER: ${github_pr_number}
PAPERTRAIL_KEY_ID: ${papertrail_key_id}
PAPERTRAIL_SECRET_KEY: ${papertrail_secret_key}
script: |
set -e
# Ensure .sbom is always created with fresh data
rm -rvf .sbom && mkdir -pv .sbom
# Load environment variables
eval $(.evergreen/print-compass-env.sh)
.evergreen/compass_package.sh
cd packages/compass && npm run prepackage-compass
- command: shell.exec
params:
working_dir: src
Expand All @@ -443,6 +439,29 @@ functions:
set -e
.evergreen/create-sbom.sh
- command: shell.exec
params:
working_dir: src
shell: bash
env:
<<: *compass-env
DEBUG: ${debug}
npm_config_loglevel: ${npm_loglevel}
COMPASS_DISTRIBUTION: ${compass_distribution}
SIGNING_SERVER_HOSTNAME: ${SIGNING_SERVER_HOSTNAME}
SIGNING_SERVER_PRIVATE_KEY: ${SIGNING_SERVER_PRIVATE_KEY}
SIGNING_SERVER_PRIVATE_KEY_CYGPATH: ${SIGNING_SERVER_PRIVATE_KEY_CYGPATH}
SIGNING_SERVER_USERNAME: ${SIGNING_SERVER_USERNAME}
SIGNING_SERVER_PORT: ${SIGNING_SERVER_PORT}
GITHUB_PR_NUMBER: ${github_pr_number}
PAPERTRAIL_KEY_ID: ${papertrail_key_id}
PAPERTRAIL_SECRET_KEY: ${papertrail_secret_key}
COMPASS_WAS_COMPILED_AND_HAS_SBOM: '1'
script: |
set -e
# Load environment variables
eval $(.evergreen/print-compass-env.sh)
.evergreen/compass_package.sh
get_first_party_dependency_list:
- command: s3.get
Expand Down
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@

## Getting Started

You'll need node `^16` and npm `^8` installed on your machine to work with the repository locally.
You'll need node `^18` and npm `^10` installed on your machine to work with the repository locally.
After your environment is ready, navigate to the repository and run `npm run bootstrap`, this will install dependencies and will compile all packages.

After bootstrap is finished, you should be able to run `npm run start` and see Compass application running locally.
After bootstrap is finished, you should be able to run `npm run start` and see Compass application running locally. Alternatively you can start a web version of the app by running `npm run start-web`.

Compass uses a monorepo is powered by [`npm workspaces`](https://docs.npmjs.com/cli/v7/using-npm/workspaces) and [`lerna`](https://github.com/lerna/lerna#readme), although not necessary, it might be helpful to have a high level understanding of those tools.

Expand Down Expand Up @@ -80,7 +80,7 @@ DEBUG=hadron* npm run package-compass
To speed up the process you might want to disable creating installer for the application. To do that you can set `HADRON_SKIP_INSTALLER` environmental variable to `true` when running the script

```sh
HADRON_SKIP_INSTALLER=true npm run test-package-compass
HADRON_SKIP_INSTALLER=true npm run package-compass
```

### Publishing Packages
Expand Down
327 changes: 160 additions & 167 deletions THIRD-PARTY-NOTICES.md

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions configs/eslint-config-compass/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ const tsOverrides = {
const tsxRules = {
...common.tsxRules,
...extraTsRules,
'react-hooks/exhaustive-deps': [
'warn',
{
additionalHooks: 'useTrackOnChange',
},
],
};

const tsxOverrides = {
Expand Down
2 changes: 1 addition & 1 deletion configs/eslint-config-compass/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@mongodb-js/eslint-config-compass",
"version": "1.1.2",
"version": "1.1.3",
"description": "Shared Compass eslint configuration",
"license": "SSPL",
"main": "index.js",
Expand Down
9 changes: 5 additions & 4 deletions configs/webpack-config-compass/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"email": "[email protected]"
},
"homepage": "https://github.com/mongodb-js/compass",
"version": "1.3.11",
"version": "1.3.13",
"repository": {
"type": "git",
"url": "https://github.com/mongodb-js/compass.git"
Expand Down Expand Up @@ -45,7 +45,7 @@
"reformat": "npm run eslint . -- --fix && npm run prettier -- --write ."
},
"devDependencies": {
"@mongodb-js/eslint-config-compass": "^1.1.2",
"@mongodb-js/eslint-config-compass": "^1.1.3",
"@mongodb-js/prettier-config-compass": "^1.0.2",
"@mongodb-js/tsconfig-compass": "^1.0.4",
"@types/cli-progress": "^3.9.2",
Expand All @@ -69,13 +69,14 @@
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
"babel-loader": "^8.2.5",
"babel-plugin-istanbul": "^5.2.0",
"browserslist": "^4.23.1",
"browserslist": "^4.23.2",
"chalk": "^4.1.2",
"cli-progress": "^3.9.1",
"core-js": "^3.17.3",
"css-loader": "^4.3.0",
"electron": "^29.4.3",
"electron": "^29.4.5",
"html-webpack-plugin": "^5.3.2",
"less": "^3.13.1",
"less-loader": "^10.0.1",
"mini-css-extract-plugin": "^2.3.0",
"node-loader": "^2.0.0",
Expand Down
Loading

0 comments on commit 4fc5ce0

Please sign in to comment.