Skip to content

Commit 26593e5

Browse files
author
Robert Jackson
authored
Merge pull request #286 from simonihmig/new-plugins
2 parents e7f5d77 + 4efb2e2 commit 26593e5

File tree

4 files changed

+2234
-1404
lines changed

4 files changed

+2234
-1404
lines changed

‎__tests__/bin-test.js

Lines changed: 181 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,17 @@ describe('main binary', function () {
9696
{
9797
devDependencies: {
9898
'release-it': expect.toMatchDevDependency('release-it'),
99-
'release-it-lerna-changelog': expect.toMatchDevDependency('release-it-lerna-changelog'),
99+
'@release-it-plugins/lerna-changelog': expect.toMatchDevDependency(
100+
'@release-it-plugins/lerna-changelog'
101+
),
100102
},
101103
},
102104
`
103105
Object {
104106
"dependencies": Object {},
105107
"devDependencies": Object {
108+
"@release-it-plugins/lerna-changelog": toMatchDevDependency<@release-it-plugins/lerna-changelog>,
106109
"release-it": toMatchDevDependency<release-it>,
107-
"release-it-lerna-changelog": toMatchDevDependency<release-it-lerna-changelog>,
108110
},
109111
"keywords": Array [],
110112
"name": "some-thing-cool",
@@ -120,7 +122,7 @@ describe('main binary', function () {
120122
"tokenRef": "GITHUB_AUTH",
121123
},
122124
"plugins": Object {
123-
"release-it-lerna-changelog": Object {
125+
"@release-it-plugins/lerna-changelog": Object {
124126
"infile": "CHANGELOG.md",
125127
"launchEditor": true,
126128
},
@@ -145,15 +147,17 @@ describe('main binary', function () {
145147
{
146148
devDependencies: {
147149
'release-it': expect.toMatchDevDependency('release-it'),
148-
'release-it-lerna-changelog': expect.toMatchDevDependency('release-it-lerna-changelog'),
150+
'@release-it-plugins/lerna-changelog': expect.toMatchDevDependency(
151+
'@release-it-plugins/lerna-changelog'
152+
),
149153
},
150154
},
151155
`
152156
Object {
153157
"dependencies": Object {},
154158
"devDependencies": Object {
159+
"@release-it-plugins/lerna-changelog": toMatchDevDependency<@release-it-plugins/lerna-changelog>,
155160
"release-it": toMatchDevDependency<release-it>,
156-
"release-it-lerna-changelog": toMatchDevDependency<release-it-lerna-changelog>,
157161
},
158162
"keywords": Array [],
159163
"name": "some-thing-cool",
@@ -169,7 +173,7 @@ describe('main binary', function () {
169173
"tokenRef": "GITHUB_AUTH",
170174
},
171175
"plugins": Object {
172-
"release-it-lerna-changelog": Object {
176+
"@release-it-plugins/lerna-changelog": Object {
173177
"infile": "CHANGELOG.md",
174178
"launchEditor": true,
175179
},
@@ -193,15 +197,17 @@ describe('main binary', function () {
193197
{
194198
devDependencies: {
195199
'release-it': expect.toMatchDevDependency('release-it'),
196-
'release-it-lerna-changelog': expect.toMatchDevDependency('release-it-lerna-changelog'),
200+
'@release-it-plugins/lerna-changelog': expect.toMatchDevDependency(
201+
'@release-it-plugins/lerna-changelog'
202+
),
197203
},
198204
},
199205
`
200206
Object {
201207
"dependencies": Object {},
202208
"devDependencies": Object {
209+
"@release-it-plugins/lerna-changelog": toMatchDevDependency<@release-it-plugins/lerna-changelog>,
203210
"release-it": toMatchDevDependency<release-it>,
204-
"release-it-lerna-changelog": toMatchDevDependency<release-it-lerna-changelog>,
205211
},
206212
"keywords": Array [],
207213
"name": "some-thing-cool",
@@ -219,7 +225,7 @@ describe('main binary', function () {
219225
},
220226
"npm": false,
221227
"plugins": Object {
222-
"release-it-lerna-changelog": Object {
228+
"@release-it-plugins/lerna-changelog": Object {
223229
"infile": "CHANGELOG.md",
224230
"launchEditor": true,
225231
},
@@ -242,7 +248,9 @@ describe('main binary', function () {
242248

243249
let pkg = JSON.parse(fs.readFileSync('package.json', { encoding: 'utf8' }));
244250

245-
expect(pkg['release-it'].plugins['release-it-lerna-changelog'].launchEditor).toBeFalsy();
251+
expect(
252+
pkg['release-it'].plugins['@release-it-plugins/lerna-changelog'].launchEditor
253+
).toBeFalsy();
246254
});
247255

248256
it('adds release-it configuration for monorepos to package.json', async function () {
@@ -257,17 +265,22 @@ describe('main binary', function () {
257265
{
258266
devDependencies: {
259267
'release-it': expect.toMatchDevDependency('release-it'),
260-
'release-it-lerna-changelog': expect.toMatchDevDependency('release-it-lerna-changelog'),
261-
'release-it-yarn-workspaces': expect.toMatchDevDependency('release-it-yarn-workspaces'),
268+
'@release-it-plugins/lerna-changelog': expect.toMatchDevDependency(
269+
'@release-it-plugins/lerna-changelog'
270+
),
271+
272+
'@release-it-plugins/workspaces': expect.toMatchDevDependency(
273+
'@release-it-plugins/workspaces'
274+
),
262275
},
263276
},
264277
`
265278
Object {
266279
"dependencies": Object {},
267280
"devDependencies": Object {
281+
"@release-it-plugins/lerna-changelog": toMatchDevDependency<@release-it-plugins/lerna-changelog>,
282+
"@release-it-plugins/workspaces": toMatchDevDependency<@release-it-plugins/workspaces>,
268283
"release-it": toMatchDevDependency<release-it>,
269-
"release-it-lerna-changelog": toMatchDevDependency<release-it-lerna-changelog>,
270-
"release-it-yarn-workspaces": toMatchDevDependency<release-it-yarn-workspaces>,
271284
},
272285
"keywords": Array [],
273286
"name": "some-thing-cool",
@@ -283,11 +296,11 @@ describe('main binary', function () {
283296
"tokenRef": "GITHUB_AUTH",
284297
},
285298
"plugins": Object {
286-
"release-it-lerna-changelog": Object {
299+
"@release-it-plugins/lerna-changelog": Object {
287300
"infile": "CHANGELOG.md",
288301
"launchEditor": true,
289302
},
290-
"release-it-yarn-workspaces": true,
303+
"@release-it-plugins/workspaces": true,
291304
},
292305
},
293306
"version": "0.1.0",
@@ -305,7 +318,7 @@ describe('main binary', function () {
305318
'after:bump': 'npm run something',
306319
},
307320
plugins: {
308-
'release-it-lerna-changelog': {
321+
'@release-it-plugins/lerna-changelog': {
309322
launchEditor: false,
310323
},
311324
},
@@ -323,15 +336,17 @@ describe('main binary', function () {
323336
{
324337
devDependencies: {
325338
'release-it': expect.toMatchDevDependency('release-it'),
326-
'release-it-lerna-changelog': expect.toMatchDevDependency('release-it-lerna-changelog'),
339+
'@release-it-plugins/lerna-changelog': expect.toMatchDevDependency(
340+
'@release-it-plugins/lerna-changelog'
341+
),
327342
},
328343
},
329344
`
330345
Object {
331346
"dependencies": Object {},
332347
"devDependencies": Object {
348+
"@release-it-plugins/lerna-changelog": toMatchDevDependency<@release-it-plugins/lerna-changelog>,
333349
"release-it": toMatchDevDependency<release-it>,
334-
"release-it-lerna-changelog": toMatchDevDependency<release-it-lerna-changelog>,
335350
},
336351
"keywords": Array [],
337352
"name": "some-thing-cool",
@@ -351,7 +366,7 @@ describe('main binary', function () {
351366
"after:bump": "npm run something",
352367
},
353368
"plugins": Object {
354-
"release-it-lerna-changelog": Object {
369+
"@release-it-plugins/lerna-changelog": Object {
355370
"infile": "CHANGELOG.md",
356371
"launchEditor": false,
357372
},
@@ -374,15 +389,17 @@ describe('main binary', function () {
374389
expect(pkg).toMatchInlineSnapshot(
375390
{
376391
devDependencies: {
377-
'release-it-lerna-changelog': expect.toMatchDevDependency('release-it-lerna-changelog'),
392+
'@release-it-plugins/lerna-changelog': expect.toMatchDevDependency(
393+
'@release-it-plugins/lerna-changelog'
394+
),
378395
},
379396
},
380397
`
381398
Object {
382399
"dependencies": Object {},
383400
"devDependencies": Object {
401+
"@release-it-plugins/lerna-changelog": toMatchDevDependency<@release-it-plugins/lerna-changelog>,
384402
"release-it": "^999.999.999",
385-
"release-it-lerna-changelog": toMatchDevDependency<release-it-lerna-changelog>,
386403
},
387404
"keywords": Array [],
388405
"name": "some-thing-cool",
@@ -398,7 +415,7 @@ describe('main binary', function () {
398415
"tokenRef": "GITHUB_AUTH",
399416
},
400417
"plugins": Object {
401-
"release-it-lerna-changelog": Object {
418+
"@release-it-plugins/lerna-changelog": Object {
402419
"infile": "CHANGELOG.md",
403420
"launchEditor": true,
404421
},
@@ -410,8 +427,8 @@ describe('main binary', function () {
410427
);
411428
});
412429

413-
it('does not update devDependencies if release-it-lerna-changelog range is greater', async function () {
414-
project.addDevDependency('release-it-lerna-changelog', '^999999.0.0');
430+
it('does not update devDependencies if @release-it-plugins/lerna-changelog range is greater', async function () {
431+
project.addDevDependency('@release-it-plugins/lerna-changelog', '^999999.0.0');
415432
project.writeSync();
416433

417434
await exec(['--no-install', '--no-label-updates']);
@@ -428,8 +445,8 @@ describe('main binary', function () {
428445
Object {
429446
"dependencies": Object {},
430447
"devDependencies": Object {
448+
"@release-it-plugins/lerna-changelog": "^999999.0.0",
431449
"release-it": toMatchDevDependency<release-it>,
432-
"release-it-lerna-changelog": "^999999.0.0",
433450
},
434451
"keywords": Array [],
435452
"name": "some-thing-cool",
@@ -445,7 +462,7 @@ describe('main binary', function () {
445462
"tokenRef": "GITHUB_AUTH",
446463
},
447464
"plugins": Object {
448-
"release-it-lerna-changelog": Object {
465+
"@release-it-plugins/lerna-changelog": Object {
449466
"infile": "CHANGELOG.md",
450467
"launchEditor": true,
451468
},
@@ -457,14 +474,150 @@ describe('main binary', function () {
457474
);
458475
});
459476

477+
it('migrates from old plugins to new ones', async function () {
478+
project.addDevDependency('release-it-lerna-changelog', '^1.0.0');
479+
project.pkg['release-it'] = {
480+
plugins: {
481+
'release-it-lerna-changelog': {
482+
infile: 'RELEASES.md',
483+
launchEditor: false,
484+
},
485+
},
486+
git: {
487+
'some-other': 'prop',
488+
},
489+
};
490+
project.writeSync();
491+
492+
await exec(['--no-install', '--no-label-updates']);
493+
494+
let pkg = JSON.parse(fs.readFileSync('package.json', { encoding: 'utf8' }));
495+
496+
expect(pkg).toMatchInlineSnapshot(
497+
{
498+
devDependencies: {
499+
'release-it': expect.toMatchDevDependency('release-it'),
500+
'@release-it-plugins/lerna-changelog': expect.toMatchDevDependency(
501+
'@release-it-plugins/lerna-changelog'
502+
),
503+
},
504+
},
505+
`
506+
Object {
507+
"dependencies": Object {},
508+
"devDependencies": Object {
509+
"@release-it-plugins/lerna-changelog": toMatchDevDependency<@release-it-plugins/lerna-changelog>,
510+
"release-it": toMatchDevDependency<release-it>,
511+
},
512+
"keywords": Array [],
513+
"name": "some-thing-cool",
514+
"publishConfig": Object {
515+
"registry": "https://registry.npmjs.org",
516+
},
517+
"release-it": Object {
518+
"git": Object {
519+
"some-other": "prop",
520+
"tagName": "v\${version}",
521+
},
522+
"github": Object {
523+
"release": true,
524+
"tokenRef": "GITHUB_AUTH",
525+
},
526+
"plugins": Object {
527+
"@release-it-plugins/lerna-changelog": Object {
528+
"infile": "RELEASES.md",
529+
"launchEditor": false,
530+
},
531+
},
532+
},
533+
"version": "0.1.0",
534+
}
535+
`
536+
);
537+
});
538+
539+
it('migrates monorepo from old plugins to new ones', async function () {
540+
project.pkg.workspaces = ['packages/*'];
541+
project.addDevDependency('release-it-lerna-changelog', '^1.0.0');
542+
project.addDevDependency('release-it-yarn-workspaces', '^1.0.0');
543+
project.pkg['release-it'] = {
544+
plugins: {
545+
'release-it-lerna-changelog': {
546+
infile: 'RELEASES.md',
547+
launchEditor: false,
548+
},
549+
'release-it-yarn-workspaces': true,
550+
},
551+
git: {
552+
'some-other': 'prop',
553+
},
554+
};
555+
project.writeSync();
556+
557+
await exec(['--no-install', '--no-label-updates']);
558+
559+
let pkg = JSON.parse(fs.readFileSync('package.json', { encoding: 'utf8' }));
560+
561+
expect(pkg).toMatchInlineSnapshot(
562+
{
563+
devDependencies: {
564+
'release-it': expect.toMatchDevDependency('release-it'),
565+
'@release-it-plugins/lerna-changelog': expect.toMatchDevDependency(
566+
'@release-it-plugins/lerna-changelog'
567+
),
568+
569+
'@release-it-plugins/workspaces': expect.toMatchDevDependency(
570+
'@release-it-plugins/workspaces'
571+
),
572+
},
573+
},
574+
`
575+
Object {
576+
"dependencies": Object {},
577+
"devDependencies": Object {
578+
"@release-it-plugins/lerna-changelog": toMatchDevDependency<@release-it-plugins/lerna-changelog>,
579+
"@release-it-plugins/workspaces": toMatchDevDependency<@release-it-plugins/workspaces>,
580+
"release-it": toMatchDevDependency<release-it>,
581+
},
582+
"keywords": Array [],
583+
"name": "some-thing-cool",
584+
"publishConfig": Object {
585+
"registry": "https://registry.npmjs.org",
586+
},
587+
"release-it": Object {
588+
"git": Object {
589+
"some-other": "prop",
590+
"tagName": "v\${version}",
591+
},
592+
"github": Object {
593+
"release": true,
594+
"tokenRef": "GITHUB_AUTH",
595+
},
596+
"plugins": Object {
597+
"@release-it-plugins/lerna-changelog": Object {
598+
"infile": "RELEASES.md",
599+
"launchEditor": false,
600+
},
601+
"@release-it-plugins/workspaces": true,
602+
},
603+
},
604+
"version": "0.1.0",
605+
"workspaces": Array [
606+
"packages/*",
607+
],
608+
}
609+
`
610+
);
611+
});
612+
460613
// skip this test when running locally, it is pretty slow and unlikely to _actually_ matter
461614
(process.env.CI ? it : it.skip)(
462615
'installs dependencies',
463616
async function () {
464617
await exec(['--no-label-updates']);
465618

466619
expect(fs.existsSync('node_modules/release-it')).toBeTruthy();
467-
expect(fs.existsSync('node_modules/release-it-lerna-changelog')).toBeTruthy();
620+
expect(fs.existsSync('node_modules/@release-it-plugins/lerna-changelog')).toBeTruthy();
468621
},
469622
60000
470623
);

0 commit comments

Comments
 (0)