Skip to content

Commit

Permalink
fix(npm): Migrate unpublishSafe presets (#7983)
Browse files Browse the repository at this point in the history
  • Loading branch information
zharinov committed Dec 13, 2020
1 parent eaf3f78 commit 3d48283
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
4 changes: 2 additions & 2 deletions lib/config/migration.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ describe('config/migration', () => {
res = configMigration.migrateConfig(config);
expect(res.isMigrated).toBe(true);
expect(res.migratedConfig).toMatchObject({
extends: ['foo', ':unpublishSafe', 'bar', 'npm:unpublishSafe'],
extends: ['foo', 'npm:unpublishSafe', 'bar'],
});

config = {
Expand All @@ -524,7 +524,7 @@ describe('config/migration', () => {
res = configMigration.migrateConfig(config);
expect(res.isMigrated).toBe(true);
expect(res.migratedConfig).toMatchObject({
extends: ['foo', 'default:unpublishSafe', 'bar', 'npm:unpublishSafe'],
extends: ['foo', 'npm:unpublishSafe', 'bar'],
});

config = {
Expand Down
12 changes: 11 additions & 1 deletion lib/config/migration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,10 @@ export function migrateConfig(
preset = 'config:js-lib';
} else if (preset.startsWith(':masterIssue')) {
preset = preset.replace('masterIssue', 'dependencyDashboard');
} else if (
[':unpublishSafe', 'default:unpublishSafe'].includes(preset)
) {
preset = 'npm:unpublishSafe';
}
presets[i] = preset;
}
Expand All @@ -239,7 +243,13 @@ export function migrateConfig(
if (is.string(migratedConfig.extends)) {
migratedConfig.extends = [migratedConfig.extends];
}
if (!migratedConfig.extends.includes('npm:unpublishSafe')) {
if (
![
':unpublishSafe',
'default:unpublishSafe',
'npm:unpublishSafe',
].some((x) => migratedConfig.extends.includes(x))
) {
migratedConfig.extends.push('npm:unpublishSafe');
}
}
Expand Down
3 changes: 0 additions & 3 deletions lib/config/presets/internal/default.ts
Original file line number Diff line number Diff line change
Expand Up @@ -584,7 +584,4 @@ export const presets: Record<string, Preset> = {
description: 'deprecated alias for config:js-lib',
extends: ['config:js-lib'],
},
unpublishSafe: {
extends: ['npm:unpublishSafe'],
},
};

0 comments on commit 3d48283

Please sign in to comment.