Skip to content
This repository was archived by the owner on Jan 14, 2022. It is now read-only.

Commit 9ff5928

Browse files
authored
Merge pull request #54 from southworkscom/remove-pwa-polyfill-level
Removed resolvePlatformRootFolder method
2 parents e4de2ed + 3043e84 commit 9ff5928

File tree

1 file changed

+4
-10
lines changed

1 file changed

+4
-10
lines changed

lib/projectBuilder.js

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,6 @@ function validateManifest(w3cManifestInfo, platformModules, platforms) {
5858
});
5959
}
6060

61-
function resolvePlatformRootFolder(platform, baseDir) {
62-
return Q.resolve(platform.isPWAPlatform() ?
63-
path.join(baseDir, constants.PWA_FOLDER) :
64-
path.join(baseDir, constants.POLYFILLS_FOLDER));
65-
}
66-
6761
function generateImages(w3cManifestInfo, options, callback) {
6862
if (options.image) {
6963
return fileTools.readFile(options.image).then(function (fileContent) {
@@ -137,7 +131,7 @@ function createApps (w3cManifestInfo, rootDir, platforms, options, callback) {
137131
var tasks = platformModules.map(function (platform) {
138132
if (platform) {
139133
log.debug('Creating the \'' + platform.name + '\' app...');
140-
return resolvePlatformRootFolder(platform, generatedAppDir).then(function(generatedAppOutputDir) {
134+
return Q.resolve(generatedAppDir).then(function(generatedAppOutputDir) {
141135
return fileTools.mkdirp(generatedAppOutputDir).then(function() {
142136
var w3cManifestInfoCopy = JSON.parse(JSON.stringify(w3cManifestInfo));
143137
return Q.ninvoke(platform, 'create', w3cManifestInfoCopy, generatedAppOutputDir, options).then(function () {
@@ -189,7 +183,7 @@ function packageApps (platforms, dir, options, callback) {
189183
var tasks = platformModules.map(function (platform) {
190184
if (platform) {
191185
log.debug('Packaging the \'' + platform.name + '\' app...');
192-
return resolvePlatformRootFolder(platform, rootDir).then(function(rootOutputDir) {
186+
return Q.resolve(rootDir).then(function(rootOutputDir) {
193187
return Q.ninvoke(platform, 'package', rootOutputDir, options).then(function (path) {
194188
log.info('The ' + platform.name + ' app was packaged successfully!');
195189
return Q.resolve(path);
@@ -234,7 +228,7 @@ function runApp (platformId, dir, options, callback) {
234228
if (platformModules && platformModules.length > 0) {
235229
var platform = platformModules[0];
236230
log.debug('Launching the \'' + platform.name + '\' app ...');
237-
return resolvePlatformRootFolder(platform, rootDir).then(function(rootOutputDir) {
231+
return Q.resolve(rootDir).then(function(rootOutputDir) {
238232
return Q.ninvoke(platform, 'run', rootOutputDir, options).catch(function (err) {
239233
return Q.reject(new CustomError('Failed to launch the ' + platform.name + ' app.', err));
240234
});
@@ -272,7 +266,7 @@ function openApp (platformId, dir, options, callback) {
272266
if (platformModules && platformModules.length > 0) {
273267
var platform = platformModules[0];
274268
log.debug('Opening the \'' + platform.name + '\' app...');
275-
return resolvePlatformRootFolder(platform, rootDir).then(function(rootOutputDir) {
269+
return Q.resolve(rootDir).then(function(rootOutputDir) {
276270
return Q.ninvoke(platform, 'open', rootOutputDir, options).catch(function (err) {
277271
return Q.reject(new CustomError('Failed to open the ' + platform.name + ' app.', err));
278272
});

0 commit comments

Comments
 (0)