Skip to content

Commit

Permalink
Replace yarn with npm
Browse files Browse the repository at this point in the history
Close #154.
  • Loading branch information
tilgovi committed Nov 14, 2023
1 parent a45684a commit affbc9e
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@

. "$(dirname "$0")/_/husky.sh"

yarn run lint-staged
npx lint-staged
2 changes: 1 addition & 1 deletion .ratignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
lerna\.json
node_modules
package\.json
package-lock\.json
tsconfig(\.\w+)?\.json
typedoc\.json
yarn\.lock
CODE_OF_CONDUCT\.md
DISCLAIMER-WIP
LICENSES
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -37,22 +37,22 @@ all: build

.PHONY: build
build:
@yarn
@npm install

.PHONY: clean
clean:
@yarn run clean
@npm run clean

.PHONY: check
check: lint test

.PHONY: lint
lint: build
@yarn lint
@npm run lint

.PHONY: test
test: build
@yarn test
@npm run test

ifeq ($(vsn_tag),)

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ See documentation on the website: <https://annotator.apache.org/docs/>

## How to build

Build requirements are [Node.JS](https://nodejs.org/) (>= 16) and [yarn](https://yarnpkg.com) (>= 1.5.0).
Building Annatator libraries requires [Node.JS](https://nodejs.org/) (>= 16).
All other dependencies are automatically installed as part of the build.

* `npm run build` -- builds the project
Expand All @@ -26,7 +26,7 @@ All other dependencies are automatically installed as part of the build.

# License

This project is available as open source under the terms of the Apache 2.0 License.
This project is available as open source under the terms of the Apache 2.0 License.
For accurate information, please check individual files.

# Disclaimer
Expand Down
4 changes: 0 additions & 4 deletions lerna.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{
"version": "0.3.0",
"npmClient": "yarn",
"packages": [
"packages/*"
],
"command": {
"publish": {
"preDistTag": "dev",
Expand Down
19 changes: 8 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,22 @@
},
"license": "Apache-2.0",
"author": "Apache Software Foundation",
"workspaces": {
"packages": [
"packages/*"
]
},
"workspaces": [
"packages/*"
],
"scripts": {
"build": "concurrently yarn:build:*",
"build": "concurrently npm:build:*",
"build:js": "lerna exec --parallel -- babel -d lib -s -x .ts --env-name production --root-mode upward src",
"build:misc": "lerna exec --parallel -- shx cp ../../DISCLAIMER-WIP ../../LICENSE ../../NOTICE ../../README.md .",
"build:types": "tsc --build",
"clean": "tsc --build --clean && lerna exec -- shx rm -rf DISCLAIMER-WIP LICENSE NOTICE README.md coverage docs lib web/dist",
"docs": "tsc --build && typedoc",
"lint": "eslint .",
"prepare": "is-ci || shx test -d .git || exit 0 && husky install",
"prepublishOnly": "yarn run build",
"prepublishOnly": "npm run build",
"publish": "lerna publish",
"publish:ci": "yarn run publish --canary --exact --force-publish '*' --no-verify-access --yes minor",
"start": "yarn run web:server",
"publish:ci": "npm run publish --canary --exact --force-publish '*' --no-verify-access --yes minor",
"start": "npm run web:server",
"test": "cross-env BABEL_ENV=test c8 -a -r html -r text mocha packages/**/*.test.ts",
"test:watch": "cross-env BABEL_ENV=test mocha -p -w packages/**/*.test.ts",
"validate": "cross-env BABEL_ENV=test mocha test/**/*.test.ts",
Expand Down Expand Up @@ -80,7 +78,6 @@
"webpack-dev-server": "^4.15.1"
},
"engines": {
"node": ">=18",
"yarn": "^1.5.0"
"node": ">=18"
}
}

0 comments on commit affbc9e

Please sign in to comment.