Skip to content
This repository was archived by the owner on Feb 15, 2024. It is now read-only.

Commit f92a39f

Browse files
committed
Don't suggest webpack for UMD module type
1 parent 1e49250 commit f92a39f

File tree

10 files changed

+2
-214
lines changed

10 files changed

+2
-214
lines changed

generators/app/index.js

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -142,20 +142,6 @@ Generator Version: ${config.generatorVersion}`
142142
);
143143
}.bind(this)
144144
},
145-
{
146-
type: "list",
147-
name: "buildTool",
148-
message: "Which build tool do you want to use?",
149-
choices: [
150-
promptOptions.buildTool.NONE,
151-
promptOptions.buildTool.WEBPACK
152-
],
153-
when: function(props) {
154-
return props.moduleType === promptOptions.moduleType.UMD && props.projectType === promptOptions.projectType.PLAIN;
155-
},
156-
default: promptOptions.buildTool.NONE,
157-
store: true
158-
},
159145
{
160146
type: "list",
161147
name: "loadingType",
@@ -168,8 +154,7 @@ Generator Version: ${config.generatorVersion}`
168154
store: true,
169155
when: function(props) {
170156
return (
171-
props.moduleType === promptOptions.moduleType.UMD &&
172-
props.buildTool === promptOptions.buildTool.NONE && props.projectType === promptOptions.projectType.PLAIN
157+
props.moduleType === promptOptions.moduleType.UMD && props.projectType === promptOptions.projectType.PLAIN
173158
);
174159
}
175160
},
@@ -178,12 +163,7 @@ Generator Version: ${config.generatorVersion}`
178163
name: "language",
179164
message: "Which language variant do you want to use?",
180165
choices: function(props) {
181-
if (props.moduleType === promptOptions.moduleType.ES6_MODULES) {
182-
return [
183-
promptOptions.language.ES6,
184-
promptOptions.language.TypeScript
185-
];
186-
} else if (props.buildTool === promptOptions.buildTool.NONE) {
166+
if (props.moduleType === promptOptions.moduleType.UMD) {
187167
return [promptOptions.language.ES5, promptOptions.language.ES6];
188168
} else {
189169
return [
@@ -238,7 +218,6 @@ Generator Version: ${config.generatorVersion}`
238218
this.props.useLocalNpm =
239219
answers.moduleType === promptOptions.moduleType.NPM;
240220
this.props.useWebpack =
241-
answers.buildTool === "webpack" ||
242221
this.props.useES6Modules ||
243222
this.props.useLocalNpm;
244223
this.props.useYarn =
@@ -341,7 +320,6 @@ Generator Version: ${config.generatorVersion}`
341320
this.config.set("scriptsPath", "app/scripts");
342321
this.config.set("libPath", "app/lib");
343322
this.config.set("stylesPath", "app/styles");
344-
this.config.set("buildTool", this.props.buildTool);
345323
this.config.set("language", this.props.language);
346324
this.config.set("modules", this.props.modules);
347325
this.config.set("licenseContent", this.props.licenseContent);

generators/app/promptOptions.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ module.exports = {
1212
ES6_MODULES: "ES Modules",
1313
NPM: "Local NPM dependency (recommended)"
1414
},
15-
buildTool: {
16-
NONE: "none",
17-
WEBPACK: "webpack"
18-
},
1915
language: {
2016
ES5: "ES5",
2117
ES6: "ES6",

generators/class/index.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,6 @@ module.exports = class extends Generator {
77
writing() {
88
const appPath = this.options.appPath || this.config.get("appPath") || "app";
99
const scriptsPath = this.options.scriptsPath || this.config.get("scriptsPath") || path.join(appPath, "scripts");
10-
const libPath = this.options.libPath || this.config.get("libPath") || path.join(appPath, "lib");
11-
const stylesPath = this.options.stylesPath || this.config.get("stylesPath") || path.join(appPath, "styles");
12-
13-
const buildTool = this.options.buildTool || this.config.get("buildTool") || "none";
14-
1510
const language = this.options.language || this.config.get("language") || "javascript";
1611

1712
const useWebpack = this.options.useWebpack;

test/umd-webpack-es6.js

Lines changed: 0 additions & 91 deletions
This file was deleted.

test/umd-webpack-typescript.js

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)