Skip to content

Commit

Permalink
jshin funcsscope true for slim and multibuild files
Browse files Browse the repository at this point in the history
  • Loading branch information
Julian authored and Julian committed Sep 22, 2017
1 parent c650036 commit 85c457e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
5 changes: 3 additions & 2 deletions lib/build/multi.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*jshint funcscope:true*/
/*
# lib/build/multi.js
Expand Down Expand Up @@ -120,14 +121,14 @@ module.exports = function(config, options){
if(options.bundleAssets){
var bundleAssets = require("steal-bundler");
p = p.then(function(builtResult) {
return bundleAssets(builtResult, options.bundleAssets)
return bundleAssets(builtResult, options.bundleAssets);
});
}

if(options.serviceWorker){
var precache = require("steal-serviceworker");
p = p.then(function (builtResult) {
return precache(builtResult, options.serviceWorker)
return precache(builtResult, options.serviceWorker);
});
}
}
Expand Down
8 changes: 4 additions & 4 deletions lib/build/slim.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
/*jshint funcscope:true*/
var pump = require("pump");
var arrify = require("../arrify");
var assign = require("lodash/assign");
Expand Down Expand Up @@ -96,28 +97,27 @@ module.exports = function(cfg, opts) {

// run external steal-tool plugins after the build
if (options) {

var p = Promise.resolve(builtResult);

if (options.bundleAssets) {
var bundleAssets = require("steal-bundler");
p = p.then(function (builtResult) {
return bundleAssets(builtResult, options.bundleAssets)
return bundleAssets(builtResult, options.bundleAssets);
});
}

if (options.serviceWorker) {
var precache = require("steal-serviceworker");
p = p.then(function (builtResult) {
return precache(builtResult, options.serviceWorker)
return precache(builtResult, options.serviceWorker);
});
}
}

p.then(function (builtResult) {
dfd.resolve(builtResult);
}).catch(function (error) {
dfd.reject(error)
dfd.reject(error);
});
});
return dfd.promise;
Expand Down

0 comments on commit 85c457e

Please sign in to comment.