Skip to content

Commit b042b29

Browse files
committed
Merge branch 'development'
2 parents d93b9dc + 9516152 commit b042b29

File tree

5 files changed

+78
-26
lines changed

5 files changed

+78
-26
lines changed

.circleci/config.yml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ commands:
7979
paths:
8080
- ~/.pnpm-store
8181

82-
install-node-modules:
82+
install-deps-npm:
8383
steps:
8484
- run:
85-
name: Install pnpm package manager and node modules
85+
name: Install pnpm package manager, then use it to install npm dependencies
8686
command: |
8787
nvm install 22
8888
nvm use 22
@@ -246,7 +246,7 @@ jobs:
246246
- fetch-submodules
247247
- install-bazel-mac:
248248
bazel-arch: arm64
249-
- install-node-modules
249+
- install-deps-npm
250250
- install-rust
251251
- deploy-mac-snapshot:
252252
target-arch: arm64
@@ -260,7 +260,7 @@ jobs:
260260
- install-brew-rosetta
261261
- install-bazel-mac:
262262
bazel-arch: amd64
263-
- install-node-modules
263+
- install-deps-npm
264264
- install-rust
265265
- deploy-mac-snapshot:
266266
target-arch: x86_64
@@ -271,7 +271,7 @@ jobs:
271271
- checkout
272272
- fetch-submodules
273273
- install-bazel-linux-arm64
274-
- install-node-modules
274+
- install-deps-npm
275275
- install-rust
276276
- deploy-linux-snapshot:
277277
target-arch: arm64
@@ -282,7 +282,7 @@ jobs:
282282
- checkout
283283
- fetch-submodules
284284
- install-bazel-linux-x86_64
285-
- install-node-modules
285+
- install-deps-npm
286286
- install-rust
287287
- deploy-linux-snapshot:
288288
target-arch: x86_64
@@ -293,7 +293,7 @@ jobs:
293293
- checkout
294294
- fetch-submodules
295295
- install-bazel-linux-arm64
296-
- install-node-modules
296+
- install-deps-npm
297297
- install-rust
298298
- deploy-apt-snapshot:
299299
target-arch: arm64
@@ -304,7 +304,7 @@ jobs:
304304
- checkout
305305
- fetch-submodules
306306
- install-bazel-linux-x86_64
307-
- install-node-modules
307+
- install-deps-npm
308308
- install-rust
309309
- deploy-apt-snapshot:
310310
target-arch: x86_64
@@ -327,7 +327,7 @@ jobs:
327327
- fetch-submodules
328328
- install-bazel-mac:
329329
bazel-arch: arm64
330-
- install-node-modules
330+
- install-deps-npm
331331
- install-rust
332332
- deploy-mac-release:
333333
target-arch: arm64
@@ -341,7 +341,7 @@ jobs:
341341
- install-brew-rosetta
342342
- install-bazel-mac:
343343
bazel-arch: amd64
344-
- install-node-modules
344+
- install-deps-npm
345345
- install-rust
346346
- deploy-mac-release:
347347
target-arch: x86_64
@@ -352,7 +352,7 @@ jobs:
352352
- checkout
353353
- fetch-submodules
354354
- install-bazel-linux-arm64
355-
- install-node-modules
355+
- install-deps-npm
356356
- install-rust
357357
- deploy-linux-release:
358358
target-arch: arm64
@@ -363,7 +363,7 @@ jobs:
363363
- checkout
364364
- fetch-submodules
365365
- install-bazel-linux-x86_64
366-
- install-node-modules
366+
- install-deps-npm
367367
- install-rust
368368
- deploy-linux-release:
369369
target-arch: x86_64
@@ -374,7 +374,7 @@ jobs:
374374
- checkout
375375
- fetch-submodules
376376
- install-bazel-linux-arm64
377-
- install-node-modules
377+
- install-deps-npm
378378
- install-rust
379379
- deploy-apt-release:
380380
target-arch: arm64
@@ -385,7 +385,7 @@ jobs:
385385
- checkout
386386
- fetch-submodules
387387
- install-bazel-linux-x86_64
388-
- install-node-modules
388+
- install-deps-npm
389389
- install-rust
390390
- deploy-apt-release:
391391
target-arch: x86_64

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"scripts": {
55
"ng": "ng",
66
"generate-grammar": "lezer-generator --typeScript src/framework/codemirror-lang-typeql/typeql.grammar -o src/framework/codemirror-lang-typeql/generated/typeql.grammar.generated",
7-
"start": "pnpm i && ng serve",
7+
"start": "ng serve",
88
"build": "ng build",
99
"watch": "ng build --watch --configuration development",
1010
"tauri": "tauri"
@@ -44,7 +44,7 @@
4444
"sigma": "3.0.1",
4545
"tslib": "^2.3.0",
4646
"typedb-driver-http": "0.0.1",
47-
"typedb-web-common": "file:typedb-web/common",
47+
"typedb-web-common": "workspace:*",
4848
"uuid": "11.1.0",
4949
"zone.js": "~0.15.1",
5050
"@tauri-apps/api": "^2",

pnpm-lock.yaml

Lines changed: 59 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
onlyBuiltDependencies:
2-
- typedb-web-common
1+
packages:
2+
- typedb-web/common

typedb-web

0 commit comments

Comments
 (0)