diff options
| author |  Sergii Kirianov <s.kirianov@gmail.com>
| 2023-11-10 16:15:59 +0200 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2023-11-10 14:15:59 +0000 |
| commit | 1e97708cda779510d638abaefdb4abf707b697e3 (patch) | |
| tree | b44b81cadc6988c55a050a9859295fc32adf3bf5 | |
| parent | 5db28e90d03bd4dfd05aab743c647f689e349cf2 (diff) | |
| download | astro-1e97708cda779510d638abaefdb4abf707b697e3.tar.gz astro-1e97708cda779510d638abaefdb4abf707b697e3.tar.zst astro-1e97708cda779510d638abaefdb4abf707b697e3.zip | |
fix: added onError functionality to spinner (#9048)
Co-authored-by: Sarah Rainsberger <sarah@rainsberger.ca>
| -rw-r--r-- | .changeset/silent-experts-sip.md | 5 | ||||
| -rw-r--r-- | packages/create-astro/package.json | 2 | ||||
| -rw-r--r-- | packages/create-astro/src/actions/dependencies.ts | 19 | ||||
| -rw-r--r-- | packages/create-astro/src/messages.ts | 1 | ||||
| -rw-r--r-- | pnpm-lock.yaml | 8 |
5 files changed, 20 insertions, 15 deletions
diff --git a/.changeset/silent-experts-sip.md b/.changeset/silent-experts-sip.md new file mode 100644 index 000000000..ce1ca3e29 --- /dev/null +++ b/.changeset/silent-experts-sip.md @@ -0,0 +1,5 @@ +--- +'create-astro': patch +--- + +Fixes an issue where a successful "Dependencies installed" message is displayed even when installing dependencies fails. diff --git a/packages/create-astro/package.json b/packages/create-astro/package.json index 4f78989fb..d19ef1e4f 100644 --- a/packages/create-astro/package.json +++ b/packages/create-astro/package.json @@ -31,7 +31,7 @@ "//a": "MOST PACKAGES SHOULD GO IN DEV_DEPENDENCIES! THEY WILL BE BUNDLED.", "//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES", "dependencies": { - "@astrojs/cli-kit": "^0.3.0", + "@astrojs/cli-kit": "^0.3.1", "giget": "1.1.2" }, "devDependencies": { diff --git a/packages/create-astro/src/actions/dependencies.ts b/packages/create-astro/src/actions/dependencies.ts index 1e731099c..e920fcf8e 100644 --- a/packages/create-astro/src/actions/dependencies.ts +++ b/packages/create-astro/src/actions/dependencies.ts @@ -27,17 +27,16 @@ export async function dependencies( await spinner({ start: `Installing dependencies with ${ctx.packageManager}...`, end: 'Dependencies installed', - while: () => { - return install({ packageManager: ctx.packageManager, cwd: ctx.cwd }).catch((e) => { - error('error', e); - error( - 'error', - `Dependencies failed to install, please run ${color.bold( - ctx.packageManager + ' install' - )} to install them manually after setup.` - ); - }); + onError: (e) => { + error('error', e); + error( + 'error', + `Dependencies failed to install, please run ${color.bold( + ctx.packageManager + ' install' + )} to install them manually after setup.` + ); }, + while: () => install({ packageManager: ctx.packageManager, cwd: ctx.cwd }), }); } else { await info( diff --git a/packages/create-astro/src/messages.ts b/packages/create-astro/src/messages.ts index 29c551883..09675740a 100644 --- a/packages/create-astro/src/messages.ts +++ b/packages/create-astro/src/messages.ts @@ -31,6 +31,7 @@ export async function say(messages: string | string[], { clear = false, hat = '' export async function spinner(args: { start: string; end: string; + onError?: (error: any) => void; while: (...args: any) => Promise<any>; }) { await load(args, { stdout }); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b6b915936..322d1a4f7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -3700,8 +3700,8 @@ importers: packages/create-astro: dependencies: '@astrojs/cli-kit': - specifier: ^0.3.0 - version: 0.3.0 + specifier: ^0.3.1 + version: 0.3.1 giget: specifier: 1.1.2 version: 1.1.2 @@ -5166,8 +5166,8 @@ packages: - prettier-plugin-astro dev: true - /@astrojs/cli-kit@0.3.0: - resolution: {integrity: sha512-nil0Kz2xuzR3xQX+FVHg2W8g+FvbeUeoCeU53duQjAFuHRJrbqWRmgfjYeM6f2780dsSuGiYMXmY+IaJqaqiaw==} + /@astrojs/cli-kit@0.3.1: + resolution: {integrity: sha512-BEzf3gudr4XrrrInJKD+GSS5O+GXRTukLUpOfgqdTSq6d48EWVhigNHobmlQGbpa9FEAw+sZmvmHmhS29QhnwA==} engines: {node: '>=18.14.1'} dependencies: chalk: 5.3.0 |