Comparing version 1.1.1 to 1.1.2
@@ -19,3 +19,3 @@ "use strict"; | ||
start(); | ||
buildMeteorApp(appPath, meteorBinary, buildLocation, function (code) { | ||
buildMeteorApp(appPath, meteorBinary, buildLocation, {}, function (code) { | ||
if (code == 0) { | ||
@@ -31,6 +31,7 @@ archiveIt(buildLocation, bundlePath, done); | ||
exports.buildApp = buildApp; | ||
function buildMeteorApp(appPath, executable, buildLocation, callback) { | ||
function buildMeteorApp(appPath, executable, buildLocation, config, done) { | ||
var args = [ | ||
"build", "--directory", buildLocation, | ||
"--server", "http://localhost:3000" | ||
"build", | ||
"--directory", buildLocation, | ||
"--server", (config.server || "http://localhost:3000"), | ||
]; | ||
@@ -44,4 +45,5 @@ var isWin = /^win/.test(process.platform); | ||
} | ||
var options = { "cwd": appPath }; | ||
console.log("Building Meteor App: ", executable, args, options); | ||
var options = { "cwd": pathResolve(appPath) }; | ||
console.log("Building Meteor App"); | ||
console.log(" ", executable, args.join(' '), options); | ||
var meteor = spawn(executable, args, options); | ||
@@ -52,3 +54,3 @@ var stdout = ""; | ||
meteor.stderr.pipe(process.stderr, { end: false }); | ||
meteor.on('close', callback); | ||
meteor.on('close', done); | ||
} | ||
@@ -55,0 +57,0 @@ exports.buildMeteorApp = buildMeteorApp; |
@@ -41,7 +41,10 @@ "use strict"; | ||
config.env = config.env || {}; | ||
config.setup = config.setup || {}; | ||
if (typeof config.setupNode === "undefined") { | ||
config.setupNode = true; | ||
config.setup.node = config.nodeVersion || true; | ||
} | ||
if (typeof config.setupPhantom === "undefined") { | ||
config.setupPhantom = true; | ||
config.setup.phantom = true; | ||
} | ||
@@ -116,3 +119,3 @@ config.meteorBinary = (config.meteorBinary) ? canonicalizePath(config.meteorBinary) : 'meteor'; | ||
function readConfig(configPath) { | ||
if (configPath != null) { | ||
if (configPath) { | ||
let filepath = path.resolve(configPath); | ||
@@ -119,0 +122,0 @@ if (fs.existsSync(filepath)) { |
@@ -13,3 +13,4 @@ "use strict"; | ||
// Installation | ||
if (config.setupNode) { | ||
if ((config.setup && config.setup.node) || config.setupNode) { | ||
// let nodeVersion = | ||
taskList.executeScript('Installing Node.js: ' + config.nodeVersion, { | ||
@@ -16,0 +17,0 @@ script: path.resolve(SCRIPT_DIR, 'install-node.sh'), |
{ | ||
"name": "typeloy", | ||
"version": "1.1.1", | ||
"version": "1.1.2", | ||
"description": "friendly meteor deployments", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -5,4 +5,4 @@ # Typeloy | ||
**This project was forked from Arunoda Susiripala's meteor-up. | ||
Thank you Arunoda Susiripala for the hard work** | ||
*This project was forked from Arunoda Susiripala's meteor-up. | ||
Thank you Arunoda Susiripala for the hard work* | ||
@@ -50,6 +50,19 @@ ### Difference | ||
### Config | ||
### Installation | ||
The typeloy config is compatible with `mup.json`. | ||
npm install -g typeloy | ||
### Config File | ||
Typeloy uses its own config but the config format is backward-compatible | ||
with `mup.json`. | ||
The config filename will be checked by this order: | ||
`typeloy.js`, `typeloy.json`, `typeloy.config.json`, `mup.json` | ||
`typeloy.js` is used by when you have some node modules need to be integrated | ||
with typeloy, for example, SlackNotificationPlugin ... | ||
typeloy.js | ||
@@ -155,6 +168,3 @@ ``` | ||
### Installation | ||
npm install -g mup | ||
### Creating a Meteor Up Project | ||
@@ -164,3 +174,3 @@ | ||
cd ~/my-meteor-deployment | ||
mup init | ||
typeloy init | ||
@@ -167,0 +177,0 @@ This will create two files in your Meteor Up project directory: |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
119696
1246
472
3