Skip to content

Commit a1c2e17

Browse files
committed
Merge remote-tracking branch 'origin/main' into 1.34-releases
2 parents 5a1b137 + a83dab4 commit a1c2e17

File tree

340 files changed

+2969
-5655
lines changed

Some content is hidden

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

340 files changed

+2969
-5655
lines changed

.evergreen/functions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,8 @@ functions:
511511
<<: *compass-env
512512
NPM_TOKEN: ${devtoolsbot_npm_token}
513513
script: |
514-
# Skip package publish for nightly builds
515-
if [[ "${requester}" != "ad_hoc" ]]; then
514+
# Only package publish for commits on the main evergreen project.
515+
if [[ "${requester}" == "commit" ]] && [[ "${project}" == "10gen-compass-main" ]]; then
516516
set -e
517517
# Load environment variables
518518
eval $(.evergreen/print-compass-env.sh)

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 Oct 05 2022.
2+
This document was automatically generated on Mon Oct 10 2022.
33

44
## List of dependencies
55

package-lock.json

Lines changed: 2 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/ace-mode/README.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ npm install --save mongodb-ace-mode
2020

2121
Why? Mental model of operators to functions. (e.g. `$avg: 'a'`, `avg(a)`)
2222

23-
Given:
23+
Given:
2424

2525
```
2626
max_cpi: {$max: "$trends.icecream_cpi"}
@@ -46,7 +46,7 @@ max_cpi: {$max: "$trends.icecream_cpi"}
4646

4747
Why? Nothing worse than off by one typos... So now really easy to catch because `"field"` and `"$field"` will be styled differently.
4848

49-
Given:
49+
Given:
5050

5151
```
5252
type: "$type"
@@ -55,7 +55,7 @@ type: "$type"
5555
```html
5656
<div class="ace_line" style="height:15px">
5757
<span class="ace_identifier">type</span>
58-
<span class="ace_punctuation ace_operator">:</span>
58+
<span class="ace_punctuation ace_operator">:</span>
5959
<span class="ace_string ace_quasi ace_start">"</span>
6060
<span class="ace_variable ace_parameter">$type</span>
6161
<span class="ace_punctuation ace_operator">"</span>
@@ -76,12 +76,12 @@ ace_other">$$localType</span>
7676

7777
```javascript
7878
/**
79-
* Gathering stats when items are in an array using
79+
* Gathering stats when items are in an array using
8080
* $project accumulators.
8181
*/
8282

8383
/**
84-
* 1. Default JS highlighter
84+
* 1. Default JS highlighter
8585
*/
8686
db.icecream_data.aggregate([
8787
{
@@ -114,7 +114,7 @@ db.icecream_data.aggregate([{
114114
}]);
115115

116116
/**
117-
* 3. What if `$` operators same as 2 but with
117+
* 3. What if `$` operators same as 2 but with
118118
* "magic" template strings?
119119
*/
120120
db.icecream_data.aggregate([{
@@ -139,7 +139,7 @@ There are 3 different ways I was thinking about this to get as close to what a d
139139

140140
[The Best Visual Studio Code Dark and Light Themes (Updated Feb 2019)](https://medium.com/@chibicode/the-best-visual-studio-code-dark-and-light-themes-july-2018-edition-a9c2cc9548da)
141141

142-
[OneDark Pro](https://github.com/Binaryify/OneDark-Pro) Most installed by a giant margin
142+
[OneDark Pro](https://github.com/Binaryify/OneDark-Pro) Most installed by a giant margin
143143

144144
Pertsonal preference: [Monokai](https://marketplace.visualstudio.com/items?itemName=gerane.Theme-Monokai) Used for more than a decade as Editor of choice has changed (TextMate :arrow_right: SublimeText :arrow_right: Atom :arrow_right: VSCode)
145145

@@ -150,7 +150,7 @@ Pertsonal preference: [Monokai](https://marketplace.visualstudio.com/items?itemN
150150
- https://ace.c9.io/build/kitchen-sink.html
151151
- https://github.com/ajaxorg/ace/wiki/Creating-or-Extending-an-Edit-Mode
152152

153-
### Basic
153+
### Basic
154154

155155
Given:
156156

@@ -164,14 +164,14 @@ Want to highlight:
164164
- `$avg`
165165
- `"` around `$trends.icecream_cpi` separated
166166

167-
See
167+
See
168168

169169
HTML we want looks something like:
170170

171171
```html
172-
<div class="ace_line" style="height: 16px; top: 32px;">
172+
<div class="ace_line" style="height: 16px; top: 32px;">
173173
<span class="ace_identifier">average_cpi</span>
174-
<span class="ace_punctuation ace_operator">:</span>
174+
<span class="ace_punctuation ace_operator">:</span>
175175
<span class="ace_paren ace_lparen">{</span>
176176
<span class="ace_identifier ace_support ace_function">$avg</span>
177177
<span class="ace_punctuation ace_operator">:</span>
@@ -184,7 +184,7 @@ HTML we want looks something like:
184184

185185
`$avg` Agg Operator:
186186
- ace_support.ace_function
187-
- ace_keyword.ace_operator
187+
- ace_keyword.ace_operator
188188
- ace_function
189189

190190
$trends.icecream_cpi Field:
@@ -287,9 +287,9 @@ color: #999999;
287287
border: 1px solid #eee;
288288
padding: 10px;
289289
//background: #f5f6f7;
290-
color: #000;
290+
color: #000000;
291291
font-family: Monaco;
292-
292+
293293
}
294294
.ace-mongodb .ace_keyword {
295295
color: #999999;

packages/compass-aggregations/package.json

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@
5656
"@testing-library/react": "^12.1.4",
5757
"@testing-library/user-event": "^13.5.0",
5858
"@types/decomment": "^0.9.2",
59-
"@types/lodash.debounce": "^4.0.7",
60-
"@types/lodash.isempty": "^4.4.6",
6159
"@types/semver": "^7.3.9",
6260
"acorn-loose": "^8.0.2",
6361
"astring": "^1.7.0",
@@ -71,7 +69,6 @@
7169
"eslint": "^7.25.0",
7270
"hadron-app-registry": "^9.0.1",
7371
"is-electron-renderer": "^2.0.1",
74-
"lodash.debounce": "^4.0.8",
7572
"lodash.isempty": "^4.4.0",
7673
"lodash.isstring": "^4.0.1",
7774
"mocha": "^8.4.0",

packages/compass-aggregations/src/components/add-stage/add-stage.module.less

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
justify-content: center;
1212
position: relative;
1313
margin: 0px 16px 0px;
14-
border: 1px solid @gray6;
14+
border: 1px solid @palette__gray--light-2;
1515
border-radius: 4px;
16-
box-shadow: 1px 1px 1px @gray6;
17-
background: @pw;
16+
box-shadow: 1px 1px 1px @palette__gray--light-2;
17+
background: @palette__white;
1818
width: 384px;
1919

2020
button {

0 commit comments

Comments
 (0)