Skip to content

Commit 094794e

Browse files
committed
Merge remote-tracking branch 'origin/main' into 1.36-releases
2 parents 570bc9e + 59dc152 commit 094794e

File tree

88 files changed

+47885
-10553
lines changed

Some content is hidden

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

88 files changed

+47885
-10553
lines changed

.github/workflows/authors-and-third-party-notices.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
- name: Install Dependencies
3636
run: |
3737
npm -v
38-
npm ci
38+
npm run bootstrap-ci
3939
4040
- name: Update AUTHORS
4141
run: npm run update-authors

THIRD-PARTY-NOTICES.md

Lines changed: 45191 additions & 4543 deletions
Large diffs are not rendered by default.

configs/webpack-config-compass/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@
6969
"@pmmmwh/react-refresh-webpack-plugin": "^0.5.5",
7070
"babel-loader": "^8.2.5",
7171
"babel-plugin-istanbul": "^5.2.0",
72-
"browserslist": "^4.21.5",
72+
"browserslist": "^4.21.4",
7373
"chalk": "^4.1.2",
7474
"cli-progress": "^3.9.1",
7575
"core-js": "^3.17.3",
7676
"css-loader": "^4.3.0",
77-
"electron": "^22.3.3",
77+
"electron": "^22.0.2",
7878
"html-webpack-plugin": "^5.3.2",
7979
"less-loader": "^10.0.1",
8080
"mini-css-extract-plugin": "^2.3.0",

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

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,10 @@ import MiniCssExtractPlugin from 'mini-css-extract-plugin';
3333

3434
const sharedResolveOptions = (
3535
target: ConfigArgs['target']
36-
): Pick<ResolveOptions, 'mainFields' | 'exportsFields' | 'extensions'> => {
36+
): Pick<
37+
ResolveOptions,
38+
'mainFields' | 'exportsFields' | 'extensions' | 'alias'
39+
> => {
3740
if (typeof target === 'string') {
3841
target = [target];
3942
}
@@ -55,6 +58,11 @@ const sharedResolveOptions = (
5558
: ['compass:module', 'compass:main', 'module', 'main'],
5659
exportsFields: ['compass:exports', 'exports'],
5760
extensions: ['.jsx', '.tsx', '.ts', '...'],
61+
alias: {
62+
// Removes `browserslist` that is pulled in by `babel` and is unnecessary
63+
// as well as being a particularly large dependency.
64+
browserslist: false,
65+
},
5866
};
5967
};
6068

0 commit comments

Comments
 (0)