Skip to content
This repository was archived by the owner on Aug 7, 2021. It is now read-only.

refactor: generate source maps when running tns debug --bundle #617

Merged
merged 1 commit into from
Jul 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/before-prepareJS.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { runWebpackCompiler } = require("./compiler");

module.exports = function ($logger, hookArgs) {
module.exports = function ($logger, $liveSyncService, hookArgs) {
const env = hookArgs.config.env || {};
const platform = hookArgs.config.platform;
const appFilesUpdaterOptions = hookArgs.config.appFilesUpdaterOptions;
Expand All @@ -11,6 +11,6 @@ module.exports = function ($logger, hookArgs) {
release: appFilesUpdaterOptions.release,
};

const result = config.bundle && runWebpackCompiler.bind(runWebpackCompiler, config, hookArgs.config.projectData, $logger, hookArgs);
const result = config.bundle && runWebpackCompiler.bind(runWebpackCompiler, config, hookArgs.config.projectData, $logger, $liveSyncService, hookArgs);
return result;
}
4 changes: 2 additions & 2 deletions lib/before-watch.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const { runWebpackCompiler } = require("./compiler");

module.exports = function ($logger, hookArgs) {
module.exports = function ($logger, $liveSyncService, hookArgs) {
if (hookArgs.config) {
const appFilesUpdaterOptions = hookArgs.config.appFilesUpdaterOptions;
if (appFilesUpdaterOptions.bundle) {
Expand All @@ -15,7 +15,7 @@ module.exports = function ($logger, hookArgs) {
watch: true
};

return runWebpackCompiler(config, hookArgs.projectData, $logger, hookArgs);
return runWebpackCompiler(config, hookArgs.projectData, $logger, $liveSyncService, hookArgs);
}));
}
}
Expand Down
8 changes: 6 additions & 2 deletions lib/compiler.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const { existsSync } = require("fs");
const readline = require("readline");

const { messages } = require("../plugins/WatchStateLoggerPlugin");
const { buildEnvData } = require("./utils");
const { buildEnvData, debuggingEnabled } = require("./utils");

let hasBeenInvoked = false;

Expand All @@ -16,7 +16,7 @@ exports.getWebpackProcess = function getWebpackProcess() {
return webpackProcess;
}

exports.runWebpackCompiler = function runWebpackCompiler(config, $projectData, $logger, hookArgs) {
exports.runWebpackCompiler = function runWebpackCompiler(config, $projectData, $logger, $liveSyncService, hookArgs) {
if (config.bundle) {
return new Promise(function (resolveBase, rejectBase) {
if (webpackProcess) {
Expand All @@ -39,6 +39,10 @@ exports.runWebpackCompiler = function runWebpackCompiler(config, $projectData, $

const projectDir = $projectData.projectDir;
const { platform, env } = config;
if (debuggingEnabled($liveSyncService, projectDir)) {
env["sourceMap"] = true;
}

const envData = buildEnvData($projectData, platform, env);
const envParams = buildEnvCommandLineParams(config, envData, $logger);

Expand Down
6 changes: 6 additions & 0 deletions lib/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@ const {
isAndroid,
} = require("../projectHelpers");

function debuggingEnabled(liveSyncService, projectDir) {
const deviceDescriptors = liveSyncService.getLiveSyncDeviceDescriptors(projectDir);
return deviceDescriptors.some(device => device.debugggingEnabled);
}

function buildEnvData($projectData, platform, env) {
const envData = Object.assign({},
env,
Expand All @@ -33,5 +38,6 @@ function shouldSnapshot(config) {

module.exports = {
buildEnvData,
debuggingEnabled,
shouldSnapshot
};