Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/faker-js/faker-9.0.3
Browse files Browse the repository at this point in the history
  • Loading branch information
ttran-Therisa authored Oct 1, 2024
2 parents dcdbce6 + af632cb commit ccd190e
Show file tree
Hide file tree
Showing 12 changed files with 79 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/gha-metrics-datadog.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
env_variable_name: GHA_CONTENT_BUILD_DATADOG_API_KEY

- name: Send GitHub Actions metrics to DataDog
uses: int128/datadog-actions-metrics@85755d0566a4b458f10acbaf68661eb1060cb2fe # v1.96.0
uses: int128/datadog-actions-metrics@b55864e8d4ccab2d30f33e9eabc6e02031894555 # v1.97.0
with:
datadog-api-key: ${{ env.GHA_CONTENT_BUILD_DATADOG_API_KEY }}
collect-job-metrics: true
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
2 changes: 1 addition & 1 deletion docker-run.sh
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/sh

ls -al envs
APP_ENV=$APP_ENV yarn build:preview && yarn start
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"@storybook/testing-library": "^0.2.2",
"@testing-library/dom": "^10.0.0",
"@testing-library/jest-dom": "^6.4.8",
"@testing-library/react": "^14.1.2",
"@testing-library/react": "^16.0.1",
"@testing-library/user-event": "^14.5.1",
"@types/jest": "^29.5.12",
"@types/lodash": "^4.17.7",
Expand All @@ -109,7 +109,7 @@
"@types/react-dom": "^18.2.18",
"@types/uuid": "^9.0.7",
"@typescript-eslint/eslint-plugin": "^7.16.1",
"@typescript-eslint/parser": "^8.2.0",
"@typescript-eslint/parser": "^8.7.0",
"axe-core": "^4.10.0",
"debug": "^4.3.4",
"eslint": "8.57.0",
Expand Down
8 changes: 6 additions & 2 deletions packages/env-loader/src/env-file.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,21 @@ import { EnvVars } from '.'

const loadEnvVarsFromPath = (path: string): EnvVars => {
const envVars = {}
// eslint-disable-next-line no-console
console.log(`trying to load vars from ${path}`)
dotenvExpand.expand(
dotenv.config({
path,
path: path,
override: true,
processEnv: envVars,
debug: true,
})
)

// eslint-disable-next-line no-console
console.log(`Using environment variables from: ${path}`)

// eslint-disable-next-line no-console
console.log(envVars)
return envVars
}

Expand Down
86 changes: 69 additions & 17 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4293,17 +4293,23 @@ __metadata:
languageName: node
linkType: hard

"@testing-library/react@npm:^14.1.2":
version: 14.3.1
resolution: "@testing-library/react@npm:14.3.1"
"@testing-library/react@npm:^16.0.1":
version: 16.0.1
resolution: "@testing-library/react@npm:16.0.1"
dependencies:
"@babel/runtime": ^7.12.5
"@testing-library/dom": ^9.0.0
"@types/react-dom": ^18.0.0
peerDependencies:
"@testing-library/dom": ^10.0.0
"@types/react": ^18.0.0
"@types/react-dom": ^18.0.0
react: ^18.0.0
react-dom: ^18.0.0
checksum: b057d4c9db5a523acfc24d7bc4665a924ab8d6f252c7f51eecf7dd30f1239413e1134925fd5cc9cbdef80496af64c04e6719b2081f89fe05ba87e8c6305bcc16
peerDependenciesMeta:
"@types/react":
optional: true
"@types/react-dom":
optional: true
checksum: 1837db473ea018cf2b5d0cbfffb7a30d0d759e5a7f23aad431441c77bcc3d2533250cd003a61878fd908267df47404cedcb5914f12d79e413002c659652b37fd
languageName: node
linkType: hard

Expand Down Expand Up @@ -4712,7 +4718,7 @@ __metadata:
languageName: node
linkType: hard

"@types/react-dom@npm:^18.0.0, @types/react-dom@npm:^18.2.18":
"@types/react-dom@npm:^18.2.18":
version: 18.3.0
resolution: "@types/react-dom@npm:18.3.0"
dependencies:
Expand Down Expand Up @@ -4940,21 +4946,21 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/parser@npm:^8.2.0":
version: 8.5.0
resolution: "@typescript-eslint/parser@npm:8.5.0"
"@typescript-eslint/parser@npm:^8.7.0":
version: 8.7.0
resolution: "@typescript-eslint/parser@npm:8.7.0"
dependencies:
"@typescript-eslint/scope-manager": 8.5.0
"@typescript-eslint/types": 8.5.0
"@typescript-eslint/typescript-estree": 8.5.0
"@typescript-eslint/visitor-keys": 8.5.0
"@typescript-eslint/scope-manager": 8.7.0
"@typescript-eslint/types": 8.7.0
"@typescript-eslint/typescript-estree": 8.7.0
"@typescript-eslint/visitor-keys": 8.7.0
debug: ^4.3.4
peerDependencies:
eslint: ^8.57.0 || ^9.0.0
peerDependenciesMeta:
typescript:
optional: true
checksum: e53f0a05d8167673d8c9ce7ca22fbd673bb4910e69a96a084cf1dac22555e04d00774533de5bdb3a6bf72f8706fa5f414ee5b398646b6651ba0fd2e875ba3c8a
checksum: fdfd7cf67662fd03442ae7e14f461ee7da14a5d27e692535167f50dfc965f9249692a6b004ac1f16d9d932364ccb8ce2c123a254d4d380d9ccd649205694d875
languageName: node
linkType: hard

