interim fix for issue ^EddyVerbruggen#65

nirmay · Oct 29, 2019 · 01ebf17 · 01ebf17
1 parent d24c34e
commit 01ebf17
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 16 deletions.
diff --git a/patch-npm-packages.js b/patch-npm-packages.js
@@ -1,15 +1,15 @@
 module.exports = function ($logger, $projectData, changesInfo) {
-  if (!changesInfo.modulesChanged) {
-    return;
-  }
+//  if (!changesInfo.modulesChanged) {
+//    return;
+//  }
 
   var fs = require('fs'),
       path = require('path'),
       replaceInFile = require('replace-in-file');
 
   function log(what) {
     // enable this line to see what the nodeify plugin is up to
-    // console.log(what);
+      console.log(what);
   }
 
   var shims = require('./shims.json');
@@ -36,6 +36,9 @@ module.exports = function ($logger, $projectData, changesInfo) {
     "fs.realpath",
     ".bin"
   ];
+  var whitelist = [
+    "aws-amplify"
+  ];
 
   function changeFiles(files, replace, by) {
     return replaceInFile.sync({
@@ -97,7 +100,7 @@ module.exports = function ($logger, $projectData, changesInfo) {
 
     var fileName = packagepath + "/package.json";
     var file = require(fileName);
-    if (blacklist.indexOf(file.name) > -1) {
+    if (whitelist.indexOf(file.name) == -1) {
       return;
     }
 
@@ -208,7 +211,7 @@ module.exports = function ($logger, $projectData, changesInfo) {
       var folder = fs.readdirSync(folderStr);
       for (var j = 0; j < folder.length; j++) {
         var folderName = folder[j];
-        if (/*appDependencies.hasOwnProperty(folderName) &&*/ blacklist.indexOf(folderName) === -1 && !folderName.startsWith("@") && (folderName === "nativescript-nodeify" || !folderName.startsWith("nativescript"))) {
+        if (/*appDependencies.hasOwnProperty(folderName) &&*/ whitelist.indexOf(folderName) > -1 && !folderName.startsWith("@") && (folderName === "nativescript-nodeify" || !folderName.startsWith("nativescript"))) {
           var f = path.join(folderStr, folderName);
           findFilesByName(f, "package.json", packages);
         }

diff --git a/patch-platforms.js b/patch-platforms.js
@@ -1,14 +1,21 @@
-module.exports = function ($logger, $projectData, $platformsData, hookArgs) {
-    var path = require("path");
-    var platformName = hookArgs.platform.toLowerCase();
+module.exports = function ($logger, $projectData, $injector, hookArgs) {
+    var path = require('path');
+    var platformName = (hookArgs.checkForChangesOpts && hookArgs.checkForChangesOpts.platform) || (hookArgs.prepareData && hookArgs.prepareData.platform);
+    const platformsData = getPlatformsData($injector);
+
+    var appDestinationDir = platformsData.getPlatformData(platformName).appDestinationDirectoryPath;
 
-    //appDestinationDir is the platform specific app folder. For Android, this will be YOUR_PROJECT_ROOT/platforms/android/src/main/assets/
-    var appDestinationDir = $platformsData.getPlatformData(platformName).appDestinationDirectoryPath;
-    var patchNpmPackageDir = path.join(appDestinationDir, "app", "tns_modules", "nativescript-nodeify", "patch-npm-packages.js");
+    var patchNpmPackageDir = path.join(appDestinationDir, 'app', 'tns_modules', 'nativescript-nodeify', 'patch-npm-packages.js');
 
-    //Calling patch-npm-packages.js under platforms to patch the node_modules in the platforms folder.
-    //This will leave the source code folder YOUR_PROJECT_ROOT/node_modules untouched.
-    var patchNpmPackage = require(patchNpmPackageDir);
+    var patchNpmPackage = require("./patch-npm-packages.js");
 
-    patchNpmPackage($logger, $projectData, hookArgs.changesInfo);
+    patchNpmPackage($logger, $projectData, hookArgs);
+}
+
+function getPlatformsData($injector) {
+    try {
+        return $injector.resolve("platformsData");
+    } catch (err) {
+        return $injector.resolve("platformsDataService");
+    }
 }