diff --git a/.gitignore b/.gitignore
index 02ec2176..e15813b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ npm-debug.log
 yarn.lock
 /test-app/package-lock.json
 /test-app/.dojorc
+.vscode/
diff --git a/src/base.config.ts b/src/base.config.ts
index 37a7f380..648ca521 100644
--- a/src/base.config.ts
+++ b/src/base.config.ts
@@ -676,5 +676,5 @@ export default function webpackConfigFactory(args: any): webpack.Configuration {
 		}
 	};
 
-	return config as webpack.Configuration;
+	return config;
 }
diff --git a/src/dev.config.ts b/src/dev.config.ts
index 2644bc33..6fe5b732 100644
--- a/src/dev.config.ts
+++ b/src/dev.config.ts
@@ -131,7 +131,11 @@ window['${libraryName}'].base = '${base}'</script>`,
 				baseUrl: base,
 				scope: libraryName,
 				onDemand: Boolean(args.serve && args.watch),
-				cacheOptions: { ...cacheOptions, invalidates: [] }
+				cacheOptions: { ...cacheOptions, invalidates: [] },
+				features: {
+					...args.features,
+					NODE_ENV: config.mode
+				}
 			})
 		);
 	}
diff --git a/src/dist.config.ts b/src/dist.config.ts
index e0ad2b81..85b08212 100644
--- a/src/dist.config.ts
+++ b/src/dist.config.ts
@@ -156,7 +156,11 @@ function webpackConfig(args: any): webpack.Configuration {
 				baseUrl: base,
 				scope: libraryName,
 				onDemand: Boolean(args.serve && args.watch),
-				cacheOptions: { ...cacheOptions, invalidates: [] }
+				cacheOptions: { ...cacheOptions, invalidates: [] },
+				features: {
+					...args.features,
+					NODE_ENV: config.mode
+				}
 			})
 		);
 	}
diff --git a/src/main.ts b/src/main.ts
index 4bf48fe6..61a51041 100644
--- a/src/main.ts
+++ b/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));
 	}
diff --git a/tests/unit/main.ts b/tests/unit/main.ts
index 2e04d9ef..f6270a9f 100644
--- a/tests/unit/main.ts
+++ b/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']));
 		});