Pass features map down to BTR

Author: KaneFreeman

.gitignore

@@ -6,3 +6,4 @@ npm-debug.log
 yarn.lock
 /test-app/package-lock.json
 /test-app/.dojorc
+.vscode/

src/base.config.ts

@@ -199,7 +199,7 @@ export class InsertScriptPlugin {
 	}
 }
 
-export default function webpackConfigFactory(args: any): webpack.Configuration {
+export default function webpackConfigFactory(args: any): { config: webpack.Configuration; features: any } {
 	tsnode.register({ transpileOnly: true });
 	const isLegacy = args.legacy;
 	const experimental = args.experimental || {};
@@ -676,5 +676,5 @@ export default function webpackConfigFactory(args: any): webpack.Configuration {
 		}
 	};
 
-	return config as webpack.Configuration;
+	return { config, features };
 }

src/base.test.config.ts

@@ -5,7 +5,7 @@ import ExternalLoaderPlugin from '@dojo/webpack-contrib/external-loader-plugin/E
 const WrapperPlugin = require('wrapper-webpack-plugin');
 
 function webpackConfig(args: any): webpack.Configuration {
-	const config = baseConfigFactory(args);
+	const { config } = baseConfigFactory(args);
 	const { plugins, module } = config;
 	const externals: any[] = (config.externals as any[]) || [];
 

src/dev.config.ts

@@ -27,7 +27,7 @@ function webpackConfig(args: any): webpack.Configuration {
 	const base = args.target === 'electron' ? './' : args.base || '/';
 
 	const basePath = process.cwd();
-	const config = baseConfigFactory(args);
+	const { config, features } = baseConfigFactory(args);
 	const manifest: WebAppManifest = args.pwa && args.pwa.manifest;
 	const { plugins, output, module } = config;
 	const outputPath = path.join(output!.path!, 'dev');
@@ -131,7 +131,8 @@ window['${libraryName}'].base = '${base}'</script>`,
 				baseUrl: base,
 				scope: libraryName,
 				onDemand: Boolean(args.serve && args.watch),
-				cacheOptions: { ...cacheOptions, invalidates: [] }
+				cacheOptions: { ...cacheOptions, invalidates: [] },
+				features
 			})
 		);
 	}

src/dist.config.ts

@@ -34,7 +34,7 @@ All rights reserved
 function webpackConfig(args: any): webpack.Configuration {
 	const basePath = process.cwd();
 	const base = args.target === 'electron' ? './' : args.base || '/';
-	const config = baseConfigFactory(args);
+	const { config, features } = baseConfigFactory(args);
 	const manifest: WebAppManifest = args.pwa && args.pwa.manifest;
 	const { plugins, output } = config;
 	const outputPath = path.join(output!.path!, 'dist');
@@ -156,7 +156,8 @@ function webpackConfig(args: any): webpack.Configuration {
 				baseUrl: base,
 				scope: libraryName,
 				onDemand: Boolean(args.serve && args.watch),
-				cacheOptions: { ...cacheOptions, invalidates: [] }
+				cacheOptions: { ...cacheOptions, invalidates: [] },
+				features
 			})
 		);
 	}

src/main.ts

@@ -196,7 +196,8 @@ async function serve(configs: webpack.Configuration[], args: any, esbuild = fals
 			compiler: (compiler as any).compilers ? (compiler as any).compilers[0] : compiler,
 			entries: mainConfig.entry ? Object.keys(mainConfig.entry) : [],
 			outputPath: outputDir,
-			jsonpName
+			jsonpName,
+			features: args['features']
 		});
 		app.use(base, (req, res, next) => onDemandBtr.middleware(req, res, next));
 	}

tests/unit/main.ts

@@ -131,7 +131,7 @@ describe('command', () => {
 
 	it('can run dev mode', () => {
 		const main = mockModule.getModuleUnderTest().default;
-		main.run(getMockHelper(), { mode: 'dev' }).then(() => {
+		return main.run(getMockHelper(), { mode: 'dev' }).then(() => {
 			assert.isTrue(mockDevConfig.called);
 			assert.isTrue(mockLogger.calledWith('stats', ['dev config']));
 		});