From 8cf63067f2dfc97e485ee472c71ca59a566c98dc Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Fri, 21 Sep 2018 11:14:52 +0300 Subject: [PATCH 1/4] Add additional check for android before adding android imports --- android-app-components-loader.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/android-app-components-loader.js b/android-app-components-loader.js index 9321e401..e7a8b3d5 100644 --- a/android-app-components-loader.js +++ b/android-app-components-loader.js @@ -6,7 +6,8 @@ module.exports = function (source) { const imports = modules.map(convertSlashesInPath) .map(m => `require("${m}");`).join("\n"); const augmentedSource = ` - if (!global["__snapshot"]) { + var application = __webpack_require__("tns-core-modules/application"); + if (application.android && !global["__snapshot"]) { ${imports} } From 7680e7c01667625f268c7619c589cef115d5a3e7 Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Fri, 21 Sep 2018 11:20:35 +0300 Subject: [PATCH 2/4] use let instead of var --- android-app-components-loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android-app-components-loader.js b/android-app-components-loader.js index e7a8b3d5..de0e7042 100644 --- a/android-app-components-loader.js +++ b/android-app-components-loader.js @@ -6,7 +6,7 @@ module.exports = function (source) { const imports = modules.map(convertSlashesInPath) .map(m => `require("${m}");`).join("\n"); const augmentedSource = ` - var application = __webpack_require__("tns-core-modules/application"); + let application = __webpack_require__("tns-core-modules/application"); if (application.android && !global["__snapshot"]) { ${imports} } From 9ee216f4b9a531b6fd73159a944797d2fb312944 Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Fri, 21 Sep 2018 13:36:55 +0300 Subject: [PATCH 3/4] change the name of the application variable not to clash with the application in the app.js file --- android-app-components-loader.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android-app-components-loader.js b/android-app-components-loader.js index de0e7042..2290bd6b 100644 --- a/android-app-components-loader.js +++ b/android-app-components-loader.js @@ -6,8 +6,8 @@ module.exports = function (source) { const imports = modules.map(convertSlashesInPath) .map(m => `require("${m}");`).join("\n"); const augmentedSource = ` - let application = __webpack_require__("tns-core-modules/application"); - if (application.android && !global["__snapshot"]) { + let applicationCheckPlatform = __webpack_require__("tns-core-modules/application"); + if (applicationCheckPlatform.android && !global["__snapshot"]) { ${imports} } From 1a8f476947577294a4e8be1021aa3174a72be5dc Mon Sep 17 00:00:00 2001 From: Vasil Trifonov Date: Tue, 25 Sep 2018 12:25:15 +0300 Subject: [PATCH 4/4] fix require --- android-app-components-loader.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android-app-components-loader.js b/android-app-components-loader.js index 2290bd6b..57760e1e 100644 --- a/android-app-components-loader.js +++ b/android-app-components-loader.js @@ -6,7 +6,7 @@ module.exports = function (source) { const imports = modules.map(convertSlashesInPath) .map(m => `require("${m}");`).join("\n"); const augmentedSource = ` - let applicationCheckPlatform = __webpack_require__("tns-core-modules/application"); + let applicationCheckPlatform = require("tns-core-modules/application"); if (applicationCheckPlatform.android && !global["__snapshot"]) { ${imports} }