diff --git a/.bowerrc b/.bowerrc deleted file mode 100644 index 959e1696e7..0000000000 --- a/.bowerrc +++ /dev/null @@ -1,4 +0,0 @@ -{ - "directory": "bower_components", - "analytics": false -} diff --git a/.travis.yml b/.travis.yml index 30c95ba09e..f36d343aba 100644 --- a/.travis.yml +++ b/.travis.yml @@ -47,11 +47,9 @@ jobs: before_install: - curl -o- -L https://yarnpkg.com/install.sh | bash - export PATH=$HOME/.yarn/bin:$PATH - - yarn global add bower install: - yarn install --ignore-engines - - bower install script: - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup=true --- node_modules/.bin/ember test --filter="Ember Debug" diff --git a/bower.json b/bower.json deleted file mode 100644 index 35aae9f143..0000000000 --- a/bower.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "name": "ember-inspector", - "dependencies": { - "moment": "~2.8.4", - "animation-frame": "~0.2.4" - } -} diff --git a/package.json b/package.json index d0eb402b0f..dc61d7875e 100644 --- a/package.json +++ b/package.json @@ -55,7 +55,7 @@ "ember-cli-htmlbars": "^2.0.3", "ember-cli-htmlbars-inline-precompile": "^1.0.2", "ember-cli-inject-live-reload": "^1.4.1", - "ember-cli-moment-shim": "3.5.0", + "ember-cli-moment-shim": "^3.6.0", "ember-cli-qunit": "^4.3.2", "ember-cli-sass": "^7.1.7", "ember-cli-shims": "^1.2.0", diff --git a/yarn.lock b/yarn.lock index df05843f65..71b393eeb6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2885,20 +2885,20 @@ ember-cli-lodash-subset@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-2.0.1.tgz#20cb68a790fe0fde2488ddfd8efbb7df6fe766f2" -ember-cli-moment-shim@3.5.0: - version "3.5.0" - resolved "https://registry.yarnpkg.com/ember-cli-moment-shim/-/ember-cli-moment-shim-3.5.0.tgz#7ea8d42b0a04c767258287b30447681e52fba0c4" +ember-cli-moment-shim@^3.6.0: + version "3.6.0" + resolved "https://registry.yarnpkg.com/ember-cli-moment-shim/-/ember-cli-moment-shim-3.6.0.tgz#a6ce858e99b285eb9c539c8cebb698435f8d043a" dependencies: broccoli-funnel "^2.0.0" broccoli-merge-trees "^2.0.0" broccoli-source "^1.1.0" broccoli-stew "^1.5.0" chalk "^1.1.3" - ember-cli-babel "^6.8.2" + ember-cli-babel "^6.6.0" ember-cli-import-polyfill "^0.2.0" exists-sync "^0.0.4" lodash.defaults "^4.2.0" - moment "^2.18.1" + moment "^2.19.3" moment-timezone "^0.5.13" ember-cli-node-assets@^0.2.2: @@ -6293,10 +6293,14 @@ moment-timezone@^0.5.13: dependencies: moment ">= 2.9.0" -moment@2.x, "moment@>= 2.9.0", moment@^2.18.1: +moment@2.x: version "2.20.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd" +"moment@>= 2.9.0", moment@^2.19.3: + version "2.22.1" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.1.tgz#529a2e9bf973f259c9643d237fda84de3a26e8ad" + morgan@^1.8.1: version "1.9.0" resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.0.tgz#d01fa6c65859b76fcf31b3cb53a3821a311d8051"