Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: generated loader template #1720

Merged
merged 6 commits into from
Aug 2, 2020
Merged

fix: generated loader template #1720

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cdd0bb9
fix: generated loader template
snitin315 Aug 1, 2020
ca6cfb9
fix: generators test
snitin315 Aug 1, 2020
27ce7d5
Merge branch 'next' into fix/loader
anshumanv Aug 1, 2020
d43fcb8
Merge branch 'next' into fix/loader
snitin315 Aug 1, 2020
c0dc0ea
Merge branch 'next' into fix/loader
jamesgeorge007 Aug 1, 2020
6b2d03b
refactor: Update test/loader/loader.test.js
snitin315 Aug 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/generate-loader/templates/src/_index.js.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* https://webpack.js.org/contribute/writing-a-loader
*/

export default function loader(source) {
module.exports = function loader(source) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should implement --babel option to this in future (put babel config and generate es module syntax)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will implement in future PR.

const { loaders, resource, request, version, webpack } = this;

console.log('<%= name %>');
const newSource = `
/**
* <%= name %>
Expand Down
2 changes: 1 addition & 1 deletion packages/generators/__tests__/loader-generator.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)],
]);

Expand Down
7 changes: 6 additions & 1 deletion test/loader/loader.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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));
expect(stdout).toContain('test-loader');
});
});