Skip to content

fix(upgrade): fix test types #16493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ematipico merged 3 commits into from
Apr 28, 2026
Merged

fix(upgrade): fix test types #16493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5165500
fix(upgrade): fix incorrect typings
ocavue Apr 27, 2026
6e83814
fix files
ocavue Apr 27, 2026
47915d1
Fix the type
ocavue Apr 27, 2026
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
5 changes: 3 additions & 2 deletions packages/upgrade/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@
"typecheck:tests": "tsc --build tsconfig.test.json"
},
"files": [
"dist",
"upgrade.js"
"dist/**/*.js",
"dist/**/*.mjs",
"upgrade.mjs"
Comment on lines +27 to +29
Copy link
Copy Markdown
Contributor Author

@ocavue ocavue Apr 27, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  1. upgrade.js is a mistake. That file has been renamed to upgrade.mjs.

  2. Since @astrojs/upgrade is a CLI, we probably don't want to ship dist/**/*.d.ts files to the NPM registry. Maybe that's why we had noEmit: true in the first place. Anyway, I get rid of all dist/**/*.d.ts files when publishing by only including .js and .mjs files.

    (We currently only emit .js files; I added .mjs just in case we want to ship .mjs files in the future)

],
"//a": "MOST PACKAGES SHOULD GO IN DEV_DEPENDENCIES! THEY WILL BE BUNDLED.",
"//b": "DEPENDENCIES IS FOR UNBUNDLED PACKAGES",
Expand Down
88 changes: 54 additions & 34 deletions packages/upgrade/test/install.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,25 @@ import { setup, type ShellFunction } from './test-utils.ts';

const tmpUrl = pathToFileURL(tmpdir());

type Context = Parameters<typeof install>[0];

describe('install', () => {
const fixture = setup();
const ctx = {
cwd: '',
const ctx: Context = {
cwd: tmpUrl,
version: 'latest',
packageManager: 'npm',
packageManager: { name: 'npm', agent: 'npm' },
dryRun: true,
// @ts-expect-error: fake `prompt` callback for testing
prompt: async () => ({ proceed: true }),
exit: (): never => {
return undefined as never;
},
packages: [],
};

it('up to date', async () => {
const context = {
const context: Context = {
...ctx,
packages: [
{
Expand All @@ -32,7 +40,7 @@ describe('install', () => {
});

it('patch', async () => {
const context = {
const context: Context = {
...ctx,
packages: [
{
Expand All @@ -47,7 +55,7 @@ describe('install', () => {
});

it('minor', async () => {
const context = {
const context: Context = {
...ctx,
packages: [
{
Expand All @@ -63,15 +71,17 @@ describe('install', () => {

it('major (reject)', async () => {
let prompted = false;
let exitCode;
const context = {
let exitCode: number | undefined;
const context: Context = {
...ctx,
prompt: () => {
// @ts-expect-error: fake `prompt` callback for testing
prompt: async () => {
prompted = true;
return { proceed: false };
},
exit: (code: number) => {
exit: (code: number): never => {
exitCode = code;
return undefined as never;
},
packages: [
{
Expand All @@ -93,15 +103,17 @@ describe('install', () => {

it('major (accept)', async () => {
let prompted = false;
let exitCode;
const context = {
let exitCode: number | undefined;
const context: Context = {
...ctx,
prompt: () => {
// @ts-expect-error: fake `prompt` callback for testing
prompt: async () => {
prompted = true;
return { proceed: true };
},
exit: (code: number) => {
exit: (code: number): never => {
exitCode = code;
return undefined as never;
},
packages: [
{
Expand All @@ -123,15 +135,17 @@ describe('install', () => {

it('multiple major', async () => {
let prompted = false;
let exitCode;
const context = {
let exitCode: number | undefined;
const context: Context = {
...ctx,
prompt: () => {
// @ts-expect-error: fake `prompt` callback for testing
prompt: async () => {
prompted = true;
return { proceed: true };
},
exit: (code: number) => {
exit: (code: number): never => {
exitCode = code;
return undefined as never;
},
packages: [
{
Expand Down Expand Up @@ -165,15 +179,17 @@ describe('install', () => {

it('current patch minor major', async () => {
let prompted = false;
let exitCode;
const context = {
let exitCode: number | undefined;
const context: Context = {
...ctx,
prompt: () => {
// @ts-expect-error: fake `prompt` callback for testing
prompt: async () => {
prompted = true;
return { proceed: true };
},
exit: (code: number) => {
exit: (code: number): never => {
exitCode = code;
return undefined as never;
},
packages: [
{
Expand Down Expand Up @@ -224,14 +240,15 @@ describe('install', () => {
return { stdout: '', stderr: '', exitCode: 0 };
});

let exitCode;
const context = {
let exitCode: number | undefined;
const context: Context = {
...ctx,
dryRun: false,
cwd: tmpUrl,
packageManager: { name: 'npm', agent: 'npm' },
exit: (code: number) => {
exit: (code: number): never => {
exitCode = code;
return undefined as never;
},
packages: [
{
Expand Down Expand Up @@ -263,14 +280,15 @@ describe('install', () => {
throw new Error('npm ERR! some other error');
});

let exitCode;
const context = {
let exitCode: number | undefined;
const context: Context = {
...ctx,
dryRun: false,
cwd: tmpUrl,
packageManager: { name: 'npm', agent: 'npm' },
exit: (code: number) => {
exit: (code: number): never => {
exitCode = code;
return undefined as never;
},
packages: [
{
Expand All @@ -295,14 +313,15 @@ describe('install', () => {
throw new Error('npm ERR! peer dependencies conflict');
});

let exitCode;
const context = {
let exitCode: number | undefined;
const context: Context = {
...ctx,
dryRun: false,
cwd: tmpUrl,
packageManager: { name: 'npm', agent: 'npm' },
exit: (code: number) => {
exit: (code: number): never => {
exitCode = code;
return undefined as never;
},
packages: [
{
Expand Down Expand Up @@ -335,14 +354,15 @@ describe('install', () => {
throw new Error('pnpm ERR! peer dependencies conflict');
});

let exitCode;
const context = {
let exitCode: number | undefined;
const context: Context = {
...ctx,
dryRun: false,
cwd: tmpUrl,
packageManager: { name: 'pnpm', agent: 'pnpm' },
exit: (code: number) => {
exit: (code: number): never => {
exitCode = code;
return undefined as never;
},
packages: [
{
Expand Down
3 changes: 1 addition & 2 deletions packages/upgrade/tsconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,10 @@
"rootDir": "./src",
"allowJs": true,
"emitDeclarationOnly": false,
"noEmit": true,
"target": "ES2022",
"module": "ES2022",
"moduleResolution": "Bundler",
"outDir": "./dist",
"declarationDir": "./dist/types"
"declarationDir": "./dist"
}
}
Loading