Skip to content

Commit c1f4699

Browse files
committed
Merge branch 'main' into 1.29-releases
2 parents 824d13f + e51701d commit c1f4699

File tree

264 files changed

+11244
-19637
lines changed

Some content is hidden

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

264 files changed

+11244
-19637
lines changed

THIRD-PARTY-NOTICES.md

Lines changed: 1531 additions & 9534 deletions
Large diffs are not rendered by default.

configs/eslint-config-compass/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ const tsRules = {
1414

1515
const reactConfigurations = [
1616
'plugin:react/recommended',
17+
'plugin:react-hooks/recommended',
1718
'plugin:jsx-a11y/recommended',
1819
];
1920

configs/eslint-config-compass/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"@typescript-eslint/eslint-plugin": "^4.28.4",
2121
"@typescript-eslint/parser": "^4.28.4",
2222
"eslint-config-prettier": "^8.3.0",
23+
"eslint-plugin-react-hooks": "^4.2.0",
2324
"eslint-plugin-jsx-a11y": "^6.4.1",
2425
"eslint-plugin-mocha": "^8.0.0",
2526
"eslint-plugin-react": "^7.24.0"

configs/webpack-config-compass/src/index.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -281,15 +281,19 @@ export function compassPluginConfig(
281281
];
282282
}
283283

284+
const entry = fs.existsSync(path.join(opts.cwd, 'src', 'index.ts'))
285+
? path.join(opts.cwd, 'src', 'index.ts')
286+
: path.join(opts.cwd, 'src', 'index.js');
287+
284288
return [
285289
createElectronRendererConfig({
286290
...opts,
287-
entry: path.join(opts.cwd, 'src', 'index.js'),
291+
entry,
288292
outputFilename: 'index.js',
289293
}),
290294
createWebConfig({
291295
...opts,
292-
entry: path.join(opts.cwd, 'src', 'index.js'),
296+
entry,
293297
outputFilename: 'browser.js',
294298
}),
295299
];

package-lock.json

Lines changed: 3647 additions & 4729 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1 @@
1-
ignores: [
2-
"lodash.result",
3-
"electron"
4-
]
1+
ignores: ['@mongodb-js/prettier-config-compass']

packages/collection-model/.eslintrc

Lines changed: 0 additions & 9 deletions
This file was deleted.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
module.exports = {
2+
root: true,
3+
extends: ['@mongodb-js/eslint-config-compass']
4+
};
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"@mongodb-js/prettier-config-compass"

packages/collection-model/index.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
var ExtendedCollectionModel = require('./lib/extended-model');
2-
var ExtendedCollectionModelCollection = require('./lib/extended-model').Collection;
1+
var ExtendedCollectionModel = require('./lib/model');
2+
var ExtendedCollectionModelCollection = require('./lib/model').Collection;
33

44
module.exports = ExtendedCollectionModel;
55
module.exports.Collection = ExtendedCollectionModelCollection;

0 commit comments

Comments
 (0)