Commit 6fc103d

committed

fix(runtime): fix default runtime

fix #10

1 parent efc7f11 commit 6fc103dCopy full SHA for 6fc103d

File tree

3 files changed

+21

-26

lines changed

package.json
src
- function.ts
- utils.ts

3 files changed

+21

-26

lines changed

`‎package.json`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -44,9 +44,9 @@`
`44`	`44`	`"typescript"`
`45`	`45`	`],`
`46`	`46`	`"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",`
`50`	`50`	`"@commitlint/cli": "^11.0.0",`
`51`	`51`	`"@commitlint/config-conventional": "^11.0.0",`
`52`	`52`	`"@types/fs-extra": "^9.0.2",`

`‎src/function.ts`

Lines changed: 15 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,12 +6,23 @@ import { mergeRight, union, without } from 'ramda';`
`6`	`6`
`7`	`7`	`import { packExternalModules } from './pack-externals';`
`8`	`8`	`import { NodejsFunctionProps } from './props';`
`9`		`-import { extractFileName, findProjectRoot, NodeMajorESMap,nodeMajorVersion } from './utils';`
	`9`	`+import { extractFileName, findProjectRoot, nodeMajorVersion } from './utils';`
`10`	`10`
`11`	`11`	`const BUILD_FOLDER = '.build';`
`12`	`12`	`const DEFAULT_BUILD_OPTIONS: es.BuildOptions = {`
`13`	`13`	`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,`
`15`	`26`	`};`
`16`	`27`
`17`	`28`	`/**`
`@@ -33,9 +44,7 @@ export class NodejsFunction extends lambda.Function {`
`33`	`44`	`const exclude = props.exclude ?? ['aws-sdk'];`
`34`	`45`	`const packager = props.packager ?? true;`
`35`	`46`	`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()];`
`39`	`48`	`const runtime = props.runtime ?? defaultRuntime;`
`40`	`49`	`const entry = extractFileName(projectRoot, handler);`
`41`	`50`
`@@ -52,7 +61,7 @@ export class NodejsFunction extends lambda.Function {`
`52`	`61`	`without(exclude, buildOptions.external \|\| []),`
`53`	`62`	`projectRoot,`
`54`	`63`	`path.join(projectRoot, BUILD_FOLDER),`
`55`		`- packager !== true ? packager : undefined,`
	`64`	`+ packager !== true ? packager : undefined`
`56`	`65`	`);`
`57`	`66`	`}`
`58`	`67`

`‎src/utils.ts`

Lines changed: 3 additions & 17 deletions

Original file line number	Diff line number	Diff line change
`@@ -91,11 +91,9 @@ export function findUp(name: string, directory: string = process.cwd()): string`
`91`	`91`	* Forwards `rootDir` or finds project root folder.
`92`	`92`	`*/`
`93`	`93`	`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`	`+ );`
`99`	`97`	`}`
`100`	`98`
`101`	`99`	`/**`
`@@ -105,18 +103,6 @@ export function nodeMajorVersion(): number {`
`105`	`103`	`return parseInt(process.versions.node.split('.')[0], 10);`
`106`	`104`	`}`
`107`	`105`
`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`		`-`
`120`	`106`	`/**`
`121`	`107`	`* Returns the package manager currently active if the program is executed`
`122`	`108`	`* through an npm or yarn script like:`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 6fc103d

File tree

3 files changed

3 files changed

`‎package.json`

`‎src/function.ts`

`‎src/utils.ts`

0 commit comments