Skip to content

Commit 24973cf

Browse files
committed
Merge remote-tracking branch 'origin/main' into 1.34-releases
2 parents a992387 + 823f55a commit 24973cf

File tree

226 files changed

+4515
-5598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+4515
-5598
lines changed

.evergreen/buildvariants.in.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ buildvariants:
1010
run_on: ubuntu1604-large
1111
tasks:
1212
- name: publish
13+
- name: publish-packages-next
1314

1415
- name: ubuntu_connectivity_tests
1516
display_name: Connectivity Tests

.evergreen/buildvariants.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ buildvariants:
1010
run_on: ubuntu1604-large
1111
tasks:
1212
- name: publish
13+
- name: publish-packages-next
1314

1415
- name: ubuntu_connectivity_tests
1516
display_name: Connectivity Tests

.evergreen/functions.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -501,3 +501,25 @@ functions:
501501
params:
502502
files:
503503
- tasks.json
504+
505+
publish-packages-next:
506+
- command: shell.exec
507+
params:
508+
working_dir: src
509+
shell: bash
510+
env:
511+
<<: *compass-env
512+
NPM_TOKEN: ${devtoolsbot_npm_token}
513+
script: |
514+
# Skip package publish for nightly builds
515+
if [[ "${requester}" != "ad_hoc" ]]; then
516+
set -e
517+
# Load environment variables
518+
eval $(.evergreen/print-compass-env.sh)
519+
echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> .npmrc
520+
npm config list
521+
echo "Publishing packages as $(npm whoami)"
522+
git update-index --assume-unchanged .npmrc
523+
npm run publish-packages-next
524+
fi
525+

.evergreen/tasks.in.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,17 @@ tasks:
180180
scope: mongodb-compass
181181
- func: get-all-artifacts
182182
- func: publish
183+
184+
- name: publish-packages-next
185+
tags: []
186+
depends_on:
187+
- name: '.required-for-publish'
188+
variant: '*'
189+
commands:
190+
- func: prepare
191+
- func: install
192+
- func: bootstrap
193+
- func: publish-packages-next
183194

184195
# copied as test-packaged-app-macos due to depends_on variation
185196
<% for (const task of testPackagedAppVariations) { %>

.evergreen/tasks.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,17 @@ tasks:
180180
scope: mongodb-compass
181181
- func: get-all-artifacts
182182
- func: publish
183+
184+
- name: publish-packages-next
185+
tags: []
186+
depends_on:
187+
- name: '.required-for-publish'
188+
variant: '*'
189+
commands:
190+
- func: prepare
191+
- func: install
192+
- func: bootstrap
193+
- func: publish-packages-next
183194

184195
# copied as test-packaged-app-macos due to depends_on variation
185196

.github/workflows/publish-packages.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ jobs:
4848
env:
4949
NPM_TOKEN: ${{ secrets.DEVTOOLSBOT_NPM_TOKEN }}
5050
run: |
51-
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" > .npmrc
51+
echo "//registry.npmjs.org/:_authToken=${NPM_TOKEN}" >> .npmrc
52+
npm config list
53+
echo "Publishing packages as $(npm whoami)"
5254
git update-index --assume-unchanged .npmrc
5355
npm run publish-packages
5456

CONTRIBUTING.md

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
# Contributing
22

3-
## Workflow
3+
4+
## Getting Started
5+
6+
You'll need node `^16` and npm `^8` installed on your machine to work with the repository locally.
7+
After your environment is ready, navigate to the repository and run `npm run bootstrap`, this will install dependencies and will compile all packages.
8+
9+
After bootstrap is finished, you should be able to run `npm run start` and see Compass application running locally.
10+
11+
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.
12+
13+
## Submitting a Change
414

515
MongoDB welcomes community contributions! If you’re interested in making a contribution to MongoDB Compass, please follow the steps below before you start writing any code:
616

@@ -25,14 +35,6 @@ This repository includes a few recommended plugins for your convenience:
2535
- ESLint extension highlights possible issues in your code following our common eslint configuration.
2636
- ANTLR4 grammar support extension helps to work with the `bson-transpilers` package that is implemented with the help of antlr (.g and .g4 files).
2737

28-
## Working With the Monorepo
29-
30-
You'll need node `^16` and npm `^8` 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.
31-
32-
After bootstrap is finished, you should be able to run `npm run start` and see Compass application running locally.
33-
34-
This 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.
35-
3638
### Working on Plugins
3739

3840
Most of the plugins have their own development environment so you can work on them in isolation. If you want to work on a plugin without running the whole Compass application, you can run `npm run start` in the plugin directory (such as at the top of the `compass/packages/compass-aggregations` directory), either with the help of `lerna` or `npm workspaces`. For example, to start `compass-aggregations` plugin locally, you can either run `npm run start --workspace @mongodb-js/compass-aggregations` from the top of `compass` directory, run `npx lerna run start --scope @mongodb-js/compass-aggregations --stream` from anywhere in the `compass` directory, or run `npm run start` from the top of the `compass/packages/compass-aggregations` directory. Same approaches will work for any other workspace-specific script. If you want to run commands like `test` or `check` only for one specific workspace in the repository, you can use any of the methods described above. As an example, to run all tests in one plugin that you are working on such as the `compass-aggregations` plugin, you can run `npm run test` from the top of the `compass/packages/compass-aggregations` directory.

README.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@ This repository contains the source code and build tooling used in [MongoDB Comp
44

55
![Aggregation Pipeline Builder Tab in Compass](packages/compass/compass-screenshot.png)
66

7+
## Contributing
8+
9+
For contributing, please refer to [CONTRIBUTING.md](CONTRIBUTING.md)
10+
11+
For issues, please create a ticket in our [JIRA Project](https://jira.mongodb.org/browse/COMPASS).
12+
13+
Is there anything else you’d like to see in Compass? Let us know by submitting suggestions in out [feedback forum](https://feedback.mongodb.com/forums/924283-compass).
14+
715
## Packages Overview
816

917
- [**mongodb-compass**](packages/compass): MongoDB Compass Application
@@ -79,14 +87,6 @@ This repository contains the source code and build tooling used in [MongoDB Comp
7987
- [**@mongodb-js/prettier-config-compass**](configs/prettier-config-compass): Shared prettier configurations used in Compass packages.
8088
- [**@mongodb-js/tsconfig-compass**](configs/tsconfig-compass): Shared basic TypeScript configurations used in Compass packages.
8189

82-
## Contributing
83-
84-
For contributing, please refer to [CONTRIBUTING.md](CONTRIBUTING.md)
85-
86-
For issues, please create a ticket in our [JIRA Project](https://jira.mongodb.org/browse/COMPASS).
87-
88-
Is there anything else you’d like to see in Compass? Let us know by submitting suggestions in out [feedback forum](https://feedback.mongodb.com/forums/924283-compass).
89-
9090
## License
9191

9292
[SSPL](LICENSE)

THIRD-PARTY-NOTICES.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
The following third-party software is used by and included in **compass**.
2-
This document was automatically generated on Wed Sep 21 2022.
2+
This document was automatically generated on Wed Oct 05 2022.
33

44
## List of dependencies
55

configs/webpack-config-compass/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"email": "[email protected]"
1414
},
1515
"homepage": "https://github.com/mongodb-js/compass",
16-
"version": "1.0.1",
16+
"version": "1.0.2",
1717
"repository": {
1818
"type": "git",
1919
"url": "https://github.com/mongodb-js/compass.git"

0 commit comments

Comments
 (0)