Skip to content

Commit f4e304b

Browse files
committed
feat(dependencies): align to the modern declaration format
BREAKING CHANGE: dependencies are now declared with the modern format for #697
1 parent 3aeee3c commit f4e304b

File tree

6 files changed

+20
-13
lines changed

6 files changed

+20
-13
lines changed

src/config/scaffolder.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,9 @@ export default defineConfig({
2727
});`
2828
);
2929

30-
return {devDependencies: [...projectTypes.PACKAGE === projectType ? ['rollup-plugin-auto-external'] : []]};
30+
return {
31+
dependencies: {
32+
javascript: {development: [...projectTypes.PACKAGE === projectType ? ['rollup-plugin-auto-external'] : []]}
33+
}
34+
};
3135
}

src/config/scaffolder.test.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ describe('config scaffolder', () => {
1616
});
1717

1818
it('should enable the library mode for a package project-type', async () => {
19-
const {devDependencies} = await scaffoldConfig({projectRoot, projectType: projectTypes.PACKAGE});
19+
const {dependencies: {javascript: {development}}} = await scaffoldConfig({
20+
projectRoot,
21+
projectType: projectTypes.PACKAGE
22+
});
2023

2124
expect(fs.writeFile).toHaveBeenCalledWith(
2225
`${projectRoot}/vite.config.js`,
@@ -34,11 +37,11 @@ export default defineConfig({
3437
}
3538
});`
3639
);
37-
expect(devDependencies).toEqual(['rollup-plugin-auto-external']);
40+
expect(development).toEqual(['rollup-plugin-auto-external']);
3841
});
3942

4043
it('should not enable library mode for other project-types', async () => {
41-
const {devDependencies} = await scaffoldConfig({projectRoot, projectType: any.word()});
44+
const {dependencies: {javascript: {development}}} = await scaffoldConfig({projectRoot, projectType: any.word()});
4245

4346
expect(fs.writeFile).toHaveBeenCalledWith(
4447
`${projectRoot}/vite.config.js`,
@@ -50,6 +53,6 @@ export default defineConfig({
5053
}
5154
});`
5255
);
53-
expect(devDependencies).toEqual([]);
56+
expect(development).toEqual([]);
5457
});
5558
});

src/scaffolder.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export default async function ({projectRoot, projectType}) {
77

88
return deepmerge.all([
99
{
10-
devDependencies: ['vite'],
10+
dependencies: {javascript: {development: ['vite']}},
1111
scripts: {
1212
'build:js': 'vite build',
1313
watch: 'run-s \'build:js -- --watch\''

src/scaffolder.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ describe('scaffolder', () => {
2323
when(scaffoldConfig).calledWith({projectRoot, projectType}).thenResolve(configResults);
2424
when(deepmerge.all).calledWith([
2525
{
26-
devDependencies: ['vite'],
26+
dependencies: {javascript: {development: ['vite']}},
2727
scripts: {
2828
'build:js': 'vite build',
2929
watch: 'run-s \'build:js -- --watch\''

test/integration/features/step_definitions/config-steps.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ import {Then} from '@cucumber/cucumber';
33
import {assert} from 'chai';
44

55
Then('basic config is defined', async function () {
6-
const {devDependencies} = this.scaffoldResult;
6+
const {dependencies: {javascript: {development}}} = this.scaffoldResult;
77
const configContents = await fs.readFile(`${process.cwd()}/vite.config.js`, 'utf-8');
88

9-
assert.notInclude(devDependencies, 'rollup-plugin-auto-external');
9+
assert.notInclude(development, 'rollup-plugin-auto-external');
1010
assert.equal(
1111
configContents,
1212
`import {defineConfig} from 'vite';
@@ -20,10 +20,10 @@ export default defineConfig({
2020
});
2121

2222
Then('library mode is enabled', async function () {
23-
const {devDependencies} = this.scaffoldResult;
23+
const {dependencies: {javascript: {development}}} = this.scaffoldResult;
2424
const configContents = await fs.readFile(`${process.cwd()}/vite.config.js`, 'utf-8');
2525

26-
assert.include(devDependencies, 'rollup-plugin-auto-external');
26+
assert.include(development, 'rollup-plugin-auto-external');
2727
assert.equal(
2828
configContents,
2929
`import {defineConfig} from 'vite';

test/integration/features/step_definitions/dependencies-steps.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import {Then} from '@cucumber/cucumber';
22
import {assert} from 'chai';
33

44
Then('vite is installed', async function () {
5-
const {devDependencies} = this.scaffoldResult;
5+
const {dependencies: {javascript: {development}}} = this.scaffoldResult;
66

7-
assert.include(devDependencies, 'vite');
7+
assert.include(development, 'vite');
88
});

0 commit comments

Comments
 (0)