Merge branch 'dev'

Author: Charoite Lee

.gitignore

@@ -0,0 +1,4 @@
+nodejs/node_modules
+nodejs/package*.json
+package*.json
+canvas-nodejs_v*.zip

build-layer.sh

@@ -1,3 +1,12 @@
+# Remove packaged layer if exists
+rm canvas-nodejs_v$CANVAS_VERSION.zip
+
+set -e
+
+# Start to build and package layer
+rm lib/*
+
+# Clean and prepare Node.js modules and dependencies
 cd nodejs
 rm -rf node_modules package*.json
 npm init -y
@@ -6,8 +15,12 @@ npm install mocha --save-dev
 CANVAS_VERSION=$(jq -r '.dependencies.canvas[1:]' package.json)
 jq --arg CANVAS_VERSION "$CANVAS_VERSION" '.name = "canvas-nodejs" | .version = $CANVAS_VERSION | .license = "MIT" | .author = "Charoite Lee" | .scripts.test = "mocha"' package.json > package-tmp.json
 mv -f package-tmp.json package.json
+
+# Test if installed modules and dependencies work fine
 npm test
 cp package-lock.json ..
+
+# Prepare and package layer
 cd ..
-rm ../canvas-nodejs_v$CANVAS_VERSION.zip
-zip -q -r ../canvas-nodejs_v$CANVAS_VERSION.zip . -x "LICENSE" "README.md" ".git*" "nodejs/test/*" "*.yml" "build-layer.sh"
+find nodejs/node_modules -type f -name "*.node" 2>/dev/null | grep -v "obj\.target" | xargs ldd | awk 'NF == 4 { system("cp " $3 " lib") }'
+zip -q -r canvas-nodejs_v$CANVAS_VERSION.zip . -x "LICENSE" "README.md" ".git*" "nodejs/test/*" "*.yml" "build-layer.sh"