diff --git a/tools/cordova/builder.js b/tools/cordova/builder.js index afa78b6d90..4981732930 100644 --- a/tools/cordova/builder.js +++ b/tools/cordova/builder.js @@ -6,7 +6,7 @@ import files from '../fs/files.js'; import bundler from '../isobuild/bundler.js'; import archinfo from '../utils/archinfo.js'; import release from '../packaging/release.js'; -import isopackets from '../tool-env/isopackets.js'; +import { load as loadIsopacket } from '../tool-env/isopackets.js'; import utils from '../utils/utils.js'; import { CORDOVA_ARCH } from './index.js'; @@ -216,7 +216,7 @@ export class CordovaBuilder { } writeConfigXmlAndCopyResources(shouldCopyResources = true) { - const { XmlBuilder } = isopackets.load('cordova-support')['xmlbuilder']; + const { XmlBuilder } = loadIsopacket('cordova-support')['xmlbuilder']; let config = XmlBuilder.create('widget'); @@ -390,7 +390,7 @@ export class CordovaBuilder { configDummy.PUBLIC_SETTINGS = publicSettings || {}; const { WebAppHashing } = - isopackets.load('cordova-support')['webapp-hashing']; + loadIsopacket('cordova-support')['webapp-hashing']; program.version = WebAppHashing.calculateClientHash(program.manifest, null, configDummy); } @@ -423,7 +423,7 @@ export class CordovaBuilder { } const { Boilerplate } = - isopackets.load('cordova-support')['boilerplate-generator']; + loadIsopacket('cordova-support')['boilerplate-generator']; const boilerplate = new Boilerplate(CORDOVA_ARCH, manifest, { urlMapper: _.identity, pathMapper: (path) => files.convertToOSPath( diff --git a/tools/cordova/project.js b/tools/cordova/project.js index 99d05db60a..aee36dceea 100644 --- a/tools/cordova/project.js +++ b/tools/cordova/project.js @@ -4,7 +4,6 @@ import assert from 'assert'; import chalk from 'chalk'; import semver from 'semver'; -import isopackets from '../tool-env/isopackets.js'; import files from '../fs/files.js'; import utils from '../utils/utils.js'; import { Console } from '../console/console.js'; diff --git a/tools/cordova/run-targets.js b/tools/cordova/run-targets.js index c516c3f401..f4fee27111 100644 --- a/tools/cordova/run-targets.js +++ b/tools/cordova/run-targets.js @@ -3,7 +3,7 @@ import chalk from 'chalk'; import child_process from 'child_process'; import eachline from 'eachline'; -import isopackets from '../tool-env/isopackets.js'; +import { load as loadIsopacket } from '../tool-env/isopackets.js'; import runLog from '../runners/run-log.js'; import { Console } from '../console/console.js'; import files from '../fs/files.js'; @@ -146,7 +146,7 @@ export class AndroidRunTarget extends CordovaRunTarget { `SystemWebViewClient:${logLevel}`, '*:F']; const { Log } = - isopackets.load('cordova-support')['logging']; + loadIsopacket('cordova-support')['logging']; const logStream = eachline((line) => { const logEntry = logFromAndroidLogcatLine(Log, line); diff --git a/tools/isobuild/bundler.js b/tools/isobuild/bundler.js index b0948159d1..662f79af2c 100644 --- a/tools/isobuild/bundler.js +++ b/tools/isobuild/bundler.js @@ -167,7 +167,7 @@ var colonConverter = require('../utils/colon-converter.js'); var Profile = require('../tool-env/profile.js').Profile; var packageVersionParser = require('../packaging/package-version-parser.js'); var release = require('../packaging/release.js'); -import isopackets from '../tool-env/isopackets.js'; +import { load as loadIsopacket } from '../tool-env/isopackets.js'; import { CORDOVA_PLATFORM_VERSIONS } from '../cordova'; // files to ignore when bundling. node has no globs, so use regexps @@ -1349,7 +1349,7 @@ class ClientTarget extends Target { if (this.arch === 'web.cordova') { const { WebAppHashing } = - isopackets.load('cordova-support')['webapp-hashing']; + loadIsopacket('cordova-support')['webapp-hashing']; const cordovaCompatibilityVersions = _.object(_.map(CORDOVA_PLATFORM_VERSIONS, (version, platform) => { const hash = WebAppHashing.calculateCordovaCompatibilityHash( diff --git a/tools/tool-env/isopackets.js b/tools/tool-env/isopackets.js index d7955f9a0f..95b7b9bd35 100644 --- a/tools/tool-env/isopackets.js +++ b/tools/tool-env/isopackets.js @@ -47,7 +47,7 @@ var Profile = require('./profile.js').Profile; // All of the defined isopackets. Whenever they are being built, they will be // built in the order listed here. -const ISOPACKETS = { +export const ISOPACKETS = { 'ddp': ['ddp-client'], 'mongo': ['npm-mongo'], 'ejson': ['ejson'], @@ -106,7 +106,7 @@ var isopacketPath = function (isopacketName) { // ensureIsopacketsLoadable is called at startup and ensures that all isopackets // exist on disk as up-to-date loadable programs. var calledEnsure = false; -var ensureIsopacketsLoadable = function () { +export function ensureIsopacketsLoadable() { if (calledEnsure) { throw Error("can't ensureIsopacketsLoadable twice!"); } @@ -200,7 +200,7 @@ var ensureIsopacketsLoadable = function () { Console.printMessages(messages); throw new Error("isopacket build failed?"); } -}; +} // Returns a new all-local-packages catalog to be used for building isopackets. var newIsopacketBuildingCatalog = function () { @@ -232,7 +232,7 @@ var newIsopacketBuildingCatalog = function () { return isopacketCatalog; }; -var makeIsopacketBuildContext = function () { +export function makeIsopacketBuildContext() { var context = {}; var catalog = newIsopacketBuildingCatalog(); var versions = {}; @@ -255,7 +255,7 @@ var makeIsopacketBuildContext = function () { noLineNumbers: true }); return context; -}; +} // Loads a built isopacket from disk. Always loads (the cache is in 'load', not // this function). Does not run a build process; it must already be built. @@ -297,10 +297,5 @@ var loadIsopacketFromDisk = function (isopacketName) { return ret; }; -var isopackets = exports; -_.extend(exports, { - load: load, - ensureIsopacketsLoadable: ensureIsopacketsLoadable, - ISOPACKETS: ISOPACKETS, - makeIsopacketBuildContext: makeIsopacketBuildContext -}); +// Support `import isopackets from "../path/to/isopackets.js"`. +export default exports;