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(generator): using configFile in configPath to get the config file name #883

Merged
merged 10 commits into from
May 24, 2019
Merged

fix(generator): using configFile in configPath to get the config file name #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2ca57a2
fix(generator): using configFile in configPath
anikethsaha May 12, 2019
0b65ba8
fix(lint): added semicolon
anikethsaha May 12, 2019
e007c45
fix(lint): remove blank line and added space
anikethsaha May 12, 2019
c395c16
chore: removed the if-statement
anikethsaha May 13, 2019
118ac1d
fix(init): refractor the init-generator to fix entry issue
anikethsaha May 21, 2019
0e762d7
Merge branch 'bugfix/init-entry-point-fix' of https://github.com/anik…
anikethsaha May 21, 2019
04e7b17
fix(init): refractor the init-generator to fix entry issue
anikethsaha May 21, 2019
7dc7a74
Merge remote-tracking branch 'upstream/master' into bugfix/init-entry…
anikethsaha May 23, 2019
f8ddc41
Merge branch 'bugfix/init-entry-point-fix' of https://github.com/anik…
anikethsaha May 23, 2019
737934b
Merge branch 'bugfix/configPath-in-remove-generator' of https://githu…
anikethsaha May 23, 2019
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
10 changes: 4 additions & 6 deletions packages/generators/init-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,13 +92,11 @@ export default class InitGenerator extends Generator {
.then(
(entryOptions: object | string): Promise<{}> => {
if (typeof entryOptions === "string" && entryOptions.length > 0) {
return this.prompt([
Input("outputType", "In which folder do you want to store your generated bundles? (dist):")
]);
}
if (entryOptions !== '""') {
this.configuration.config.webpackOptions.entry = entryOptions;
if (entryOptions !== "\"\"" && entryOptions !== "\'\'") {
this.configuration.config.webpackOptions.entry = entryOptions;
}
}

return this.prompt([
Input("outputType", "In which folder do you want to store your generated bundles? (dist):")
]);
Expand Down
8 changes: 2 additions & 6 deletions packages/generators/remove-generator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,9 @@ export default class RemoveGenerator extends Generator {
webpackOptions: {}
}
};

let configPath = path.resolve(process.cwd(), "webpack.config.js");
const { configFile } = opts;
let configPath = path.resolve(process.cwd(), configFile);
const webpackConfigExists = fs.existsSync(configPath);
if (!webpackConfigExists) {
configPath = null;
// end the generator stating webpack config not found or to specify the config
}
this.webpackOptions = require(configPath);
}

Expand Down
9 changes: 5 additions & 4 deletions packages/utils/modify-config-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ export default function modifyHelperUtil(
logSymbols.error +
chalk.red(" ERROR ") +
chalk.cyan(configFile) +
" not found. Please specify a valid path to your webpack config like " +
" not found. Please specify a valid path to your webpack config like \n " +
chalk.white("$ ") +
chalk.cyan(`webpack-cli ${action} webpack.dev.js`) +
"\n"
Expand All @@ -87,10 +87,11 @@ export default function modifyHelperUtil(
}
};
}

env.registerStub(generator, generatorName);

env.run(generatorName)
.then(
env.run(generatorName, {
configFile
Copy link
Contributor

Choose a reason for hiding this comment

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

What's this change for?

Copy link
Member Author

Choose a reason for hiding this comment

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

To pass the config file name to the generator.

Copy link
Member

Choose a reason for hiding this comment

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

This change is probably ok and needed as we need this to be dynamic. Just gotta check that it works. Change is that the generator will have output of the config file supplied vs webpack.config.js

Copy link
Member Author

Choose a reason for hiding this comment

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

yes, I used this in my machine and its working fine. This can use workable with the other generators too like the update one and in add too

}).then(
(): void => {
let configModule: object;
try {
Expand Down