Skip to content

Commit 63aab57

Browse files
build: use latest juno js libs and generate with @junobuild/schema (#476)
* build: use latest juno js libs and schema instead of zod Signed-off-by: David Dal Busco <david.dalbusco@outlook.com> * feat: renamed api Signed-off-by: David Dal Busco <david.dalbusco@outlook.com> * feat: use released Signed-off-by: David Dal Busco <david.dalbusco@outlook.com> * feat: the final ones! Signed-off-by: David Dal Busco <david.dalbusco@outlook.com> --------- Signed-off-by: David Dal Busco <david.dalbusco@outlook.com>
1 parent 8b03a09 commit 63aab57

15 files changed

Lines changed: 77 additions & 79 deletions

package-lock.json

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

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@
3434
"@icp-sdk/core": "^5.0.0",
3535
"@junobuild/admin": "^4.2.0",
3636
"@junobuild/cdn": "^2.3.0",
37-
"@junobuild/cli-tools": "^0.11.0",
38-
"@junobuild/config": "^2.13.0",
37+
"@junobuild/cli-tools": "^0.12.2",
38+
"@junobuild/config": "^2.14.1",
3939
"@junobuild/config-loader": "^0.4.8",
4040
"@junobuild/core": "^5.2.1",
41-
"@junobuild/functions-tools": "^0.4.1",
41+
"@junobuild/functions-tools": "^0.5.2",
4242
"@junobuild/ic-client": "^8.0.1",
43+
"@junobuild/schema": "^1.1.0",
4344
"@junobuild/storage": "^2.3.0",
4445
"@junobuild/utils": "^0.3.0",
45-
"@junobuild/zod": "^1.0.0",
4646
"chokidar": "^4.0.3",
4747
"conf": "^14.0.0",
4848
"open": "^11.0.0",
@@ -56,7 +56,7 @@
5656
"@eslint/eslintrc": "^3.3.3",
5757
"@eslint/js": "^9.39.2",
5858
"@junobuild/emulator-playwright": "^0.0.5",
59-
"@junobuild/functions": "^0.6.0",
59+
"@junobuild/functions": "^0.7.1",
6060
"@playwright/test": "^1.58.1",
6161
"@types/node": "24.10.9",
6262
"@types/prompts": "^2.4.9",

scripts/install-next

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/usr/bin/env bash
22

33
npm rm @junobuild/functions
4-
npm rm @junobuild/{admin,cdn,cli-tools,config,config-loader,core,functions-tools,ic-client,storage,utils,zod}
4+
npm rm @junobuild/{admin,cdn,cli-tools,config,config-loader,core,functions-tools,ic-client,storage,utils,schema}
55

6-
npm i @junobuild/{admin,cdn,cli-tools,config,config-loader,core,functions-tools,ic-client,storage,utils,zod}@next
6+
npm i @junobuild/{admin,cdn,cli-tools,config,config-loader,core,functions-tools,ic-client,storage,utils,schema}@next
77
npm i @junobuild/functions@next -D

src/configs/cli.state.config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {type PrincipalText} from '@junobuild/zod';
1+
import {type PrincipalText} from '@junobuild/schema';
22
import Conf from 'conf';
33
import {ENV} from '../env';
44
import {

src/services/auth/login.emulator.services.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import {notEmptyString} from '@dfinity/utils';
2-
import {type PrincipalText} from '@junobuild/zod';
2+
import {type PrincipalText} from '@junobuild/schema';
33
import {green, red} from 'kleur';
44
import ora from 'ora';
55
import {saveCliConfig} from '../../configs/cli.config';

src/services/functions/build/build.api.services.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {isNullish} from '@dfinity/utils';
22
import type {GenerateResultData} from '@junobuild/cli-tools';
33
import {
44
generateIdlApi as generateIdlApiLib,
5-
generateZodApi as generateZodApiLib,
5+
generateSchemaApi as generateSchemaApiLib,
66
type TransformerOptions
77
} from '@junobuild/functions-tools';
88
import {existsSync} from 'node:fs';
@@ -30,7 +30,7 @@ export const generateIdlApi = async () => {
3030
await generateApi({generateFn, lang});
3131
};
3232

33-
export const generateZodApi = async ({
33+
export const generateSchemaApi = async ({
3434
generatedData,
3535
lang
3636
}: {
@@ -49,7 +49,7 @@ export const generateZodApi = async ({
4949
const functions = [...queries, ...updates];
5050

5151
const generateFn: GenerateFn = async (params) => {
52-
await generateZodApiLib({
52+
await generateSchemaApiLib({
5353
...params,
5454
functions
5555
});

src/services/functions/build/build.javascript.services.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import {checkIcpBindgen} from '../../../utils/build.bindgen.utils';
1919
import {installEsbuild} from '../../../utils/esbuild.utils';
2020
import {formatTime} from '../../../utils/format.utils';
2121
import {readEmulatorConfigAndCreateDeployTargetDir} from '../../emulator/_fs.services';
22-
import {generateZodApi} from './build.api.services';
22+
import {generateSchemaApi} from './build.api.services';
2323
import {generateJsTsDid} from './build.did.services';
2424
import {generateIdl} from './build.idl.services';
2525
import {prepareJavaScriptBuildMetadata} from './build.metadata.services';
@@ -55,7 +55,7 @@ const generateAndBuild = async ({lang, ...rest}: BuildArgsTsJs) => {
5555
await generateJsTsDid({generatedData});
5656

5757
await generateIdl();
58-
await generateZodApi({generatedData, lang});
58+
await generateSchemaApi({generatedData, lang});
5959

6060
if (isNullish(generatedData.generate)) {
6161
spinner.stop();

src/services/modules/snapshot/_snapshot.assert.services.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
JUNO_PACKAGE_ORBITER_ID,
66
JUNO_PACKAGE_SATELLITE_ID
77
} from '@junobuild/config';
8-
import {type PrincipalText} from '@junobuild/zod';
8+
import {type PrincipalText} from '@junobuild/schema';
99
import {actorParameters} from '../../../api/actor.api';
1010
import type {AssetKey} from '../../../types/asset-key';
1111
import {displaySegment} from '../../../utils/display.utils';

src/services/modules/upgrade/upgrade.mission-control.services.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import {
55
} from '@junobuild/admin';
66
import {hasArgs, nextArg} from '@junobuild/cli-tools';
77
import type {MissionControlParameters} from '@junobuild/ic-client/actor';
8-
import type {PrincipalText} from '@junobuild/zod';
8+
import type {PrincipalText} from '@junobuild/schema';
99
import {cyan, red} from 'kleur';
1010
import {actorParameters} from '../../../api/actor.api';
1111
import {getCliMissionControl} from '../../../configs/cli.config';

src/services/modules/upgrade/upgrade.orbiter.services.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {isNullish} from '@dfinity/utils';
22
import {orbiterVersion, upgradeOrbiter as upgradeOrbiterAdmin} from '@junobuild/admin';
33
import {hasArgs, nextArg} from '@junobuild/cli-tools';
44
import type {OrbiterParameters} from '@junobuild/ic-client/actor';
5-
import type {PrincipalText} from '@junobuild/zod';
5+
import type {PrincipalText} from '@junobuild/schema';
66
import {cyan, red} from 'kleur';
77
import {actorParameters} from '../../../api/actor.api';
88
import {ORBITER_WASM_NAME} from '../../../constants/constants';

0 commit comments

Comments
 (0)