Skip to content

Commit 3fe1498

Browse files
authored
build: fix yarn merge script alias since it wasn't using ts-node (#25126)
The `yarn merge` script directly calls into `ng-dev` but should instead go through the `ng-dev` yarn script alias we have (the one that wires up TSNode for the config loading).
1 parent 8b5a632 commit 3fe1498

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@
3030
"breaking-changes": "ts-node --project scripts/tsconfig.json scripts/breaking-changes.ts",
3131
"check-entry-point-setup": "node ./scripts/check-entry-point-setup.js",
3232
"check-package-externals": "ts-node --project scripts/tsconfig.json scripts/check-package-externals.ts",
33-
"format": "yarn ng-dev format changed",
33+
"format": "yarn -s ng-dev format changed",
3434
"cherry-pick-patch": "ts-node --project tools/cherry-pick-patch/tsconfig.json tools/cherry-pick-patch/cherry-pick-patch.ts",
3535
"ownerslint": "ts-node --project scripts/tsconfig.json scripts/ownerslint.ts",
3636
"tslint": "tslint -c tslint.json --project ./tsconfig.json",
3737
"stylelint": "stylelint \"src/**/*.+(css|scss)\" --config .stylelintrc.json",
3838
"resync-caretaker-app": "ts-node --project scripts/tsconfig.json scripts/caretaking/resync-caretaker-app-prs.ts",
3939
"ts-circular-deps:check": "yarn -s ng-dev ts-circular-deps check --config ./src/circular-deps-test.conf.js",
4040
"ts-circular-deps:approve": "yarn -s ng-dev ts-circular-deps approve --config ./src/circular-deps-test.conf.js",
41-
"merge": "ng-dev pr merge",
41+
"merge": "yarn -s ng-dev pr merge",
4242
"approve-api": "node ./scripts/approve-api-golden.js",
4343
"approve-size-tests": "node ./scripts/approve-size-golden.js",
4444
"integration-tests": "bazel test --test_tag_filters=-linker-integration-test --build_tests_only -- //integration/... -//integration/size-test/...",

0 commit comments

Comments
 (0)