Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@dfinity/zod-schemas": "^1.0.0",
"@junobuild/admin": "^2.0.0-next-2025-08-13",
"@junobuild/cdn": "^1.0.0-next-2025-08-13",
"@junobuild/cli-tools": "^0.5.0-next-2025-08-13",
"@junobuild/cli-tools": "^0.5.0-next-2025-08-13.1",
"@junobuild/config": "^1.1.2",
"@junobuild/config-loader": "^0.4.1",
"@junobuild/core": "^1.1.0-next-2025-08-13",
Expand Down
32 changes: 24 additions & 8 deletions src/services/assets/_deploy/deploy.execute.services.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
import {nonNullish} from '@dfinity/utils';
import type {
DeployParams,
DeployResult,
DeployResultWithProposal,
UploadFileStorage
import {
postDeploy as cliPostDeploy,
preDeploy as cliPreDeploy,
type DeployParams,
DeployProgressStep,
type DeployResult,
type DeployResultWithProposal,
type OnDeployProgress,
type UploadFileStorage
} from '@junobuild/cli-tools';
import {postDeploy as cliPostDeploy, preDeploy as cliPreDeploy} from '@junobuild/cli-tools';
import type {SatelliteConfig} from '@junobuild/config';
import {type Asset} from '@junobuild/core';
import {red} from 'kleur';
import {lstatSync} from 'node:fs';
import ora from 'ora';
import {
type DeployFnParams,
type UploadFileFnParams,
Expand Down Expand Up @@ -117,6 +121,16 @@ const deployWithMethod = async <
assertMemory
};

const spinner = ora('Preparing deploy...').start();

const progress: OnDeployProgress = {
onProgress: ({step, state}) => {
if (step === DeployProgressStep.PrepareDeploy && state !== 'in_progress') {
spinner.stop();
}
}
};

if (method === 'batch') {
const uploadFiles = async (params: UploadInput<{files: P[]}, R>) => {
const paramsWithSatellite: UploadParams<{files: P[]}, R> = {
Expand All @@ -129,7 +143,8 @@ const deployWithMethod = async <
return await deployFn({
deploy: {
params: deployParams,
upload: uploadFiles
upload: uploadFiles,
...progress
},
satellite
});
Expand All @@ -146,7 +161,8 @@ const deployWithMethod = async <
return await deployFn({
deploy: {
params: deployParams,
upload: uploadFile
upload: uploadFile,
...progress
},
satellite
});
Expand Down
7 changes: 5 additions & 2 deletions src/services/assets/_deploy/deploy.individual.services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,13 @@ export const deployImmediate = async ({
await clear();
}

const deployFn = async ({deploy: {params, upload}}: DeployFnParams): Promise<DeployResult> =>
const deployFn = async ({
deploy: {params, upload, onProgress}
}: DeployFnParams): Promise<DeployResult> =>
await cliDeploy({
params,
upload: {uploadFile: upload}
upload: {uploadFile: upload},
onProgress
});

const uploadFn = async ({
Expand Down
16 changes: 9 additions & 7 deletions src/services/assets/_deploy/deploy.with-proposal.services.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import {uploadAssetsWithProposal, uploadAssetWithProposal} from '@junobuild/cdn';
import {
deployWithProposal as cliDeployWithProposal,
type OnDeployProgress,
type DeployParams,
type DeployResultWithProposal,
type UploadFileStorage,
Expand Down Expand Up @@ -52,11 +53,11 @@ const uploadFilesIndividually = async ({
};

const deployFn = async ({
deploy: {params, upload},
deploy: {params, upload, onProgress},
satellite
}: DeployFnParams<UploadFileWithProposal>): Promise<DeployResultWithProposal> =>
await deployWithUpload({
deploy: {params, upload: {uploadFile: upload}},
deploy: {params, upload: {uploadFile: upload}, onProgress},
satellite,
cliParams
});
Expand All @@ -82,11 +83,11 @@ const uploadFilesWithBatch = async ({
};

const deployFn = async ({
deploy: {params, upload},
deploy: {params, upload, onProgress},
satellite
}: DeployFnParams<UploadFilesWithProposal>): Promise<DeployResultWithProposal> =>
await deployWithUpload({
deploy: {params, upload: {uploadFiles: upload}},
deploy: {params, upload: {uploadFiles: upload}, onProgress},
satellite,
cliParams
});
Expand All @@ -100,14 +101,14 @@ const uploadFilesWithBatch = async ({
};

const deployWithUpload = async ({
deploy: {params, upload},
deploy: {params, upload, onProgress},
satellite,
cliParams: {clearOption, noCommit}
}: {
deploy: {
params: DeployParams;
upload: UploadIndividually<UploadFileWithProposal> | UploadWithBatch<UploadFilesWithProposal>;
};
} & OnDeployProgress;
satellite: SatelliteParametersWithId;
cliParams: Omit<DeployWithProposalParams, 'deprecatedGzip'>;
}): Promise<DeployResultWithProposal> =>
Expand All @@ -117,7 +118,8 @@ const deployWithUpload = async ({
...params,
includeAllFiles: clearOption
},
upload
upload,
onProgress
},
proposal: {
clearAssets: clearOption,
Expand Down
3 changes: 2 additions & 1 deletion src/types/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ import type {
DeployParams,
DeployResult,
DeployResultWithProposal,
OnDeployProgress,
UploadFile,
UploadFileStorage
} from '@junobuild/cli-tools';
import type {OnUploadProgress} from '@junobuild/storage';
import type {SatelliteParametersWithId} from './satellite';

export interface DeployFnParams<T = UploadFile> {
deploy: {params: DeployParams; upload: T};
deploy: {params: DeployParams; upload: T} & OnDeployProgress;
satellite: SatelliteParametersWithId;
}

Expand Down
Loading