Do not explicitly require modules from project directory (#713)

* Allow to pass-through projectPath to Builder * Do not explicitly require modules from project directory
apache · Apr 13, 2019 · 4cf3dcf · 4cf3dcf
1 parent b177f84
commit 4cf3dcf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/bin/lib/create.js b/bin/lib/create.js
@@ -142,8 +142,8 @@ function writeProjectProperties (projectPath, target_api) {
 
 // This makes no sense, what if you're building with a different build system?
 function prepBuildFiles (projectPath) {
-    var buildModule = require(path.resolve(projectPath, 'cordova/lib/builders/builders'));
-    buildModule.getBuilder().prepBuildFiles();
+    var buildModule = require('../templates/cordova/lib/builders/builders');
+    buildModule.getBuilder(projectPath).prepBuildFiles();
 }
 
 function copyBuildRules (projectPath, isLegacy) {

diff --git a/bin/templates/cordova/Api.js b/bin/templates/cordova/Api.js
@@ -99,8 +99,7 @@ Api.createPlatform = function (destination, config, options, events) {
     var result;
     try {
         result = require('../../lib/create').create(destination, config, options, events).then(function (destination) {
-            var PlatformApi = require(path.resolve(destination, 'cordova/Api'));
-            return new PlatformApi(PLATFORM, destination, events);
+            return new Api(PLATFORM, destination, events);
         });
     } catch (e) {
         events.emit('error', 'createPlatform is not callable from the android project API.');
@@ -130,8 +129,7 @@ Api.updatePlatform = function (destination, options, events) {
     var result;
     try {
         result = require('../../lib/create').update(destination, options, events).then(function (destination) {
-            var PlatformApi = require(path.resolve(destination, 'cordova/Api'));
-            return new PlatformApi('android', destination, events);
+            return new Api(PLATFORM, destination, events);
         });
     } catch (e) {
         events.emit('error', 'updatePlatform is not callable from the android project API, you will need to do this manually.');

diff --git a/bin/templates/cordova/lib/builders/builders.js b/bin/templates/cordova/lib/builders/builders.js
@@ -24,10 +24,10 @@ const CordovaError = require('cordova-common').CordovaError;
  *
  * @return {Builder} A builder instance for specified build type.
  */
-module.exports.getBuilder = function () {
+module.exports.getBuilder = function (projectPath) {
     try {
         const Builder = require('./ProjectBuilder');
-        return new Builder();
+        return new Builder(projectPath);
     } catch (err) {
         throw new CordovaError('Failed to instantiate ProjectBuilder builder: ' + err);
     }