@@ -5,21 +5,23 @@ var webpack = require("webpack");
5
5
var merge = require ( "webpack-merge" ) ;
6
6
7
7
// custom babel target for each node version
8
- function getBabelTarget ( ) {
8
+ function getBabelTarget ( envConfig ) {
9
+ var key = "AWS_LAMBDA_JS_RUNTIME" ;
9
10
var runtimes = [ "nodejs8.10" , "nodejs4.3.2" , "nodejs6.10.3" ] ;
10
- var current = process . env [ "AWS_LAMBDA_JS_RUNTIME" ] || "nodejs6.10.3" ;
11
+ var current = envConfig [ key ] || process . env [ key ] || "nodejs6.10.3" ;
11
12
var unknown = runtimes . indexOf ( current ) === - 1 ;
12
- return unknown ? "6.10" : current . replace ( / ^ n o d e j s / ) ;
13
+ return unknown ? "6.10" : current . replace ( / ^ n o d e j s / , '' ) ;
13
14
}
14
15
15
16
function webpackConfig ( dir , additionalConfig ) {
16
17
var config = conf . load ( ) ;
18
+ var envConfig = config . build . environment || config . build . Environment || { } ;
17
19
var babelOpts = { cacheDirectory : true } ;
18
20
if ( ! fs . existsSync ( path . join ( process . cwd ( ) , '.babelrc' ) ) ) {
19
21
babelOpts . presets = [
20
22
[ "env" , {
21
23
targets : {
22
- node : getBabelTarget ( )
24
+ node : getBabelTarget ( envConfig )
23
25
}
24
26
} ]
25
27
] ;
@@ -40,7 +42,6 @@ function webpackConfig(dir, additionalConfig) {
40
42
41
43
// Include environment variables from config if available
42
44
var defineEnv = { } ;
43
- var envConfig = config . build . environment || config . build . Environment || { } ;
44
45
Object . keys ( envConfig ) . forEach ( ( key ) => {
45
46
defineEnv [ "process.env." + key ] = JSON . stringify ( envConfig [ key ] ) ;
46
47
} ) ;
0 commit comments