Skip to content

Commit 0fb992e

Browse files
committed
build: Cleanup
1 parent a07f283 commit 0fb992e

File tree

14 files changed

+3070
-2031
lines changed

14 files changed

+3070
-2031
lines changed

.eslintignore

Lines changed: 0 additions & 6 deletions
This file was deleted.

.eslintrc.yml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.github/actions/setup/action.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ runs:
55
- uses: actions/setup-node@v2
66
with:
77
node-version: 17
8-
cache: 'yarn'
8+
registry-url: 'https://registry.npmjs.org/'
9+
cache: 'npm'
910
# - if: runner.os == 'macOS'
1011
# run: brew install wabt
1112
# shell: bash
@@ -31,5 +32,5 @@ runs:
3132
mv /tmp/wabt-1.0.31 /c/tools/wabt
3233
cp /c/tools/wabt/bin/* /c/Windows/system32
3334
shell: bash
34-
- run: yarnpkg --pure-lockfile
35+
- run: npm ci
3536
shell: bash

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ jobs:
1313
steps:
1414
- uses: actions/checkout@v3
1515
- uses: ./.github/actions/setup
16-
- run: yarnpkg build
17-
- run: yarnpkg lint
18-
- run: yarnpkg test --coverage
16+
- run: npm run build
17+
- run: npm run lint
18+
- run: npm test
1919
- run: make -C src/web/notebook
2020
- run: ./dist/wafnb2html src/web/notebook/examples/drawing-with-forth.wafnb
2121

.github/workflows/publish-release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ jobs:
1414
steps:
1515
- uses: actions/checkout@v3
1616
- uses: ./.github/actions/setup
17-
- run: yarnpkg publish --non-interactive
17+
- run: npm publish
1818
env:
19-
NPM_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
19+
NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,19 @@ WAT2WASM_FLAGS:=$(WAT2WASM_FLAGS) --debug-names
66
endif
77

88
all:
9-
yarn -s build
9+
npm run build
1010

1111
dev:
12-
yarn -s dev
12+
npm run dev
1313

1414
check:
15-
yarn -s test
15+
npm test
1616

1717
check-watch:
18-
yarn -s test-watch
18+
npm run test-watch
1919

2020
lint:
21-
yarn -s lint
21+
npm run lint
2222

2323
wasm: src/waforth.assembled.wat scripts/word.wasm.hex
2424

README.md

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -264,28 +264,27 @@ Here are some of the goals (and non-goals) of WAForth:
264264

265265
The build uses the [WebAssembly Binary
266266
Toolkit](https://github.com/WebAssembly/wabt) for converting raw WebAssembly
267-
text format into the binary format, and [Yarn](https://yarnpkg.com) (and therefore
268-
[Node.JS](https://nodejs.org/en/)) for
267+
text format into the binary format, and [Node.JS](https://nodejs.org/en/) for
269268
managing the build process and the dependencies of the shell.
270269

271-
brew install wabt yarn
272-
yarn
270+
brew install wabt node
271+
npm install
273272

274273

275274
### Building & Running
276275

277276
To build everything:
278277

279-
yarn build
278+
npm run build
280279

281280
To run the development server:
282281

283-
yarn dev
282+
npm run dev
284283

285284
### Testing
286285

287286
The tests are served from `/waforth/tests` by the development server.
288287

289288
You can also run the tests in Node.JS by running
290289

291-
yarn test
290+
npm test

0 commit comments

Comments
 (0)