Skip to content

Commit e389e1c

Browse files
committed
chore: use standard npm script names
Closes #88
1 parent 59c3880 commit e389e1c

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

.circleci/config.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ jobs:
108108
at: .
109109
- attach_workspace:
110110
at: /tmp
111-
- run: npm run projects:patch -- apply --no-stash
111+
- run: npm run tools:patch -- apply --no-stash
112112
- run:
113113
name: Send report
114114
command: /tmp/cc-test-reporter after-build --coverage-input-type lcov --exit-code $(cat ./TEST_STATUS)
@@ -118,7 +118,7 @@ jobs:
118118
steps:
119119
- attach_workspace:
120120
at: .
121-
- run: npm run projects:patch -- apply --no-stash
121+
- run: npm run tools:patch -- apply --no-stash
122122
- run: npm run lint
123123
- run:
124124
command: |
@@ -142,7 +142,7 @@ jobs:
142142
steps:
143143
- attach_workspace:
144144
at: .
145-
- run: npm run projects:patch -- apply --no-stash
145+
- run: npm run tools:patch -- apply --no-stash
146146
- run: npm run lint
147147
- run:
148148
command: npm run test:ci
@@ -157,7 +157,7 @@ jobs:
157157
steps:
158158
- attach_workspace:
159159
at: .
160-
- run: npm run projects:build
160+
- run: npm run build
161161
- store_artifacts:
162162
path: ./packages/**/dist
163163
- persist_to_workspace:

package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -24,28 +24,28 @@
2424
"./packages/*"
2525
],
2626
"scripts": {
27+
"build": "npm run tools:patch -- apply && node ./tools/s-projects \"npm run build -- --pretty\"",
28+
"build:clean": "npm run build:clean --workspaces",
29+
"build:watch": "npm run build && node ./tools/p-projects \"npm run build -- --watch --preserveWatchOutput --pretty\"",
2730
"changelog": "conventional-changelog -p angular -i CHANGELOG.md -s",
2831
"docs": "typedoc",
29-
"format:pkg": "format-package --write",
32+
"format:pkg": "format-package --write \"./package.json\" \"./packages/*/package.json\"",
3033
"lint": "eslint --ignore-path ./.eslintignore \"**/?(.)*.?([cm])[tj]s?(x)\"",
31-
"precommit": "npm run projects:patch -- diff && npm run lint -- --cache && npm run projects:build && npm run projects:test -- --onlyChanged && npm run docs",
32-
"prepare": "npm run prepare:husky",
34+
"precommit": "npm run tools:patch -- diff && npm run lint -- --cache && npm run build && npm run test -- --onlyChanged && npm run docs",
35+
"prepare": "npm run prepare:husky && git submodule update --init --recursive",
3336
"prepare:husky": "run-script-os",
3437
"prepare:husky:default": "[ -d ./node_modules/husky ] && husky install || true",
3538
"prepare:husky:windows": "if exist './node_modules/husky' { husky install }",
36-
"projects:build": "npm run projects:patch -- apply && node ./tools/s-projects \"npm run build -- --pretty\"",
37-
"projects:build:clean": "npm run build:clean --workspaces",
38-
"projects:build:watch": "npm run projects:build && node ./tools/p-projects \"npm run build -- --watch --preserveWatchOutput --pretty\"",
39-
"projects:patch": "node ./tools/typedoc-patcher --no-stash",
40-
"projects:test": "jest",
4139
"release": "run-script-os",
4240
"release:default": "./tools/release.sh",
4341
"release:windows": "echo \"Unsupported platform for release. Run this command only from an UNIX-like environment.\"",
42+
"test": "jest",
4443
"test:ci": "cross-env JEST_JUNIT_OUTPUT_NAME=junit.xml jest --config jest.config.ci.js --all --ci --reporters=default --reporters=jest-junit",
4544
"test:ci:coverage": "npm run test:ci -- --collectCoverage",
4645
"tools:bump-versions": "cross-env NODE_NO_WARNINGS=1 node tools/bump-versions",
4746
"tools:infer-next-version": "cross-env NODE_NO_WARNINGS=1 node tools/infer-next-version",
48-
"tools:packages-sync": "cross-env NODE_NO_WARNINGS=1 node tools/package-proto"
47+
"tools:patch": "node ./tools/typedoc-patcher --no-stash",
48+
"tools:sync-proto": "cross-env NODE_NO_WARNINGS=1 node tools/package-proto"
4949
},
5050
"commitlint": {
5151
"extends": [

tools/release.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,13 @@ npm run tools:bump-versions "${VERSION}"
1919
npm install
2020
git add package-lock.json
2121
# Update readmes
22-
npm run tools:packages-sync -- --no-stash
22+
npm run tools:sync-proto -- --no-stash
2323
find . \( -name README.md -or -name package.json \) -not -path '*/node_modules/*' -not -path './typedoc/*' -not -path '*/__tests__/*' -exec git add {} \;
2424
# Run build & tests
25-
npm run projects:build:clean
26-
npm run projects:build
25+
npm run build:clean
26+
npm run build
2727
npm run lint
28-
npm run projects:test -- --all
28+
npm run test -- --all
2929
# Commit
3030
git commit -m "chore: bump to version ${VERSION}" --no-verify
3131
git tag "v${VERSION}"

0 commit comments

Comments
 (0)