Comparing version 1.0.0-beta.16 to 1.0.0-beta.17
@@ -6,3 +6,2 @@ 'use strict'; | ||
var stringUtils = require('ember-cli-string-utils'); | ||
var assign = require('lodash/assign'); | ||
@@ -79,3 +78,3 @@ var RootCommand = require('../models/command'); | ||
this.project.eachAddonCommand(function (addonName, commands) { | ||
assign(this.commands, commands); | ||
Object.assign(this.commands, commands); | ||
}.bind(this)); | ||
@@ -82,0 +81,0 @@ } |
@@ -16,3 +16,2 @@ 'use strict'; | ||
var logger = require('heimdalljs-logger')('ember-cli:command'); | ||
var WatchDetector = require('../models/watch-detector'); | ||
var SilentError = require('silent-error'); | ||
@@ -225,21 +224,3 @@ var execSync = require('child_process').execSync; | ||
var detector = new WatchDetector({ | ||
ui: this.ui, | ||
childProcess: { execSync: execSync }, | ||
fs: fs, | ||
watchmanSupportsPlatform: /^win/.test(process.platform), | ||
cache: cache, | ||
root: this.project.root | ||
}); | ||
var options = commandOptions.options; | ||
if (this.hasOption('watcher')) { | ||
// do stuff to try and provide a good experience when it comes to file watching | ||
var watchPreference = detector.findBestWatcherOption(options); | ||
this.project._watchmanInfo = watchPreference.watchmanInfo; | ||
options.watcher = watchPreference.watcher; | ||
} | ||
resolve(this.run(options, commandOptions.args)); | ||
resolve(this.run(commandOptions.options, commandOptions.args)); | ||
}.bind(this)); | ||
@@ -246,0 +227,0 @@ }, |
@@ -27,3 +27,2 @@ /* | ||
const cli = require('./ember-cli/lib/cli'); | ||
const Watcher = require('./ember-cli/lib/models/watcher'); | ||
const path = require('path'); | ||
@@ -34,9 +33,2 @@ | ||
module.exports = (options) => { | ||
// patch Watcher to always default to node, not checking for Watchman | ||
Watcher.detectWatcher = (ui, _options) => { | ||
const options = _options || {}; // eslint-disable-line | ||
options.watcher = 'node'; | ||
return Promise.resolve(options); | ||
}; | ||
options.cli = { // eslint-disable-line | ||
@@ -43,0 +35,0 @@ name: 'atomable', |
{ | ||
"name": "atomable", | ||
"version": "1.0.0-beta.16", | ||
"version": "1.0.0-beta.17", | ||
"description": "Serverless Microservice Framework", | ||
@@ -31,2 +31,7 @@ "main": "index.js", | ||
"babel-runtime": "6.18.0", | ||
"broccoli-concat": "^3.0.5", | ||
"broccoli-es6modules": "^1.2.3", | ||
"broccoli-funnel": "^1.0.9", | ||
"broccoli-merge-trees": "^1.1.4", | ||
"broccoli-source": "^1.1.0", | ||
"chalk": "1.1.3", | ||
@@ -46,3 +51,5 @@ "configstore": "^2.1.0", | ||
"git-repo-info": "^1.3.1", | ||
"glob": "^7.1.1", | ||
"heimdalljs-logger": "^0.1.7", | ||
"inquirer": "^1.2.2", | ||
"is-git-url": "^0.2.3", | ||
@@ -60,2 +67,3 @@ "js-yaml": "3.6.1", | ||
"resolve": "1.1.7", | ||
"rsvp": "^3.3.3", | ||
"semver": "^5.3.0", | ||
@@ -65,2 +73,4 @@ "serverless": "https://github.com/pre63/serverless", | ||
"source-map-loader": "0.1.5", | ||
"through": "^2.3.8", | ||
"walk-sync": "^0.3.1", | ||
"webpack": "1.13.3", | ||
@@ -67,0 +77,0 @@ "yam": "^0.0.22" |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
34
301100
52
71
4152
+ Addedbroccoli-concat@^3.0.5
+ Addedbroccoli-es6modules@^1.2.3
+ Addedbroccoli-funnel@^1.0.9
+ Addedbroccoli-merge-trees@^1.1.4
+ Addedbroccoli-source@^1.1.0
+ Addedglob@^7.1.1
+ Addedinquirer@^1.2.2
+ Addedrsvp@^3.3.3
+ Addedthrough@^2.3.8
+ Addedwalk-sync@^0.3.1
+ Addedacorn@1.2.2(transitive)
+ Addedansi-styles@3.2.1(transitive)
+ Addedbroccoli-caching-writer@1.1.0(transitive)
+ Addedbroccoli-concat@3.7.5(transitive)
+ Addedbroccoli-debug@0.6.5(transitive)
+ Addedbroccoli-es6modules@1.2.3(transitive)
+ Addedbroccoli-funnel@1.2.0(transitive)
+ Addedbroccoli-kitchen-sink-helpers@0.2.9(transitive)
+ Addedbroccoli-merge-trees@1.2.4(transitive)
+ Addedbroccoli-read-compat@0.1.3(transitive)
+ Addedbroccoli-source@1.1.0(transitive)
+ Addedcan-symlink@1.0.0(transitive)
+ Addedchalk@2.4.2(transitive)
+ Addedcolor-convert@1.9.3(transitive)
+ Addedcolor-name@1.1.3(transitive)
+ Addedcore-object@1.1.0(transitive)
+ Addedes6-promise@2.3.0(transitive)
+ Addedesperanto@0.7.4(transitive)
+ Addedextend@3.0.2(transitive)
+ Addedexternal-editor@1.1.1(transitive)
+ Addedfast-sourcemap-concat@1.4.0(transitive)
+ Addedfind-index@1.1.1(transitive)
+ Addedfs-extra@4.0.35.0.0(transitive)
+ Addedgraceful-fs@3.0.12(transitive)
+ Addedhas-flag@3.0.0(transitive)
+ Addedinquirer@1.2.3(transitive)
+ Addedjsesc@0.3.0(transitive)
+ Addedjsonfile@4.0.0(transitive)
+ Addedlodash-node@3.10.2(transitive)
+ Addedlodash._reinterpolate@3.0.0(transitive)
+ Addedlodash.foreach@4.5.0(transitive)
+ Addedlodash.omit@4.5.0(transitive)
+ Addedlodash.template@4.5.0(transitive)
+ Addedlodash.templatesettings@4.2.0(transitive)
+ Addedlodash.uniq@4.5.0(transitive)
+ Addedmagic-string@0.4.9(transitive)
+ Addedmemory-streams@0.1.3(transitive)
+ Addedmute-stream@0.0.6(transitive)
+ Addednatives@1.1.6(transitive)
+ Addedos-shim@0.1.3(transitive)
+ Addedreadable-stream@1.0.34(transitive)
+ Addedrun-async@2.4.1(transitive)
+ Addedrx@4.1.0(transitive)
+ Addedsander@0.2.4(transitive)
+ Addedsource-map-url@0.3.0(transitive)
+ Addedsourcemap-validator@1.1.1(transitive)
+ Addedspawn-sync@1.0.15(transitive)
+ Addedsupports-color@5.5.0(transitive)
+ Addedtmp@0.0.280.0.29(transitive)
+ Addedtree-sync@1.4.0(transitive)
+ Addeduniversalify@0.1.2(transitive)
+ Addedvlq@0.2.3(transitive)
+ Addedwalk-sync@0.1.3(transitive)