Skip to content

Commit c9b0be8

Browse files
Merge remote-tracking branch 'origin/main' into beta-releases
2 parents 0d89d9f + 9f98ac8 commit c9b0be8

File tree

194 files changed

+5310
-3370
lines changed

Some content is hidden

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

194 files changed

+5310
-3370
lines changed

.evergreen/compass_package.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,8 @@ if [[ "$OSTYPE" == "cygwin" ]]; then
77
net start MSIServer
88
fi
99

10-
# Ensure .sbom is always created with fresh data
11-
rm -rvf .sbom && mkdir -pv .sbom
12-
1310
echo "Creating signed release build..."
14-
npm run package-compass $COMPASS_DISTRIBUTION;
11+
npm run package-compass-nocompile $COMPASS_DISTRIBUTION
1512
npm run generate-first-party-deps-json
1613

1714
ls -la packages/compass/dist

.evergreen/functions.yml

Lines changed: 28 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -410,19 +410,15 @@ functions:
410410
DEBUG: ${debug}
411411
npm_config_loglevel: ${npm_loglevel}
412412
COMPASS_DISTRIBUTION: ${compass_distribution}
413-
SIGNING_SERVER_HOSTNAME: ${SIGNING_SERVER_HOSTNAME}
414-
SIGNING_SERVER_PRIVATE_KEY: ${SIGNING_SERVER_PRIVATE_KEY}
415-
SIGNING_SERVER_PRIVATE_KEY_CYGPATH: ${SIGNING_SERVER_PRIVATE_KEY_CYGPATH}
416-
SIGNING_SERVER_USERNAME: ${SIGNING_SERVER_USERNAME}
417-
SIGNING_SERVER_PORT: ${SIGNING_SERVER_PORT}
418-
GITHUB_PR_NUMBER: ${github_pr_number}
419-
PAPERTRAIL_KEY_ID: ${papertrail_key_id}
420-
PAPERTRAIL_SECRET_KEY: ${papertrail_secret_key}
421413
script: |
422414
set -e
415+
416+
# Ensure .sbom is always created with fresh data
417+
rm -rvf .sbom && mkdir -pv .sbom
418+
423419
# Load environment variables
424420
eval $(.evergreen/print-compass-env.sh)
425-
.evergreen/compass_package.sh
421+
cd packages/compass && npm run prepackage-compass
426422
- command: shell.exec
427423
params:
428424
working_dir: src
@@ -443,6 +439,29 @@ functions:
443439
set -e
444440
445441
.evergreen/create-sbom.sh
442+
- command: shell.exec
443+
params:
444+
working_dir: src
445+
shell: bash
446+
env:
447+
<<: *compass-env
448+
DEBUG: ${debug}
449+
npm_config_loglevel: ${npm_loglevel}
450+
COMPASS_DISTRIBUTION: ${compass_distribution}
451+
SIGNING_SERVER_HOSTNAME: ${SIGNING_SERVER_HOSTNAME}
452+
SIGNING_SERVER_PRIVATE_KEY: ${SIGNING_SERVER_PRIVATE_KEY}
453+
SIGNING_SERVER_PRIVATE_KEY_CYGPATH: ${SIGNING_SERVER_PRIVATE_KEY_CYGPATH}
454+
SIGNING_SERVER_USERNAME: ${SIGNING_SERVER_USERNAME}
455+
SIGNING_SERVER_PORT: ${SIGNING_SERVER_PORT}
456+
GITHUB_PR_NUMBER: ${github_pr_number}
457+
PAPERTRAIL_KEY_ID: ${papertrail_key_id}
458+
PAPERTRAIL_SECRET_KEY: ${papertrail_secret_key}
459+
COMPASS_WAS_COMPILED_AND_HAS_SBOM: '1'
460+
script: |
461+
set -e
462+
# Load environment variables
463+
eval $(.evergreen/print-compass-env.sh)
464+
.evergreen/compass_package.sh
446465
447466
get_first_party_dependency_list:
448467
- command: s3.get

THIRD-PARTY-NOTICES.md

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

configs/eslint-config-compass/index.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ const tsOverrides = {
3030
const tsxRules = {
3131
...common.tsxRules,
3232
...extraTsRules,
33+
'react-hooks/exhaustive-deps': [
34+
'warn',
35+
{
36+
additionalHooks: 'useTrackOnChange',
37+
},
38+
],
3339
};
3440

3541
const tsxOverrides = {

configs/webpack-config-compass/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
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.23.1",
72+
"browserslist": "^4.23.2",
7373
"chalk": "^4.1.2",
7474
"cli-progress": "^3.9.1",
7575
"core-js": "^3.17.3",

0 commit comments

Comments
 (0)