From cdd0bb9153563b65e979704014804ec432199aca Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Sat, 1 Aug 2020 16:55:59 +0530 Subject: [PATCH 1/3] fix: generated loader template --- packages/generate-loader/templates/src/_index.js.tpl | 4 ++-- test/loader/loader.test.js | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/generate-loader/templates/src/_index.js.tpl b/packages/generate-loader/templates/src/_index.js.tpl index cbea1368621..fa1972c5704 100644 --- a/packages/generate-loader/templates/src/_index.js.tpl +++ b/packages/generate-loader/templates/src/_index.js.tpl @@ -3,9 +3,9 @@ * https://webpack.js.org/contribute/writing-a-loader */ -export default function loader(source) { +module.exports = function loader(source) { const { loaders, resource, request, version, webpack } = this; - + console.log('<%= name %>'); const newSource = ` /** * <%= name %> diff --git a/test/loader/loader.test.js b/test/loader/loader.test.js index d075c322f58..60bec673b95 100644 --- a/test/loader/loader.test.js +++ b/test/loader/loader.test.js @@ -28,7 +28,7 @@ describe('loader command', () => { }); it('should scaffold loader template with a given name', async () => { - const { stdout } = await runPromptWithAnswers(__dirname, ['loader'], [`${loaderName}${ENTER}`]); + let { stdout } = await runPromptWithAnswers(__dirname, ['loader'], [`${loaderName}${ENTER}`]); expect(stdout).toContain(firstPrompt); @@ -46,5 +46,10 @@ describe('loader command', () => { files.forEach((file) => { expect(existsSync(join(__dirname, `${loaderName}/${file}`))).toBeTruthy(); }); + + //check if the the generated plugin works successfully + const path = resolve(__dirname, './test-loader/examples/simple/'); + stdout = run(path, [], false).stdout; + expect(stdout).toContain('test-loader'); }); }); From ca6cfb9933aeca66dc4fa939351f9da64b2e7e52 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Sat, 1 Aug 2020 18:36:33 +0530 Subject: [PATCH 2/3] fix: generators test --- packages/generators/__tests__/loader-generator.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/generators/__tests__/loader-generator.test.ts b/packages/generators/__tests__/loader-generator.test.ts index 6ee76b208c7..4b6d7f38605 100644 --- a/packages/generators/__tests__/loader-generator.test.ts +++ b/packages/generators/__tests__/loader-generator.test.ts @@ -28,7 +28,7 @@ describe('loader generator', () => { // Check the contents of the webpack config and loader file assert.fileContent([ [join(loaderDir, 'examples/simple/webpack.config.js'), /resolveLoader: {/], - [join(loaderDir, 'src/index.js'), /export default function loader\(source\) {/], + [join(loaderDir, 'src/index.js'), /module.exports = function loader\(source\) {/], [join(loaderDir, 'package.json'), new RegExp(loaderName)], ]); From 6b2d03b630266e38dfedc1d61b573382df324280 Mon Sep 17 00:00:00 2001 From: Nitin Kumar Date: Sun, 2 Aug 2020 09:58:13 +0530 Subject: [PATCH 3/3] refactor: Update test/loader/loader.test.js Co-authored-by: James George --- test/loader/loader.test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/loader/loader.test.js b/test/loader/loader.test.js index 60bec673b95..89a01479fc8 100644 --- a/test/loader/loader.test.js +++ b/test/loader/loader.test.js @@ -49,7 +49,7 @@ describe('loader command', () => { //check if the the generated plugin works successfully const path = resolve(__dirname, './test-loader/examples/simple/'); - stdout = run(path, [], false).stdout; + ({ stdout } = run(path, [], false)); expect(stdout).toContain('test-loader'); }); });