From 83c06fc5c675d6615fd8aed77a43cdb3254682e4 Mon Sep 17 00:00:00 2001 From: Taha Yassine Kraiem Date: Thu, 30 Jun 2022 21:23:37 +0200 Subject: [PATCH] feat(sourcemaps): include wasm file in build --- api/Dockerfile | 4 +++- ee/api/Dockerfile | 4 +++- sourcemap-reader/package.json | 2 +- sourcemap-reader/servers/sourcemaps-handler.js | 6 +++--- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/api/Dockerfile b/api/Dockerfile index 65e745ab1..6b54d2be6 100644 --- a/api/Dockerfile +++ b/api/Dockerfile @@ -4,10 +4,12 @@ LABEL Maintainer="KRAIEM Taha Yassine" ENV APP_NAME chalice # Add Tini # Startup daemon -ENV TINI_VERSION v0.19.0 +ENV TINI_VERSION v0.19.0 \ + SOURCE_MAP_VERSION 0.7.4 ARG envarg ENV ENTERPRISE_BUILD ${envarg} ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini +ADD https://unpkg.com/source-map@${SOURCE_MAP_VERSION}/lib/mappings.wasm /mappings.wasm RUN chmod +x /tini # Installing Nodejs diff --git a/ee/api/Dockerfile b/ee/api/Dockerfile index 794f51f73..b84bb3436 100644 --- a/ee/api/Dockerfile +++ b/ee/api/Dockerfile @@ -5,10 +5,12 @@ ENV APP_NAME chalice RUN apt-get update && apt-get install -y pkg-config libxmlsec1-dev gcc && rm -rf /var/lib/apt/lists/* # Add Tini # Startup daemon -ENV TINI_VERSION v0.19.0 +ENV TINI_VERSION v0.19.0 \ + SOURCE_MAP_VERSION 0.7.4 ARG envarg ENV ENTERPRISE_BUILD ${envarg} ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /tini +ADD https://unpkg.com/source-map@${SOURCE_MAP_VERSION}/lib/mappings.wasm /mappings.wasm RUN chmod +x /tini # Installing Nodejs diff --git a/sourcemap-reader/package.json b/sourcemap-reader/package.json index 8ed3189bb..c389c5804 100644 --- a/sourcemap-reader/package.json +++ b/sourcemap-reader/package.json @@ -20,6 +20,6 @@ "dependencies": { "aws-sdk": "^2.992.0", "express": "^4.17.1", - "source-map": "^0.7.3" + "source-map": "^0.7.4" } } diff --git a/sourcemap-reader/servers/sourcemaps-handler.js b/sourcemap-reader/servers/sourcemaps-handler.js index 91917104d..19ecf5d0b 100644 --- a/sourcemap-reader/servers/sourcemaps-handler.js +++ b/sourcemap-reader/servers/sourcemaps-handler.js @@ -1,13 +1,13 @@ 'use strict'; +const fs = require('fs'); const sourceMap = require('source-map'); const AWS = require('aws-sdk'); -const sourceMapVersion = require('../package.json').dependencies["source-map"]; const URL = require('url'); -const getVersion = version => version.replace(/[\^\$\=\~]/, ""); +const wasm = fs.readFileSync('/mappings.wasm'); module.exports.sourcemapReader = async event => { sourceMap.SourceMapConsumer.initialize({ - "lib/mappings.wasm": `https://unpkg.com/source-map@${getVersion(sourceMapVersion)}/lib/mappings.wasm` + "lib/mappings.wasm": wasm }); let s3; if (event.S3_HOST) {