Skip to content

Commit

Permalink
Merge pull request #157 from apache/154-yarn-to-npm
Browse files Browse the repository at this point in the history
Replace yarn with npm
  • Loading branch information
tilgovi authored Dec 11, 2023
2 parents a45684a + d99b8da commit 664d1bb
Show file tree
Hide file tree
Showing 9 changed files with 16,604 additions and 8,956 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ jobs:
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: yarn install --frozen-lockfile
- run: npm ci
- run: npm run build --if-present
- run: npm test
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/) (>= 18).
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
Loading

0 comments on commit 664d1bb

Please sign in to comment.