Skip to content

Commit

Permalink
feat(babel-istanbul): stopped including the plugin since it is not ne…
Browse files Browse the repository at this point in the history
…eded with c8
  • Loading branch information
travi committed Jun 3, 2022
1 parent d94a8a3 commit 18daef0
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 40 deletions.
21 changes: 0 additions & 21 deletions src/scaffolder/dialects/babel-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,27 +24,6 @@ suite('babel config', () => {

assert.deepEqual(
await scaffoldBabel({preset: babelPreset, projectRoot, tests: {unit: true}, buildDirectory}),
{devDependencies: ['@babel/register', babelPresetPackageName, 'babel-plugin-istanbul'], eslint: {}}
);

assert.calledWith(
fs.writeFile,
`${projectRoot}/.babelrc`,
JSON.stringify({
presets: [babelPresetName],
ignore: [`./${buildDirectory}/`],
env: {test: {plugins: ['istanbul']}}
})
);
});

test('that the istanbul plugin dependency is not included if unit testing is not desired', async () => {
const babelPresetName = any.string();
const babelPresetPackageName = any.word();
const babelPreset = {name: babelPresetName, packageName: babelPresetPackageName};

assert.deepEqual(
await scaffoldBabel({preset: babelPreset, projectRoot, tests: {unit: false}, buildDirectory}),
{devDependencies: ['@babel/register', babelPresetPackageName], eslint: {}}
);

Expand Down
14 changes: 3 additions & 11 deletions src/scaffolder/dialects/babel.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,17 @@
import {promises as fsPromises} from 'fs';

export default async function ({projectRoot, preset, tests, buildDirectory}) {
export default async function ({projectRoot, preset, buildDirectory}) {
if (!preset) {
throw new Error('No babel preset provided. Cannot configure babel transpilation');
}

await fsPromises.writeFile(
`${projectRoot}/.babelrc`,
JSON.stringify({
presets: [preset.name],
ignore: [`./${buildDirectory}/`],
...tests.unit && {env: {test: {plugins: ['istanbul']}}}
})
JSON.stringify({presets: [preset.name], ignore: [`./${buildDirectory}/`]})
);

return {
devDependencies: [
'@babel/register',
preset.packageName,
...tests.unit ? ['babel-plugin-istanbul'] : []
],
devDependencies: ['@babel/register', preset.packageName],
eslint: {}
};
}
5 changes: 2 additions & 3 deletions src/scaffolder/dialects/scaffolder-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,12 @@ suite('scaffold dialect', () => {

test('that babel is scaffolded when chosen', async () => {
const babelPreset = any.word();
const tests = any.simpleObject();
const buildDirectory = any.string();
const babelResults = any.simpleObject();
babel.default.withArgs({preset: babelPreset, projectRoot, tests, buildDirectory}).resolves(babelResults);
babel.default.withArgs({preset: babelPreset, projectRoot, buildDirectory}).resolves(babelResults);

assert.equal(
await scaffoldDialect({dialect: dialects.BABEL, configs: {babelPreset}, projectRoot, tests, buildDirectory}),
await scaffoldDialect({dialect: dialects.BABEL, configs: {babelPreset}, projectRoot, buildDirectory}),
babelResults
);
});
Expand Down
4 changes: 2 additions & 2 deletions src/scaffolder/dialects/scaffolder.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import scaffoldBabel from './babel';
import scaffoldTypescript from './typescript';
import scaffoldEsm from './esm';

export default function ({dialect, projectType, projectRoot, configs, tests, buildDirectory, testFilenamePattern}) {
export default function ({dialect, projectType, projectRoot, configs, buildDirectory, testFilenamePattern}) {
switch (dialect) {
case dialects.BABEL:
return scaffoldBabel({preset: configs.babelPreset, projectRoot, tests, buildDirectory});
return scaffoldBabel({preset: configs.babelPreset, projectRoot, buildDirectory});
case dialects.TYPESCRIPT:
return scaffoldTypescript({config: configs.typescript, projectType, projectRoot, testFilenamePattern});
case dialects.ESM:
Expand Down
2 changes: 0 additions & 2 deletions src/scaffolder/scaffolder-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,6 @@ suite('javascript project scaffolder', () => {
projectRoot,
projectType,
configs,
tests,
buildDirectory: projectTypeBuildDirectory,
dialect: chosenDialect,
testFilenamePattern
Expand Down Expand Up @@ -279,7 +278,6 @@ suite('javascript project scaffolder', () => {
configs,
projectRoot,
projectType,
tests,
buildDirectory: projectTypeBuildDirectory,
dialect: chosenDialect,
testFilenamePattern
Expand Down
1 change: 0 additions & 1 deletion src/scaffolder/scaffolder.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ export default async function (options) {
configs,
projectRoot,
projectType,
tests,
buildDirectory: projectTypeResults.buildDirectory,
testFilenamePattern: verificationResults.testFilenamePattern
})
Expand Down

0 comments on commit 18daef0

Please sign in to comment.