Support features on the command line

package.json

@@ -99,7 +99,7 @@
   },
   "dependencies": {
     "@dojo/framework": "~3.0.0",
-    "@dojo/webpack-contrib": "~3.0.1",
+    "@dojo/webpack-contrib": "4.0.0-alpha.1",
     "brotli-webpack-plugin": "0.5.0",
     "chalk": "2.4.1",
     "clean-webpack-plugin": "0.1.17",

src/main.ts

@@ -202,17 +202,38 @@ const command: Command = {
 			default: false,
 			type: 'boolean'
 		});
+
+		options('feature', {
+			describe: 'List of features to include',
+			alias: 'f',
+			array: true,
+			coerce: (args: string[]) => {
+				return args.reduce(
+					(newArgs, arg) => {
+						const parts = arg.split('=');
+						if (parts.length === 1) {
+							newArgs[arg] = true;
+						} else if (parts.length === 2) {
+							newArgs[parts[0]] = parts[1];
+						}
+						return newArgs;
+					},
+					{} as any
+				);
+			}
+		});
 	},
 	run(helper: Helper, args: any) {
 		console.log = () => {};
-		const rc = helper.configuration.get() || {};
 		let config: webpack.Configuration;
+		let { feature, ...remainingArgs } = args;
+		remainingArgs = { ...remainingArgs, features: { ...remainingArgs.features, ...feature } };
 		if (args.mode === 'dev') {
-			config = devConfigFactory({ ...rc, ...args });
+			config = devConfigFactory(remainingArgs);
 		} else if (args.mode === 'test') {
-			config = testConfigFactory({ ...rc, ...args });
+			config = testConfigFactory(remainingArgs);
 		} else {
-			config = distConfigFactory({ ...rc, ...args });
+			config = distConfigFactory(remainingArgs);
 		}
 
 		if (args.serve) {

test-app/.dojorc-app

@@ -4,6 +4,7 @@
 		"locale": "en",
 		"supportedLocales": [ "es" ],
 		"features": {
+			"env": "ci",
 			"foo": true,
 			"bar": false
 		},

test-app/.dojorc-pwa

@@ -3,6 +3,7 @@
 		"locale": "en",
 		"supportedLocales": [ "es" ],
 		"features": {
+			"env": "ci",
 			"foo": true,
 			"bar": false
 		},

test-app/package.json

@@ -5,9 +5,9 @@
   "main": "index.js",
   "scripts": {
     "install-build-app": "npm install --no-save ../dist/dojo-cli-build-app.tgz",
-    "build:dist": "dojo build --mode dist --legacy",
+    "build:dist": "dojo build --mode dist --legacy --feature env=prod",
     "build:dev": "dojo build --mode dev --legacy",
-    "build:dist:evergreen": "dojo build --mode dist",
+    "build:dist:evergreen": "dojo build --mode dist --feature env=prod",
     "build:dev:evergreen": "dojo build --mode dev",
     "build:test": "dojo build --mode test"
   },

test-app/src/main.ts

@@ -12,7 +12,7 @@ if (has('foo')) {
 
 const btr = has('build-time-render');
 
-App().then(result => {
+App().then((result) => {
 	console.log(result());
 	console.log(require('foo/bar'));
 });
@@ -29,6 +29,14 @@ if (process.env.NODE_ENV === 'production') {
 	div.setAttribute('nodeenv', 'production');
 }
 
+if (has('env') === 'prod') {
+	div.setAttribute('has-prod', 'prod');
+}
+
+if (has('env') === 'ci') {
+	div.setAttribute('has-ci', 'ci');
+}
+
 div.textContent = `Built with Build Time Render: ${!!div.getAttribute('hasBtr')}
 Currently Rendered by BTR: ${has('build-time-render')}`;
 

tests/integration/build.spec.ts

@@ -9,6 +9,8 @@ Currently Rendered by BTR: false`
 	cy.get('script[src^="lazy"]').should('exist');
 	cy.get('script[src^="src/Foo"]').should('exist');
 	cy.get('#div[nodeenv=production]').should(isDist ? 'exist' : 'not.exist');
+	cy.get('#div[has-prod=prod]').should(isDist ? 'exist' : 'not.exist');
+	cy.get('#div[has-ci=ci]').should(isDist ? 'not.exist' : 'exist');
 
 	cy.get('meta[name="mobile-web-app-capable"]').should(isPwa ? 'exist' : 'not.exist');
 	cy.get('meta[name="apple-mobile-web-app-capable"]').should(isPwa ? 'exist' : 'not.exist');

tests/unit/main.ts

@@ -133,6 +133,18 @@ describe('command', () => {
 		});
 	});
 
+	it('mixes in features from command line', () => {
+		const main = mockModule.getModuleUnderTest().default;
+		return main
+			.run(getMockConfiguration(), { mode: 'dist', feature: { foo: true }, features: { foo: false, bar: false } })
+			.then(() => {
+				assert.isTrue(mockDistConfig.called);
+				assert.deepEqual(mockDistConfig.firstCall.args, [
+					{ mode: 'dist', features: { foo: true, bar: false } }
+				]);
+			});
+	});
+
 	it('rejects if an error occurs', () => {
 		isError = true;
 		const main = mockModule.getModuleUnderTest().default;