V6 -> develop #1694
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| 127525 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 22 | ||
jmgasper marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,49 @@ | ||
| #!/bin/bash | ||
| set -eo pipefail | ||
|
|
||
| APP_NAME=$1 | ||
| LOCK_FILE_LOCAL="" | ||
| LOCK_FILE_NAME="" | ||
| UPDATE_CACHE=0 | ||
|
|
||
| echo "NODE ENV: $NODE_ENV" | ||
| echo "BABEL ENV: $BABEL_ENV" | ||
|
|
||
| # Build the container image | ||
| docker compose -f docker/docker-compose.yml build \ | ||
| --build-arg NODE_ENV=$NODE_ENV \ | ||
| --build-arg BABEL_ENV=$BABEL_ENV \ | ||
| --build-arg FILE_PICKER_API_KEY=$FILE_PICKER_API_KEY \ | ||
| --build-arg FORCE_DEV=$FORCE_DEV \ | ||
| $APP_NAME | ||
|
|
||
| # Create a throwaway container for copying artifacts | ||
| docker create --name app $APP_NAME:latest >/dev/null | ||
|
|
||
| # Determine which lockfile to compare (pnpm preferred, fallback to npm) | ||
| if [ -f pnpm-lock.yaml ]; then | ||
| LOCK_FILE_NAME="pnpm-lock.yaml" | ||
| elif [ -f package-lock.json ]; then | ||
| LOCK_FILE_NAME="package-lock.json" | ||
| fi | ||
|
|
||
| if [ -z "$LOCK_FILE_NAME" ] || [ ! -d node_modules ]; then | ||
| UPDATE_CACHE=1 | ||
| else | ||
| # Compare lockfile from container with local copy | ||
| cp "$LOCK_FILE_NAME" ".old-$LOCK_FILE_NAME" | ||
| docker cp "app:/$APP_NAME/$LOCK_FILE_NAME" "$LOCK_FILE_NAME" | ||
|
There was a problem hiding this comment. [ |
||
| set +e | ||
| cmp "$LOCK_FILE_NAME" ".old-$LOCK_FILE_NAME" >/dev/null 2>&1 | ||
| CMP_STATUS=$? | ||
| set -e | ||
| if [ $CMP_STATUS -ne 0 ]; then | ||
| UPDATE_CACHE=1 | ||
| fi | ||
| fi | ||
|
|
||
| if [ "$UPDATE_CACHE" -eq 1 ]; then | ||
| echo "Lockfile changed or node_modules missing; refreshing local node_modules from container..." | ||
| rm -rf node_modules | ||
|
There was a problem hiding this comment. [ |
||
| docker cp "app:/$APP_NAME/node_modules" . | ||
| fi | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,18 @@ | ||
| module.exports = (() => { | ||
| let env = process.env.NODE_ENV || 'development' | ||
| if (process.env.FORCE_DEV) env = 'development' | ||
|
|
||
| // Only allow specific files to be required for security reasons | ||
| if (env === 'production') { | ||
| return require('./production') | ||
| } | ||
|
|
||
| // Support explicit local environment (mirrors platform-ui local setup) | ||
| const hostEnv = process.env.HOST_ENV | ||
|
There was a problem hiding this comment. [ |
||
| if (env === 'local' || hostEnv === 'local') { | ||
| return require('./local') | ||
| } | ||
|
|
||
| // Default to development | ||
| return require('./development') | ||
| })() | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.