Expand Down Expand Up @@ -5008,6 +5014,16 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/scope-manager@npm:8.7.0":
version: 8.7.0
resolution: "@typescript-eslint/scope-manager@npm:8.7.0"
dependencies:
"@typescript-eslint/types": 8.7.0
"@typescript-eslint/visitor-keys": 8.7.0
checksum: 30ef3bf4fa9c6c614cda7a2765e5163b8e07dc80619ffd70882d7d4db957b939167ef6efd418db993bad9435517e826ce86fae2329dd8202b262a712f7bc724e
languageName: node
linkType: hard

"@typescript-eslint/type-utils@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/type-utils@npm:7.18.0"
Expand Down Expand Up @@ -5077,6 +5093,13 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/types@npm:8.7.0":
version: 8.7.0
resolution: "@typescript-eslint/types@npm:8.7.0"
checksum: 4f1a625c1460649fc21a330fc9dde81d47a20b46bca3de60d50653a1d6c082bd419af1c7c7dde6be800416116f3d63734f9faa6629bdd9f3a8e6bba3a92a4e82
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:5.62.0":
version: 5.62.0
resolution: "@typescript-eslint/typescript-estree@npm:5.62.0"
Expand Down Expand Up @@ -5171,6 +5194,25 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/typescript-estree@npm:8.7.0":
version: 8.7.0
resolution: "@typescript-eslint/typescript-estree@npm:8.7.0"
dependencies:
"@typescript-eslint/types": 8.7.0
"@typescript-eslint/visitor-keys": 8.7.0
debug: ^4.3.4
fast-glob: ^3.3.2
is-glob: ^4.0.3
minimatch: ^9.0.4
semver: ^7.6.0
ts-api-utils: ^1.3.0
peerDependenciesMeta:
typescript:
optional: true
checksum: f1a2d53640bb47a293ef6fa2102e2d9a53f52e3c88682d65fd17133ae90cae327aeacdc582a8a23e576a48b104151021b50b4e4f8fe4c14d1fec49d52a823bd1
languageName: node
linkType: hard

"@typescript-eslint/utils@npm:7.18.0":
version: 7.18.0
resolution: "@typescript-eslint/utils@npm:7.18.0"
Expand Down Expand Up @@ -5284,6 +5326,16 @@ __metadata:
languageName: node
linkType: hard

"@typescript-eslint/visitor-keys@npm:8.7.0":
version: 8.7.0
resolution: "@typescript-eslint/visitor-keys@npm:8.7.0"
dependencies:
"@typescript-eslint/types": 8.7.0
eslint-visitor-keys: ^3.4.3
checksum: 072d3d4e7ff8da51a0a37d057d6ca0895c163d480e77329de50e2a7a057acc8d6552f7d18f1fd87cb326d709fe4b667b2ed5cb968d307f92a3e12825cf65b9cd
languageName: node
linkType: hard

"@ungap/structured-clone@npm:^1.0.0, @ungap/structured-clone@npm:^1.2.0":
version: 1.2.0
resolution: "@ungap/structured-clone@npm:1.2.0"
Expand Down Expand Up @@ -13577,7 +13629,7 @@ __metadata:
"@storybook/testing-library": ^0.2.2
"@testing-library/dom": ^10.0.0
"@testing-library/jest-dom": ^6.4.8
"@testing-library/react": ^14.1.2
"@testing-library/react": ^16.0.1
"@testing-library/user-event": ^14.5.1
"@types/jest": ^29.5.12
"@types/lodash": ^4.17.7
Expand All @@ -13587,7 +13639,7 @@ __metadata:
"@types/react-gtm-module": ^2.0.3
"@types/uuid": ^9.0.7
"@typescript-eslint/eslint-plugin": ^7.16.1
"@typescript-eslint/parser": ^8.2.0
"@typescript-eslint/parser": ^8.7.0
axe-core: ^4.10.0
axios: ^1.6.3
chalk: ^5.3.0
Expand Down

0 comments on commit ccd190e

Please sign in to comment.