Skip to content

Commit c4f9602

Browse files
committed
feat(version): wrote to the existing package.json after the order change in the js language plugin
BREAKING CHANGE: the plugin now expects to be executed after the `package.json` already exists, which was not reality before v6.0.0-alpha.1 of `@form8ion/javascript`
1 parent 0775344 commit c4f9602

File tree

6 files changed

+71
-30
lines changed

6 files changed

+71
-30
lines changed

package-lock.json

Lines changed: 41 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@
8888
"dependencies": {
8989
"@form8ion/core": "^1.4.2",
9090
"@form8ion/github-workflows-core": "1.0.0",
91-
"@form8ion/javascript-core": "^5.0.0",
91+
"@form8ion/javascript-core": "^5.2.0",
9292
"deepmerge": "^4.2.2",
9393
"js-yaml": "^4.1.0"
9494
}

src/scaffolder-test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ suite('commit-convention scaffolder', () => {
3333
sandbox.stub(semanticReleaseScaffolder, 'default');
3434

3535
commitizenScaffolder.default.withArgs({projectRoot}).resolves(commitizenResults);
36-
semanticReleaseScaffolder.default.returns(semanticReleaseResults);
36+
semanticReleaseScaffolder.default.withArgs({projectRoot}).resolves(semanticReleaseResults);
3737
});
3838

3939
teardown(() => sandbox.restore());
@@ -45,6 +45,7 @@ suite('commit-convention scaffolder', () => {
4545
test('that only semantic-release is configured for a sub-package', async () => {
4646
assert.deepEqual(
4747
await scaffoldCommitConvention({
48+
projectRoot,
4849
pathWithinParent: any.string(),
4950
projectType: publishedProjectType
5051
}),

src/scaffolder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import scaffoldCommitlint from './commitlint';
77

88
export default async function ({projectRoot, projectType, configs, pathWithinParent}) {
99
const detailsForProjectsPublishedToARegistry = [projectTypes.PACKAGE, projectTypes.CLI].includes(projectType)
10-
? scaffoldSemanticRelease()
10+
? await scaffoldSemanticRelease({projectRoot})
1111
: {};
1212

1313
if (pathWithinParent) return detailsForProjectsPublishedToARegistry;

src/semantic-release/scaffolder-test.js

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
1+
import * as jsCore from '@form8ion/javascript-core';
2+
13
import {assert} from 'chai';
4+
import sinon from 'sinon';
5+
import any from '@travi/any';
26

37
import scaffoldSemanticRelease from './scaffolder';
48

59
suite('semantic-release scaffolder', () => {
10+
let sandbox;
11+
const projectRoot = any.string();
12+
13+
setup(() => {
14+
sandbox = sinon.createSandbox();
15+
16+
sandbox.stub(jsCore, 'mergeIntoExistingPackageJson');
17+
});
18+
19+
teardown(() => sandbox.restore());
20+
621
test('that that the badge and version string are generated', async () => {
722
assert.deepEqual(
8-
await scaffoldSemanticRelease(),
23+
await scaffoldSemanticRelease({projectRoot}),
924
{
10-
packageProperties: {version: '0.0.0-semantically-released'},
1125
badges: {
1226
contribution: {
1327
'semantic-release': {
@@ -19,5 +33,10 @@ suite('semantic-release scaffolder', () => {
1933
}
2034
}
2135
);
36+
37+
assert.calledWith(
38+
jsCore.mergeIntoExistingPackageJson,
39+
{projectRoot, config: {version: '0.0.0-semantically-released'}}
40+
);
2241
});
2342
});

src/semantic-release/scaffolder.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
export default function () {
1+
import {mergeIntoExistingPackageJson} from '@form8ion/javascript-core';
2+
3+
export default async function ({projectRoot}) {
4+
await mergeIntoExistingPackageJson({projectRoot, config: {version: '0.0.0-semantically-released'}});
5+
26
return {
3-
packageProperties: {version: '0.0.0-semantically-released'},
47
badges: {
58
contribution: {
69
'semantic-release': {

0 commit comments

Comments
 (0)