From 8fcc529e049f8cf5abc15d5e451bcba76f9db650 Mon Sep 17 00:00:00 2001 From: Matthew Phillips Date: Thu, 29 Mar 2018 16:55:22 -0400 Subject: [PATCH] 1.11.3 --- package.json | 2 +- steal-sans-promises.production.js | 2 +- steal.production.js | 2 +- test/ext/npm.js | 13 ++++++++++--- 4 files changed, 13 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index c951d0698..a2cf190a8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "steal", "description": "Gets JavaScript.", - "version": "1.11.2", + "version": "1.11.3", "author": { "name": "Bitovi", "email": "contact@bitovi.com", diff --git a/steal-sans-promises.production.js b/steal-sans-promises.production.js index 7b8278b48..0cc5e6ec0 100644 --- a/steal-sans-promises.production.js +++ b/steal-sans-promises.production.js @@ -1,5 +1,5 @@ /* - * steal v1.11.1 + * steal v1.11.3 * * Copyright (c) 2018 Bitovi; Licensed MIT */ diff --git a/steal.production.js b/steal.production.js index 6865c92d4..ebe225272 100644 --- a/steal.production.js +++ b/steal.production.js @@ -1,5 +1,5 @@ /* - * steal v1.11.1 + * steal v1.11.3 * * Copyright (c) 2018 Bitovi; Licensed MIT */ diff --git a/test/ext/npm.js b/test/ext/npm.js index 8f595c800..bdd5d538a 100644 --- a/test/ext/npm.js +++ b/test/ext/npm.js @@ -22,8 +22,8 @@ exports.translate = function(load){ return "define([]);"; } - var resavePackageInfo = isNode && loader.isEnv && - !loader.isEnv("production"); + var resavePackageInfo = isNode && !loader.isEnv("production"); + var isBuild = loader.isPlatform("build"); var prevPackages = loader.npmContext && loader.npmContext.pkgInfo; var versions = loader.npmContext && loader.npmContext.versions; @@ -48,6 +48,7 @@ exports.translate = function(load){ crawl: crawl, convert: convert, resavePackageInfo: resavePackageInfo, + applyBuildConfig: isBuild, forwardSlashMap: {}, // default file structure for npm 3 and higher isFlatFileStructure: true @@ -95,6 +96,12 @@ exports.translate = function(load){ } pkg = utils.json.transform(loader, load, pkg); + var conv = convert.steal(context, pkg, pkg.steal, index === 0); + + // When packages load, apply their configuration + convert.updateConfigOnPackageLoad(conv, resavePackageInfo, + true, isBuild); + packages.push({ name: pkg.name, version: pkg.version, @@ -102,7 +109,7 @@ exports.translate = function(load){ pkg.fileUrl : utils.relativeURI(context.loader.baseURL, pkg.fileUrl), main: pkg.main, - steal: convert.steal(context, pkg, pkg.steal, index === 0), + steal: conv.steal, globalBrowser: convert.browser(pkg, pkg.globalBrowser), browser: convert.browser(pkg, pkg.browser || pkg.browserify), jspm: convert.jspm(pkg, pkg.jspm),