kevin/baron-sso
1
0
Fork 0
forked from baron/baron-sso
Code Pull Requests Activity

Merge pull request 'bugfix/org' (#893) from bugfix/org into dev

Browse Source 
Reviewed-on: baron/baron-sso#893
This commit is contained in:
조찬영
2026-05-27 13:12:07 +09:00
parent 0e7ab2a22f dda1df9c48
commit 899365de9d
9 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -263,7 +263,7 @@ code-check-userfront-lint:
code-check-front-lint: code-check-front-lint:
@echo "==> adminfront biome lint/format check" @echo "==> adminfront biome lint/format check"
rm -rf adminfront/playwright-report adminfront/test-results rm -rf adminfront/playwright-report adminfront/test-results
cd adminfront && pnpm install --frozen-lockfile --ignore-scripts cd adminfront && CI=true pnpm install --frozen-lockfile --ignore-scripts
cd adminfront && npx biome check . --formatter-enabled=false --organize-imports-enabled=false cd adminfront && npx biome check . --formatter-enabled=false --organize-imports-enabled=false
cd adminfront && npx biome check . --linter-enabled=false --organize-imports-enabled=false cd adminfront && npx biome check . --linter-enabled=false --organize-imports-enabled=false
@echo "==> devfront biome lint/format check" @echo "==> devfront biome lint/format check"

3
adminfront/Dockerfile
View File

@@ -2,6 +2,9 @@ FROM node:lts
WORKDIR /workspace WORKDIR /workspace
# Set CI environment variable to true to avoid TTY issues with pnpm
ENV CI=true
# Install pnpm # Install pnpm
RUN npm install -g pnpm RUN npm install -g pnpm

2
adminfront/scripts/runtime-mode.sh
View File

@@ -106,7 +106,7 @@ ensure_frontend_dependencies() {
return 0 return 0
fi fi
if [ "$WORKSPACE_DIR" = "/workspace/common" ]; then if [ "$WORKSPACE_DIR" = "/workspace/common" ]; then
(cd /workspace/common && pnpm install --filter "${APP_WORKSPACE_FILTER}..." --frozen-lockfile --ignore-scripts) (cd /workspace/common && CI=true pnpm install --filter "${APP_WORKSPACE_FILTER}..." --no-frozen-lockfile --ignore-scripts)
else else
npm ci npm ci
fi fi

3
common/pnpm-lock.yaml generated
View File

@@ -423,6 +423,9 @@ importers:
autoprefixer: autoprefixer:
specifier: ^10.5.0 specifier: ^10.5.0
version: 10.5.0(postcss@8.5.14) version: 10.5.0(postcss@8.5.14)
jsdom:
specifier: ^28.1.0
version: 28.1.0
postcss: postcss:
specifier: ^8.5.14 specifier: ^8.5.14
version: 8.5.14 version: 8.5.14

3
devfront/Dockerfile
View File

@@ -2,6 +2,9 @@ FROM node:lts
WORKDIR /workspace WORKDIR /workspace
# Set CI environment variable to true to avoid TTY issues with pnpm
ENV CI=true
# Install pnpm # Install pnpm
RUN npm install -g pnpm RUN npm install -g pnpm

2
devfront/scripts/runtime-mode.sh
View File

@@ -106,7 +106,7 @@ ensure_frontend_dependencies() {
return 0 return 0
fi fi
if [ "$WORKSPACE_DIR" = "/workspace/common" ]; then if [ "$WORKSPACE_DIR" = "/workspace/common" ]; then
(cd /workspace/common && pnpm install --filter "${APP_WORKSPACE_FILTER}..." --frozen-lockfile --ignore-scripts) (cd /workspace/common && CI=true pnpm install --filter "${APP_WORKSPACE_FILTER}..." --no-frozen-lockfile --ignore-scripts)
else else
npm ci npm ci
fi fi

3
orgfront/Dockerfile
View File

@@ -2,6 +2,9 @@ FROM node:lts
WORKDIR /workspace WORKDIR /workspace
# Set CI environment variable to true to avoid TTY issues with pnpm
ENV CI=true
# Install pnpm # Install pnpm
RUN npm install -g pnpm RUN npm install -g pnpm

2
orgfront/scripts/runtime-mode.sh
View File

@@ -106,7 +106,7 @@ ensure_frontend_dependencies() {
return 0 return 0
fi fi
if [ "$WORKSPACE_DIR" = "/workspace/common" ]; then if [ "$WORKSPACE_DIR" = "/workspace/common" ]; then
(cd /workspace/common && pnpm install --filter "${APP_WORKSPACE_FILTER}..." --frozen-lockfile --ignore-scripts) (cd /workspace/common && CI=true pnpm install --filter "${APP_WORKSPACE_FILTER}..." --no-frozen-lockfile --ignore-scripts)
else else
npm ci npm ci
fi fi

2
scripts/run_adminfront_ci_tests.sh
View File

@@ -201,7 +201,7 @@ set +e
if ! command -v pnpm >/dev/null 2>&1; then if ! command -v pnpm >/dev/null 2>&1; then
run_with_retry 3 npm install -g pnpm run_with_retry 3 npm install -g pnpm
fi fi
run_with_retry 3 pnpm install -C ../common --no-frozen-lockfile --store-dir "$pnpm_store_dir" run_with_retry 3 CI=true pnpm install -C ../common --no-frozen-lockfile --store-dir "$pnpm_store_dir"
fi fi
) 2>&1 | tee reports/adminfront-install.log ) 2>&1 | tee reports/adminfront-install.log
install_exit_code=${PIPESTATUS[0]} install_exit_code=${PIPESTATUS[0]}