Skip to content

Commit bad571f

Browse files
committed
switch skipruntime-ts to pnpm
1 parent dd878da commit bad571f

10 files changed

Lines changed: 1209 additions & 5665 deletions

File tree

.circleci/base.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,12 @@ jobs:
5353
steps:
5454
- custom-checkout:
5555
submodules: true
56+
- run:
57+
name: Install pnpm
58+
command: npm install -g pnpm
5659
- run:
5760
name: Typecheck and lint typescript sources
58-
command: SKIPRUNTIME=$(pwd)/build/skipruntime npm install && npm run build && npm run lint
61+
command: SKIPRUNTIME=$(pwd)/build/skipruntime pnpm install && pnpm run build && pnpm run lint
5962

6063
compiler:
6164
docker:
@@ -91,6 +94,9 @@ jobs:
9194
steps:
9295
- custom-checkout:
9396
submodules: true
97+
- run:
98+
name: Install pnpm
99+
command: npm install -g pnpm
94100
- run:
95101
name: Run wasm skdb tests
96102
no_output_timeout: 15m
@@ -155,6 +161,9 @@ jobs:
155161
steps:
156162
- custom-checkout:
157163
submodules: true
164+
- run:
165+
name: Install pnpm
166+
command: npm install -g pnpm
158167
- run:
159168
name: Run wasm skip runtime tests
160169
no_output_timeout: 10m

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ dist/
1111
*.wasm
1212
target
1313
**/node_modules/
14+
.pnpm-store/
1415
.skgw.conf
1516
bun.lockb
1617
/www/docs/api/

Makefile

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# various build systems
33

44
.PHONY: all
5-
all: npm build/skdb build/init.sql
5+
all: pnpm build/skdb build/init.sql
66

77
PRETTIER_LOG_LEVEL?=warn
88

@@ -19,9 +19,9 @@ export SKIPRUNTIME
1919
# skdb wasm + js client
2020
################################################################################
2121

22-
.PHONY: npm
23-
npm:
24-
npm install && npm run build
22+
.PHONY: pnpm
23+
pnpm:
24+
pnpm install && pnpm build
2525

2626

2727
sql/target/wasm32-unknown-unknown/dev/skdb.wasm: sql/src/*
@@ -70,7 +70,7 @@ check:
7070

7171
.PHONY: check-ts
7272
check-ts:
73-
npm install
73+
pnpm install
7474
bin/check-ts.sh
7575

7676
.PHONY: check-sh
@@ -84,7 +84,7 @@ check-sh:
8484
clean:
8585
rm -Rf build
8686
find . -name 'Skargo.toml' -print0 | sed 's|Skargo.toml|target|g' | xargs -0 rm -rf
87-
npm run clean
87+
pnpm clean
8888

8989
.PHONY: clean-all
9090
clean-all: clean
@@ -119,23 +119,23 @@ check-fmt:
119119
# regenerate api docs served by docs-run from ts sources
120120
.PHONY: docs
121121
docs:
122-
npm install && npm run build
123-
cd www && rm -rf docs/api && npm install && npx docusaurus generate-typedoc
122+
pnpm install && pnpm build
123+
cd www && rm -rf docs/api && pnpm install && npx docusaurus generate-typedoc
124124

125125
# run the docs site locally at http://localhost:3000
126126
.PHONY: docs-run
127127
docs-run: # depends on docs, but can't be tracked reliably
128-
cd www && npm run start
128+
cd www && pnpm start
129129

130130
# generate the docs site as static files
131131
.PHONY: docs-build
132132
docs-build: docs
133-
cd www && rm -rf build && npm run build
133+
cd www && rm -rf build && pnpm build
134134

135135
# run the static docs site locally
136136
.PHONY: docs-serve
137137
docs-serve: # depends on docs-build, but can't be tracked reliably
138-
cd www && npm run serve
138+
cd www && pnpm serve
139139

140140
# update the static docs site repo
141141
.PHONY: docs-publish
@@ -223,18 +223,18 @@ build/index.html: sql/js/index.html
223223
cp $^ $@
224224

225225
.PHONY: check-vite
226-
check-vite: npm
226+
check-vite: pnpm
227227
rm -rf build/vitejs
228228
cp -r sql/ts/vitejs build/vitejs
229-
cd build/vitejs && npm install;
229+
cd build/vitejs && pnpm install;
230230
rm -r build/vitejs/node_modules/skdb
231231
cp -r build/package/skdb build/vitejs/node_modules/
232-
cd build/vitejs && npm run build
232+
cd build/vitejs && pnpm build
233233
cd build/vitejs && node server.js
234-
cd build/vitejs && npm run dev
234+
cd build/vitejs && pnpm dev
235235

236236
.PHONY: test-bun
237-
test-bun: npm
237+
test-bun: pnpm
238238
rm -rf build/bun
239239
cp -r sql/ts/bun build/bun
240240
cd build/bun && bun install;

bin/check-ts.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ DIRS=$( jq --raw-output ".workspaces[]" package.json )
1212

1313
for dir in $DIRS
1414
do
15-
"$SCRIPT_DIR"/cd_sh "$dir" "npm run build --if-present && npm run lint --if-present"
15+
"$SCRIPT_DIR"/cd_sh "$dir" "pnpm run build --if-present && pnpm run lint --if-present"
1616
done

bin/release_npm.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ fi
1414

1515
cd "$(dirname "$2")"
1616

17-
npm run build --if-present
17+
pnpm run build --if-present
1818

19-
npm run test --if-present
19+
pnpm run test --if-present
2020

2121
if [[ "$3" =~ ^([0-9]{6})$ ]];
2222
then

bin/release_npm_skdb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ fi
1414

1515
cd "$SCRIPT_DIR/../" || exit
1616

17-
make npm
17+
make pnpm
1818

1919
make test-wasm
2020

0 commit comments

Comments
 (0)