Skip to content

Commit 67de0c2

Browse files
authored
Update fix_format.sh to use root yarn prettier scripts (#112)
* Update fix_format.sh to use root yarn prettier scripts Update scripts/fix_format.sh to call root package.json yarn scripts. Default CHECK_ONLY to true so format checks run by default. Add prettier:check script to root and workspace package.json files. TAG=agy CONV=98e54060-798a-4573-8f25-3c54fe5bb3cf * Restore correct default value.
1 parent c4d0ede commit 67de0c2

8 files changed

Lines changed: 9 additions & 4 deletions

File tree

bridge/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
"clean": "rm -rf dist",
2727
"test": "NODE_ENV=test vitest run --coverage",
2828
"prettier": "prettier --ignore-path ../.prettierignore --write . | grep -v '(unchanged)'",
29+
"prettier:check": "prettier --ignore-path ../.prettierignore --check .",
2930
"lint": "eslint ."
3031
},
3132
"devDependencies": {

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
"test": "yarn workspaces foreach -A --exclude a2ui-composer-root run test",
1313
"build": "yarn workspaces foreach -A --topological-dev --exclude a2ui-composer-root run build",
1414
"prettier": "yarn workspaces foreach -A --exclude a2ui-composer-root run prettier",
15+
"prettier:check": "yarn workspaces foreach -A --exclude a2ui-composer-root run prettier:check",
1516
"tsc": "yarn --cwd shell tsc --noEmit && yarn --cwd bridge tsc --project tsconfig.bridge.json --noEmit",
1617
"clean": "yarn workspaces foreach -A --exclude a2ui-composer-root run clean",
1718
"lint": "yarn workspaces foreach -A --exclude a2ui-composer-root run lint"

samples/lit-basic-catalog/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"preview": "vite preview",
1111
"test": "vitest run",
1212
"prettier": "prettier --ignore-path ../../.prettierignore --write . | grep -v '(unchanged)'",
13+
"prettier:check": "prettier --ignore-path ../../.prettierignore --check .",
1314
"clean": "rm -rf dist node_modules/.vite",
1415
"lint": "eslint ."
1516
},

samples/ng-basic-catalog/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"build": "yarn lint && ng build",
88
"test": "vitest run",
99
"prettier": "prettier --ignore-path ../../.prettierignore --write . | grep -v '(unchanged)'",
10+
"prettier:check": "prettier --ignore-path ../../.prettierignore --check .",
1011
"clean": "rm -rf dist .angular node_modules/.vite",
1112
"lint": "eslint ."
1213
},

samples/react-basic-catalog/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"preview": "vite preview",
1111
"test": "NODE_ENV=test vitest run",
1212
"prettier": "prettier --ignore-path ../../.prettierignore --write . | grep -v '(unchanged)'",
13+
"prettier:check": "prettier --ignore-path ../../.prettierignore --check .",
1314
"clean": "rm -rf dist node_modules/.vite",
1415
"lint": "eslint ."
1516
},

scripts/fix_format.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ cd "$REPO_ROOT"
2626

2727
echo "Running Prettier..."
2828
if [ "$CHECK_ONLY" = true ]; then
29-
npx -y prettier --config .prettierrc --check .
29+
corepack yarn prettier:check
3030
else
31-
npx -y prettier --config .prettierrc --write .
31+
corepack yarn prettier
3232
fi
3333

3434
echo "Done."

shell/e2e/gallery.e2e.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,7 @@ test.describe('Components Gallery User Journey', () => {
135135
const createSurface = cmd1['createSurface'] as Record<string, unknown> | undefined;
136136
const updateComponents = cmd2['updateComponents'] as Record<string, unknown> | undefined;
137137
const components = updateComponents?.['components'] as
138-
| Array<Record<string, unknown>>
139-
| undefined;
138+
Array<Record<string, unknown>> | undefined;
140139
const hasComponent =
141140
Array.isArray(components) &&
142141
components.some(c => c['component'] === firstComponentName);

shell/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
"e2e": "playwright test",
1414
"e2e-headless": "E2E_HEADLESS=true playwright test",
1515
"prettier": "prettier --ignore-path ../.prettierignore --write . | grep -v '(unchanged)'",
16+
"prettier:check": "prettier --ignore-path ../.prettierignore --check .",
1617
"clean": "rm -rf dist .angular node_modules/.vite",
1718
"lint": "eslint ."
1819
},

0 commit comments

Comments
 (0)