Skip to content

Commit 6fc103d

Browse files
committed
fix(runtime): fix default runtime
fix #10
1 parent efc7f11 commit 6fc103d

File tree

3 files changed

+21
-26
lines changed

3 files changed

+21
-26
lines changed

package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
"typescript"
4545
],
4646
"devDependencies": {
47-
"@aws-cdk/assert": "^1.70.0",
48-
"@aws-cdk/aws-lambda": "^1.70.0",
49-
"@aws-cdk/core": "^1.70.0",
47+
"@aws-cdk/assert": "^1.114.0",
48+
"@aws-cdk/aws-lambda": "^1.114.0",
49+
"@aws-cdk/core": "^1.114.0",
5050
"@commitlint/cli": "^11.0.0",
5151
"@commitlint/config-conventional": "^11.0.0",
5252
"@types/fs-extra": "^9.0.2",

src/function.ts

+15-6
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,23 @@ import { mergeRight, union, without } from 'ramda';
66

77
import { packExternalModules } from './pack-externals';
88
import { NodejsFunctionProps } from './props';
9-
import { extractFileName, findProjectRoot, NodeMajorESMap, nodeMajorVersion } from './utils';
9+
import { extractFileName, findProjectRoot, nodeMajorVersion } from './utils';
1010

1111
const BUILD_FOLDER = '.build';
1212
const DEFAULT_BUILD_OPTIONS: es.BuildOptions = {
1313
bundle: true,
14-
target: NodeMajorESMap[nodeMajorVersion()],
14+
target: `node${nodeMajorVersion()}`,
15+
};
16+
17+
const NodeMajorMap = {
18+
8: lambda.Runtime.NODEJS_8_10,
19+
9: lambda.Runtime.NODEJS_8_10,
20+
10: lambda.Runtime.NODEJS_10_X,
21+
11: lambda.Runtime.NODEJS_10_X,
22+
12: lambda.Runtime.NODEJS_12_X,
23+
13: lambda.Runtime.NODEJS_12_X,
24+
14: lambda.Runtime.NODEJS_14_X,
25+
15: lambda.Runtime.NODEJS_14_X,
1526
};
1627

1728
/**
@@ -33,9 +44,7 @@ export class NodejsFunction extends lambda.Function {
3344
const exclude = props.exclude ?? ['aws-sdk'];
3445
const packager = props.packager ?? true;
3546
const handler = props.handler ?? 'index.handler';
36-
const defaultRuntime = nodeMajorVersion() >= 12
37-
? lambda.Runtime.NODEJS_12_X
38-
: lambda.Runtime.NODEJS_10_X;
47+
const defaultRuntime = NodeMajorMap[nodeMajorVersion()];
3948
const runtime = props.runtime ?? defaultRuntime;
4049
const entry = extractFileName(projectRoot, handler);
4150

@@ -52,7 +61,7 @@ export class NodejsFunction extends lambda.Function {
5261
without(exclude, buildOptions.external || []),
5362
projectRoot,
5463
path.join(projectRoot, BUILD_FOLDER),
55-
packager !== true ? packager : undefined,
64+
packager !== true ? packager : undefined
5665
);
5766
}
5867

src/utils.ts

+3-17
Original file line numberDiff line numberDiff line change
@@ -91,11 +91,9 @@ export function findUp(name: string, directory: string = process.cwd()): string
9191
* Forwards `rootDir` or finds project root folder.
9292
*/
9393
export function findProjectRoot(rootDir?: string): string | undefined {
94-
return rootDir
95-
?? findUp('yarn.lock')
96-
?? findUp('package-lock.json')
97-
?? findUp('package.json')
98-
?? findUp(`.git${path.sep}`);
94+
return (
95+
rootDir ?? findUp('yarn.lock') ?? findUp('package-lock.json') ?? findUp('package.json') ?? findUp(`.git${path.sep}`)
96+
);
9997
}
10098

10199
/**
@@ -105,18 +103,6 @@ export function nodeMajorVersion(): number {
105103
return parseInt(process.versions.node.split('.')[0], 10);
106104
}
107105

108-
export const NodeMajorESMap = {
109-
8: 'es2016',
110-
9: 'es2017',
111-
10: 'es2018',
112-
11: 'es2018',
113-
12: 'es2019',
114-
13: 'es2019',
115-
14: 'es2020',
116-
15: 'es2020',
117-
16: 'esnext',
118-
};
119-
120106
/**
121107
* Returns the package manager currently active if the program is executed
122108
* through an npm or yarn script like:

0 commit comments

Comments
 (0)