From ec5647eda5201c0fedfcbf8a2a20bac3ff4321ca Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Fri, 6 Apr 2018 13:47:27 -0400 Subject: [PATCH 01/34] Update ember-cli-uglify --- package.json | 2 +- yarn.lock | 54 +++++++++++++++++++++++++++++++--------------------- 2 files changed, 33 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index bc5cd2d0..a00b4d9d 100644 --- a/package.json +++ b/package.json @@ -58,7 +58,7 @@ "ember-cli-shims": "~1.0.2", "ember-cli-sri": "~2.1.0", "ember-cli-test-loader": "~1.1.0", - "ember-cli-uglify": "~1.2.0", + "ember-cli-uglify": "^2.1.0", "ember-concurrency": "~0.8.2", "ember-data": "~2.12.0", "ember-disable-proxy-controllers": "~1.0.1", diff --git a/yarn.lock b/yarn.lock index 80f51a0f..766e7bbf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -396,7 +396,7 @@ async-foreach@^0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/async-foreach/-/async-foreach-0.1.3.tgz#36121f845c0578172de419a97dbeb1d16ec34542" -async-promise-queue@^1.0.3: +async-promise-queue@^1.0.3, async-promise-queue@^1.0.4: version "1.0.4" resolved "https://registry.yarnpkg.com/async-promise-queue/-/async-promise-queue-1.0.4.tgz#308baafbc74aff66a0bb6e7f4a18d4fe8434440c" dependencies: @@ -1645,19 +1645,21 @@ broccoli-string-replace@^0.1.1: broccoli-persistent-filter "^1.1.5" minimatch "^3.0.3" -broccoli-uglify-sourcemap@^1.0.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-1.5.2.tgz#04f84ab0db539031fa868ccfa563c9932d50cedb" +broccoli-uglify-sourcemap@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-2.1.1.tgz#33005537e18a322a181a5aea3e46d145b3355630" dependencies: + async-promise-queue "^1.0.4" broccoli-plugin "^1.2.1" - debug "^2.2.0" - lodash.merge "^4.5.1" - matcher-collection "^1.0.0" + debug "^3.1.0" + lodash.defaultsdeep "^4.6.0" + matcher-collection "^1.0.5" mkdirp "^0.5.0" - source-map-url "^0.3.0" + source-map-url "^0.4.0" symlink-or-copy "^1.0.1" - uglify-js "^2.7.0" - walk-sync "^0.1.3" + uglify-es "^3.1.3" + walk-sync "^0.3.2" + workerpool "^2.3.0" broccoli-unwatched-tree@^0.1.1: version "0.1.3" @@ -2200,6 +2202,10 @@ commander@^2.5.0, commander@^2.6.0, commander@^2.9.0: version "2.15.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" +commander@~2.13.0: + version "2.13.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" + commoner@~0.10.3: version "0.10.8" resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5" @@ -3273,11 +3279,12 @@ ember-cli-test-loader@^1.1.1, ember-cli-test-loader@~1.1.0: dependencies: ember-cli-babel "^5.2.1" -ember-cli-uglify@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-1.2.0.tgz#3208c32b54bc2783056e8bb0d5cfe9bbaf17ffb2" +ember-cli-uglify@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-2.1.0.tgz#4a0641fe4768d7ab7d4807aca9924cc77c544184" dependencies: - broccoli-uglify-sourcemap "^1.0.0" + broccoli-uglify-sourcemap "^2.1.1" + lodash.defaultsdeep "^4.6.0" ember-cli-valid-component-name@^1.0.0: version "1.0.0" @@ -6108,7 +6115,7 @@ lodash.merge@^3.3.2: lodash.keysin "^3.0.0" lodash.toplainobject "^3.0.0" -lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.5.1: +lodash.merge@^4.3.0, lodash.merge@^4.4.0: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54" @@ -6346,7 +6353,7 @@ marked@^0.3.12: version "0.3.19" resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790" -matcher-collection@^1.0.0: +matcher-collection@^1.0.0, matcher-collection@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/matcher-collection/-/matcher-collection-1.0.5.tgz#2ee095438372cb8884f058234138c05c644ec339" dependencies: @@ -9162,7 +9169,14 @@ uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376" -uglify-js@^2.6, uglify-js@^2.7.0: +uglify-es@^3.1.3: + version "3.3.9" + resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677" + dependencies: + commander "~2.13.0" + source-map "~0.6.1" + +uglify-js@^2.6: version "2.8.29" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" dependencies: @@ -9349,17 +9363,13 @@ walk-sync-matcher@^0.2.2: dependencies: minimatch "^2.0.10" -walk-sync@0.3.2, walk-sync@^0.3.0, walk-sync@^0.3.1: +walk-sync@0.3.2, walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.2.tgz#4827280afc42d0e035367c4a4e31eeac0d136f75" dependencies: ensure-posix-path "^1.0.0" matcher-collection "^1.0.0" -walk-sync@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.1.3.tgz#8a07261a00bda6cfb1be25e9f100fad57546f583" - walk-sync@^0.2.5, walk-sync@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.2.7.tgz#b49be4ee6867657aeb736978b56a29d10fa39969" From 4421606eeaa1a820d652f8bbe91995b480b5b615 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 12 Apr 2018 14:53:56 -0400 Subject: [PATCH 02/34] Update some dependencies --- app/components/twiddle-panes.js | 6 +- bower.json | 6 - package.json | 41 ++++--- yarn.lock | 203 ++++++++++++++++++-------------- 4 files changed, 142 insertions(+), 114 deletions(-) diff --git a/app/components/twiddle-panes.js b/app/components/twiddle-panes.js index 469c0178..f607e83a 100644 --- a/app/components/twiddle-panes.js +++ b/app/components/twiddle-panes.js @@ -1,6 +1,6 @@ import Ember from 'ember'; -const { inject } = Ember; +const { inject, run } = Ember; export default Ember.Component.extend({ resizeableColumns: inject.service(), @@ -13,6 +13,10 @@ export default Ember.Component.extend({ didRender() { this._super(...arguments); + run.schedule('afterRender', this, this.setupHandles); + }, + + setupHandles() { if (!this.get('media.isMobile')) { this.$('.twiddle-pane').after('
'); this.$('.handle').last().remove(); diff --git a/bower.json b/bower.json index cadc0f62..60e7caa3 100644 --- a/bower.json +++ b/bower.json @@ -3,7 +3,6 @@ "version": "0.13.1", "dependencies": { "jquery": "1.11.3", - "codemirror": "~5.19.0", "bootstrap-sass": "~3.3.5", "dom-ruler": "~0.2.4", "pretender": "~1.4.1", @@ -11,10 +10,5 @@ "Faker": "~3.1.0", "file-saver": "1.3.4", "jstree": "~3.3.0" - }, - "resolutions": { - "codemirror": "~5.19.0", - "FakeXMLHttpRequest": "^1.3.0", - "route-recognizer": "^0.2.3" } } diff --git a/package.json b/package.json index a00b4d9d..cba0baa3 100644 --- a/package.json +++ b/package.json @@ -20,12 +20,11 @@ "babel-preset-es2017": "^6.24.1", "babel-standalone": "^6.26.0", "broccoli-asset-rev": "^2.4.5", - "broccoli-babel-transpiler": "~6.1.4", + "broccoli-babel-transpiler": "^6.1.4", "broccoli-concat": "^2.3.2", "broccoli-funnel": "^1.0.1", "broccoli-merge-trees": "^1.1.1", "browserify": "^13.0.1", - "dc-tabs": "0.1.0", "dedent": "~0.6.0", "ember-ajax": "~2.4.1", "ember-api-actions": "~0.1.4", @@ -34,7 +33,7 @@ "ember-cli-app-version": "^2.0.0", "ember-cli-babel": "^6.12.0", "ember-cli-bootstrap-sassy": "~0.5.5", - "ember-cli-build-notifications": "0.2.0", + "ember-cli-build-notifications": "~0.2.0", "ember-cli-code-coverage": "~0.3.4", "ember-cli-dependency-checker": "^2.0.0", "ember-cli-deploy": "^1.0.0", @@ -45,40 +44,40 @@ "ember-cli-fastboot": "1.0.0-beta.11", "ember-cli-file-creator": "~0.4.0", "ember-cli-htmlbars": "^1.1.1", - "ember-cli-htmlbars-inline-precompile": "^0.4.0", + "ember-cli-htmlbars-inline-precompile": "~0.4.0", "ember-cli-inject-live-reload": "^1.4.1", - "ember-cli-jstree": "~1.0.7", + "ember-cli-jstree": "^1.0.7", "ember-cli-legacy-blueprints": "^0.1.0", - "ember-cli-mirage": "0.2.3", - "ember-cli-moment-shim": "~2.2.1", + "ember-cli-mirage": "~0.2.3", + "ember-cli-moment-shim": "^2.2.1", "ember-cli-node-assets": "~0.1.6", "ember-cli-qunit": "^3.1.2", "ember-cli-release": "1.0.0-beta.2", - "ember-cli-sass": "~6.0.0", + "ember-cli-sass": "^6.0.0", "ember-cli-shims": "~1.0.2", - "ember-cli-sri": "~2.1.0", - "ember-cli-test-loader": "~1.1.0", + "ember-cli-sri": "^2.1.0", + "ember-cli-test-loader": "^1.1.0", "ember-cli-uglify": "^2.1.0", "ember-concurrency": "~0.8.2", "ember-data": "~2.12.0", - "ember-disable-proxy-controllers": "~1.0.1", - "ember-export-application-global": "~1.1.1", + "ember-disable-proxy-controllers": "^1.0.1", + "ember-export-application-global": "^1.1.1", "ember-git-version": "~0.1.1", - "ember-inflector": "~1.9.4", - "ember-load": "0.0.9", - "ember-load-initializers": "~1.0.0", + "ember-inflector": "^1.9.4", + "ember-load": "~0.0.9", + "ember-load-initializers": "^1.0.0", "ember-lodash": "~0.0.10", "ember-moment": "7.0.0-beta.5", - "ember-notify": "~5.1.6", + "ember-notify": "^5.1.6", "ember-resolver": "^2.0.3", - "ember-responsive": "~1.2.7", + "ember-responsive": "^1.2.7", "ember-route-action-helper": "^1.0.0", "ember-source": "~2.12.0", "ember-test-helpers": "~0.6.3", - "eslint-plugin-ember": "~5.1.0", - "ivy-codemirror": "~2.0.3", - "loader.js": "~4.2.3", - "moment": "~2.19.3", + "eslint-plugin-ember": "^5.1.0", + "ivy-codemirror": "^2.0.3", + "loader.js": "^4.2.3", + "moment": "^2.19.3", "moment-timezone": "~0.5.4", "path-browser": "^2.2.1", "torii": "~0.8.0" diff --git a/yarn.lock b/yarn.lock index 766e7bbf..d40bfab8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1299,7 +1299,7 @@ broccoli-asset-rewrite@^1.1.0: dependencies: broccoli-filter "^1.2.3" -broccoli-babel-transpiler@^5.5.0, broccoli-babel-transpiler@^5.6.0, broccoli-babel-transpiler@^5.6.2: +broccoli-babel-transpiler@^5.5.0, broccoli-babel-transpiler@^5.6.2: version "5.7.4" resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.7.4.tgz#2b0611ce9e5d98b8d8d2b49ae1219af2f52767e3" dependencies: @@ -1314,7 +1314,7 @@ broccoli-babel-transpiler@^5.5.0, broccoli-babel-transpiler@^5.6.0, broccoli-bab rsvp "^3.5.0" workerpool "^2.3.0" -broccoli-babel-transpiler@^6.1.2, broccoli-babel-transpiler@~6.1.4: +broccoli-babel-transpiler@^6.1.2, broccoli-babel-transpiler@^6.1.4: version "6.1.4" resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.1.4.tgz#8be8074c42abf2e17ff79b2d2a21df5c51143c82" dependencies: @@ -1493,6 +1493,24 @@ broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli symlink-or-copy "^1.0.0" walk-sync "^0.3.1" +broccoli-funnel@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.1.tgz#6823c73b675ef78fffa7ab800f083e768b51d449" + dependencies: + array-equal "^1.0.0" + blank-object "^1.0.1" + broccoli-plugin "^1.3.0" + debug "^2.2.0" + fast-ordered-set "^1.0.0" + fs-tree-diff "^0.5.3" + heimdalljs "^0.2.0" + minimatch "^3.0.0" + mkdirp "^0.5.0" + path-posix "^1.0.0" + rimraf "^2.4.3" + symlink-or-copy "^1.0.0" + walk-sync "^0.3.1" + broccoli-kitchen-sink-helpers@^0.2.5, broccoli-kitchen-sink-helpers@~0.2.0: version "0.2.9" resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc" @@ -2135,6 +2153,10 @@ code-point-at@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77" +codemirror@~5.15.0: + version "5.15.2" + resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.15.2.tgz#58b3dc732c6d10d7aae806f4c7cdd56a9b87fe8f" + coffee-script@~1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.7.1.tgz#62996a861780c75e6d5069d13822723b73404bfc" @@ -2503,10 +2525,6 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" -dc-tabs@0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/dc-tabs/-/dc-tabs-0.1.0.tgz#e020e14607625b06362796a70872f769b5a44572" - debug@2, debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.4.0, debug@^2.6.8: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -2802,16 +2820,6 @@ ember-cli-app-version@^2.0.0: ember-cli-babel "^6.8.0" git-repo-version "0.4.1" -ember-cli-babel@5.1.10: - version "5.1.10" - resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.1.10.tgz#d403f178aab602e1337c403c5a58c0200a8969aa" - dependencies: - broccoli-babel-transpiler "^5.6.0" - broccoli-funnel "^1.0.0" - clone "^1.0.2" - ember-cli-version-checker "^1.0.2" - resolve "^1.1.2" - ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7, ember-cli-babel@^5.2.1: version "5.2.8" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.8.tgz#0356b03cc3fdff5d0f2ecaa46a0e1cfaebffd876" @@ -2822,7 +2830,7 @@ ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-c ember-cli-version-checker "^1.0.2" resolve "^1.1.2" -ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.2: +ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.2: version "6.12.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.12.0.tgz#3adcdbe1278da1fcd0b9038f1360cb4ac5d4414c" dependencies: @@ -2861,7 +2869,7 @@ ember-cli-broccoli-sane-watcher@^2.0.4: rsvp "^3.0.18" sane "^2.4.1" -ember-cli-build-notifications@0.2.0: +ember-cli-build-notifications@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/ember-cli-build-notifications/-/ember-cli-build-notifications-0.2.0.tgz#624f3ea63072bdba3b45f05a926f41ee3c0cf1f2" dependencies: @@ -3078,7 +3086,7 @@ ember-cli-get-dependency-depth@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-get-dependency-depth/-/ember-cli-get-dependency-depth-1.0.0.tgz#e0afecf82a2d52f00f28ab468295281aec368d11" -ember-cli-htmlbars-inline-precompile@^0.4.0: +ember-cli-htmlbars-inline-precompile@~0.4.0: version "0.4.4" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-0.4.4.tgz#24a7617152630d64a047e553b72e00963a4f8d73" dependencies: @@ -3087,7 +3095,7 @@ ember-cli-htmlbars-inline-precompile@^0.4.0: hash-for-dep "^1.0.2" silent-error "^1.1.0" -ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.0.8, ember-cli-htmlbars@^1.1.1: +ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.1.1: version "1.3.4" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.3.4.tgz#461289724b34af372a6a0c4b6635819156963353" dependencies: @@ -3097,6 +3105,15 @@ ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.0.8, ember-cli-htmlbars@^1.1.1: json-stable-stringify "^1.0.0" strip-bom "^2.0.0" +ember-cli-htmlbars@^2.0.1: + version "2.0.3" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-2.0.3.tgz#e116e1500dba12f29c94b05b9ec90f52cb8bb042" + dependencies: + broccoli-persistent-filter "^1.0.3" + hash-for-dep "^1.0.2" + json-stable-stringify "^1.0.0" + strip-bom "^3.0.0" + ember-cli-inject-live-reload@^1.4.1: version "1.7.0" resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-1.7.0.tgz#af94336e015336127dfb98080ad442bb233e37ed" @@ -3105,7 +3122,7 @@ ember-cli-is-package-missing@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-is-package-missing/-/ember-cli-is-package-missing-1.0.0.tgz#6e6184cafb92635dd93ca6c946b104292d4e3390" -ember-cli-jstree@~1.0.7: +ember-cli-jstree@^1.0.7: version "1.0.9" resolved "https://registry.yarnpkg.com/ember-cli-jstree/-/ember-cli-jstree-1.0.9.tgz#de7296661231f6ff4e7292e925b08b370d3153b5" dependencies: @@ -3140,25 +3157,25 @@ ember-cli-lodash-subset@^1.0.11, ember-cli-lodash-subset@^1.0.7: version "1.0.12" resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-1.0.12.tgz#af2e77eba5dcb0d77f3308d3a6fd7d3450f6e537" -ember-cli-mirage@0.2.3: - version "0.2.3" - resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.2.3.tgz#8a07f7682686bcb81d1dbc3d276e69a1b51d4c72" +ember-cli-mirage@~0.2.3: + version "0.2.9" + resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.2.9.tgz#f710bb97e6895b3918839127ab5e570538d668b4" dependencies: broccoli-funnel "^1.0.2" broccoli-merge-trees "^1.1.0" broccoli-unwatched-tree "^0.1.1" chalk "^1.1.1" - ember-cli-babel "^5.1.5" + ember-cli-babel "^5.1.7" ember-cli-node-assets "^0.1.4" ember-inflector "^1.9.2" - ember-lodash "0.0.9" + ember-lodash "^4.0" exists-sync "0.0.3" fake-xml-http-request "^1.4.0" - faker "3.0.1" - pretender "^1.4.1" - route-recognizer "^0.1.11" + faker "^3.0.0" + pretender "^1.4.2" + route-recognizer "^0.2.3" -ember-cli-moment-shim@~2.2.1: +ember-cli-moment-shim@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ember-cli-moment-shim/-/ember-cli-moment-shim-2.2.1.tgz#78870872a626177d0b04223c9eb6be0729590e61" dependencies: @@ -3183,6 +3200,17 @@ ember-cli-node-assets@^0.1.4, ember-cli-node-assets@^0.1.6, ember-cli-node-asset lodash "^4.5.1" resolve "^1.1.7" +ember-cli-node-assets@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/ember-cli-node-assets/-/ember-cli-node-assets-0.2.2.tgz#d2d55626e7cc6619f882d7fe55751f9266022708" + dependencies: + broccoli-funnel "^1.0.1" + broccoli-merge-trees "^1.1.1" + broccoli-source "^1.1.0" + debug "^2.2.0" + lodash "^4.5.1" + resolve "^1.1.7" + ember-cli-normalize-entity-name@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-normalize-entity-name/-/ember-cli-normalize-entity-name-1.0.0.tgz#0b14f7bcbc599aa117b5fddc81e4fd03c4bad5b7" @@ -3238,14 +3266,13 @@ ember-cli-release@1.0.0-beta.2: semver "^4.3.1" silent-error "^1.0.0" -ember-cli-sass@~6.0.0: - version "6.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-6.0.0.tgz#31c9c8fa789c0d25aaf8e315431b7a3ec4ba0175" +ember-cli-sass@^6.0.0: + version "6.2.0" + resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-6.2.0.tgz#e1f81289678e1e22d9cf9dbf7fa2de76a0de9a2f" dependencies: broccoli-funnel "^1.0.0" broccoli-merge-trees "^1.1.0" broccoli-sass-source-maps "^2.0.0" - ember-cli-babel "5.1.10" ember-cli-version-checker "^1.0.2" merge "^1.2.0" @@ -3257,7 +3284,7 @@ ember-cli-shims@~1.0.2: ember-cli-version-checker "^1.2.0" silent-error "^1.0.1" -ember-cli-sri@~2.1.0: +ember-cli-sri@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ember-cli-sri/-/ember-cli-sri-2.1.1.tgz#971620934a4b9183cf7923cc03e178b83aa907fd" dependencies: @@ -3273,7 +3300,7 @@ ember-cli-test-info@^1.0.0: dependencies: ember-cli-string-utils "^1.0.0" -ember-cli-test-loader@^1.1.1, ember-cli-test-loader@~1.1.0: +ember-cli-test-loader@^1.1.0, ember-cli-test-loader@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-1.1.1.tgz#333311209b18185d0e0e95f918349da10cacf0b1" dependencies: @@ -3434,13 +3461,13 @@ ember-data@~2.12.0: semver "^5.1.0" silent-error "^1.0.0" -ember-disable-proxy-controllers@~1.0.1: +ember-disable-proxy-controllers@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/ember-disable-proxy-controllers/-/ember-disable-proxy-controllers-1.0.1.tgz#1254eeec0ba025c24eb9e8da611afa7b38754281" dependencies: ember-cli-babel "^5.0.0" -ember-export-application-global@~1.1.1: +ember-export-application-global@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-1.1.1.tgz#f257d5271268932a89d7392679ce4db89d7154af" dependencies: @@ -3478,33 +3505,30 @@ ember-inflector@^1.9.2, ember-inflector@^1.9.4: dependencies: ember-cli-babel "^5.1.7" -ember-inflector@~1.9.4: - version "1.9.6" - resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-1.9.6.tgz#574b093664ade6c66e84185d788ec99ed29741af" - dependencies: - ember-cli-babel "^5.1.6" - -ember-load-initializers@~1.0.0: +ember-load-initializers@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-1.0.0.tgz#4919eaf06f6dfeca7e134633d8c05a6c9921e6e7" dependencies: ember-cli-babel "^6.0.0-beta.7" -ember-load@0.0.9: - version "0.0.9" - resolved "https://registry.yarnpkg.com/ember-load/-/ember-load-0.0.9.tgz#c370fa38f316f05536bc387ae2e17ac5a2a43623" +ember-load@~0.0.9: + version "0.0.12" + resolved "https://registry.yarnpkg.com/ember-load/-/ember-load-0.0.12.tgz#5bc057567c85d6b7a6e0efd22accd029a59a51fe" dependencies: - ember-cli-babel "^5.1.6" - ember-cli-htmlbars "^1.0.8" - ember-cli-version-checker "^1.1.4" + ember-cli-babel "^6.1.0" + ember-cli-htmlbars "^2.0.1" + ember-cli-version-checker "^2.0.0" -ember-lodash@0.0.9: - version "0.0.9" - resolved "https://registry.yarnpkg.com/ember-lodash/-/ember-lodash-0.0.9.tgz#5cc559a10c2fb4e89de6df3951cfd9a691aff6b4" +ember-lodash@^4.0: + version "4.18.0" + resolved "https://registry.yarnpkg.com/ember-lodash/-/ember-lodash-4.18.0.tgz#45de700d6a4f68f1cd62888d90b50aa6477b9a83" dependencies: - broccoli-merge-trees "^1.1.1" - ember-cli-babel "^5.1.5" - lodash-es "^3.10.0" + broccoli-debug "^0.6.1" + broccoli-funnel "^2.0.1" + broccoli-merge-trees "^2.0.0" + broccoli-string-replace "^0.1.1" + ember-cli-babel "^6.10.0" + lodash-es "^4.17.4" ember-lodash@~0.0.10: version "0.0.11" @@ -3529,13 +3553,13 @@ ember-moment@7.0.0-beta.5: dependencies: ember-cli-babel "^5.1.6" -ember-notify@~5.1.6: - version "5.1.7" - resolved "https://registry.yarnpkg.com/ember-notify/-/ember-notify-5.1.7.tgz#24e3f5979b9159aba21590526bf082e4b78f702e" +ember-notify@^5.1.6: + version "5.2.1" + resolved "https://registry.yarnpkg.com/ember-notify/-/ember-notify-5.2.1.tgz#c603e928bc6e92885a8f98181e7bdbf8d90eb2d3" dependencies: ember-cli-babel "^5.1.6" ember-cli-htmlbars "^1.0.3" - ember-string-ishtmlsafe-polyfill "1.0.1" + ember-string-ishtmlsafe-polyfill "^1.1.0" object-assign "^4.1.0" ember-qunit@^2.0.0-beta.1: @@ -3551,7 +3575,7 @@ ember-resolver@^2.0.3: ember-cli-babel "^5.1.6" ember-cli-version-checker "^1.1.6" -ember-responsive@~1.2.7: +ember-responsive@^1.2.7: version "1.2.10" resolved "https://registry.yarnpkg.com/ember-responsive/-/ember-responsive-1.2.10.tgz#4dcc60a43208a3d68d79c6f3c992de05cb94d079" dependencies: @@ -3604,11 +3628,12 @@ ember-source@~2.12.0: rsvp "^3.4.0" simple-dom "^0.3.0" -ember-string-ishtmlsafe-polyfill@1.0.1: - version "1.0.1" - resolved "https://registry.yarnpkg.com/ember-string-ishtmlsafe-polyfill/-/ember-string-ishtmlsafe-polyfill-1.0.1.tgz#b40a8c98663be5c16d16f31dc686102bb655abbd" +ember-string-ishtmlsafe-polyfill@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/ember-string-ishtmlsafe-polyfill/-/ember-string-ishtmlsafe-polyfill-1.1.0.tgz#ecde33419ff912b91dd8acf0640eb74b9758408e" dependencies: - ember-cli-babel "^5.1.6" + ember-cli-babel "^5.1.7" + ember-cli-version-checker "^1.2.0" ember-test-helpers@^0.5.22: version "0.5.34" @@ -3779,7 +3804,7 @@ escodegen@1.x.x, escodegen@^1.8.0: optionalDependencies: source-map "~0.6.1" -eslint-plugin-ember@~5.1.0: +eslint-plugin-ember@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-5.1.0.tgz#fb96abd2d8bf105678a0aa81dadd99d7ca441ba1" dependencies: @@ -4101,9 +4126,9 @@ fake-xml-http-request@^1.4.0, fake-xml-http-request@^1.6.0: version "1.6.0" resolved "https://registry.yarnpkg.com/fake-xml-http-request/-/fake-xml-http-request-1.6.0.tgz#bd0ac79ae3e2660098282048a12c730a6f64d550" -faker@3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/faker/-/faker-3.0.1.tgz#c36278cd423f3c5375bc270466a223485c0e7bb2" +faker@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/faker/-/faker-3.1.0.tgz#0f908faf4e6ec02524e54a57e432c5c013e08c9f" fast-deep-equal@^1.0.0: version "1.1.0" @@ -5490,11 +5515,13 @@ istextorbinary@2.1.0: editions "^1.1.1" textextensions "1 || 2" -ivy-codemirror@~2.0.3: - version "2.0.4" - resolved "https://registry.yarnpkg.com/ivy-codemirror/-/ivy-codemirror-2.0.4.tgz#137bd595bf08f28980a433bb44ef282e24217abc" +ivy-codemirror@^2.0.3: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ivy-codemirror/-/ivy-codemirror-2.1.0.tgz#c06f1606c375610bf62b007a21a9e63f5854175e" dependencies: - ember-cli-babel "^5.1.7" + codemirror "~5.15.0" + ember-cli-babel "^6.0.0" + ember-cli-node-assets "^0.2.2" jmespath@0.15.0: version "0.15.0" @@ -5725,9 +5752,9 @@ load-json-file@^1.0.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" -loader.js@~4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/loader.js/-/loader.js-4.2.3.tgz#845228877aa5317209e41f6c00d9bab36a6a4808" +loader.js@^4.2.3: + version "4.7.0" + resolved "https://registry.yarnpkg.com/loader.js/-/loader.js-4.7.0.tgz#a1a52902001c83631efde9688b8ab3799325ef1f" locate-path@^2.0.0: version "2.0.0" @@ -5744,6 +5771,10 @@ lodash-es@^3.10.0: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-3.10.1.tgz#a1c85d9829c9009004339dc3846dbabb46cf4e19" +lodash-es@^4.17.4: + version "4.17.8" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.8.tgz#6fa8c8c5d337481df0bdf1c0d899d42473121e45" + lodash._arraycopy@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/lodash._arraycopy/-/lodash._arraycopy-3.0.0.tgz#76e7b7c1f1fb92547374878a562ed06a3e50f6e1" @@ -6601,14 +6632,10 @@ moment-timezone@^0.5.0, moment-timezone@~0.5.4: dependencies: moment ">= 2.9.0" -"moment@>= 2.6.0", "moment@>= 2.9.0", moment@^2.10.3, moment@^2.13.0, moment@^2.18.0: +"moment@>= 2.6.0", "moment@>= 2.9.0", moment@^2.10.3, moment@^2.13.0, moment@^2.18.0, moment@^2.19.3: version "2.22.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730" -moment@~2.19.3: - version "2.19.4" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.4.tgz#17e5e2c6ead8819c8ecfad83a0acccb312e94682" - morgan@^1.5.2: version "1.9.0" resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.0.tgz#d01fa6c65859b76fcf31b3cb53a3821a311d8051" @@ -7443,7 +7470,7 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -pretender@^1.4.1: +pretender@^1.4.2: version "1.6.1" resolved "https://registry.yarnpkg.com/pretender/-/pretender-1.6.1.tgz#77d1e42ac8c6b298f5cd43534a87645df035db8c" dependencies: @@ -8161,9 +8188,9 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^2.0.0" inherits "^2.0.1" -route-recognizer@^0.1.11: - version "0.1.11" - resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.1.11.tgz#810d8e5702abb4056d6dcb8e865c5685e7c14eb7" +route-recognizer@^0.2.3: + version "0.2.10" + resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.10.tgz#024b2283c2e68d13a7c7f5173a5924645e8902df" route-recognizer@^0.3.3: version "0.3.3" @@ -8840,6 +8867,10 @@ strip-bom@^2.0.0: dependencies: is-utf8 "^0.2.0" +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" From 8cc4a700c6d5719eb4ffc8b49bc74a58213a0000 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 12 Apr 2018 15:46:48 -0400 Subject: [PATCH 03/34] Update more dependencies --- app/models/settings.js | 2 +- app/services/ember-cli.js | 2 +- package.json | 66 +++---- yarn.lock | 370 ++++++++++++++++++++++++-------------- 4 files changed, 274 insertions(+), 166 deletions(-) diff --git a/app/models/settings.js b/app/models/settings.js index a769c2c1..b9bdcc60 100644 --- a/app/models/settings.js +++ b/app/models/settings.js @@ -1,5 +1,5 @@ import Ember from 'ember'; -import _merge from 'lodash/object/merge'; +import _merge from 'lodash/merge'; const { ObjectProxy, diff --git a/app/services/ember-cli.js b/app/services/ember-cli.js index c74cea50..ad5d8214 100644 --- a/app/services/ember-cli.js +++ b/app/services/ember-cli.js @@ -4,7 +4,7 @@ import HbsPlugin from '../plugins/hbs-plugin'; import blueprints from '../lib/blueprints'; import Ember from 'ember'; import moment from 'moment'; -import _template from "lodash/string/template"; +import _template from "lodash/template"; const { computed, inject, RSVP, $, testing } = Ember; const twiddleAppName = 'twiddle'; diff --git a/package.json b/package.json index cba0baa3..05b2cd68 100644 --- a/package.json +++ b/package.json @@ -21,53 +21,53 @@ "babel-standalone": "^6.26.0", "broccoli-asset-rev": "^2.4.5", "broccoli-babel-transpiler": "^6.1.4", - "broccoli-concat": "^2.3.2", - "broccoli-funnel": "^1.0.1", - "broccoli-merge-trees": "^1.1.1", - "browserify": "^13.0.1", - "dedent": "~0.6.0", - "ember-ajax": "~2.4.1", - "ember-api-actions": "~0.1.4", - "ember-autoresize": "~0.5.17", + "broccoli-concat": "^3.2.2", + "broccoli-funnel": "^2.0.1", + "broccoli-merge-trees": "^3.0.0", + "browserify": "^16.2.0", + "dedent": "~0.7.0", + "ember-ajax": "^2.5.6", + "ember-api-actions": "~0.1.8", + "ember-autoresize": "~0.6.1", "ember-cli": "2.12.2", - "ember-cli-app-version": "^2.0.0", + "ember-cli-app-version": "^2.1.0", "ember-cli-babel": "^6.12.0", - "ember-cli-bootstrap-sassy": "~0.5.5", + "ember-cli-bootstrap-sassy": "~0.5.8", "ember-cli-build-notifications": "~0.2.0", - "ember-cli-code-coverage": "~0.3.4", - "ember-cli-dependency-checker": "^2.0.0", - "ember-cli-deploy": "^1.0.0", - "ember-cli-deploy-s3-pack": "^1.0.0-beta.1", - "ember-cli-deploy-slack": "~0.1.0", + "ember-cli-code-coverage": "~0.3.12 ", + "ember-cli-dependency-checker": "^2.1.0", + "ember-cli-deploy": "^1.0.2", + "ember-cli-deploy-s3-pack": "^1.0.0-beta.2", + "ember-cli-deploy-slack": "^1.0.0", "ember-cli-document-title": "~0.3.3", - "ember-cli-eslint": "^4.2.1", + "ember-cli-eslint": "^4.2.3", "ember-cli-fastboot": "1.0.0-beta.11", "ember-cli-file-creator": "~0.4.0", - "ember-cli-htmlbars": "^1.1.1", - "ember-cli-htmlbars-inline-precompile": "~0.4.0", - "ember-cli-inject-live-reload": "^1.4.1", - "ember-cli-jstree": "^1.0.7", - "ember-cli-legacy-blueprints": "^0.1.0", - "ember-cli-mirage": "~0.2.3", + "ember-cli-htmlbars": "^1.3.4", + "ember-cli-htmlbars-inline-precompile": "~0.4.4", + "ember-cli-inject-live-reload": "^1.7.0", + "ember-cli-jstree": "^1.0.9", + "ember-cli-legacy-blueprints": "~0.2.1", + "ember-cli-mirage": "~0.2.9", "ember-cli-moment-shim": "^2.2.1", - "ember-cli-node-assets": "~0.1.6", - "ember-cli-qunit": "^3.1.2", + "ember-cli-node-assets": "~0.2.2", + "ember-cli-qunit": "^3.1.3", "ember-cli-release": "1.0.0-beta.2", - "ember-cli-sass": "^6.0.0", + "ember-cli-sass": "^6.2.0", "ember-cli-shims": "~1.0.2", - "ember-cli-sri": "^2.1.0", - "ember-cli-test-loader": "^1.1.0", + "ember-cli-sri": "^2.1.1", + "ember-cli-test-loader": "^1.1.1", "ember-cli-uglify": "^2.1.0", - "ember-concurrency": "~0.8.2", + "ember-concurrency": "~0.8.17", "ember-data": "~2.12.0", "ember-disable-proxy-controllers": "^1.0.1", "ember-export-application-global": "^1.1.1", - "ember-git-version": "~0.1.1", - "ember-inflector": "^1.9.4", - "ember-load": "~0.0.9", + "ember-git-version": "~0.1.2", + "ember-inflector": "^1.12.1", + "ember-load": "~0.0.12", "ember-load-initializers": "^1.0.0", - "ember-lodash": "~0.0.10", - "ember-moment": "7.0.0-beta.5", + "ember-lodash": "^4.18.0", + "ember-moment": "7.6.0", "ember-notify": "^5.1.6", "ember-resolver": "^2.0.3", "ember-responsive": "^1.2.7", diff --git a/yarn.lock b/yarn.lock index d40bfab8..54a06e40 100644 --- a/yarn.lock +++ b/yarn.lock @@ -37,7 +37,7 @@ acorn-jsx@^3.0.0: dependencies: acorn "^3.0.4" -acorn-node@^1.2.0: +acorn-node@^1.2.0, acorn-node@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/acorn-node/-/acorn-node-1.3.0.tgz#5f86d73346743810ef1269b901dbcbded020861b" dependencies: @@ -1377,7 +1377,7 @@ broccoli-clean-css@^1.1.0: inline-source-map-comment "^1.0.5" json-stable-stringify "^1.0.0" -broccoli-concat@^2.2.0, broccoli-concat@^2.3.2: +broccoli-concat@^2.2.0: version "2.3.8" resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-2.3.8.tgz#590cdcc021bb905b6c121d87c2d1d57df44a2a48" dependencies: @@ -1557,6 +1557,13 @@ broccoli-merge-trees@^2.0.0: broccoli-plugin "^1.3.0" merge-trees "^1.0.1" +broccoli-merge-trees@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-3.0.0.tgz#90e4959f9e3c57cf1f04fab35152f3d849468d8b" + dependencies: + broccoli-plugin "^1.3.0" + merge-trees "^2.0.0" + broccoli-middleware@^1.0.0-beta.8: version "1.2.1" resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-1.2.1.tgz#a21f255f8bfe5a21c2f0fbf2417addd9d24c9436" @@ -1759,41 +1766,42 @@ browserify-sign@^4.0.0: inherits "^2.0.1" parse-asn1 "^5.0.0" -browserify-zlib@~0.1.2: - version "0.1.4" - resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.1.4.tgz#bb35f8a519f600e0fa6b8485241c979d0141fb2d" +browserify-zlib@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/browserify-zlib/-/browserify-zlib-0.2.0.tgz#2869459d9aa3be245fe8fe2ca1f46e2e7f54d73f" dependencies: - pako "~0.2.0" + pako "~1.0.5" -browserify@^13.0.1: - version "13.3.0" - resolved "https://registry.yarnpkg.com/browserify/-/browserify-13.3.0.tgz#b5a9c9020243f0c70e4675bec8223bc627e415ce" +browserify@^16.2.0: + version "16.2.0" + resolved "https://registry.yarnpkg.com/browserify/-/browserify-16.2.0.tgz#04ba47c4150555532978453818160666aa3bd8a7" dependencies: JSONStream "^1.0.3" assert "^1.4.0" browser-pack "^6.0.1" browser-resolve "^1.11.0" - browserify-zlib "~0.1.2" - buffer "^4.1.0" + browserify-zlib "~0.2.0" + buffer "^5.0.2" cached-path-relative "^1.0.0" - concat-stream "~1.5.1" + concat-stream "^1.6.0" console-browserify "^1.1.0" constants-browserify "~1.0.0" crypto-browserify "^3.0.0" defined "^1.0.0" deps-sort "^2.0.0" - domain-browser "~1.1.0" + domain-browser "^1.2.0" duplexer2 "~0.1.2" - events "~1.1.0" + events "^2.0.0" glob "^7.1.0" has "^1.0.0" htmlescape "^1.1.0" - https-browserify "~0.0.0" + https-browserify "^1.0.0" inherits "~2.0.1" insert-module-globals "^7.0.0" labeled-stream-splicer "^2.0.0" - module-deps "^4.0.8" - os-browserify "~0.1.1" + mkdirp "^0.5.0" + module-deps "^6.0.0" + os-browserify "~0.3.0" parents "^1.0.1" path-browserify "~0.0.0" process "~0.11.0" @@ -1806,15 +1814,15 @@ browserify@^13.0.1: shell-quote "^1.6.1" stream-browserify "^2.0.0" stream-http "^2.0.0" - string_decoder "~0.10.0" + string_decoder "^1.1.1" subarg "^1.0.0" syntax-error "^1.1.1" through2 "^2.0.0" timers-browserify "^1.0.1" - tty-browserify "~0.0.0" + tty-browserify "0.0.1" url "~0.11.0" util "~0.10.1" - vm-browserify "~0.0.1" + vm-browserify "^1.0.0" xtend "^4.0.0" browserslist@^2.1.2: @@ -1824,6 +1832,13 @@ browserslist@^2.1.2: caniuse-lite "^1.0.30000792" electron-to-chromium "^1.3.30" +browserslist@^3.1.1: + version "3.2.4" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.4.tgz#fb9ad70fd09875137ae943a31ab815ed76896031" + dependencies: + caniuse-lite "^1.0.30000821" + electron-to-chromium "^1.3.41" + bser@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/bser/-/bser-2.0.0.tgz#9ac78d3ed5d915804fd87acb158bc797147a1719" @@ -1838,7 +1853,7 @@ buffer-xor@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/buffer-xor/-/buffer-xor-1.0.3.tgz#26e61ed1422fb70dd42e6e36729ed51d855fe8d9" -buffer@4.9.1, buffer@^4.1.0: +buffer@4.9.1: version "4.9.1" resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.1.tgz#6d1bb601b07a4efced97094132093027c95bc298" dependencies: @@ -1846,6 +1861,13 @@ buffer@4.9.1, buffer@^4.1.0: ieee754 "^1.1.4" isarray "^1.0.0" +buffer@^5.0.2: + version "5.1.0" + resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.1.0.tgz#c913e43678c7cb7c8bd16afbcddb6c5505e8f9fe" + dependencies: + base64-js "^1.0.2" + ieee754 "^1.1.4" + builtin-modules@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" @@ -1937,6 +1959,10 @@ caniuse-lite@^1.0.30000792: version "1.0.30000823" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000823.tgz#b79842a5b5a48eaa416b73f5a5d7a23f52d26014" +caniuse-lite@^1.0.30000821: + version "1.0.30000828" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000828.tgz#048f98de213f7a3c047bf78a9523c611855d4fdd" + capture-exit@^1.1.0: version "1.2.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f" @@ -1992,7 +2018,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0: +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0: version "2.3.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" dependencies: @@ -2068,6 +2094,10 @@ clean-css@^3.4.5: commander "2.8.x" source-map "0.4.x" +clean-up-path@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/clean-up-path/-/clean-up-path-1.0.0.tgz#de9e8196519912e749c9eaf67c13d64fac72a3e5" + cli-cursor@^1.0.1, cli-cursor@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" @@ -2254,6 +2284,10 @@ component-emitter@1.2.1, component-emitter@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" +component-indexof@0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/component-indexof/-/component-indexof-0.0.3.tgz#11d091312239eb8f32c8f25ae9cb002ffe8d3c24" + component-inherit@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" @@ -2288,7 +2322,7 @@ concat-stream@1.6.0: readable-stream "^2.2.2" typedarray "^0.0.6" -concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.6.0, concat-stream@^1.6.1: +concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" dependencies: @@ -2297,14 +2331,6 @@ concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.6.0, concat-stream@ readable-stream "^2.2.2" typedarray "^0.0.6" -concat-stream@~1.5.0, concat-stream@~1.5.1: - version "1.5.2" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.5.2.tgz#708978624d856af41a5a741defdd261da752c266" - dependencies: - inherits "~2.0.1" - readable-stream "~2.0.0" - typedarray "~0.0.5" - config-chain@~1.1.9: version "1.1.11" resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.11.tgz#aba09747dfbe4c3e70e766a6e41586e1859fc6f2" @@ -2561,9 +2587,9 @@ decode-uri-component@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545" -dedent@~0.6.0: - version "0.6.0" - resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.6.0.tgz#0e6da8f0ce52838ef5cec5c8f9396b0c1b64a3cb" +dedent@~0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" deep-extend@~0.4.0: version "0.4.2" @@ -2701,13 +2727,21 @@ detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" -detective@^4.0.0, detective@^4.3.1: +detective@^4.3.1: version "4.7.1" resolved "https://registry.yarnpkg.com/detective/-/detective-4.7.1.tgz#0eca7314338442febb6d65da54c10bb1c82b246e" dependencies: acorn "^5.2.1" defined "^1.0.0" +detective@^5.0.2: + version "5.1.0" + resolved "https://registry.yarnpkg.com/detective/-/detective-5.1.0.tgz#7a20d89236d7b331ccea65832e7123b5551bb7cb" + dependencies: + acorn-node "^1.3.0" + defined "^1.0.0" + minimist "^1.1.1" + dezalgo@^1.0.0, dezalgo@^1.0.1, dezalgo@^1.0.2, dezalgo@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/dezalgo/-/dezalgo-1.0.3.tgz#7f742de066fc748bc8db820569dddce49bf0d456" @@ -2739,9 +2773,9 @@ dom-ruler@^0.2.5: dependencies: broccoli-module-alchemist-install "^0.1.6" -domain-browser@~1.1.0: - version "1.1.7" - resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.1.7.tgz#867aa4b093faa05f1de08c06f4d7b21fdf8698bc" +domain-browser@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" dot-prop@^3.0.0: version "3.0.0" @@ -2777,7 +2811,7 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -electron-to-chromium@^1.3.30: +electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.41: version "1.3.42" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz#95c33bf01d0cc405556aec899fe61fd4d76ea0f9" @@ -2793,27 +2827,27 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -ember-ajax@~2.4.1: - version "2.4.1" - resolved "https://registry.yarnpkg.com/ember-ajax/-/ember-ajax-2.4.1.tgz#6d9b572db1ca0c69234f54c3bc3291f46e2303cd" +ember-ajax@^2.5.6: + version "2.5.6" + resolved "https://registry.yarnpkg.com/ember-ajax/-/ember-ajax-2.5.6.tgz#a75f743ccf1b95e979a5cf96013b3dba8fa625e4" dependencies: ember-cli-babel "^5.1.5" -ember-api-actions@~0.1.4: +ember-api-actions@~0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/ember-api-actions/-/ember-api-actions-0.1.8.tgz#651031b9d61a320c221dd75b20f7e8f783e6393d" dependencies: ember-cli-babel "^6.0.0" -ember-autoresize@~0.5.17: - version "0.5.22" - resolved "https://registry.yarnpkg.com/ember-autoresize/-/ember-autoresize-0.5.22.tgz#97e72642242993af9a4816aba652d374b7bba08a" +ember-autoresize@~0.6.1: + version "0.6.1" + resolved "https://registry.yarnpkg.com/ember-autoresize/-/ember-autoresize-0.6.1.tgz#8150f7cc03c03dcef9e3d2116f64959d242bb904" dependencies: dom-ruler "^0.2.5" - ember-cli-babel "^5.1.7" - ember-cli-node-assets "^0.1.6" + ember-cli-babel "^6.8.2" + ember-cli-node-assets "^0.2.2" -ember-cli-app-version@^2.0.0: +ember-cli-app-version@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-2.1.0.tgz#149101d4fd0d97875e12ec5e61ff105f508e5e2d" dependencies: @@ -2830,7 +2864,7 @@ ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-c ember-cli-version-checker "^1.0.2" resolve "^1.1.2" -ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.2: +ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.2: version "6.12.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.12.0.tgz#3adcdbe1278da1fcd0b9038f1360cb4ac5d4414c" dependencies: @@ -2848,7 +2882,7 @@ ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-be ember-cli-version-checker "^2.1.0" semver "^5.4.1" -ember-cli-bootstrap-sassy@~0.5.5: +ember-cli-bootstrap-sassy@~0.5.8: version "0.5.8" resolved "https://registry.yarnpkg.com/ember-cli-bootstrap-sassy/-/ember-cli-bootstrap-sassy-0.5.8.tgz#9bb6d4c3f7f8a634fc51b0f2a29983d82e88b404" dependencies: @@ -2876,7 +2910,7 @@ ember-cli-build-notifications@~0.2.0: ember-cli-babel "^5.0.0" node-notifier "^4.1.1" -ember-cli-code-coverage@~0.3.4: +"ember-cli-code-coverage@~0.3.12 ": version "0.3.12" resolved "https://registry.yarnpkg.com/ember-cli-code-coverage/-/ember-cli-code-coverage-0.3.12.tgz#6139ad643e882c8dd738f6bc0b480fcfd3a4b351" dependencies: @@ -2897,7 +2931,7 @@ ember-cli-code-coverage@~0.3.4: source-map "0.5.6" string.prototype.startswith "^0.2.0" -ember-cli-dependency-checker@^2.0.0: +ember-cli-dependency-checker@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-2.1.0.tgz#9d66286a7c778e94733eaf21320d129c4fd0dd64" dependencies: @@ -2979,7 +3013,7 @@ ember-cli-deploy-s3-index@^1.0.0: mime-types "^2.1.9" rsvp "^3.0.18" -ember-cli-deploy-s3-pack@^1.0.0-beta.1: +ember-cli-deploy-s3-pack@^1.0.0-beta.2: version "1.0.0-beta.2" resolved "https://registry.yarnpkg.com/ember-cli-deploy-s3-pack/-/ember-cli-deploy-s3-pack-1.0.0-beta.2.tgz#bbc4017f088235103eed5c0f98a4e2d0e04335c0" dependencies: @@ -3005,20 +3039,19 @@ ember-cli-deploy-s3@^1.1.0: proxy-agent "^2.0.0" rsvp "^3.5.0" -ember-cli-deploy-slack@~0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/ember-cli-deploy-slack/-/ember-cli-deploy-slack-0.1.0.tgz#41eaad2ca0433f62fd4fff1b6ac59cfbb038c85a" +ember-cli-deploy-slack@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/ember-cli-deploy-slack/-/ember-cli-deploy-slack-1.0.0.tgz#b7449ffa2c568bbed0db0a9afc99274af01f749e" dependencies: chalk "^1.0.0" - core-object "^1.1.0" - ember-cli-babel "^5.0.0" - ember-cli-deploy-plugin "^0.2.1" - moment "^2.10.3" - moment-duration-format "^1.3.0" + core-object "^2.0.0" + ember-cli-deploy-plugin "^0.2.3" + moment "^2.17.1" node-slackr "^0.1.0" + rsvp "^3.5.0" silent-error "^1.0.0" -ember-cli-deploy@^1.0.0: +ember-cli-deploy@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/ember-cli-deploy/-/ember-cli-deploy-1.0.2.tgz#9ab39188c882b57937418db5b3da6fc65b16b916" dependencies: @@ -3037,7 +3070,7 @@ ember-cli-document-title@~0.3.3: dependencies: ember-cli-babel "^5.1.6" -ember-cli-eslint@^4.2.1: +ember-cli-eslint@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/ember-cli-eslint/-/ember-cli-eslint-4.2.3.tgz#2844d3f5e8184f19b2d7132ba99eb0b370b55598" dependencies: @@ -3086,7 +3119,7 @@ ember-cli-get-dependency-depth@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-get-dependency-depth/-/ember-cli-get-dependency-depth-1.0.0.tgz#e0afecf82a2d52f00f28ab468295281aec368d11" -ember-cli-htmlbars-inline-precompile@~0.4.0: +ember-cli-htmlbars-inline-precompile@~0.4.4: version "0.4.4" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-0.4.4.tgz#24a7617152630d64a047e553b72e00963a4f8d73" dependencies: @@ -3095,7 +3128,7 @@ ember-cli-htmlbars-inline-precompile@~0.4.0: hash-for-dep "^1.0.2" silent-error "^1.1.0" -ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.1.1: +ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.3.4: version "1.3.4" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.3.4.tgz#461289724b34af372a6a0c4b6635819156963353" dependencies: @@ -3114,7 +3147,7 @@ ember-cli-htmlbars@^2.0.1: json-stable-stringify "^1.0.0" strip-bom "^3.0.0" -ember-cli-inject-live-reload@^1.4.1: +ember-cli-inject-live-reload@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/ember-cli-inject-live-reload/-/ember-cli-inject-live-reload-1.7.0.tgz#af94336e015336127dfb98080ad442bb233e37ed" @@ -3122,7 +3155,7 @@ ember-cli-is-package-missing@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-is-package-missing/-/ember-cli-is-package-missing-1.0.0.tgz#6e6184cafb92635dd93ca6c946b104292d4e3390" -ember-cli-jstree@^1.0.7: +ember-cli-jstree@^1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/ember-cli-jstree/-/ember-cli-jstree-1.0.9.tgz#de7296661231f6ff4e7292e925b08b370d3153b5" dependencies: @@ -3131,7 +3164,7 @@ ember-cli-jstree@^1.0.7: ember-component-inbound-actions "1.1.0" phantomjs-prebuilt "^2.1.12" -ember-cli-legacy-blueprints@^0.1.0, ember-cli-legacy-blueprints@^0.1.2: +ember-cli-legacy-blueprints@^0.1.2: version "0.1.5" resolved "https://registry.yarnpkg.com/ember-cli-legacy-blueprints/-/ember-cli-legacy-blueprints-0.1.5.tgz#93c15ca242ec5107d62a8af7ec30f6ac538f3ad9" dependencies: @@ -3153,11 +3186,37 @@ ember-cli-legacy-blueprints@^0.1.0, ember-cli-legacy-blueprints@^0.1.2: rsvp "^3.0.17" silent-error "^1.0.0" +ember-cli-legacy-blueprints@~0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/ember-cli-legacy-blueprints/-/ember-cli-legacy-blueprints-0.2.1.tgz#480f37cb83f1eda2d46bbc7d07c59ea2e8ce9b84" + dependencies: + chalk "^2.3.0" + ember-cli-get-component-path-option "^1.0.0" + ember-cli-get-dependency-depth "^1.0.0" + ember-cli-is-package-missing "^1.0.0" + ember-cli-lodash-subset "^2.0.1" + ember-cli-normalize-entity-name "^1.0.0" + ember-cli-path-utils "^1.0.0" + ember-cli-string-utils "^1.0.0" + ember-cli-test-info "^1.0.0" + ember-cli-valid-component-name "^1.0.0" + ember-cli-version-checker "^2.1.0" + ember-router-generator "^1.0.0" + exists-sync "0.0.3" + fs-extra "^4.0.0" + inflection "^1.7.1" + rsvp "^4.7.0" + silent-error "^1.0.0" + ember-cli-lodash-subset@^1.0.11, ember-cli-lodash-subset@^1.0.7: version "1.0.12" resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-1.0.12.tgz#af2e77eba5dcb0d77f3308d3a6fd7d3450f6e537" -ember-cli-mirage@~0.2.3: +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-mirage@~0.2.9: version "0.2.9" resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.2.9.tgz#f710bb97e6895b3918839127ab5e570538d668b4" dependencies: @@ -3189,7 +3248,7 @@ ember-cli-moment-shim@^2.2.1: moment "^2.13.0" moment-timezone "^0.5.0" -ember-cli-node-assets@^0.1.4, ember-cli-node-assets@^0.1.6, ember-cli-node-assets@~0.1.6: +ember-cli-node-assets@^0.1.4: version "0.1.6" resolved "https://registry.yarnpkg.com/ember-cli-node-assets/-/ember-cli-node-assets-0.1.6.tgz#6488a2949048c801ad6d9e33753c7bce32fc1146" dependencies: @@ -3200,7 +3259,7 @@ ember-cli-node-assets@^0.1.4, ember-cli-node-assets@^0.1.6, ember-cli-node-asset lodash "^4.5.1" resolve "^1.1.7" -ember-cli-node-assets@^0.2.2: +ember-cli-node-assets@^0.2.2, ember-cli-node-assets@~0.2.2: version "0.2.2" resolved "https://registry.yarnpkg.com/ember-cli-node-assets/-/ember-cli-node-assets-0.2.2.tgz#d2d55626e7cc6619f882d7fe55751f9266022708" dependencies: @@ -3234,7 +3293,7 @@ ember-cli-preprocess-registry@^3.0.0: process-relative-require "^1.0.0" silent-error "^1.0.0" -ember-cli-qunit@^3.1.2: +ember-cli-qunit@^3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-3.1.3.tgz#1bc6e3fc00b5e50753ab443246bfc147a8d2acbc" dependencies: @@ -3266,7 +3325,7 @@ ember-cli-release@1.0.0-beta.2: semver "^4.3.1" silent-error "^1.0.0" -ember-cli-sass@^6.0.0: +ember-cli-sass@^6.2.0: version "6.2.0" resolved "https://registry.yarnpkg.com/ember-cli-sass/-/ember-cli-sass-6.2.0.tgz#e1f81289678e1e22d9cf9dbf7fa2de76a0de9a2f" dependencies: @@ -3284,13 +3343,13 @@ ember-cli-shims@~1.0.2: ember-cli-version-checker "^1.2.0" silent-error "^1.0.1" -ember-cli-sri@^2.1.0: +ember-cli-sri@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ember-cli-sri/-/ember-cli-sri-2.1.1.tgz#971620934a4b9183cf7923cc03e178b83aa907fd" dependencies: broccoli-sri-hash "^2.1.0" -ember-cli-string-utils@^1.0.0: +ember-cli-string-utils@^1.0.0, ember-cli-string-utils@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ember-cli-string-utils/-/ember-cli-string-utils-1.1.0.tgz#39b677fc2805f55173735376fcef278eaa4452a1" @@ -3300,7 +3359,7 @@ ember-cli-test-info@^1.0.0: dependencies: ember-cli-string-utils "^1.0.0" -ember-cli-test-loader@^1.1.0, ember-cli-test-loader@^1.1.1: +ember-cli-test-loader@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-1.1.1.tgz#333311209b18185d0e0e95f918349da10cacf0b1" dependencies: @@ -3425,7 +3484,7 @@ ember-component-inbound-actions@1.1.0: dependencies: ember-cli-babel "^5.1.5" -ember-concurrency@~0.8.2: +ember-concurrency@~0.8.17: version "0.8.17" resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.8.17.tgz#be47a90342f1960f4f57284c2fe5f7ce2396142a" dependencies: @@ -3473,7 +3532,7 @@ ember-export-application-global@^1.1.1: dependencies: ember-cli-babel "^5.1.10" -ember-factory-for-polyfill@^1.1.0: +ember-factory-for-polyfill@^1.1.0, ember-factory-for-polyfill@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/ember-factory-for-polyfill/-/ember-factory-for-polyfill-1.3.1.tgz#b446ed64916d293c847a4955240eb2c993b86eae" dependencies: @@ -3493,13 +3552,20 @@ ember-getowner-polyfill@^1.0.0: ember-cli-version-checker "^1.2.0" ember-factory-for-polyfill "^1.1.0" -ember-git-version@~0.1.1: +ember-getowner-polyfill@^2.0.1: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-2.2.0.tgz#38e7dccbcac69d5ec694000329ec0b2be651d2b2" + dependencies: + ember-cli-version-checker "^2.1.0" + ember-factory-for-polyfill "^1.3.1" + +ember-git-version@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/ember-git-version/-/ember-git-version-0.1.2.tgz#9a50b14d061434e256d76c6b353475b92fd1ae58" dependencies: git-repo-info "^1.0.2" -ember-inflector@^1.9.2, ember-inflector@^1.9.4: +ember-inflector@^1.12.1, ember-inflector@^1.9.2, ember-inflector@^1.9.4: version "1.12.1" resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-1.12.1.tgz#d8bd2ca2f327b439720f89923fe614d46b5da1ca" dependencies: @@ -3511,7 +3577,7 @@ ember-load-initializers@^1.0.0: dependencies: ember-cli-babel "^6.0.0-beta.7" -ember-load@~0.0.9: +ember-load@~0.0.12: version "0.0.12" resolved "https://registry.yarnpkg.com/ember-load/-/ember-load-0.0.12.tgz#5bc057567c85d6b7a6e0efd22accd029a59a51fe" dependencies: @@ -3519,7 +3585,7 @@ ember-load@~0.0.9: ember-cli-htmlbars "^2.0.1" ember-cli-version-checker "^2.0.0" -ember-lodash@^4.0: +ember-lodash@^4.0, ember-lodash@^4.18.0: version "4.18.0" resolved "https://registry.yarnpkg.com/ember-lodash/-/ember-lodash-4.18.0.tgz#45de700d6a4f68f1cd62888d90b50aa6477b9a83" dependencies: @@ -3530,13 +3596,14 @@ ember-lodash@^4.0: ember-cli-babel "^6.10.0" lodash-es "^4.17.4" -ember-lodash@~0.0.10: - version "0.0.11" - resolved "https://registry.yarnpkg.com/ember-lodash/-/ember-lodash-0.0.11.tgz#4c27298c02e8da0e92e1f9018dc1bc6a01cb1fac" +ember-macro-helpers@^0.17.0: + version "0.17.0" + resolved "https://registry.yarnpkg.com/ember-macro-helpers/-/ember-macro-helpers-0.17.0.tgz#5e64a49f476e38c1916aff75f949455533cd1abe" dependencies: - broccoli-merge-trees "^1.1.1" - ember-cli-babel "^5.1.6" - lodash-es "^3.10.0" + ember-cli-babel "^6.6.0" + ember-cli-string-utils "^1.1.0" + ember-cli-test-info "^1.0.0" + ember-weakmap "^3.0.0" ember-maybe-import-regenerator@^0.1.5: version "0.1.6" @@ -3547,11 +3614,13 @@ ember-maybe-import-regenerator@^0.1.5: ember-cli-babel "^6.0.0-beta.4" regenerator-runtime "^0.9.5" -ember-moment@7.0.0-beta.5: - version "7.0.0-beta.5" - resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-7.0.0-beta.5.tgz#b62c144d32f6ad0acaadd588ba93f4ddeb72ba89" +ember-moment@7.6.0: + version "7.6.0" + resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-7.6.0.tgz#f82beba81a6b9f4ea3bb0ac2463cc5d2c5cbd8e6" dependencies: - ember-cli-babel "^5.1.6" + ember-cli-babel "^6.7.2" + ember-getowner-polyfill "^2.0.1" + ember-macro-helpers "^0.17.0" ember-notify@^5.1.6: version "5.2.1" @@ -3671,6 +3740,14 @@ ember-try@^0.2.9: rsvp "^3.0.17" semver "^5.1.0" +ember-weakmap@^3.0.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/ember-weakmap/-/ember-weakmap-3.2.0.tgz#663871d7a8bb085c5b1cedcb3fb183857990343f" + dependencies: + browserslist "^3.1.1" + debug "^3.1.0" + ember-cli-babel "^6.6.0" + encodeurl@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59" @@ -3933,10 +4010,14 @@ events-to-array@^1.0.1: version "1.1.2" resolved "https://registry.yarnpkg.com/events-to-array/-/events-to-array-1.1.2.tgz#2d41f563e1fe400ed4962fe1a4d5c6a7539df7f6" -events@1.1.1, events@~1.1.0: +events@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" +events@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/events/-/events-2.0.0.tgz#cbbb56bf3ab1ac18d71c43bb32c86255062769f2" + evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz#7fcbdb198dc71959432efe13842684e0525acb02" @@ -4429,6 +4510,14 @@ fs-extra@^2.0.0: graceful-fs "^4.1.2" jsonfile "^2.1.0" +fs-extra@^4.0.0: + version "4.0.3" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^4.0.0" + universalify "^0.1.0" + fs-readdir-recursive@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz#315b4fb8c1ca5b8c47defef319d073dad3568059" @@ -4442,6 +4531,16 @@ fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5 path-posix "^1.0.0" symlink-or-copy "^1.1.8" +fs-updater@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/fs-updater/-/fs-updater-1.0.4.tgz#2329980f99ae9176e9a0e84f7637538a182ce63b" + dependencies: + can-symlink "^1.0.0" + clean-up-path "^1.0.0" + heimdalljs "^0.2.5" + heimdalljs-logger "^0.1.9" + rimraf "^2.6.2" + fs-vacuum@~1.2.7: version "1.2.10" resolved "https://registry.yarnpkg.com/fs-vacuum/-/fs-vacuum-1.2.10.tgz#b7629bec07a4031a2548fdf99f5ecf1cc8b31e36" @@ -4921,14 +5020,14 @@ heimdalljs-graph@^0.3.1: version "0.3.4" resolved "https://registry.yarnpkg.com/heimdalljs-graph/-/heimdalljs-graph-0.3.4.tgz#0bd75797beeaa20b0ed59017aed3b2d95312acee" -heimdalljs-logger@^0.1.7: +heimdalljs-logger@^0.1.7, heimdalljs-logger@^0.1.9: version "0.1.9" resolved "https://registry.yarnpkg.com/heimdalljs-logger/-/heimdalljs-logger-0.1.9.tgz#d76ada4e45b7bb6f786fc9c010a68eb2e2faf176" dependencies: debug "^2.2.0" heimdalljs "^0.2.0" -heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3: +heimdalljs@^0.2.0, heimdalljs@^0.2.1, heimdalljs@^0.2.3, heimdalljs@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/heimdalljs/-/heimdalljs-0.2.5.tgz#6aa54308eee793b642cff9cf94781445f37730ac" dependencies: @@ -5041,9 +5140,9 @@ http-signature@~1.2.0: jsprim "^1.2.2" sshpk "^1.7.0" -https-browserify@~0.0.0: - version "0.0.1" - resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-0.0.1.tgz#3f91365cabe60b77ed0ebba24b454e3e09d95a82" +https-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" https-proxy-agent@^1.0.0: version "1.0.0" @@ -5628,6 +5727,12 @@ jsonfile@^2.1.0: optionalDependencies: graceful-fs "^4.1.6" +jsonfile@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" + optionalDependencies: + graceful-fs "^4.1.6" + jsonify@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73" @@ -5767,10 +5872,6 @@ lockfile@~1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.3.tgz#2638fc39a0331e9cac1a04b71799931c9c50df79" -lodash-es@^3.10.0: - version "3.10.1" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-3.10.1.tgz#a1c85d9829c9009004339dc3846dbabb46cf4e19" - lodash-es@^4.17.4: version "4.17.8" resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.8.tgz#6fa8c8c5d337481df0bdf1c0d899d42473121e45" @@ -6457,6 +6558,13 @@ merge-trees@^1.0.1: rimraf "^2.4.3" symlink-or-copy "^1.0.0" +merge-trees@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/merge-trees/-/merge-trees-2.0.0.tgz#a560d796e566c5d9b2c40472a2967cca48d85161" + dependencies: + fs-updater "^1.0.4" + heimdalljs "^0.2.5" + merge@^1.1.3, merge@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da" @@ -6596,30 +6704,26 @@ mktemp@~0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b" -module-deps@^4.0.8: - version "4.1.1" - resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-4.1.1.tgz#23215833f1da13fd606ccb8087b44852dcb821fd" +module-deps@^6.0.0: + version "6.0.2" + resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.0.2.tgz#660217d1602b863ac8d4d16951a3720dd9aa4c80" dependencies: JSONStream "^1.0.3" browser-resolve "^1.7.0" cached-path-relative "^1.0.0" - concat-stream "~1.5.0" + concat-stream "~1.6.0" defined "^1.0.0" - detective "^4.0.0" + detective "^5.0.2" duplexer2 "^0.1.2" inherits "^2.0.1" parents "^1.0.0" readable-stream "^2.0.2" - resolve "^1.1.3" + resolve "^1.4.0" stream-combiner2 "^1.1.1" subarg "^1.0.0" through2 "^2.0.0" xtend "^4.0.0" -moment-duration-format@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/moment-duration-format/-/moment-duration-format-1.3.0.tgz#541771b5f87a049cc65540475d3ad966737d6908" - moment-timezone@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.3.1.tgz#3ef47856b02d53b718a10a5ec2023aa299e07bf5" @@ -6632,7 +6736,7 @@ moment-timezone@^0.5.0, moment-timezone@~0.5.4: dependencies: moment ">= 2.9.0" -"moment@>= 2.6.0", "moment@>= 2.9.0", moment@^2.10.3, moment@^2.13.0, moment@^2.18.0, moment@^2.19.3: +"moment@>= 2.6.0", "moment@>= 2.9.0", moment@^2.13.0, moment@^2.17.1, moment@^2.18.0, moment@^2.19.3: version "2.22.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730" @@ -7187,9 +7291,9 @@ ora@^0.2.0: cli-spinners "^0.1.2" object-assign "^4.0.1" -os-browserify@~0.1.1: - version "0.1.2" - resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.1.2.tgz#49ca0293e0b19590a5f5de10c7f265a617d8fe54" +os-browserify@~0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/os-browserify/-/os-browserify-0.3.0.tgz#854373c7f5c2315914fc9bfc6bd8238fdda1ec27" os-homedir@^1.0.0, os-homedir@^1.0.1: version "1.0.2" @@ -7267,9 +7371,9 @@ pac-resolver@^3.0.0: netmask "^1.0.6" thunkify "^2.1.2" -pako@~0.2.0: - version "0.2.9" - resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75" +pako@~1.0.5: + version "1.0.6" + resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258" parents@^1.0.0, parents@^1.0.1: version "1.0.1" @@ -7774,7 +7878,7 @@ readable-stream@~1.0.2: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@~2.0.0, readable-stream@~2.0.5: +readable-stream@~2.0.5: version "2.0.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.0.6.tgz#8f90341e68a53ccc928788dacfcd11b36eb9b78e" dependencies: @@ -8131,7 +8235,7 @@ resolve@1.5.0: dependencies: path-parse "^1.0.5" -resolve@^1.1.2, resolve@^1.1.3, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0: +resolve@^1.1.2, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0: version "1.6.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c" dependencies: @@ -8165,7 +8269,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1: +rimraf@2, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: @@ -8821,11 +8925,11 @@ string.prototype.startswith@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/string.prototype.startswith/-/string.prototype.startswith-0.2.0.tgz#da68982e353a4e9ac4a43b450a2045d1c445ae7b" -string_decoder@0.10, string_decoder@~0.10.0, string_decoder@~0.10.x: +string_decoder@0.10, string_decoder@~0.10.x: version "0.10.31" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94" -string_decoder@~1.1.1: +string_decoder@^1.1.1, string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" dependencies: @@ -9161,7 +9265,7 @@ tryor@~0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/tryor/-/tryor-0.1.2.tgz#8145e4ca7caff40acde3ccf946e8b8bb75b4172b" -tty-browserify@~0.0.0: +tty-browserify@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.1.tgz#3f05251ee17904dfd0677546670db9651682b811" @@ -9192,7 +9296,7 @@ type-is@~1.6.15, type-is@~1.6.16: media-typer "0.3.0" mime-types "~2.1.18" -typedarray@^0.0.6, typedarray@~0.0.5: +typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -9272,6 +9376,10 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" +universalify@^0.1.0: + version "0.1.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" + unpipe@1.0.0, unpipe@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec" @@ -9382,11 +9490,11 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" -vm-browserify@~0.0.1: - version "0.0.4" - resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-0.0.4.tgz#5d7ea45bbef9e4a6ff65f95438e0a87c357d5a73" +vm-browserify@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.0.0.tgz#88768214567fd00a27be2f553712c9fc5aeb548f" dependencies: - indexof "0.0.1" + component-indexof "0.0.3" walk-sync-matcher@^0.2.2: version "0.2.2" From 5cf98bc00357155f2a09bc9c6ec3105fe9ae7e9b Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 12 Apr 2018 16:14:09 -0400 Subject: [PATCH 04/34] Update yet more dependencies --- app/routes/gist-base-route.js | 6 +++- app/routes/twiddles.js | 3 +- package.json | 20 +++++------ yarn.lock | 66 +++++++++++++---------------------- 4 files changed, 41 insertions(+), 54 deletions(-) diff --git a/app/routes/gist-base-route.js b/app/routes/gist-base-route.js index 5d4a5976..f4b97b31 100644 --- a/app/routes/gist-base-route.js +++ b/app/routes/gist-base-route.js @@ -28,6 +28,10 @@ export default Ember.Route.extend({ } else { return true; } - } + }, + + showRevision() {}, + showCurrentVersion() {}, + signInViaGithub() {} } }); diff --git a/app/routes/twiddles.js b/app/routes/twiddles.js index 4b9e590f..6586f39f 100644 --- a/app/routes/twiddles.js +++ b/app/routes/twiddles.js @@ -25,6 +25,7 @@ export default Ember.Route.extend({ this.session.close().then(() => { this.transitionTo('/'); }); - } + }, + signInViaGithub() {} } }); diff --git a/package.json b/package.json index 05b2cd68..4624c858 100644 --- a/package.json +++ b/package.json @@ -67,20 +67,20 @@ "ember-load": "~0.0.12", "ember-load-initializers": "^1.0.0", "ember-lodash": "^4.18.0", - "ember-moment": "7.6.0", - "ember-notify": "^5.1.6", - "ember-resolver": "^2.0.3", - "ember-responsive": "^1.2.7", - "ember-route-action-helper": "^1.0.0", + "ember-moment": "^7.6.0", + "ember-notify": "^5.2.1", + "ember-resolver": "^2.1.1", + "ember-responsive": "^2.0.8", + "ember-route-action-helper": "^2.0.6", "ember-source": "~2.12.0", "ember-test-helpers": "~0.6.3", "eslint-plugin-ember": "^5.1.0", - "ivy-codemirror": "^2.0.3", - "loader.js": "^4.2.3", - "moment": "^2.19.3", - "moment-timezone": "~0.5.4", + "ivy-codemirror": "^2.1.0", + "loader.js": "^4.7.0", + "moment": "^2.22.0", + "moment-timezone": "~0.5.14", "path-browser": "^2.2.1", - "torii": "~0.8.0" + "torii": "~0.10.1" }, "engines": { "node": "^4.5 || 6.* || >= 8" diff --git a/yarn.lock b/yarn.lock index 54a06e40..f374d0eb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2854,7 +2854,7 @@ ember-cli-app-version@^2.1.0: ember-cli-babel "^6.8.0" git-repo-version "0.4.1" -ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7, ember-cli-babel@^5.2.1: +ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7, ember-cli-babel@^5.2.1: version "5.2.8" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.8.tgz#0356b03cc3fdff5d0f2ecaa46a0e1cfaebffd876" dependencies: @@ -2864,7 +2864,7 @@ ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.3, ember-c ember-cli-version-checker "^1.0.2" resolve "^1.1.2" -ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.2: +ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2: version "6.12.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.12.0.tgz#3adcdbe1278da1fcd0b9038f1360cb4ac5d4414c" dependencies: @@ -3532,27 +3532,13 @@ ember-export-application-global@^1.1.1: dependencies: ember-cli-babel "^5.1.10" -ember-factory-for-polyfill@^1.1.0, ember-factory-for-polyfill@^1.3.1: +ember-factory-for-polyfill@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/ember-factory-for-polyfill/-/ember-factory-for-polyfill-1.3.1.tgz#b446ed64916d293c847a4955240eb2c993b86eae" dependencies: ember-cli-version-checker "^2.1.0" -ember-getowner-polyfill@1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-1.0.0.tgz#f847ceabd97ab97e9e9d279c382400a4d407a9d6" - dependencies: - ember-cli-babel "^5.1.5" - -ember-getowner-polyfill@^1.0.0: - version "1.2.5" - resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-1.2.5.tgz#ceff8a09897d0d7e05c821bb71666a95eb26dc92" - dependencies: - ember-cli-babel "^5.1.6" - ember-cli-version-checker "^1.2.0" - ember-factory-for-polyfill "^1.1.0" - -ember-getowner-polyfill@^2.0.1: +ember-getowner-polyfill@^2.0.0, ember-getowner-polyfill@^2.0.1: version "2.2.0" resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-2.2.0.tgz#38e7dccbcac69d5ec694000329ec0b2be651d2b2" dependencies: @@ -3614,7 +3600,7 @@ ember-maybe-import-regenerator@^0.1.5: ember-cli-babel "^6.0.0-beta.4" regenerator-runtime "^0.9.5" -ember-moment@7.6.0: +ember-moment@^7.6.0: version "7.6.0" resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-7.6.0.tgz#f82beba81a6b9f4ea3bb0ac2463cc5d2c5cbd8e6" dependencies: @@ -3622,7 +3608,7 @@ ember-moment@7.6.0: ember-getowner-polyfill "^2.0.1" ember-macro-helpers "^0.17.0" -ember-notify@^5.1.6: +ember-notify@^5.2.1: version "5.2.1" resolved "https://registry.yarnpkg.com/ember-notify/-/ember-notify-5.2.1.tgz#c603e928bc6e92885a8f98181e7bdbf8d90eb2d3" dependencies: @@ -3637,19 +3623,18 @@ ember-qunit@^2.0.0-beta.1: dependencies: ember-test-helpers "^0.6.3" -ember-resolver@^2.0.3: +ember-resolver@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-2.1.1.tgz#5e4c1fffe9f5f48fc2194ad7592274ed0cd74f72" dependencies: ember-cli-babel "^5.1.6" ember-cli-version-checker "^1.1.6" -ember-responsive@^1.2.7: - version "1.2.10" - resolved "https://registry.yarnpkg.com/ember-responsive/-/ember-responsive-1.2.10.tgz#4dcc60a43208a3d68d79c6f3c992de05cb94d079" +ember-responsive@^2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/ember-responsive/-/ember-responsive-2.0.8.tgz#6281362faf42e94e0a31b46d0f88f6e4449b0c99" dependencies: - ember-cli-babel "^5.1.6" - ember-getowner-polyfill "1.0.0" + ember-cli-babel "^6.6.0" ember-rfc176-data@^0.2.7: version "0.2.7" @@ -3659,12 +3644,12 @@ ember-rfc176-data@^0.3.0: version "0.3.2" resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.2.tgz#bde5538939529b263c142b53a47402f8127f8dce" -ember-route-action-helper@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ember-route-action-helper/-/ember-route-action-helper-1.0.0.tgz#b53a6e37259813a47a7fd609eb9a486a0c6f65b7" +ember-route-action-helper@^2.0.6: + version "2.0.6" + resolved "https://registry.yarnpkg.com/ember-route-action-helper/-/ember-route-action-helper-2.0.6.tgz#1d50454350d7112be326ab44058f06cf291d5fd9" dependencies: - ember-cli-babel "^5.1.6" - ember-getowner-polyfill "^1.0.0" + ember-cli-babel "^6.8.1" + ember-getowner-polyfill "^2.0.0" ember-router-generator@^1.0.0: version "1.2.3" @@ -5614,7 +5599,7 @@ istextorbinary@2.1.0: editions "^1.1.1" textextensions "1 || 2" -ivy-codemirror@^2.0.3: +ivy-codemirror@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ivy-codemirror/-/ivy-codemirror-2.1.0.tgz#c06f1606c375610bf62b007a21a9e63f5854175e" dependencies: @@ -5857,7 +5842,7 @@ load-json-file@^1.0.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" -loader.js@^4.2.3: +loader.js@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/loader.js/-/loader.js-4.7.0.tgz#a1a52902001c83631efde9688b8ab3799325ef1f" @@ -6730,13 +6715,13 @@ moment-timezone@^0.3.0: dependencies: moment ">= 2.6.0" -moment-timezone@^0.5.0, moment-timezone@~0.5.4: +moment-timezone@^0.5.0, moment-timezone@~0.5.14: version "0.5.14" resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.14.tgz#4eb38ff9538b80108ba467a458f3ed4268ccfcb1" dependencies: moment ">= 2.9.0" -"moment@>= 2.6.0", "moment@>= 2.9.0", moment@^2.13.0, moment@^2.17.1, moment@^2.18.0, moment@^2.19.3: +"moment@>= 2.6.0", "moment@>= 2.9.0", moment@^2.13.0, moment@^2.17.1, moment@^2.18.0, moment@^2.22.0: version "2.22.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730" @@ -9214,14 +9199,11 @@ to-regex@^3.0.1, to-regex@^3.0.2: regex-not "^1.0.2" safe-regex "^1.1.0" -torii@~0.8.0: - version "0.8.4" - resolved "https://registry.yarnpkg.com/torii/-/torii-0.8.4.tgz#12ba0b51af0594ad6f0f16294c71fe13c82c7686" +torii@~0.10.1: + version "0.10.1" + resolved "https://registry.yarnpkg.com/torii/-/torii-0.10.1.tgz#caad0a81e82189fc0483b65e68ee28041ad3590f" dependencies: - broccoli-funnel "^1.0.1" - broccoli-merge-trees "^1.1.1" - broccoli-string-replace "^0.1.1" - ember-cli-babel "^5.1.3" + ember-cli-babel "^6.11.0" tough-cookie@~2.2.0: version "2.2.2" From 861de0ae2ad41c2e97478a51c7425576443bb853 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Mon, 16 Apr 2018 15:23:10 -0400 Subject: [PATCH 05/34] Upgrade ember-cli to 2.13 --- config/targets.js | 7 + package.json | 18 +- yarn.lock | 446 +++++++++++++++++++++++++++------------------- 3 files changed, 274 insertions(+), 197 deletions(-) create mode 100644 config/targets.js diff --git a/config/targets.js b/config/targets.js new file mode 100644 index 00000000..6c6b86ef --- /dev/null +++ b/config/targets.js @@ -0,0 +1,7 @@ +/* eslint-env node */ + +module.exports = { + browsers: [ + 'last 2 versions' + ] +}; diff --git a/package.json b/package.json index 4624c858..11cdcebb 100644 --- a/package.json +++ b/package.json @@ -26,11 +26,11 @@ "broccoli-merge-trees": "^3.0.0", "browserify": "^16.2.0", "dedent": "~0.7.0", - "ember-ajax": "^2.5.6", + "ember-ajax": "^3.0.0", "ember-api-actions": "~0.1.8", "ember-autoresize": "~0.6.1", - "ember-cli": "2.12.2", - "ember-cli-app-version": "^2.1.0", + "ember-cli": "2.13.3", + "ember-cli-app-version": "^3.0.0", "ember-cli-babel": "^6.12.0", "ember-cli-bootstrap-sassy": "~0.5.8", "ember-cli-build-notifications": "~0.2.0", @@ -41,7 +41,7 @@ "ember-cli-deploy-slack": "^1.0.0", "ember-cli-document-title": "~0.3.3", "ember-cli-eslint": "^4.2.3", - "ember-cli-fastboot": "1.0.0-beta.11", + "ember-cli-fastboot": "^1.0.0", "ember-cli-file-creator": "~0.4.0", "ember-cli-htmlbars": "^1.3.4", "ember-cli-htmlbars-inline-precompile": "~0.4.4", @@ -51,7 +51,7 @@ "ember-cli-mirage": "~0.2.9", "ember-cli-moment-shim": "^2.2.1", "ember-cli-node-assets": "~0.2.2", - "ember-cli-qunit": "^3.1.3", + "ember-cli-qunit": "^3.1.1", "ember-cli-release": "1.0.0-beta.2", "ember-cli-sass": "^6.2.0", "ember-cli-shims": "~1.0.2", @@ -59,9 +59,9 @@ "ember-cli-test-loader": "^1.1.1", "ember-cli-uglify": "^2.1.0", "ember-concurrency": "~0.8.17", - "ember-data": "~2.12.0", + "ember-data": "~2.12.2", "ember-disable-proxy-controllers": "^1.0.1", - "ember-export-application-global": "^1.1.1", + "ember-export-application-global": "^2.0.0", "ember-git-version": "~0.1.2", "ember-inflector": "^1.12.1", "ember-load": "~0.0.12", @@ -69,10 +69,10 @@ "ember-lodash": "^4.18.0", "ember-moment": "^7.6.0", "ember-notify": "^5.2.1", - "ember-resolver": "^2.1.1", + "ember-resolver": "^4.0.0", "ember-responsive": "^2.0.8", "ember-route-action-helper": "^2.0.6", - "ember-source": "~2.12.0", + "ember-source": "~2.13.3", "ember-test-helpers": "~0.6.3", "eslint-plugin-ember": "^5.1.0", "ivy-codemirror": "^2.1.0", diff --git a/yarn.lock b/yarn.lock index f374d0eb..a0d03539 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,90 @@ # yarn lockfile v1 +"@glimmer/compiler@^0.22.3": + version "0.22.3" + resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.22.3.tgz#3aef9448460af1d320a82423323498a6ff38a0c6" + dependencies: + "@glimmer/syntax" "^0.22.3" + "@glimmer/util" "^0.22.3" + "@glimmer/wire-format" "^0.22.3" + simple-html-tokenizer "^0.3.0" + +"@glimmer/di@^0.1.8": + version "0.1.11" + resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280" + +"@glimmer/di@^0.2.0": + version "0.2.0" + resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.0.tgz#73bfd4a6ee4148a80bf092e8a5d29bcac9d4ce7e" + +"@glimmer/interfaces@^0.22.3": + version "0.22.3" + resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.22.3.tgz#1c2e3289ae41a750f0c8ddcc64529b9e90dda604" + dependencies: + "@glimmer/wire-format" "^0.22.3" + +"@glimmer/node@^0.22.3": + version "0.22.3" + resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.22.3.tgz#ff33eea6e65147a20c1bd1f05fdc4a6c3595c54c" + dependencies: + "@glimmer/runtime" "^0.22.3" + simple-dom "^0.3.0" + +"@glimmer/object-reference@^0.22.3": + version "0.22.3" + resolved "https://registry.yarnpkg.com/@glimmer/object-reference/-/object-reference-0.22.3.tgz#31db68c8912324c63509b1ef83213f7ad4ef312b" + dependencies: + "@glimmer/reference" "^0.22.3" + "@glimmer/util" "^0.22.3" + +"@glimmer/object@^0.22.3": + version "0.22.3" + resolved "https://registry.yarnpkg.com/@glimmer/object/-/object-0.22.3.tgz#1fc9fd7465c7d12e5b92464ad40038b595de8ed0" + dependencies: + "@glimmer/object-reference" "^0.22.3" + "@glimmer/util" "^0.22.3" + +"@glimmer/reference@^0.22.3": + version "0.22.3" + resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.22.3.tgz#6f2ef8cd97fe756d89fef75f8c3c79003502a2a9" + dependencies: + "@glimmer/util" "^0.22.3" + +"@glimmer/resolver@^0.4.1": + version "0.4.3" + resolved "https://registry.yarnpkg.com/@glimmer/resolver/-/resolver-0.4.3.tgz#b1baae5c3291b4621002ccf8d7870466097e841d" + dependencies: + "@glimmer/di" "^0.2.0" + +"@glimmer/runtime@^0.22.3": + version "0.22.3" + resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.22.3.tgz#b8cb28efc9cc86c406ee996f5c2cf6730620d404" + dependencies: + "@glimmer/interfaces" "^0.22.3" + "@glimmer/object" "^0.22.3" + "@glimmer/object-reference" "^0.22.3" + "@glimmer/reference" "^0.22.3" + "@glimmer/util" "^0.22.3" + "@glimmer/wire-format" "^0.22.3" + +"@glimmer/syntax@^0.22.3": + version "0.22.3" + resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.22.3.tgz#8528d19324bf7f920f5cfd31925e452e51781b44" + dependencies: + handlebars "^4.0.6" + simple-html-tokenizer "^0.3.0" + +"@glimmer/util@^0.22.3": + version "0.22.3" + resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.22.3.tgz#8272f50905d1bb904ee371e8ade83fd779b51508" + +"@glimmer/wire-format@^0.22.3": + version "0.22.3" + resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.22.3.tgz#19b226d9b93ba6ee54472d9ffb1d48e7c0d80a0d" + dependencies: + "@glimmer/util" "^0.22.3" + JSONStream@^1.0.3: version "1.3.2" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea" @@ -675,7 +759,7 @@ babel-plugin-dead-code-elimination@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/babel-plugin-dead-code-elimination/-/babel-plugin-dead-code-elimination-1.0.2.tgz#5f7c451274dcd7cccdbfbb3e0b85dd28121f0f65" -babel-plugin-debug-macros@^0.1.11: +babel-plugin-debug-macros@^0.1.10, babel-plugin-debug-macros@^0.1.11: version "0.1.11" resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.1.11.tgz#6c562bf561fccd406ce14ab04f42c218cf956605" dependencies: @@ -1314,7 +1398,7 @@ broccoli-babel-transpiler@^5.5.0, broccoli-babel-transpiler@^5.6.2: rsvp "^3.5.0" workerpool "^2.3.0" -broccoli-babel-transpiler@^6.1.2, broccoli-babel-transpiler@^6.1.4: +broccoli-babel-transpiler@^6.0.0, broccoli-babel-transpiler@^6.1.2, broccoli-babel-transpiler@^6.1.4: version "6.1.4" resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.1.4.tgz#8be8074c42abf2e17ff79b2d2a21df5c51143c82" dependencies: @@ -1390,7 +1474,7 @@ broccoli-concat@^2.2.0: lodash.omit "^4.1.0" lodash.uniq "^4.2.0" -broccoli-concat@^3.0.4, broccoli-concat@^3.2.2: +broccoli-concat@^3.2.2: version "3.2.2" resolved "https://registry.yarnpkg.com/broccoli-concat/-/broccoli-concat-3.2.2.tgz#86ffdc52606eb590ba9f6b894c5ec7a016f5b7b9" dependencies: @@ -1462,19 +1546,7 @@ broccoli-funnel-reducer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea" -broccoli-funnel@0.2.8: - version "0.2.8" - resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-0.2.8.tgz#8a78553e9c275ed08e37d4fc2ba0a15ce604a250" - dependencies: - array-equal "^1.0.0" - broccoli-plugin "^1.0.0" - debug "^2.2.0" - minimatch "^2.0.1" - mkdirp "^0.5.0" - symlink-or-copy "^1.0.0" - walk-sync-matcher "^0.2.2" - -broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli-funnel@^1.0.6, broccoli-funnel@^1.2.0: +broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli-funnel@^1.0.6, broccoli-funnel@^1.1.0, broccoli-funnel@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296" dependencies: @@ -1493,7 +1565,7 @@ broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli symlink-or-copy "^1.0.0" walk-sync "^0.3.1" -broccoli-funnel@^2.0.1: +broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-2.0.1.tgz#6823c73b675ef78fffa7ab800f083e768b51d449" dependencies: @@ -1537,7 +1609,7 @@ broccoli-lint-eslint@^4.2.1: lodash.defaultsdeep "^4.6.0" md5-hex "^2.0.0" -broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.3, broccoli-merge-trees@^1.1.4: +broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.4: version "1.2.4" resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5" dependencies: @@ -2298,7 +2370,7 @@ compressible@~2.0.13: dependencies: mime-db ">= 1.33.0 < 2" -compression@^1.4.4, compression@^1.6.2: +compression@^1.4.4: version "1.7.2" resolved "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz#aaffbcd6aaf854b44ebb280353d5ad1651f59a69" dependencies: @@ -2338,19 +2410,16 @@ config-chain@~1.1.9: ini "^1.3.4" proto-list "~1.2.1" -configstore@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/configstore/-/configstore-2.1.0.tgz#737a3a7036e9886102aa6099e47bb33ab1aba1a1" +configstore@^3.0.0: + version "3.1.2" + resolved "https://registry.yarnpkg.com/configstore/-/configstore-3.1.2.tgz#c6f25defaeef26df12dd33414b001fe81a543f8f" dependencies: - dot-prop "^3.0.0" + dot-prop "^4.1.0" graceful-fs "^4.1.2" - mkdirp "^0.5.0" - object-assign "^4.0.1" - os-tmpdir "^1.0.0" - osenv "^0.1.0" - uuid "^2.0.1" - write-file-atomic "^1.1.2" - xdg-basedir "^2.0.0" + make-dir "^1.0.0" + unique-string "^1.0.0" + write-file-atomic "^2.0.0" + xdg-basedir "^3.0.0" console-browserify@^1.1.0: version "1.1.0" @@ -2393,7 +2462,7 @@ continuable-cache@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f" -convert-source-map@^1.1.0, convert-source-map@^1.5.0: +convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" @@ -2435,13 +2504,13 @@ core-object@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/core-object/-/core-object-1.1.0.tgz#86d63918733cf9da1a5aae729e62c0a88e66ad0a" -core-object@^2.0.0, core-object@^2.0.5, core-object@^2.0.6: +core-object@^2.0.0, core-object@^2.0.6: version "2.1.1" resolved "https://registry.yarnpkg.com/core-object/-/core-object-2.1.1.tgz#4b7a5f1edefcb1e6d0dcb58eab1b9f90bfc666a8" dependencies: chalk "^1.1.3" -core-object@^3.0.0: +core-object@^3.1.3: version "3.1.5" resolved "https://registry.yarnpkg.com/core-object/-/core-object-3.1.5.tgz#fa627b87502adc98045e44678e9a8ec3b9c0d2a9" dependencies: @@ -2521,6 +2590,10 @@ crypto-browserify@^3.0.0: randombytes "^2.0.0" randomfill "^1.0.3" +crypto-random-string@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" + currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" @@ -2533,7 +2606,7 @@ d@1: dependencies: es5-ext "^0.10.9" -dag-map@^2.0.1: +dag-map@^2.0.1, dag-map@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/dag-map/-/dag-map-2.0.2.tgz#9714b472de82a1843de2fba9b6876938cab44c68" @@ -2749,9 +2822,9 @@ dezalgo@^1.0.0, dezalgo@^1.0.1, dezalgo@^1.0.2, dezalgo@~1.0.3: asap "^2.0.0" wrappy "1" -diff@^1.3.1: - version "1.4.0" - resolved "https://registry.yarnpkg.com/diff/-/diff-1.4.0.tgz#7f28d2eb9ee7b15a97efd89ce63dcfdaa3ccbabf" +diff@^3.2.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" diffie-hellman@^5.0.0: version "5.0.2" @@ -2777,9 +2850,9 @@ domain-browser@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/domain-browser/-/domain-browser-1.2.0.tgz#3d31f50191a6749dd1375a7f522e823d42e54eda" -dot-prop@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-3.0.0.tgz#1b708af094a49c9a0e7dbcad790aba539dac1177" +dot-prop@^4.1.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57" dependencies: is-obj "^1.0.0" @@ -2827,11 +2900,11 @@ elliptic@^6.0.0: minimalistic-assert "^1.0.0" minimalistic-crypto-utils "^1.0.0" -ember-ajax@^2.5.6: - version "2.5.6" - resolved "https://registry.yarnpkg.com/ember-ajax/-/ember-ajax-2.5.6.tgz#a75f743ccf1b95e979a5cf96013b3dba8fa625e4" +ember-ajax@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/ember-ajax/-/ember-ajax-3.1.0.tgz#3db36e67357ef447639517656aeac4bb13e73a9c" dependencies: - ember-cli-babel "^5.1.5" + ember-cli-babel "^6.6.0" ember-api-actions@~0.1.8: version "0.1.8" @@ -2847,14 +2920,14 @@ ember-autoresize@~0.6.1: ember-cli-babel "^6.8.2" ember-cli-node-assets "^0.2.2" -ember-cli-app-version@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-2.1.0.tgz#149101d4fd0d97875e12ec5e61ff105f508e5e2d" +ember-cli-app-version@^3.0.0: + version "3.1.3" + resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-3.1.3.tgz#26d25f5e653ff0106f0b39da6d75518ba8ed282d" dependencies: ember-cli-babel "^6.8.0" - git-repo-version "0.4.1" + git-repo-version "^1.0.0" -ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.10, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7, ember-cli-babel@^5.2.1: +ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7, ember-cli-babel@^5.2.1: version "5.2.8" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-5.2.8.tgz#0356b03cc3fdff5d0f2ecaa46a0e1cfaebffd876" dependencies: @@ -3079,28 +3152,25 @@ ember-cli-eslint@^4.2.3: rsvp "^4.6.1" walk-sync "^0.3.0" -ember-cli-fastboot@1.0.0-beta.11: - version "1.0.0-beta.11" - resolved "https://registry.yarnpkg.com/ember-cli-fastboot/-/ember-cli-fastboot-1.0.0-beta.11.tgz#fe2d63a4355ca59241a4b07042b4a633ea25ac13" +ember-cli-fastboot@^1.0.0: + version "1.1.3" + resolved "https://registry.yarnpkg.com/ember-cli-fastboot/-/ember-cli-fastboot-1.1.3.tgz#2ca968beaefd6f45e021242b6fe9d74d213f5045" dependencies: - broccoli-funnel "0.2.8" - broccoli-merge-trees "^1.1.1" + broccoli-concat "^3.2.2" + broccoli-funnel "^2.0.0" + broccoli-merge-trees "^2.0.0" broccoli-plugin "^1.2.1" - broccoli-stew "^1.2.0" - compression "^1.6.2" - core-object "^2.0.5" - debug "^2.2.0" - ember-cli-babel "^5.1.5" - ember-cli-version-checker "^1.1.6" - ember-test-helpers "^0.5.22" - express "^4.8.5" - fastboot-express-middleware "1.0.0-beta.8" - fastboot-filter-initializers "0.0.2" - lodash.defaults "^4.0.1" - lodash.uniq "^4.2.0" - md5-hex "^1.3.0" - portfinder "^1.0.3" - rsvp "^3.0.16" + chalk "^2.0.1" + ember-cli-babel "^6.7.2" + ember-cli-lodash-subset "2.0.1" + ember-cli-preprocess-registry "^3.1.0" + ember-cli-version-checker "^2.1.0" + fastboot "^1.1.3" + fastboot-express-middleware "^1.1.0" + fastboot-transform "^0.1.2" + fs-extra "^4.0.2" + json-stable-stringify "^1.0.1" + md5-hex "^2.0.0" silent-error "^1.0.0" ember-cli-file-creator@~0.4.0: @@ -3208,14 +3278,14 @@ ember-cli-legacy-blueprints@~0.2.1: rsvp "^4.7.0" silent-error "^1.0.0" +ember-cli-lodash-subset@2.0.1, 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-lodash-subset@^1.0.11, ember-cli-lodash-subset@^1.0.7: version "1.0.12" resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-1.0.12.tgz#af2e77eba5dcb0d77f3308d3a6fd7d3450f6e537" -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-mirage@~0.2.9: version "0.2.9" resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.2.9.tgz#f710bb97e6895b3918839127ab5e570538d668b4" @@ -3280,7 +3350,7 @@ ember-cli-path-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-path-utils/-/ember-cli-path-utils-1.0.0.tgz#4e39af8b55301cddc5017739b77a804fba2071ed" -ember-cli-preprocess-registry@^3.0.0: +ember-cli-preprocess-registry@^3.1.0: version "3.1.1" resolved "https://registry.yarnpkg.com/ember-cli-preprocess-registry/-/ember-cli-preprocess-registry-3.1.1.tgz#38456c21c4d2b64945850cf9ec68db6ba769288a" dependencies: @@ -3293,7 +3363,7 @@ ember-cli-preprocess-registry@^3.0.0: process-relative-require "^1.0.0" silent-error "^1.0.0" -ember-cli-qunit@^3.1.3: +ember-cli-qunit@^3.1.1: version "3.1.3" resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-3.1.3.tgz#1bc6e3fc00b5e50753ab443246bfc147a8d2acbc" dependencies: @@ -3391,22 +3461,23 @@ ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0: resolve "^1.3.3" semver "^5.3.0" -ember-cli@2.12.2: - version "2.12.2" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.12.2.tgz#eccae6359e5d4e49d509e6391dcdf1961848377a" +ember-cli@2.13.3: + version "2.13.3" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.13.3.tgz#1918500e6280a68be017aca9b69937f6782a24b8" dependencies: amd-name-resolver "0.0.6" + babel-plugin-transform-es2015-modules-amd "^6.24.0" bower-config "^1.3.0" bower-endpoint-parser "0.2.2" - broccoli-babel-transpiler "^5.6.2" + broccoli-babel-transpiler "^6.0.0" broccoli-brocfile-loader "^0.18.0" broccoli-builder "^0.18.3" - broccoli-concat "^3.0.4" + broccoli-concat "^3.2.2" broccoli-config-loader "^1.0.0" broccoli-config-replace "^1.1.2" broccoli-funnel "^1.0.6" broccoli-funnel-reducer "^1.0.0" - broccoli-merge-trees "^1.1.3" + broccoli-merge-trees "^2.0.0" broccoli-middleware "^1.0.0-beta.8" broccoli-source "^1.1.0" broccoli-stew "^1.2.0" @@ -3415,19 +3486,20 @@ ember-cli@2.12.2: chalk "^1.1.3" clean-base-url "^1.0.0" compression "^1.4.4" - configstore "^2.0.0" + configstore "^3.0.0" console-ui "^1.0.2" - core-object "^3.0.0" - diff "^1.3.1" + core-object "^3.1.3" + dag-map "^2.0.2" + diff "^3.2.0" ember-cli-broccoli-sane-watcher "^2.0.4" ember-cli-get-component-path-option "^1.0.0" ember-cli-is-package-missing "^1.0.0" ember-cli-legacy-blueprints "^0.1.2" ember-cli-lodash-subset "^1.0.11" ember-cli-normalize-entity-name "^1.0.0" - ember-cli-preprocess-registry "^3.0.0" + ember-cli-preprocess-registry "^3.1.0" ember-cli-string-utils "^1.0.0" - ember-try "^0.2.9" + ember-try "^0.2.15" ensure-posix-path "^1.0.2" escape-string-regexp "^1.0.3" execa "^0.6.0" @@ -3439,7 +3511,7 @@ ember-cli@2.12.2: fs-extra "2.0.0" fs-tree-diff "^0.5.2" get-caller-file "^1.0.0" - git-repo-info "^1.0.4" + git-repo-info "^1.4.1" glob "7.1.1" heimdalljs "^0.2.3" heimdalljs-fs-monitor "^0.1.0" @@ -3453,28 +3525,29 @@ ember-cli@2.12.2: json-stable-stringify "^1.0.1" leek "0.0.24" lodash.template "^4.2.5" - markdown-it "^8.2.0" + markdown-it "^8.3.0" markdown-it-terminal "0.0.4" minimatch "^3.0.0" - morgan "^1.5.2" + morgan "^1.8.1" node-modules-path "^1.0.0" - nopt "^4.0.0" + nopt "^3.0.6" npm-package-arg "^4.1.1" portfinder "^1.0.7" promise-map-series "^0.2.1" - quick-temp "0.1.6" - resolve "^1.1.6" + quick-temp "^0.1.8" + resolve "^1.3.0" rsvp "^3.3.3" - sane "^1.1.1" + sane "^1.6.0" semver "^5.1.1" silent-error "^1.0.0" sort-package-json "^1.4.0" symlink-or-copy "^1.1.8" temp "0.8.3" - testem "^1.8.1" + testem "^1.15.0" tiny-lr "^1.0.3" tree-sync "^1.2.1" uuid "^3.0.0" + validate-npm-package-name "^3.0.0" walk-sync "^0.3.0" yam "0.0.22" @@ -3492,7 +3565,7 @@ ember-concurrency@~0.8.17: ember-cli-babel "^6.8.2" ember-maybe-import-regenerator "^0.1.5" -ember-data@~2.12.0: +ember-data@~2.12.2: version "2.12.2" resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.12.2.tgz#45369001847b59e7d0ca8b183e9f57cb1f339260" dependencies: @@ -3526,11 +3599,11 @@ ember-disable-proxy-controllers@^1.0.1: dependencies: ember-cli-babel "^5.0.0" -ember-export-application-global@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-1.1.1.tgz#f257d5271268932a89d7392679ce4db89d7154af" +ember-export-application-global@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/ember-export-application-global/-/ember-export-application-global-2.0.0.tgz#8d6d7619ac8a1a3f8c43003549eb21ebed685bd2" dependencies: - ember-cli-babel "^5.1.10" + ember-cli-babel "^6.0.0-beta.7" ember-factory-for-polyfill@^1.3.1: version "1.3.1" @@ -3623,12 +3696,17 @@ ember-qunit@^2.0.0-beta.1: dependencies: ember-test-helpers "^0.6.3" -ember-resolver@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-2.1.1.tgz#5e4c1fffe9f5f48fc2194ad7592274ed0cd74f72" +ember-resolver@^4.0.0: + version "4.5.5" + resolved "https://registry.yarnpkg.com/ember-resolver/-/ember-resolver-4.5.5.tgz#6fef0597a42724e4960f37588df8a208ffd3365a" dependencies: - ember-cli-babel "^5.1.6" - ember-cli-version-checker "^1.1.6" + "@glimmer/resolver" "^0.4.1" + babel-plugin-debug-macros "^0.1.10" + broccoli-funnel "^1.1.0" + broccoli-merge-trees "^2.0.0" + ember-cli-babel "^6.8.1" + ember-cli-version-checker "^2.0.0" + resolve "^1.3.3" ember-responsive@^2.0.8: version "2.0.8" @@ -3664,10 +3742,16 @@ ember-runtime-enumerable-includes-polyfill@^1.0.0: ember-cli-babel "^5.1.6" ember-cli-version-checker "^1.1.6" -ember-source@~2.12.0: - version "2.12.2" - resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.12.2.tgz#02094fd9d30c85e7717a240fd8a18b2a117b5594" +ember-source@~2.13.3: + version "2.13.4" + resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.13.4.tgz#97022069febfb5651ddc26a83f1987370cc404c8" dependencies: + "@glimmer/compiler" "^0.22.3" + "@glimmer/di" "^0.1.8" + "@glimmer/node" "^0.22.3" + "@glimmer/reference" "^0.22.3" + "@glimmer/runtime" "^0.22.3" + "@glimmer/util" "^0.22.3" broccoli-funnel "^1.0.6" broccoli-merge-trees "^1.1.4" ember-cli-get-component-path-option "^1.0.0" @@ -3677,10 +3761,12 @@ ember-source@~2.12.0: ember-cli-test-info "^1.0.0" ember-cli-valid-component-name "^1.0.0" ember-cli-version-checker "^1.1.7" + handlebars "^4.0.6" jquery "^3.1.1" resolve "^1.1.7" rsvp "^3.4.0" simple-dom "^0.3.0" + simple-html-tokenizer "^0.3.0" ember-string-ishtmlsafe-polyfill@^1.1.0: version "1.1.0" @@ -3689,12 +3775,6 @@ ember-string-ishtmlsafe-polyfill@^1.1.0: ember-cli-babel "^5.1.7" ember-cli-version-checker "^1.2.0" -ember-test-helpers@^0.5.22: - version "0.5.34" - resolved "https://registry.yarnpkg.com/ember-test-helpers/-/ember-test-helpers-0.5.34.tgz#c8439108d1cba1d7d838c212208a5c4061471b83" - dependencies: - klassy "^0.1.3" - ember-test-helpers@^0.6.3, ember-test-helpers@~0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/ember-test-helpers/-/ember-test-helpers-0.6.3.tgz#f864cdf6f4e75f3f8768d6537785b5ab6e82d907" @@ -3708,7 +3788,7 @@ ember-try-config@^2.2.0: rsvp "^3.2.1" semver "^5.1.0" -ember-try@^0.2.9: +ember-try@^0.2.15: version "0.2.23" resolved "https://registry.yarnpkg.com/ember-try/-/ember-try-0.2.23.tgz#39b57141b4907541d0ac8b503d211e6946b08718" dependencies: @@ -4084,7 +4164,7 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2: dependencies: homedir-polyfill "^1.0.1" -express@^4.10.7, express@^4.12.3, express@^4.8.5: +express@^4.10.7, express@^4.12.3: version "4.16.3" resolved "https://registry.yarnpkg.com/express/-/express-4.16.3.tgz#6af8a502350db3246ecc4becf6b5a34d22f7ed53" dependencies: @@ -4227,20 +4307,22 @@ fast-sourcemap-concat@^1.0.1: source-map-url "^0.3.0" sourcemap-validator "^1.0.5" -fastboot-express-middleware@1.0.0-beta.8: - version "1.0.0-beta.8" - resolved "https://registry.yarnpkg.com/fastboot-express-middleware/-/fastboot-express-middleware-1.0.0-beta.8.tgz#d1e5262dc23a0f49f8393a0f46e9ecd75c604f3f" +fastboot-express-middleware@^1.1.0: + version "1.1.1" + resolved "https://registry.yarnpkg.com/fastboot-express-middleware/-/fastboot-express-middleware-1.1.1.tgz#b6e156a3acbaecef42b1f023ebb8405a934c28e6" dependencies: - chalk "^1.1.3" - fastboot "^1.0.0-beta.5" + chalk "^2.0.1" + fastboot "^1.1.2" + request "^2.81.0" -fastboot-filter-initializers@0.0.2: - version "0.0.2" - resolved "https://registry.yarnpkg.com/fastboot-filter-initializers/-/fastboot-filter-initializers-0.0.2.tgz#67aa9e8b22ca4b0e6a244f2450fd1cc6befa45e7" +fastboot-transform@^0.1.2: + version "0.1.3" + resolved "https://registry.yarnpkg.com/fastboot-transform/-/fastboot-transform-0.1.3.tgz#7dea0b117594afd8772baa6c9b0919644e7f7dcd" dependencies: - broccoli-funnel "^1.0.1" + broccoli-stew "^1.5.0" + convert-source-map "^1.5.1" -fastboot@^1.0.0-beta.5: +fastboot@^1.1.2, fastboot@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-1.1.3.tgz#56c5f56415c5ae8de2db539c0d3ecbcd65538f8b" dependencies: @@ -4495,7 +4577,7 @@ fs-extra@^2.0.0: graceful-fs "^4.1.2" jsonfile "^2.1.0" -fs-extra@^4.0.0: +fs-extra@^4.0.0, fs-extra@^4.0.2: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" dependencies: @@ -4665,19 +4747,15 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" -git-repo-info@^1.0.2, git-repo-info@^1.0.4, git-repo-info@^1.1.2, git-repo-info@^1.3.0: +git-repo-info@^1.0.2, git-repo-info@^1.1.2, git-repo-info@^1.3.0, git-repo-info@^1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.4.1.tgz#2a072823254aaf62fcf0766007d7b6651bd41943" -git-repo-info@~1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.2.0.tgz#43d8513e04a24dd441330a2f7c6655a709fdbaf2" - -git-repo-version@0.4.1: - version "0.4.1" - resolved "https://registry.yarnpkg.com/git-repo-version/-/git-repo-version-0.4.1.tgz#75fab9a0a4ec8470755b0eea7fdaa6f9d41453bf" +git-repo-version@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/git-repo-version/-/git-repo-version-1.0.2.tgz#2c8e9bee5d970cafc0dd58480f9dc56d9afe8e4f" dependencies: - git-repo-info "~1.2.0" + git-repo-info "^1.4.1" git-tools@^0.1.4: version "0.1.4" @@ -4826,7 +4904,7 @@ growly@^1.2.0, growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" -handlebars@^4.0.1, handlebars@^4.0.4: +handlebars@^4.0.1, handlebars@^4.0.4, handlebars@^4.0.6: version "4.0.11" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc" dependencies: @@ -5763,10 +5841,6 @@ kind-of@^6.0.0, kind-of@^6.0.2: version "6.0.2" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051" -klassy@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/klassy/-/klassy-0.1.3.tgz#c31d5756d583197d75f582b6e692872be497067f" - klaw@^1.0.0: version "1.3.1" resolved "https://registry.yarnpkg.com/klaw/-/klaw-1.3.1.tgz#4088433b46b3b1ba259d78785d8e96f73ba02439" @@ -6106,7 +6180,7 @@ lodash.debounce@^3.1.1: dependencies: lodash._getnative "^3.0.0" -lodash.defaults@^4.0.1, lodash.defaults@^4.1.0: +lodash.defaults@^4.1.0: version "4.2.0" resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c" @@ -6406,6 +6480,12 @@ make-array@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/make-array/-/make-array-0.1.2.tgz#335e36ebb0c5a43154d21213a1ecaeae2a1bb3ef" +make-dir@^1.0.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b" + dependencies: + pify "^3.0.0" + makeerror@1.0.x: version "1.0.11" resolved "https://registry.yarnpkg.com/makeerror/-/makeerror-1.0.11.tgz#e01a5c9109f2af79660e4e8b9587790184f5a96c" @@ -6446,7 +6526,7 @@ markdown-it@^4.4.0: mdurl "~1.0.0" uc.micro "^1.0.0" -markdown-it@^8.2.0: +markdown-it@^8.3.0: version "8.4.1" resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.1.tgz#206fe59b0e4e1b78a7c73250af9b34a4ad0aaf44" dependencies: @@ -6476,12 +6556,6 @@ matcher-collection@^1.0.0, matcher-collection@^1.0.5: dependencies: minimatch "^3.0.2" -md5-hex@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4" - dependencies: - md5-o-matic "^0.1.1" - md5-hex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33" @@ -6644,7 +6718,7 @@ minimatch@1: dependencies: brace-expansion "^1.1.7" -minimatch@^2.0.1, minimatch@^2.0.10, minimatch@^2.0.3: +minimatch@^2.0.1, minimatch@^2.0.3: version "2.0.10" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-2.0.10.tgz#8d087c39c6b38c001b97fca7ce6d0e1e80afbac7" dependencies: @@ -6725,7 +6799,7 @@ moment-timezone@^0.5.0, moment-timezone@~0.5.14: version "2.22.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730" -morgan@^1.5.2: +morgan@^1.8.1: version "1.9.0" resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.9.0.tgz#d01fa6c65859b76fcf31b3cb53a3821a311d8051" dependencies: @@ -6951,13 +7025,13 @@ node-uuid@~1.4.7: version "1.4.8" resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907" -"nopt@2 || 3", nopt@3.x, nopt@^3.0.3, nopt@~3.0.6: +"nopt@2 || 3", nopt@3.x, nopt@^3.0.3, nopt@^3.0.6, nopt@~3.0.6: version "3.0.6" resolved "https://registry.yarnpkg.com/nopt/-/nopt-3.0.6.tgz#c6465dbf08abcd4db359317f79ac68a646b28ff9" dependencies: abbrev "1" -nopt@^4.0.0, nopt@^4.0.1: +nopt@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d" dependencies: @@ -7298,7 +7372,7 @@ os-tmpdir@^1.0.0, os-tmpdir@^1.0.1, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" -osenv@0, osenv@^0.1.0, osenv@^0.1.3, osenv@^0.1.4, osenv@~0.1.3: +osenv@0, osenv@^0.1.3, osenv@^0.1.4, osenv@~0.1.3: version "0.1.5" resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410" dependencies: @@ -7525,6 +7599,10 @@ pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" +pify@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176" + pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" @@ -7539,7 +7617,7 @@ pluralize@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" -portfinder@^1.0.3, portfinder@^1.0.7: +portfinder@^1.0.7: version "1.0.13" resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.13.tgz#bb32ecd87c27104ae6ee44b5a3ccbf0ebb1aede9" dependencies: @@ -7685,15 +7763,7 @@ querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" -quick-temp@0.1.6: - version "0.1.6" - resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.6.tgz#a6242a15cba9f9cdbd341287b5c569e318eec307" - dependencies: - mktemp "~0.4.0" - rimraf "~2.2.6" - underscore.string "~2.3.3" - -quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5: +quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408" dependencies: @@ -8226,6 +8296,12 @@ resolve@^1.1.2, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.3, dependencies: path-parse "^1.0.5" +resolve@^1.3.0: + version "1.7.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3" + dependencies: + path-parse "^1.0.5" + restore-cursor@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" @@ -8335,7 +8411,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -sane@^1.1.1: +sane@^1.6.0: version "1.7.0" resolved "https://registry.yarnpkg.com/sane/-/sane-1.7.0.tgz#b3579bccb45c94cf20355cc81124990dfd346e30" dependencies: @@ -8542,6 +8618,10 @@ simple-git@^1.57.0: dependencies: debug "^3.1.0" +simple-html-tokenizer@^0.3.0: + version "0.3.0" + resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.3.0.tgz#9b8b5559d80e331a544dd13dd59382e5d0d94411" + simple-is@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0" @@ -9068,7 +9148,7 @@ temp@0.8.3: os-tmpdir "^1.0.0" rimraf "~2.2.6" -testem@^1.8.1: +testem@^1.15.0: version "1.18.4" resolved "https://registry.yarnpkg.com/testem/-/testem-1.18.4.tgz#e45fed922bec2f54a616c43f11922598ac97eb41" dependencies: @@ -9322,10 +9402,6 @@ umd@^3.0.0: version "3.0.3" resolved "https://registry.yarnpkg.com/umd/-/umd-3.0.3.tgz#aa9fe653c42b9097678489c01000acb69f0b26cf" -underscore.string@~2.3.3: - version "2.3.3" - resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.3.3.tgz#71c08bf6b428b1133f37e78fa3a21c82f7329b0d" - underscore.string@~3.3.4: version "3.3.4" resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-3.3.4.tgz#2c2a3f9f83e64762fdc45e6ceac65142864213db" @@ -9358,6 +9434,12 @@ unique-slug@^2.0.0: dependencies: imurmurhash "^0.1.4" +unique-string@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/unique-string/-/unique-string-1.0.0.tgz#9e1057cca851abb93398f8b33ae187b99caec11a" + dependencies: + crypto-random-string "^1.0.0" + universalify@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7" @@ -9433,10 +9515,6 @@ uuid@3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.1.0.tgz#3dd3d3e790abc24d7b0d3a034ffababe28ebbc04" -uuid@^2.0.1: - version "2.0.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a" - uuid@^3.0.0, uuid@^3.1.0: version "3.2.1" resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" @@ -9478,12 +9556,6 @@ vm-browserify@^1.0.0: dependencies: component-indexof "0.0.3" -walk-sync-matcher@^0.2.2: - version "0.2.2" - resolved "https://registry.yarnpkg.com/walk-sync-matcher/-/walk-sync-matcher-0.2.2.tgz#60baf44875b2d9a660876373ed7b8ece7332899f" - dependencies: - minimatch "^2.0.10" - walk-sync@0.3.2, walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/walk-sync/-/walk-sync-0.3.2.tgz#4827280afc42d0e035367c4a4e31eeac0d136f75" @@ -9591,13 +9663,13 @@ wrappy@1, wrappy@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" -write-file-atomic@^1.1.2: - version "1.3.4" - resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-1.3.4.tgz#f807a4f0b1d9e913ae7a48112e6cc3af1991b45f" +write-file-atomic@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/write-file-atomic/-/write-file-atomic-2.3.0.tgz#1ff61575c2e2a4e8e510d6fa4e243cce183999ab" dependencies: graceful-fs "^4.1.11" imurmurhash "^0.1.4" - slide "^1.1.5" + signal-exit "^3.0.2" write-file-atomic@~1.1.4: version "1.1.4" @@ -9624,11 +9696,9 @@ wtf-8@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/wtf-8/-/wtf-8-1.0.0.tgz#392d8ba2d0f1c34d1ee2d630f15d0efb68e1048a" -xdg-basedir@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-2.0.0.tgz#edbc903cc385fc04523d966a335504b5504d1bd2" - dependencies: - os-homedir "^1.0.0" +xdg-basedir@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" xml2js@0.4.17: version "0.4.17" From afb075f543aac339972dc87a88fa9e7a9e806720 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Mon, 16 Apr 2018 19:16:29 -0400 Subject: [PATCH 06/34] Upgrade ember-data to 2.13 --- app/components/file-tree.js | 4 ++ app/mixins/files.js | 8 +++- app/routes/gist/edit.js | 5 +- app/routes/gist/edit/revision.js | 14 ++++-- app/routes/gist/new.js | 3 +- app/services/ember-cli.js | 15 ++++-- app/utils/push-deletion.js | 44 ++++++++++++++++++ package.json | 4 +- yarn.lock | 78 ++++++++++++++++++-------------- 9 files changed, 125 insertions(+), 50 deletions(-) create mode 100644 app/utils/push-deletion.js diff --git a/app/components/file-tree.js b/app/components/file-tree.js index 749d24bb..1e5d1514 100644 --- a/app/components/file-tree.js +++ b/app/components/file-tree.js @@ -10,6 +10,10 @@ export default Ember.Component.extend({ const files = this.get('model.files') || []; return files.reduce((accumulator, file) => { + if (!file) { + return accumulator; + } + const path = file.get('filePath'); const splitPath = path.split('/'); const splitPathZeroBasedLength = splitPath.length - 1; diff --git a/app/mixins/files.js b/app/mixins/files.js index f0f7859d..58459c39 100644 --- a/app/mixins/files.js +++ b/app/mixins/files.js @@ -1,5 +1,8 @@ import Ember from "ember"; import ErrorMessages from "../utils/error-messages"; +import { pushDeletion } from "../utils/push-deletion"; + +const { run } = Ember; export default Ember.Mixin.create({ hasPath(filePath) { @@ -16,7 +19,10 @@ export default Ember.Mixin.create({ } fileProperties.filePath = filePath; - let file = this.get('store').createRecord('gistFile', fileProperties); + + let store = this.get('store'); + run(() => pushDeletion(store, 'gist-file', filePath)); + let file = store.createRecord('gistFile', fileProperties); this.get('model.files').pushObject(file); this.get('notify').info(`File ${file.get('filePath')} was added`); diff --git a/app/routes/gist/edit.js b/app/routes/gist/edit.js index 441a9e08..05dc9977 100644 --- a/app/routes/gist/edit.js +++ b/app/routes/gist/edit.js @@ -1,11 +1,12 @@ import Ember from "ember"; import GistRoute from "ember-twiddle/routes/gist-base-route"; +import { pushDeleteAll } from "ember-twiddle/utils/push-deletion"; -const { get } = Ember; +const { get, run } = Ember; export default GistRoute.extend({ model(params) { - this.get('store').unloadAll('gistFile'); + run(() => pushDeleteAll(this.get('store'), 'gist-file')); return this.get('store').find('gist', params.gistId); }, diff --git a/app/routes/gist/edit/revision.js b/app/routes/gist/edit/revision.js index adb3b71f..e449d5fe 100644 --- a/app/routes/gist/edit/revision.js +++ b/app/routes/gist/edit/revision.js @@ -1,14 +1,19 @@ +import Ember from 'ember'; import GistEditRoute from "../edit"; +import { pushDeleteAll } from "ember-twiddle/utils/push-deletion"; + +const { run } = Ember; export default GistEditRoute.extend({ templateName: 'gist', model(params) { - this.get('store').unloadAll('gistFile'); + let store = this.get('store'); + run(() => pushDeleteAll(store, 'gist-file')); const gistParams = this.paramsFor('gist.edit'); - return this.get('store').queryRecord('gist-revision', { + return store.queryRecord('gist-revision', { gistId: gistParams.gistId, revId: params.revId }); @@ -23,8 +28,9 @@ export default GistEditRoute.extend({ actions: { showCurrentVersion() { - this.get('store').unloadAll('gistFile'); - this.store.find('gist', this.paramsFor('gist.edit').gistId).then((model) => { + const store = this.get('store'); + run(() => pushDeleteAll(store, 'gist-file')); + store.find('gist', this.paramsFor('gist.edit').gistId).then((model) => { this.transitionTo('gist.edit', model); }); } diff --git a/app/routes/gist/new.js b/app/routes/gist/new.js index b7f38a0b..f6c2ea62 100644 --- a/app/routes/gist/new.js +++ b/app/routes/gist/new.js @@ -1,5 +1,6 @@ import Ember from 'ember'; import GistRoute from "ember-twiddle/routes/gist-base-route"; +import { pushDeleteAll } from "ember-twiddle/utils/push-deletion"; const { inject, run } = Ember; @@ -13,7 +14,7 @@ export default GistRoute.extend({ if (params.copyCurrentTwiddle) { store.peekAll('gistFile').setEach('gist', model); } else { - store.unloadAll('gistFile'); + run(() => pushDeleteAll(store, 'gist-file')); let files = model.get('files'); let emberCli = this.get('emberCli'); files.pushObject(emberCli.generate('controllers/application')); diff --git a/app/services/ember-cli.js b/app/services/ember-cli.js index ad5d8214..3c7c7be1 100644 --- a/app/services/ember-cli.js +++ b/app/services/ember-cli.js @@ -5,8 +5,9 @@ import blueprints from '../lib/blueprints'; import Ember from 'ember'; import moment from 'moment'; import _template from "lodash/template"; +import { pushDeletion } from 'ember-twiddle/utils/push-deletion'; -const { computed, inject, RSVP, $, testing } = Ember; +const { computed, inject, RSVP, run, $, testing } = Ember; const twiddleAppName = 'twiddle'; const oldTwiddleAppNames = ['demo-app', 'app']; const hbsPlugin = new HbsPlugin(Babel); @@ -162,7 +163,9 @@ export default Ember.Service.extend({ }, generate(type) { - return this.get('store').createRecord('gistFile', this.buildProperties(type)); + let store = this.get('store'); + run(() => pushDeletion(store, 'gist-file', type)); + return store.createRecord('gistFile', this.buildProperties(type)); }, buildProperties(type, replacements) { @@ -400,9 +403,11 @@ export default Ember.Service.extend({ checkRequiredFiles(out, gist) { requiredFiles.forEach(filePath => { - var file = gist.get('files').findBy('filePath', filePath); - if(!file) { - gist.get('files').pushObject(this.get('store').createRecord('gistFile', { + let file = gist.get('files').findBy('filePath', filePath); + if (!file) { + let store = this.get('store'); + run(() => pushDeletion(store, 'gist-file', filePath)); + gist.get('files').pushObject(store.createRecord('gistFile', { filePath: filePath, content: blueprints[filePath] })); diff --git a/app/utils/push-deletion.js b/app/utils/push-deletion.js new file mode 100644 index 00000000..0e12182c --- /dev/null +++ b/app/utils/push-deletion.js @@ -0,0 +1,44 @@ +// Taken from https://github.com/travis-ci/travis-web/pull/1173/files +export function removeInternalModels(store, type, id) { + let recordMap = store._internalModelsFor(type); + let internalModel = recordMap.get(id); + if (internalModel) { + recordMap.remove(internalModel, id); + } +} + +// Taken from https://gist.github.com/runspired/96618af26fb1c687a74eb30bf15e58b6/ +export function pushDeletion(store, type, id) { + let record = store.peekRecord(type, id); + + if (record !== null) { + let relationships = {}; + let hasRelationships = false; + + record.eachRelationship((name, { kind }) => { + hasRelationships = true; + relationships[name] = { + data: kind === 'hasMany' ? [] : null + }; + }); + + if (hasRelationships && !record.get('isDeleted')) { + store.push({ + data: { + type, + id, + relationships + } + }); + } + + record.unloadRecord(); + + removeInternalModels(store, type, id); + } +} + +export function pushDeleteAll(store, type) { + let records = store.peekAll(type); + records.forEach(record => pushDeletion(store, type, record.get('id'))); +} diff --git a/package.json b/package.json index 11cdcebb..825415e4 100644 --- a/package.json +++ b/package.json @@ -59,11 +59,11 @@ "ember-cli-test-loader": "^1.1.1", "ember-cli-uglify": "^2.1.0", "ember-concurrency": "~0.8.17", - "ember-data": "~2.12.2", + "ember-data": "~2.13.2", "ember-disable-proxy-controllers": "^1.0.1", "ember-export-application-global": "^2.0.0", "ember-git-version": "~0.1.2", - "ember-inflector": "^1.12.1", + "ember-inflector": "~2.0.0", "ember-load": "~0.0.12", "ember-load-initializers": "^1.0.0", "ember-lodash": "^4.18.0", diff --git a/yarn.lock b/yarn.lock index a0d03539..36b00bb0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -775,17 +775,13 @@ babel-plugin-eval@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/babel-plugin-eval/-/babel-plugin-eval-1.0.1.tgz#a2faed25ce6be69ade4bfec263f70169195950da" -babel-plugin-feature-flags@^0.2.1: - version "0.2.3" - resolved "https://registry.yarnpkg.com/babel-plugin-feature-flags/-/babel-plugin-feature-flags-0.2.3.tgz#81d81ed77bda2014098fa8243abcf03a551cbd4d" - dependencies: - json-stable-stringify "^1.0.1" +babel-plugin-feature-flags@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/babel-plugin-feature-flags/-/babel-plugin-feature-flags-0.3.1.tgz#9c827cf9a4eb9a19f725ccb239e85cab02036fc1" -babel-plugin-filter-imports@^0.2.0: - version "0.2.1" - resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-0.2.1.tgz#784f96a892f2f7ed2ccf0955688bd8916cd2e212" - dependencies: - json-stable-stringify "^1.0.1" +babel-plugin-filter-imports@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-0.3.1.tgz#e7859b56886b175dd2616425d277b219e209ea8b" babel-plugin-htmlbars-inline-precompile@^0.2.3: version "0.2.4" @@ -1158,13 +1154,13 @@ babel-types@^6.19.0, babel-types@^6.24.1, babel-types@^6.26.0: lodash "^4.17.4" to-fast-properties "^1.0.3" -babel5-plugin-strip-class-callcheck@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/babel5-plugin-strip-class-callcheck/-/babel5-plugin-strip-class-callcheck-5.1.0.tgz#77d4a40c8614d367b8a21a53908159806dba5f91" +babel6-plugin-strip-class-callcheck@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/babel6-plugin-strip-class-callcheck/-/babel6-plugin-strip-class-callcheck-6.0.0.tgz#de841c1abebbd39f78de0affb2c9a52ee228fddf" -babel5-plugin-strip-heimdall@^5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/babel5-plugin-strip-heimdall/-/babel5-plugin-strip-heimdall-5.0.2.tgz#e1fe191c34de79686564d50a86f4217b8df629c1" +babel6-plugin-strip-heimdall@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/babel6-plugin-strip-heimdall/-/babel6-plugin-strip-heimdall-6.0.1.tgz#35f80eddec1f7fffdc009811dfbd46d9965072b6" babylon@^5.8.38: version "5.8.38" @@ -2937,7 +2933,7 @@ ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cl ember-cli-version-checker "^1.0.2" resolve "^1.1.2" -ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2: +ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.0: version "6.12.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.12.0.tgz#3adcdbe1278da1fcd0b9038f1360cb4ac5d4414c" dependencies: @@ -3448,7 +3444,7 @@ ember-cli-valid-component-name@^1.0.0: dependencies: silent-error "^1.0.0" -ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.6, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0: +ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz#0bc2d134c830142da64bf9627a0eded10b61ae72" dependencies: @@ -3565,26 +3561,26 @@ ember-concurrency@~0.8.17: ember-cli-babel "^6.8.2" ember-maybe-import-regenerator "^0.1.5" -ember-data@~2.12.2: - version "2.12.2" - resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.12.2.tgz#45369001847b59e7d0ca8b183e9f57cb1f339260" +ember-data@~2.13.2: + version "2.13.2" + resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.13.2.tgz#151c93ad5152885d4ca50b1942d7c66e15865c74" dependencies: amd-name-resolver "0.0.5" - babel-plugin-feature-flags "^0.2.1" - babel-plugin-filter-imports "^0.2.0" - babel5-plugin-strip-class-callcheck "^5.1.0" - babel5-plugin-strip-heimdall "^5.0.2" - broccoli-babel-transpiler "^5.5.0" + babel-plugin-feature-flags "^0.3.1" + babel-plugin-filter-imports "^0.3.1" + babel6-plugin-strip-class-callcheck "^6.0.0" + babel6-plugin-strip-heimdall "^6.0.1" + broccoli-babel-transpiler "^6.0.0" broccoli-file-creator "^1.0.0" broccoli-merge-trees "^1.0.0" chalk "^1.1.1" - ember-cli-babel "^5.1.6" + ember-cli-babel "^6.0.0-beta.7" ember-cli-path-utils "^1.0.0" ember-cli-string-utils "^1.0.0" ember-cli-test-info "^1.0.0" ember-cli-version-checker "^1.1.4" - ember-inflector "^1.9.4" - ember-runtime-enumerable-includes-polyfill "^1.0.0" + ember-inflector "^2.0.0" + ember-runtime-enumerable-includes-polyfill "^2.0.0" exists-sync "0.0.3" git-repo-info "^1.1.2" heimdalljs "^0.3.0" @@ -3624,12 +3620,24 @@ ember-git-version@~0.1.2: dependencies: git-repo-info "^1.0.2" -ember-inflector@^1.12.1, ember-inflector@^1.9.2, ember-inflector@^1.9.4: +ember-inflector@^1.9.2: version "1.12.1" resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-1.12.1.tgz#d8bd2ca2f327b439720f89923fe614d46b5da1ca" dependencies: ember-cli-babel "^5.1.7" +ember-inflector@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-2.2.0.tgz#edd273dfd1a29be27f14b195e2f0ed70e812d9e0" + dependencies: + ember-cli-babel "^6.0.0" + +ember-inflector@~2.0.0: + version "2.0.1" + resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-2.0.1.tgz#e9ac469ffa17992a43276bb1c9b8d87992b10d37" + dependencies: + ember-cli-babel "^6.0.0" + ember-load-initializers@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-1.0.0.tgz#4919eaf06f6dfeca7e134633d8c05a6c9921e6e7" @@ -3735,12 +3743,12 @@ ember-router-generator@^1.0.0: dependencies: recast "^0.11.3" -ember-runtime-enumerable-includes-polyfill@^1.0.0: - version "1.0.4" - resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-1.0.4.tgz#16a7612e347a2edf07da8b2f2f09dbfee70deba0" +ember-runtime-enumerable-includes-polyfill@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ember-runtime-enumerable-includes-polyfill/-/ember-runtime-enumerable-includes-polyfill-2.1.0.tgz#dc6d4a028471e4acc350dfd2a149874fb20913f5" dependencies: - ember-cli-babel "^5.1.6" - ember-cli-version-checker "^1.1.6" + ember-cli-babel "^6.9.0" + ember-cli-version-checker "^2.1.0" ember-source@~2.13.3: version "2.13.4" From 0c3de75642a9f3e2cbe1d94ba4d8f1c56038d9cf Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Wed, 18 Apr 2018 11:57:03 -0400 Subject: [PATCH 07/34] Upgrade ember-data to 2.18 --- package.json | 2 +- yarn.lock | 102 +++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 83 insertions(+), 21 deletions(-) diff --git a/package.json b/package.json index 825415e4..e9239d7b 100644 --- a/package.json +++ b/package.json @@ -59,7 +59,7 @@ "ember-cli-test-loader": "^1.1.1", "ember-cli-uglify": "^2.1.0", "ember-concurrency": "~0.8.17", - "ember-data": "~2.13.2", + "ember-data": "^2.18.0", "ember-disable-proxy-controllers": "^1.0.1", "ember-export-application-global": "^2.0.0", "ember-git-version": "~0.1.2", diff --git a/yarn.lock b/yarn.lock index 36b00bb0..a63f43d6 100644 --- a/yarn.lock +++ b/yarn.lock @@ -191,12 +191,6 @@ alter@~0.2.0: dependencies: stable "~0.1.3" -amd-name-resolver@0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.5.tgz#76962dac876ed3311b05d29c6a58c14e1ef3304b" - dependencies: - ensure-posix-path "^1.0.1" - amd-name-resolver@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.6.tgz#d3e4ba2dfcaab1d820c1be9de947c67828cfe595" @@ -765,6 +759,12 @@ babel-plugin-debug-macros@^0.1.10, babel-plugin-debug-macros@^0.1.11: dependencies: semver "^5.3.0" +babel-plugin-ember-modules-api-polyfill@^1.4.2: + version "1.6.0" + resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-1.6.0.tgz#abd1afa4237b3121cb51222f9bf3283cad8990aa" + dependencies: + ember-rfc176-data "^0.2.0" + babel-plugin-ember-modules-api-polyfill@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-2.3.0.tgz#0c01f359658cfb9c797f705af6b09f6220205ae0" @@ -861,7 +861,7 @@ babel-plugin-transform-es2015-block-scoped-functions@^6.22.0: dependencies: babel-runtime "^6.22.0" -babel-plugin-transform-es2015-block-scoping@^6.23.0: +babel-plugin-transform-es2015-block-scoping@^6.23.0, babel-plugin-transform-es2015-block-scoping@^6.24.1: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz#d70f5299c1308d05c12f463813b0a09e73b1895f" dependencies: @@ -1681,6 +1681,22 @@ broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli rimraf "^2.3.4" symlink-or-copy "^1.1.8" +broccoli-rollup@^1.2.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-1.3.0.tgz#43a0a7798555bab54217009eb470a4ff5a056df0" + dependencies: + broccoli-plugin "^1.2.1" + es6-map "^0.1.4" + fs-extra "^0.30.0" + fs-tree-diff "^0.5.2" + heimdalljs "^0.2.1" + heimdalljs-logger "^0.1.7" + md5-hex "^1.3.0" + node-modules-path "^1.0.1" + rollup "^0.41.4" + symlink-or-copy "^1.1.8" + walk-sync "^0.3.1" + broccoli-sass-source-maps@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.2.0.tgz#1f1a0794136152b096188638b59b42b17a4bdc68" @@ -1978,7 +1994,7 @@ cached-path-relative@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/cached-path-relative/-/cached-path-relative-1.0.1.tgz#d09c4b52800aa4c078e2dd81a869aac90d2e54e7" -calculate-cache-key-for-tree@^1.0.0: +calculate-cache-key-for-tree@^1.0.0, calculate-cache-key-for-tree@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/calculate-cache-key-for-tree/-/calculate-cache-key-for-tree-1.1.0.tgz#0c3e42c9c134f3c9de5358c0f16793627ea976d6" dependencies: @@ -3561,24 +3577,30 @@ ember-concurrency@~0.8.17: ember-cli-babel "^6.8.2" ember-maybe-import-regenerator "^0.1.5" -ember-data@~2.13.2: - version "2.13.2" - resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.13.2.tgz#151c93ad5152885d4ca50b1942d7c66e15865c74" +ember-data@^2.18.0: + version "2.18.2" + resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-2.18.2.tgz#3c6e99c9aed77ef8945451c39f39865f370f3db4" dependencies: - amd-name-resolver "0.0.5" + amd-name-resolver "0.0.7" + babel-plugin-ember-modules-api-polyfill "^1.4.2" babel-plugin-feature-flags "^0.3.1" babel-plugin-filter-imports "^0.3.1" + babel-plugin-transform-es2015-block-scoping "^6.24.1" babel6-plugin-strip-class-callcheck "^6.0.0" babel6-plugin-strip-heimdall "^6.0.1" broccoli-babel-transpiler "^6.0.0" + broccoli-debug "^0.6.2" broccoli-file-creator "^1.0.0" - broccoli-merge-trees "^1.0.0" + broccoli-funnel "^1.2.0" + broccoli-merge-trees "^2.0.0" + broccoli-rollup "^1.2.0" + calculate-cache-key-for-tree "^1.1.0" chalk "^1.1.1" - ember-cli-babel "^6.0.0-beta.7" + ember-cli-babel "^6.8.2" ember-cli-path-utils "^1.0.0" ember-cli-string-utils "^1.0.0" ember-cli-test-info "^1.0.0" - ember-cli-version-checker "^1.1.4" + ember-cli-version-checker "^2.1.0" ember-inflector "^2.0.0" ember-runtime-enumerable-includes-polyfill "^2.0.0" exists-sync "0.0.3" @@ -3722,7 +3744,7 @@ ember-responsive@^2.0.8: dependencies: ember-cli-babel "^6.6.0" -ember-rfc176-data@^0.2.7: +ember-rfc176-data@^0.2.0, ember-rfc176-data@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.2.7.tgz#bd355bc9b473e08096b518784170a23388bc973b" @@ -3899,7 +3921,7 @@ es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: es6-symbol "~3.1.1" next-tick "1" -es6-iterator@~2.0.3: +es6-iterator@~2.0.1, es6-iterator@~2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/es6-iterator/-/es6-iterator-2.0.3.tgz#a7de889141a05a94b0854403b2d0a0fbfa98f3b7" dependencies: @@ -3907,6 +3929,17 @@ es6-iterator@~2.0.3: es5-ext "^0.10.35" es6-symbol "^3.1.1" +es6-map@^0.1.4: + version "0.1.5" + resolved "https://registry.yarnpkg.com/es6-map/-/es6-map-0.1.5.tgz#9136e0503dcc06a301690f0bb14ff4e364e949f0" + dependencies: + d "1" + es5-ext "~0.10.14" + es6-iterator "~2.0.1" + es6-set "~0.1.5" + es6-symbol "~3.1.1" + event-emitter "~0.3.5" + es6-promise@^4.0.3: version "4.2.4" resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-4.2.4.tgz#dc4221c2b16518760bd8c39a52d8f356fc00ed29" @@ -3917,7 +3950,17 @@ es6-promisify@^5.0.0: dependencies: es6-promise "^4.0.3" -es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.1: +es6-set@~0.1.5: + version "0.1.5" + resolved "https://registry.yarnpkg.com/es6-set/-/es6-set-0.1.5.tgz#d2b3ec5d4d800ced818db538d28974db0a73ccb1" + dependencies: + d "1" + es5-ext "~0.10.14" + es6-iterator "~2.0.1" + es6-symbol "3.1.1" + event-emitter "~0.3.5" + +es6-symbol@3.1.1, es6-symbol@^3.0.2, es6-symbol@^3.1.1, es6-symbol@~3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77" dependencies: @@ -4075,6 +4118,13 @@ etag@~1.8.1: version "1.8.1" resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887" +event-emitter@~0.3.5: + version "0.3.5" + resolved "https://registry.yarnpkg.com/event-emitter/-/event-emitter-0.3.5.tgz#df8c69eef1647923c7157b9ce83840610b02cc39" + dependencies: + d "1" + es5-ext "~0.10.14" + eventemitter3@1.x.x: version "1.2.0" resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508" @@ -6564,6 +6614,12 @@ matcher-collection@^1.0.0, matcher-collection@^1.0.5: dependencies: minimatch "^3.0.2" +md5-hex@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4" + dependencies: + md5-o-matic "^0.1.1" + md5-hex@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-2.0.0.tgz#d0588e9f1c74954492ecd24ac0ac6ce997d92e33" @@ -6956,7 +7012,7 @@ node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" -node-modules-path@^1.0.0: +node-modules-path@^1.0.0, node-modules-path@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/node-modules-path/-/node-modules-path-1.0.1.tgz#40096b08ce7ad0ea14680863af449c7c75a5d1c8" @@ -8361,6 +8417,12 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^2.0.0" inherits "^2.0.1" +rollup@^0.41.4: + version "0.41.6" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.41.6.tgz#e0d05497877a398c104d816d2733a718a7a94e2a" + dependencies: + source-map-support "^0.4.0" + route-recognizer@^0.2.3: version "0.2.10" resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.10.tgz#024b2283c2e68d13a7c7f5173a5924645e8902df" @@ -8785,7 +8847,7 @@ source-map-support@^0.2.10: dependencies: source-map "0.1.32" -source-map-support@^0.4.15: +source-map-support@^0.4.0, source-map-support@^0.4.15: version "0.4.18" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f" dependencies: From 88127773b29f40ec2d173841257c04fbe7646be4 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Wed, 18 Apr 2018 12:26:18 -0400 Subject: [PATCH 08/34] Try to fix travis failure --- app/services/ember-cli.js | 40 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/app/services/ember-cli.js b/app/services/ember-cli.js index 3c7c7be1..408734d6 100644 --- a/app/services/ember-cli.js +++ b/app/services/ember-cli.js @@ -334,27 +334,27 @@ export default Ember.Service.extend({ url: 'https://cdnjs.cloudflare.com/ajax/libs/qunit/2.3.2/qunit.js', dataType: 'text' }).then(function(script) { - var oldQUnit; - if (window.QUnit) { - oldQUnit = window.QUnit; - } - window.QUnit = { - config: { - autostart: false - } - } - eval(script); - if (!oldQUnit) { - oldQUnit = window.QUnit; - } - if (window.testModule) { - window.require(window.testModule); - } - window.QUnit.start = function() {}; - window.QUnit.done(function() { - window.QUnit = oldQUnit; - }); Ember.run(function() { + var oldQUnit; + if (window.QUnit) { + oldQUnit = window.QUnit; + } + window.QUnit = { + config: { + autostart: false + } + } + eval(script); + if (!oldQUnit) { + oldQUnit = window.QUnit; + } + if (window.testModule) { + window.require(window.testModule); + } + window.QUnit.start = function() {}; + window.QUnit.done(function() { + window.QUnit = oldQUnit; + }); oldQUnit.start(); }); }); From 3e48455fe5703015ca83ab852519ac4d65d1702b Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 19 Apr 2018 05:00:44 -0700 Subject: [PATCH 09/34] Upgrade to ember-cli-qunit@4 --- app/components/main-gist.js | 10 +++++----- app/mixins/files.js | 10 +++++----- ember-cli-build.js | 2 ++ package.json | 2 +- tests/test-helper.js | 3 +++ yarn.lock | 35 ++++++++++++++++++++--------------- 6 files changed, 36 insertions(+), 26 deletions(-) diff --git a/app/components/main-gist.js b/app/components/main-gist.js index e3981e99..a6d37967 100644 --- a/app/components/main-gist.js +++ b/app/components/main-gist.js @@ -5,7 +5,7 @@ import FilesMixin from "../mixins/files"; import TestFilesMixin from "../mixins/test-files"; import AppBuilderMixin from "../mixins/app-builder"; -const { inject, computed } = Ember; +const { inject, computed, run } = Ember; export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin, TestFilesMixin, { emberCli: inject.service(), @@ -124,7 +124,7 @@ export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin, selectFile (file) { this.set('activeFile', file); - this.updateOpenFiles(); + run.scheduleOnce('afterRender', this, this.updateOpenFiles); }, openFile(filePath) { @@ -204,7 +204,7 @@ export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin, removeColumn (col) { this.removeColumn(col); - this.updateOpenFiles(); + run.scheduleOnce('afterRender', this, this.updateOpenFiles); this.get('transitionQueryParams')({numColumns: this.get('realNumColumns') - 1}); }, @@ -216,7 +216,7 @@ export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin, }).then((queryParams) => { this.setProperties(queryParams); this.initializeColumns(); - this.updateOpenFiles(); + run.scheduleOnce('afterRender', this, this.updateOpenFiles); }); }, @@ -232,7 +232,7 @@ export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin, fullScreen: false }).then(() => { this.initializeColumns(); - this.updateOpenFiles(); + run.scheduleOnce('afterRender', this, this.updateOpenFiles); }); }, diff --git a/app/mixins/files.js b/app/mixins/files.js index 58459c39..2da5b0ce 100644 --- a/app/mixins/files.js +++ b/app/mixins/files.js @@ -29,7 +29,7 @@ export default Ember.Mixin.create({ this.setColumnFile(fileColumn, file); this.set('activeEditorCol', '1'); this.send('contentsChanged'); - this.updateOpenFiles(); + run.scheduleOnce('afterRender', this, this.updateOpenFiles); } }, @@ -63,7 +63,7 @@ export default Ember.Mixin.create({ this.setColumnFile(activeCol, file); this.set('activeEditorCol', activeCol); this.set('activeFile', file); - this.updateOpenFiles(); + run.scheduleOnce('afterRender', this, this.updateOpenFiles); }, addFile(type) { @@ -77,7 +77,7 @@ export default Ember.Mixin.create({ return; } this.createFile(filePath, fileProperties); - this.updateOpenFiles(); + run.scheduleOnce('afterRender', this, this.updateOpenFiles); }, renameFile(file) { @@ -90,7 +90,7 @@ export default Ember.Mixin.create({ file.set('filePath', filePath); this.get('notify').info(`File ${file.get('filePath')} was added`); - this.updateOpenFiles(); + run.scheduleOnce('afterRender', this, this.updateOpenFiles); } }, @@ -105,8 +105,8 @@ export default Ember.Mixin.create({ }); } - this.updateOpenFiles(); this.send('contentsChanged'); + run.scheduleOnce('afterRender', this, this.updateOpenFiles); }, addComponent(path) { diff --git a/ember-cli-build.js b/ember-cli-build.js index b43c805e..cf87cced 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -1,5 +1,7 @@ /* global require, module, process */ module.exports = function(defaults) { + process.env.FASTBOOT_DISABLED = true; + var EmberApp = require('ember-cli/lib/broccoli/ember-app'); var funnel = require('broccoli-funnel'); var concat = require('broccoli-concat'); diff --git a/package.json b/package.json index e9239d7b..eeb3ea1a 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "ember-cli-mirage": "~0.2.9", "ember-cli-moment-shim": "^2.2.1", "ember-cli-node-assets": "~0.2.2", - "ember-cli-qunit": "^3.1.1", + "ember-cli-qunit": "~4.0.0", "ember-cli-release": "1.0.0-beta.2", "ember-cli-sass": "^6.2.0", "ember-cli-shims": "~1.0.2", diff --git a/tests/test-helper.js b/tests/test-helper.js index 4263311a..2ff16b8d 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -3,6 +3,7 @@ import resolver from './helpers/resolver'; import { setResolver } from 'ember-qunit'; +import { start } from 'ember-cli-qunit'; import createGist from "./helpers/create-gist"; import runGist from "./helpers/run-gist"; import runRevision from "./helpers/run-revision"; @@ -27,3 +28,5 @@ Ember.Test.registerAsyncHelper('runGist', runGist); Ember.Test.registerAsyncHelper('runRevision', runRevision); Ember.Test.registerAsyncHelper('waitForLoadedIFrame', waitForLoadedIFrame); Ember.Test.registerAsyncHelper('waitForUnloadedIFrame', waitForUnloadedIFrame); + +start(); diff --git a/yarn.lock b/yarn.lock index a63f43d6..885f1595 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1379,7 +1379,7 @@ broccoli-asset-rewrite@^1.1.0: dependencies: broccoli-filter "^1.2.3" -broccoli-babel-transpiler@^5.5.0, broccoli-babel-transpiler@^5.6.2: +broccoli-babel-transpiler@^5.6.2: version "5.7.4" resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-5.7.4.tgz#2b0611ce9e5d98b8d8d2b49ae1219af2f52767e3" dependencies: @@ -3375,21 +3375,20 @@ ember-cli-preprocess-registry@^3.1.0: process-relative-require "^1.0.0" silent-error "^1.0.0" -ember-cli-qunit@^3.1.1: - version "3.1.3" - resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-3.1.3.tgz#1bc6e3fc00b5e50753ab443246bfc147a8d2acbc" +ember-cli-qunit@~4.0.0: + version "4.0.2" + resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-4.0.2.tgz#4d4d9cad106ccf1be658d35015d344efbbcf8951" dependencies: - broccoli-babel-transpiler "^5.5.0" - broccoli-funnel "^1.0.1" - broccoli-merge-trees "^1.1.0" - ember-cli-babel "^5.1.5" - ember-cli-test-loader "^1.1.1" - ember-cli-version-checker "^1.1.4" - ember-qunit "^2.0.0-beta.1" + broccoli-funnel "^2.0.0" + broccoli-merge-trees "^2.0.0" + ember-cli-babel "^6.8.1" + ember-cli-test-loader "^2.2.0" + ember-cli-version-checker "^2.0.0" + ember-qunit "^2.2.0" qunit "^2.4.1" qunit-notifications "^0.1.1" - resolve "^1.1.6" - silent-error "^1.0.0" + resolve "^1.4.0" + silent-error "^1.1.0" ember-cli-release@1.0.0-beta.2: version "1.0.0-beta.2" @@ -3447,6 +3446,12 @@ ember-cli-test-loader@^1.1.1: dependencies: ember-cli-babel "^5.2.1" +ember-cli-test-loader@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/ember-cli-test-loader/-/ember-cli-test-loader-2.2.0.tgz#3fb8d5d1357e4460d3f0a092f5375e71b6f7c243" + dependencies: + ember-cli-babel "^6.8.1" + ember-cli-uglify@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ember-cli-uglify/-/ember-cli-uglify-2.1.0.tgz#4a0641fe4768d7ab7d4807aca9924cc77c544184" @@ -3460,7 +3465,7 @@ ember-cli-valid-component-name@^1.0.0: dependencies: silent-error "^1.0.0" -ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.4, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0: +ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz#0bc2d134c830142da64bf9627a0eded10b61ae72" dependencies: @@ -3720,7 +3725,7 @@ ember-notify@^5.2.1: ember-string-ishtmlsafe-polyfill "^1.1.0" object-assign "^4.1.0" -ember-qunit@^2.0.0-beta.1: +ember-qunit@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-2.2.0.tgz#3cdf400031c93a38de781a7304819738753b7f99" dependencies: From e2ce741c31ce0f23338c1d29bc7a42c9ad9d98b5 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Mon, 23 Apr 2018 05:02:46 -0700 Subject: [PATCH 10/34] Upgrade ember-cli-mirage --- mirage/config.js | 8 ++-- mirage/factories/gist-file.js | 2 +- mirage/factories/gist-revision.js | 4 +- mirage/factories/gist.js | 23 ++++----- mirage/factories/user.js | 2 +- mirage/models/gist-file.js | 5 ++ mirage/models/gist-revision.js | 7 +++ mirage/models/gist.js | 8 ++++ mirage/models/owner.js | 5 ++ mirage/models/user.js | 5 ++ mirage/serializers/application.js | 6 ++- mirage/serializers/gist-revision.js | 5 ++ mirage/serializers/gist.js | 27 +++++++++++ package.json | 2 +- tests/acceptance/twiddles-test.js | 33 ++++++++----- tests/helpers/create-gist.js | 24 ++++++---- yarn.lock | 74 +++++++++++++++++++++-------- 17 files changed, 177 insertions(+), 63 deletions(-) create mode 100644 mirage/models/gist-file.js create mode 100644 mirage/models/gist-revision.js create mode 100644 mirage/models/gist.js create mode 100644 mirage/models/owner.js create mode 100644 mirage/models/user.js create mode 100644 mirage/serializers/gist-revision.js create mode 100644 mirage/serializers/gist.js diff --git a/mirage/config.js b/mirage/config.js index 4ea9c947..1b2fad26 100644 --- a/mirage/config.js +++ b/mirage/config.js @@ -14,17 +14,17 @@ export default function() {} export function testConfig() { this.get('/gists', function(schema) { - return schema.db.gists; + return schema.gists.all(); }); this.get('/gists/:id', function(schema, request) { let id = request.params.id; - return schema.db.gists.find(id); + return schema.gists.find(id); }); this.get('/gists/:id/:rev_id', function(schema, request) { let id = request.params.id; - return schema.db["gistRevisions"].find(id); + return schema.gistRevisions.find(id); }); this.post('/gists', function(schema, request) { @@ -49,7 +49,7 @@ export function testConfig() { }); this.get('/user', function(schema) { - return schema.db.users.find(1); + return schema.users.find(1); }); this.get(config.addonUrl, function(schema, request) { diff --git a/mirage/factories/gist-file.js b/mirage/factories/gist-file.js index 89148a27..0f58c1b1 100644 --- a/mirage/factories/gist-file.js +++ b/mirage/factories/gist-file.js @@ -1,7 +1,7 @@ /** * This is a factory definition for a gist file */ -import Mirage/*, {faker} */ from 'ember-cli-mirage'; +import Mirage from 'ember-cli-mirage'; export default Mirage.Factory.extend({ type() { diff --git a/mirage/factories/gist-revision.js b/mirage/factories/gist-revision.js index a033db35..4a5a10fe 100644 --- a/mirage/factories/gist-revision.js +++ b/mirage/factories/gist-revision.js @@ -6,7 +6,9 @@ import GistFactory from './gist'; export default GistFactory.extend({ url() { return `https://api.github.com/gists/${this.id}/${this.revId}`; - } + }, + owner: null, + afterCreate() {} }); /* Sample diff --git a/mirage/factories/gist.js b/mirage/factories/gist.js index c7d0f42e..1561d62f 100644 --- a/mirage/factories/gist.js +++ b/mirage/factories/gist.js @@ -1,7 +1,7 @@ /** * This is a factory definition for a gist. */ -import Mirage/*, {faker} */ from 'ember-cli-mirage'; +import Mirage from 'ember-cli-mirage'; export default Mirage.Factory.extend({ url() { @@ -34,16 +34,17 @@ export default Mirage.Factory.extend({ }, //owner, forks: [], - history() { - return [ - { - "user": null, - "version": "921e8958fe32b5a1b724fa6754d0dd904cfa9e62", - "committed_at": "2015-07-23T22:49:45Z", - "url": `https://api.github.com/gists/${this.id}/921e8958fe32b5a1b724fa6754d0dd904cfa9e62` - } - ]; - } + //history, + afterCreate(gist, server) { + let historyEntry = server.create('gistRevision', { + "user": null, + "version": "921e8958fe32b5a1b724fa6754d0dd904cfa9e62", + "committed_at": "2015-07-23T22:49:45Z", + "url": `https://api.github.com/gists/${gist.id}/921e8958fe32b5a1b724fa6754d0dd904cfa9e62` + }); + gist.update({ history: [historyEntry] }); + }, + //history }); /* Sample diff --git a/mirage/factories/user.js b/mirage/factories/user.js index 011855bc..ddc7385b 100644 --- a/mirage/factories/user.js +++ b/mirage/factories/user.js @@ -1,7 +1,7 @@ /** * This is a factory definition for an owner */ -import Mirage/*, { faker } */ from 'ember-cli-mirage'; +import Mirage from 'ember-cli-mirage'; export default Mirage.Factory.extend({ avatar_url() { diff --git a/mirage/models/gist-file.js b/mirage/models/gist-file.js new file mode 100644 index 00000000..aa3ad864 --- /dev/null +++ b/mirage/models/gist-file.js @@ -0,0 +1,5 @@ +import { Model, belongsTo } from 'ember-cli-mirage'; + +export default Model.extend({ + gist: belongsTo() +}); diff --git a/mirage/models/gist-revision.js b/mirage/models/gist-revision.js new file mode 100644 index 00000000..8aebd01b --- /dev/null +++ b/mirage/models/gist-revision.js @@ -0,0 +1,7 @@ +import { Model, belongsTo, hasMany } from 'ember-cli-mirage'; + +export default Model.extend({ + gist: belongsTo(), + owner: belongsTo(), + files: hasMany('gistFile') +}); diff --git a/mirage/models/gist.js b/mirage/models/gist.js new file mode 100644 index 00000000..01c81310 --- /dev/null +++ b/mirage/models/gist.js @@ -0,0 +1,8 @@ +import { Model, belongsTo, hasMany } from 'ember-cli-mirage'; + +export default Model.extend({ + user: belongsTo(), + owner: belongsTo(), + history: hasMany('gistRevision'), + files: hasMany('gistFile') +}); diff --git a/mirage/models/owner.js b/mirage/models/owner.js new file mode 100644 index 00000000..aa3ad864 --- /dev/null +++ b/mirage/models/owner.js @@ -0,0 +1,5 @@ +import { Model, belongsTo } from 'ember-cli-mirage'; + +export default Model.extend({ + gist: belongsTo() +}); diff --git a/mirage/models/user.js b/mirage/models/user.js new file mode 100644 index 00000000..aa3ad864 --- /dev/null +++ b/mirage/models/user.js @@ -0,0 +1,5 @@ +import { Model, belongsTo } from 'ember-cli-mirage'; + +export default Model.extend({ + gist: belongsTo() +}); diff --git a/mirage/serializers/application.js b/mirage/serializers/application.js index 6d47a366..843b079b 100644 --- a/mirage/serializers/application.js +++ b/mirage/serializers/application.js @@ -1,4 +1,6 @@ -import { JSONAPISerializer } from 'ember-cli-mirage'; +import { RestSerializer } from 'ember-cli-mirage'; -export default JSONAPISerializer.extend({ +export default RestSerializer.extend({ + root: false, + embed: true }); diff --git a/mirage/serializers/gist-revision.js b/mirage/serializers/gist-revision.js new file mode 100644 index 00000000..12820459 --- /dev/null +++ b/mirage/serializers/gist-revision.js @@ -0,0 +1,5 @@ +import GistSerializer from './gist'; + +export default GistSerializer.extend({ + include: ['owner', 'files'] +}); diff --git a/mirage/serializers/gist.js b/mirage/serializers/gist.js new file mode 100644 index 00000000..9b19aec4 --- /dev/null +++ b/mirage/serializers/gist.js @@ -0,0 +1,27 @@ +import ApplicationSerializer from './application'; +import Ember from 'ember'; + +const { isArray } = Ember; + +export default ApplicationSerializer.extend({ + include: ['owner', 'files', 'history'], + serialize() { + let payload = ApplicationSerializer.prototype.serialize.apply(this, arguments); + let files = payload.files; + if (files) { + payload.files = {}; + files.forEach(file => { + payload.files[file.filename] = file; + }); + } else if (isArray(payload)) { + payload.forEach(obj => { + files = obj.files; + obj.files = {}; + files.forEach(file => { + obj.files[file.filename] = file; + }); + }); + } + return payload; + } +}); diff --git a/package.json b/package.json index eeb3ea1a..cc63546d 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "ember-cli-inject-live-reload": "^1.7.0", "ember-cli-jstree": "^1.0.9", "ember-cli-legacy-blueprints": "~0.2.1", - "ember-cli-mirage": "~0.2.9", + "ember-cli-mirage": "~0.4.4", "ember-cli-moment-shim": "^2.2.1", "ember-cli-node-assets": "~0.2.2", "ember-cli-qunit": "~4.0.0", diff --git a/tests/acceptance/twiddles-test.js b/tests/acceptance/twiddles-test.js index 6de4fae2..c6b30d70 100644 --- a/tests/acceptance/twiddles-test.js +++ b/tests/acceptance/twiddles-test.js @@ -4,25 +4,32 @@ import { stubValidSession } from 'ember-twiddle/tests/helpers/torii'; import $ from 'jquery'; moduleForAcceptance('Acceptance | twiddles', { - beforeEach: function() { + beforeEach() { server.create('user', { login: 'octocat' }); const owner = server.create('owner', {login: 'octocat'}); - const file = server.create('gist-file', { + const file1 = server.create('gist-file', { login: "octocat", filename: "twiddle.json", content: '{ "dependencies": {} }' }); - const files = {}; - files[file.filename] = file; - server.create('gist', { - id: '35de43cb81fc35ddffb2', - owner: owner, - files: files + const file2 = server.create('gist-file', { + login: "octocat", + filename: "twiddle.json", + content: '{ "dependencies": {} }' + }); + const gist1 = server.create('gist', { + id: '35de43cb81fc35ddffb2' + }); + gist1.update({ + owner, + files: [file1] + }); + const gist2 = server.create('gist', { + id: '74bae9a34142370ff5a3' }); - server.create('gist', { - id: '74bae9a34142370ff5a3', - owner: owner, - files: files + gist2.update({ + owner, + files: [file2] }); stubValidSession(this.application, { @@ -33,7 +40,7 @@ moduleForAcceptance('Acceptance | twiddles', { window.confirm = function() {}; }, - afterEach: function() { + afterEach() { window.confirm = this.cacheConfirm; } }); diff --git a/tests/helpers/create-gist.js b/tests/helpers/create-gist.js index 8ed1bfa8..4a4953bf 100644 --- a/tests/helpers/create-gist.js +++ b/tests/helpers/create-gist.js @@ -28,7 +28,7 @@ export default function(app, options) { };` }); - let gistFiles = {}; + let gistFiles = []; files.forEach(function (file) { let gistFile = server.create('gist-file', { @@ -38,26 +38,30 @@ export default function(app, options) { commit: commit, content: file.content }); - gistFiles[gistFile.filename] = gistFile; + gistFiles.push(gistFile); }); server.create('user', { id: faker.random.number(99999), login: login }); const owner = server.create('owner', { id: faker.random.number(99999), login: login }); if (isGitRevision) { - server.create('gist-revision', { + let revision = server.create('gist-revision', { id: gist_id, - revId: commit, - owner: owner, - files: gistFiles + revId: commit }); + revision.update({ + owner, + files: gistFiles + }) } if (!options.doNotCreateGist) { - server.create('gist', { - id: gist_id, - owner: owner, - files: gistFiles + let gist = server.create('gist', { + id: gist_id }); + gist.update({ + owner, + files: gistFiles + }) } } diff --git a/yarn.lock b/yarn.lock index 885f1595..e38c54f1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -277,6 +277,14 @@ aot-test-generators@^0.1.0: dependencies: jsesc "^2.5.0" +applause@1.2.2: + version "1.2.2" + resolved "https://registry.yarnpkg.com/applause/-/applause-1.2.2.tgz#a8468579e81f67397bb5634c29953bedcd0f56c0" + dependencies: + cson-parser "^1.1.0" + js-yaml "^3.3.0" + lodash "^3.10.0" + aproba@^1.0.3: version "1.2.0" resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a" @@ -1524,6 +1532,13 @@ broccoli-file-creator@^1.0.0, broccoli-file-creator@^1.1.0: rsvp "~3.0.6" symlink-or-copy "^1.0.1" +broccoli-file-creator@^1.1.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-1.2.0.tgz#27f1b25b1b00e7bb7bf3d5d7abed5f4d5388df4d" + dependencies: + broccoli-plugin "^1.1.0" + mkdirp "^0.5.1" + broccoli-filter@^1.2.2, broccoli-filter@^1.2.3: version "1.3.0" resolved "https://registry.yarnpkg.com/broccoli-filter/-/broccoli-filter-1.3.0.tgz#71e3a8e32a17f309e12261919c5b1006d6766de6" @@ -1645,7 +1660,7 @@ broccoli-module-alchemist-install@^0.1.6: dependencies: debug "^2.2.0" -broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.4.0, broccoli-persistent-filter@^1.4.2, broccoli-persistent-filter@^1.4.3: +broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0, broccoli-persistent-filter@^1.4.0, broccoli-persistent-filter@^1.4.2, broccoli-persistent-filter@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.3.tgz#3511bc52fc53740cda51621f58a28152d9911bc1" dependencies: @@ -1681,6 +1696,14 @@ broccoli-plugin@^1.0.0, broccoli-plugin@^1.1.0, broccoli-plugin@^1.2.0, broccoli rimraf "^2.3.4" symlink-or-copy "^1.1.8" +broccoli-replace@^0.12.0: + version "0.12.0" + resolved "https://registry.yarnpkg.com/broccoli-replace/-/broccoli-replace-0.12.0.tgz#36460a984c45c61731638c53068b0ab12ea8fdb7" + dependencies: + applause "1.2.2" + broccoli-persistent-filter "^1.2.0" + minimatch "^3.0.0" + broccoli-rollup@^1.2.0: version "1.3.0" resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-1.3.0.tgz#43a0a7798555bab54217009eb470a4ff5a056df0" @@ -2271,6 +2294,10 @@ codemirror@~5.15.0: version "5.15.2" resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.15.2.tgz#58b3dc732c6d10d7aae806f4c7cdd56a9b87fe8f" +coffee-script@^1.10.0: + version "1.12.7" + resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53" + coffee-script@~1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.7.1.tgz#62996a861780c75e6d5069d13822723b73404bfc" @@ -2606,6 +2633,12 @@ crypto-random-string@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e" +cson-parser@^1.1.0: + version "1.3.5" + resolved "https://registry.yarnpkg.com/cson-parser/-/cson-parser-1.3.5.tgz#7ec675e039145533bf2a6a856073f1599d9c2d24" + dependencies: + coffee-script "^1.10.0" + currently-unhandled@^0.4.1: version "0.4.1" resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea" @@ -2949,7 +2982,7 @@ ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cl ember-cli-version-checker "^1.0.2" resolve "^1.1.2" -ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.0: +ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.0: version "6.12.0" resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.12.0.tgz#3adcdbe1278da1fcd0b9038f1360cb4ac5d4414c" dependencies: @@ -3298,22 +3331,24 @@ ember-cli-lodash-subset@^1.0.11, ember-cli-lodash-subset@^1.0.7: version "1.0.12" resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-1.0.12.tgz#af2e77eba5dcb0d77f3308d3a6fd7d3450f6e537" -ember-cli-mirage@~0.2.9: - version "0.2.9" - resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.2.9.tgz#f710bb97e6895b3918839127ab5e570538d668b4" +ember-cli-mirage@~0.4.4: + version "0.4.4" + resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.4.4.tgz#cd11160df63e9972540d8da55dc30ef2aa281693" dependencies: broccoli-funnel "^1.0.2" broccoli-merge-trees "^1.1.0" - broccoli-unwatched-tree "^0.1.1" + broccoli-replace "^0.12.0" + broccoli-stew "^1.5.0" chalk "^1.1.1" - ember-cli-babel "^5.1.7" + ember-cli-babel "^6.8.2" ember-cli-node-assets "^0.1.4" - ember-inflector "^1.9.2" - ember-lodash "^4.0" + ember-get-config "^0.2.2" + ember-inflector "^2.0.0" + ember-lodash "^4.17.3" exists-sync "0.0.3" fake-xml-http-request "^1.4.0" faker "^3.0.0" - pretender "^1.4.2" + pretender "^1.6.1" route-recognizer "^0.2.3" ember-cli-moment-shim@^2.2.1: @@ -3634,6 +3669,13 @@ ember-factory-for-polyfill@^1.3.1: dependencies: ember-cli-version-checker "^2.1.0" +ember-get-config@^0.2.2: + version "0.2.4" + resolved "https://registry.yarnpkg.com/ember-get-config/-/ember-get-config-0.2.4.tgz#118492a2a03d73e46004ed777928942021fe1ecd" + dependencies: + broccoli-file-creator "^1.1.1" + ember-cli-babel "^6.3.0" + ember-getowner-polyfill@^2.0.0, ember-getowner-polyfill@^2.0.1: version "2.2.0" resolved "https://registry.yarnpkg.com/ember-getowner-polyfill/-/ember-getowner-polyfill-2.2.0.tgz#38e7dccbcac69d5ec694000329ec0b2be651d2b2" @@ -3647,12 +3689,6 @@ ember-git-version@~0.1.2: dependencies: git-repo-info "^1.0.2" -ember-inflector@^1.9.2: - version "1.12.1" - resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-1.12.1.tgz#d8bd2ca2f327b439720f89923fe614d46b5da1ca" - dependencies: - ember-cli-babel "^5.1.7" - ember-inflector@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-2.2.0.tgz#edd273dfd1a29be27f14b195e2f0ed70e812d9e0" @@ -3679,7 +3715,7 @@ ember-load@~0.0.12: ember-cli-htmlbars "^2.0.1" ember-cli-version-checker "^2.0.0" -ember-lodash@^4.0, ember-lodash@^4.18.0: +ember-lodash@^4.17.3, ember-lodash@^4.18.0: version "4.18.0" resolved "https://registry.yarnpkg.com/ember-lodash/-/ember-lodash-4.18.0.tgz#45de700d6a4f68f1cd62888d90b50aa6477b9a83" dependencies: @@ -5776,7 +5812,7 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" -js-yaml@3.x, js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.6.1, js-yaml@^3.9.1: +js-yaml@3.x, js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.3.0, js-yaml@^3.6.1, js-yaml@^3.9.1: version "3.11.0" resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef" dependencies: @@ -7706,7 +7742,7 @@ preserve@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" -pretender@^1.4.2: +pretender@^1.6.1: version "1.6.1" resolved "https://registry.yarnpkg.com/pretender/-/pretender-1.6.1.tgz#77d1e42ac8c6b298f5cd43534a87645df035db8c" dependencies: From d1d9f93fefcbdf2e1ac61853be43abb1540b6604 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 26 Apr 2018 12:39:34 -0700 Subject: [PATCH 11/34] Upgrade ember-cli to 2.14 --- .gitignore | 6 ++ app/app.js | 4 +- config/environment.js | 28 +++---- ember-cli-build.js | 90 ++++++++++----------- package.json | 6 +- yarn.lock | 179 ++++++++++++++---------------------------- 6 files changed, 126 insertions(+), 187 deletions(-) diff --git a/.gitignore b/.gitignore index 8f01e812..02e4107c 100644 --- a/.gitignore +++ b/.gitignore @@ -17,4 +17,10 @@ /coverage/* /libpeerconnection.log npm-debug.log* +yarn-error.log testem.log + +# ember-try +.node_modules.ember-try/ +bower.json.ember-try +package.json.ember-try diff --git a/app/app.js b/app/app.js index f796e79d..c15f9359 100644 --- a/app/app.js +++ b/app/app.js @@ -3,9 +3,7 @@ import Resolver from './resolver'; import loadInitializers from 'ember-load-initializers'; import config from './config/environment'; -let App; - -App = Ember.Application.extend({ +const App = Ember.Application.extend({ modulePrefix: config.modulePrefix, podModulePrefix: config.podModulePrefix, Resolver diff --git a/config/environment.js b/config/environment.js index a11166c1..d2d01002 100644 --- a/config/environment.js +++ b/config/environment.js @@ -1,25 +1,25 @@ module.exports = function(environment) { - var deployTarget = process.env.DEPLOY_TARGET; - var rootURL = process.env.TWIDDLE_ROOT_URL || '/'; - var host = process.env.GH_API_HOST || 'https://api.github.com'; - var toriiGHEBaseURL = process.env.TORII_GHE_OAUTH || null; - var toriiProvider = process.env.TORII_PROVIDER || 'github-oauth2'; - var githubOauthURL = process.env.GATEKEEPER_URL || 'http://localhost:9999/authenticate/'; - var assetsHost = process.env.TWIDDLE_ASSET_HOST || '/'; - var githubApiKey = process.env.GH_API_KEY || '2b84ab967ef8266ca0dc' + let deployTarget = process.env.DEPLOY_TARGET; + let rootURL = process.env.TWIDDLE_ROOT_URL || '/'; + let host = process.env.GH_API_HOST || 'https://api.github.com'; + let toriiGHEBaseURL = process.env.TORII_GHE_OAUTH || null; + let toriiProvider = process.env.TORII_PROVIDER || 'github-oauth2'; + let githubOauthURL = process.env.GATEKEEPER_URL || 'http://localhost:9999/authenticate/'; + let assetsHost = process.env.TWIDDLE_ASSET_HOST || '/'; + let githubApiKey = process.env.GH_API_KEY || '2b84ab967ef8266ca0dc' - var ENV = { + let ENV = { modulePrefix: 'ember-twiddle', - environment: environment, + environment, rootURL: rootURL, locationType: 'auto', - host: host, + host, githubOauthUrl: githubOauthURL, - githubApiKey: githubApiKey, + githubApiKey, addonUrl: 'https://emw2ujz4u1.execute-api.us-east-1.amazonaws.com/canary/addon', - assetsHost: assetsHost, + assetsHost, maxNumFilesInitiallyExpanded: 12, - toriiProvider: toriiProvider, + toriiProvider, EmberENV: { FEATURES: { // Here you can enable experimental features on an ember canary build diff --git a/ember-cli-build.js b/ember-cli-build.js index cf87cced..29883e16 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -2,20 +2,20 @@ module.exports = function(defaults) { process.env.FASTBOOT_DISABLED = true; - var EmberApp = require('ember-cli/lib/broccoli/ember-app'); - var funnel = require('broccoli-funnel'); - var concat = require('broccoli-concat'); - var mergeTrees = require('broccoli-merge-trees'); - var babelTranspiler = require('broccoli-babel-transpiler'); - var browserify = require('browserify'); - var path = require('path'); - var fs = require('fs'); - - var env = EmberApp.env(); - var deployTarget = process.env.DEPLOY_TARGET; - var isProductionLikeBuild = ['production', 'staging'].indexOf(env) > -1; - var isFastboot = process.env.EMBER_CLI_FASTBOOT; - var prepend = null; + const EmberApp = require('ember-cli/lib/broccoli/ember-app'); + const funnel = require('broccoli-funnel'); + const concat = require('broccoli-concat'); + const mergeTrees = require('broccoli-merge-trees'); + const babelTranspiler = require('broccoli-babel-transpiler'); + const browserify = require('browserify'); + const path = require('path'); + const fs = require('fs'); + + const env = EmberApp.env(); + const deployTarget = process.env.DEPLOY_TARGET; + const isProductionLikeBuild = ['production', 'staging'].indexOf(env) > -1; + const isFastboot = process.env.EMBER_CLI_FASTBOOT; + let prepend = null; if (isProductionLikeBuild) { if (deployTarget === 'production') { @@ -26,9 +26,9 @@ module.exports = function(defaults) { } } - var blueprintsCode = getEmberCLIBlueprints(); + const blueprintsCode = getEmberCLIBlueprints(); - var app = new EmberApp(defaults, { + let app = new EmberApp(defaults, { SRI: { runsIn: "production" }, @@ -83,7 +83,7 @@ module.exports = function(defaults) { }); if (isFastboot) { - var b = browserify(); + let b = browserify(); b.add(require.resolve('babel-core/browser-polyfill')); b.bundle(function(err, buf) { fs.writeFileSync('vendor/polyfill.js', buf); @@ -102,12 +102,12 @@ module.exports = function(defaults) { app.import('vendor/bootstrap-dropdown-submenu-fix.css'); app.import('vendor/hint.css'); - var loaderTree = funnel(path.dirname(require.resolve('loader.js')), { + let loaderTree = funnel(path.dirname(require.resolve('loader.js')), { files: ['loader.js'], destDir: '/assets' }); - var testLoaderTree = funnel("node_modules/ember-cli-test-loader/addon-test-support", { + let testLoaderTree = funnel("node_modules/ember-cli-test-loader/addon-test-support", { files: ['index.js'], getDestinationPath: function() { return "assets/test-loader.js"; @@ -115,33 +115,33 @@ module.exports = function(defaults) { }); testLoaderTree = babelTranspiler(testLoaderTree, babelOpts()); - var emberDataShims = funnel('vendor', { + let emberDataShims = funnel('vendor', { files: ['ember-data-shims.js'] }); - var bowerTree = funnel('bower_components'); - var shimsTree = funnel('node_modules/ember-cli-shims/vendor/ember-cli-shims' , { + let bowerTree = funnel('bower_components'); + let shimsTree = funnel('node_modules/ember-cli-shims/vendor/ember-cli-shims' , { destDir: 'ember-cli-shims' }); - var baseResolverTree = funnel('node_modules/ember-resolver/addon', { + let baseResolverTree = funnel('node_modules/ember-resolver/addon', { destDir: 'ember-resolver' }); - var transpiledResolverTree = babelTranspiler(baseResolverTree, babelOpts()); + let transpiledResolverTree = babelTranspiler(baseResolverTree, babelOpts()); - var baseInitializersTree = funnel('node_modules/ember-load-initializers/addon', { + let baseInitializersTree = funnel('node_modules/ember-load-initializers/addon', { destDir: 'ember-load-initializers' }); - var transpiledInitializersTree = babelTranspiler(baseInitializersTree, babelOpts()); + let transpiledInitializersTree = babelTranspiler(baseInitializersTree, babelOpts()); - var finalQUnitTree = buildAddonTree('ember-qunit'); - var finalTestHelpersTree = buildAddonTree('ember-test-helpers'); + let finalQUnitTree = buildAddonTree('ember-qunit'); + let finalTestHelpersTree = buildAddonTree('ember-test-helpers'); - var mergedDepsTree = mergeTrees([bowerTree, shimsTree, transpiledInitializersTree, transpiledResolverTree, emberDataShims]); + let mergedDepsTree = mergeTrees([bowerTree, shimsTree, transpiledInitializersTree, transpiledResolverTree, emberDataShims]); - var twiddleVendorTree = concat(mergedDepsTree, { + let twiddleVendorTree = concat(mergedDepsTree, { inputFiles: [ 'ember-cli-shims/app-shims.js', 'ember-load-initializers/**/*.js', @@ -155,16 +155,16 @@ module.exports = function(defaults) { }; function buildAddonTree(addonName) { - var funnel = require('broccoli-funnel'); - var concat = require('broccoli-concat'); - var babelTranspiler = require('broccoli-babel-transpiler'); - var path = require('path'); + const funnel = require('broccoli-funnel'); + const concat = require('broccoli-concat'); + const babelTranspiler = require('broccoli-babel-transpiler'); + const path = require('path'); - var baseTree = funnel(path.dirname(require.resolve(addonName)), { + let baseTree = funnel(path.dirname(require.resolve(addonName)), { include: ['**/*.js'] }); - var transpiledTree = babelTranspiler(baseTree, babelOpts()); + let transpiledTree = babelTranspiler(baseTree, babelOpts()); return concat(transpiledTree, { inputFiles: ['**/*.js'], @@ -189,11 +189,11 @@ function babelOpts() { // app/lib/blueprints so we don't have to maintain our // own blueprints function getEmberCLIBlueprints() { - var fs = require('fs'); - var path = require('path'); - var fileMap = {}; + const fs = require('fs'); + const path = require('path'); + let fileMap = {}; - var blueprintFiles = { + let blueprintFiles = { "cliBlueprintFiles": { "path": "node_modules/ember-cli", "files": { @@ -224,11 +224,11 @@ function getEmberCLIBlueprints() { } }; - for (var list in blueprintFiles) { - var blueprintPath = blueprintFiles[list].path; - var files = blueprintFiles[list].files; - for (var blueprintName in files) { - var filePath = blueprintPath + '/blueprints/' + files[blueprintName]; + for (let list in blueprintFiles) { + let blueprintPath = blueprintFiles[list].path; + let files = blueprintFiles[list].files; + for (let blueprintName in files) { + let filePath = blueprintPath + '/blueprints/' + files[blueprintName]; fileMap[blueprintName] = fs.readFileSync(filePath).toString(); } } diff --git a/package.json b/package.json index cc63546d..e96ab9a4 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "ember-ajax": "^3.0.0", "ember-api-actions": "~0.1.8", "ember-autoresize": "~0.6.1", - "ember-cli": "2.13.3", + "ember-cli": "2.14.2", "ember-cli-app-version": "^3.0.0", "ember-cli-babel": "^6.12.0", "ember-cli-bootstrap-sassy": "~0.5.8", @@ -43,7 +43,7 @@ "ember-cli-eslint": "^4.2.3", "ember-cli-fastboot": "^1.0.0", "ember-cli-file-creator": "~0.4.0", - "ember-cli-htmlbars": "^1.3.4", + "ember-cli-htmlbars": "^2.0.1", "ember-cli-htmlbars-inline-precompile": "~0.4.4", "ember-cli-inject-live-reload": "^1.7.0", "ember-cli-jstree": "^1.0.9", @@ -72,7 +72,7 @@ "ember-resolver": "^4.0.0", "ember-responsive": "^2.0.8", "ember-route-action-helper": "^2.0.6", - "ember-source": "~2.13.3", + "ember-source": "~2.14.1", "ember-test-helpers": "~0.6.3", "eslint-plugin-ember": "^5.1.0", "ivy-codemirror": "^2.1.0", diff --git a/yarn.lock b/yarn.lock index e38c54f1..4e3232b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11,10 +11,6 @@ "@glimmer/wire-format" "^0.22.3" simple-html-tokenizer "^0.3.0" -"@glimmer/di@^0.1.8": - version "0.1.11" - resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.1.11.tgz#a6878c07a13a2c2c76fcde598a5c97637bfc4280" - "@glimmer/di@^0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.0.tgz#73bfd4a6ee4148a80bf092e8a5d29bcac9d4ce7e" @@ -231,11 +227,11 @@ ansi-styles@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de" -ansi-styles@^2.1.0, ansi-styles@^2.2.1: +ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" -ansi-styles@^3.2.1: +ansi-styles@^3.0.0, ansi-styles@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d" dependencies: @@ -311,7 +307,7 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.6" -argparse@^1.0.7, argparse@~1.0.2: +argparse@^1.0.7: version "1.0.10" resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" dependencies: @@ -1423,7 +1419,7 @@ broccoli-brocfile-loader@^0.18.0: dependencies: findup-sync "^0.4.2" -broccoli-builder@^0.18.3: +broccoli-builder@^0.18.8: version "0.18.11" resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.11.tgz#a42393c7b10bb0380df255a616307945f5e26efb" dependencies: @@ -1620,7 +1616,7 @@ broccoli-lint-eslint@^4.2.1: lodash.defaultsdeep "^4.6.0" md5-hex "^2.0.0" -broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1, broccoli-merge-trees@^1.1.4: +broccoli-merge-trees@^1.0.0, broccoli-merge-trees@^1.1.0, broccoli-merge-trees@^1.1.1: version "1.2.4" resolved "https://registry.yarnpkg.com/broccoli-merge-trees/-/broccoli-merge-trees-1.2.4.tgz#a001519bb5067f06589d91afa2942445a2d0fdb5" dependencies: @@ -1647,7 +1643,7 @@ broccoli-merge-trees@^3.0.0: broccoli-plugin "^1.3.0" merge-trees "^2.0.0" -broccoli-middleware@^1.0.0-beta.8: +broccoli-middleware@^1.0.0: version "1.2.1" resolved "https://registry.yarnpkg.com/broccoli-middleware/-/broccoli-middleware-1.2.1.tgz#a21f255f8bfe5a21c2f0fbf2417addd9d24c9436" dependencies: @@ -2076,13 +2072,6 @@ capture-exit@^1.1.0: dependencies: rsvp "^3.3.3" -cardinal@^0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-0.5.0.tgz#00d5f661dbd4aabfdf7d41ce48a5a59bca35a291" - dependencies: - ansicolors "~0.2.1" - redeyed "~0.5.0" - cardinal@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/cardinal/-/cardinal-1.0.0.tgz#50e21c1b0aa37729f9377def196b5a9cec932ee9" @@ -3243,7 +3232,7 @@ ember-cli-htmlbars-inline-precompile@~0.4.4: hash-for-dep "^1.0.2" silent-error "^1.1.0" -ember-cli-htmlbars@^1.0.3, ember-cli-htmlbars@^1.3.4: +ember-cli-htmlbars@^1.0.3: version "1.3.4" resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-1.3.4.tgz#461289724b34af372a6a0c4b6635819156963353" dependencies: @@ -3500,7 +3489,7 @@ ember-cli-valid-component-name@^1.0.0: dependencies: silent-error "^1.0.0" -ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0: +ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.7, ember-cli-version-checker@^1.2.0, ember-cli-version-checker@^1.3.1: version "1.3.1" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-1.3.1.tgz#0bc2d134c830142da64bf9627a0eded10b61ae72" dependencies: @@ -3513,9 +3502,9 @@ ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0: resolve "^1.3.3" semver "^5.3.0" -ember-cli@2.13.3: - version "2.13.3" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.13.3.tgz#1918500e6280a68be017aca9b69937f6782a24b8" +ember-cli@2.14.2: + version "2.14.2" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.14.2.tgz#f2c8c75d486ce6cc6b7ffbc22ebef8b32bb242b7" dependencies: amd-name-resolver "0.0.6" babel-plugin-transform-es2015-modules-amd "^6.24.0" @@ -3523,14 +3512,14 @@ ember-cli@2.13.3: bower-endpoint-parser "0.2.2" broccoli-babel-transpiler "^6.0.0" broccoli-brocfile-loader "^0.18.0" - broccoli-builder "^0.18.3" + broccoli-builder "^0.18.8" broccoli-concat "^3.2.2" broccoli-config-loader "^1.0.0" broccoli-config-replace "^1.1.2" broccoli-funnel "^1.0.6" broccoli-funnel-reducer "^1.0.0" broccoli-merge-trees "^2.0.0" - broccoli-middleware "^1.0.0-beta.8" + broccoli-middleware "^1.0.0" broccoli-source "^1.1.0" broccoli-stew "^1.2.0" calculate-cache-key-for-tree "^1.0.0" @@ -3560,7 +3549,7 @@ ember-cli@2.13.3: express "^4.12.3" filesize "^3.1.3" find-up "^2.1.0" - fs-extra "2.0.0" + fs-extra "^3.0.0" fs-tree-diff "^0.5.2" get-caller-file "^1.0.0" git-repo-info "^1.4.1" @@ -3578,7 +3567,7 @@ ember-cli@2.13.3: leek "0.0.24" lodash.template "^4.2.5" markdown-it "^8.3.0" - markdown-it-terminal "0.0.4" + markdown-it-terminal "0.1.0" minimatch "^3.0.0" morgan "^1.8.1" node-modules-path "^1.0.0" @@ -3813,31 +3802,30 @@ ember-runtime-enumerable-includes-polyfill@^2.0.0: ember-cli-babel "^6.9.0" ember-cli-version-checker "^2.1.0" -ember-source@~2.13.3: - version "2.13.4" - resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.13.4.tgz#97022069febfb5651ddc26a83f1987370cc404c8" +ember-source@~2.14.1: + version "2.14.1" + resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.14.1.tgz#4abf0b4c916f2da8bf317349df4750905df7e628" dependencies: "@glimmer/compiler" "^0.22.3" - "@glimmer/di" "^0.1.8" "@glimmer/node" "^0.22.3" "@glimmer/reference" "^0.22.3" "@glimmer/runtime" "^0.22.3" "@glimmer/util" "^0.22.3" - broccoli-funnel "^1.0.6" - broccoli-merge-trees "^1.1.4" + broccoli-funnel "^1.2.0" + broccoli-merge-trees "^2.0.0" ember-cli-get-component-path-option "^1.0.0" ember-cli-normalize-entity-name "^1.0.0" ember-cli-path-utils "^1.0.0" - ember-cli-string-utils "^1.0.0" + ember-cli-string-utils "^1.1.0" ember-cli-test-info "^1.0.0" ember-cli-valid-component-name "^1.0.0" - ember-cli-version-checker "^1.1.7" + ember-cli-version-checker "^1.3.1" handlebars "^4.0.6" - jquery "^3.1.1" - resolve "^1.1.7" - rsvp "^3.4.0" + jquery "^3.2.1" + resolve "^1.3.3" + rsvp "^3.5.0" simple-dom "^0.3.0" - simple-html-tokenizer "^0.3.0" + simple-html-tokenizer "^0.4.1" ember-string-ishtmlsafe-polyfill@^1.1.0: version "1.1.0" @@ -4107,10 +4095,6 @@ espree@^3.5.4: acorn "^5.5.0" acorn-jsx "^3.0.0" -esprima-fb@~12001.1.0-dev-harmony-fb: - version "12001.1.0-dev-harmony-fb" - resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-12001.1.0-dev-harmony-fb.tgz#d84400384ba95ce2678c617ad24a7f40808da915" - esprima-fb@~15001.1001.0-dev-harmony-fb: version "15001.1001.0-dev-harmony-fb" resolved "https://registry.yarnpkg.com/esprima-fb/-/esprima-fb-15001.1001.0-dev-harmony-fb.tgz#43beb57ec26e8cf237d3dd8b33e42533577f2659" @@ -4625,13 +4609,6 @@ fs-exists-sync@^0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/fs-exists-sync/-/fs-exists-sync-0.1.0.tgz#982d6893af918e72d08dec9e8673ff2b5a8d6add" -fs-extra@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-2.0.0.tgz#337352bded4a0b714f3eb84de8cea765e9d37600" - dependencies: - graceful-fs "^4.1.2" - jsonfile "^2.1.0" - fs-extra@^0.24.0: version "0.24.0" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-0.24.0.tgz#d4e4342a96675cb7846633a6099249332b539952" @@ -4676,6 +4653,14 @@ fs-extra@^2.0.0: graceful-fs "^4.1.2" jsonfile "^2.1.0" +fs-extra@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" + dependencies: + graceful-fs "^4.1.2" + jsonfile "^3.0.0" + universalify "^0.1.0" + fs-extra@^4.0.0, fs-extra@^4.0.2: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" @@ -5792,7 +5777,7 @@ jquery-deferred@^0.3.0: version "0.3.1" resolved "https://registry.yarnpkg.com/jquery-deferred/-/jquery-deferred-0.3.1.tgz#596eca1caaff54f61b110962b23cafea74c35355" -jquery@^3.1.1: +jquery@^3.2.1: version "3.3.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" @@ -5889,6 +5874,12 @@ jsonfile@^2.1.0: optionalDependencies: graceful-fs "^4.1.6" +jsonfile@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" + optionalDependencies: + graceful-fs "^4.1.6" + jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -5995,12 +5986,6 @@ linkify-it@^2.0.0: dependencies: uc.micro "^1.0.1" -linkify-it@~1.2.0: - version "1.2.4" - resolved "https://registry.yarnpkg.com/linkify-it/-/linkify-it-1.2.4.tgz#0773526c317c8fd13bd534ee1d180ff88abf881a" - dependencies: - uc.micro "^1.0.1" - livereload-js@^2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/livereload-js/-/livereload-js-2.3.0.tgz#c3ab22e8aaf5bf3505d80d098cbad67726548c9a" @@ -6350,14 +6335,6 @@ lodash.isobject@~2.3.0: dependencies: lodash._objecttypes "~2.3.0" -lodash.isplainobject@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-3.2.0.tgz#9a8238ae16b200432960cd7346512d0123fbf4c5" - dependencies: - lodash._basefor "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.keysin "^3.0.0" - lodash.istypedarray@^3.0.0: version "3.0.6" resolved "https://registry.yarnpkg.com/lodash.istypedarray/-/lodash.istypedarray-3.0.6.tgz#c9a477498607501d8e8494d283b87c39281cef62" @@ -6378,34 +6355,11 @@ lodash.keys@~2.3.0: lodash._shimkeys "~2.3.0" lodash.isobject "~2.3.0" -lodash.keysin@^3.0.0: - version "3.0.8" - resolved "https://registry.yarnpkg.com/lodash.keysin/-/lodash.keysin-3.0.8.tgz#22c4493ebbedb1427962a54b445b2c8a767fb47f" - dependencies: - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.memoize@~3.0.3: version "3.0.4" resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f" -lodash.merge@^3.3.2: - version "3.3.2" - resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-3.3.2.tgz#0d90d93ed637b1878437bb3e21601260d7afe994" - dependencies: - lodash._arraycopy "^3.0.0" - lodash._arrayeach "^3.0.0" - lodash._createassigner "^3.0.0" - lodash._getnative "^3.0.0" - lodash.isarguments "^3.0.0" - lodash.isarray "^3.0.0" - lodash.isplainobject "^3.0.0" - lodash.istypedarray "^3.0.0" - lodash.keys "^3.0.0" - lodash.keysin "^3.0.0" - lodash.toplainobject "^3.0.0" - -lodash.merge@^4.3.0, lodash.merge@^4.4.0: +lodash.merge@^4.3.0, lodash.merge@^4.4.0, lodash.merge@^4.6.0: version "4.6.1" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54" @@ -6485,13 +6439,6 @@ lodash.toarray@^4.4.0: version "4.4.0" resolved "https://registry.yarnpkg.com/lodash.toarray/-/lodash.toarray-4.4.0.tgz#24c4bfcd6b2fba38bfd0594db1179d8e9b656561" -lodash.toplainobject@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/lodash.toplainobject/-/lodash.toplainobject-3.0.0.tgz#28790ad942d293d78aa663a07ecf7f52ca04198d" - dependencies: - lodash._basecopy "^3.0.0" - lodash.keysin "^3.0.0" - lodash.union@~3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-3.1.0.tgz#a4a3066fc15d6a7f8151cce9bdfe63dce7f5bcff" @@ -6605,27 +6552,17 @@ map-visit@^1.0.0: dependencies: object-visit "^1.0.0" -markdown-it-terminal@0.0.4: - version "0.0.4" - resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.0.4.tgz#3f2ce624ba2ca964a78b8b388d605ee330de9ced" +markdown-it-terminal@0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/markdown-it-terminal/-/markdown-it-terminal-0.1.0.tgz#545abd8dd01c3d62353bfcea71db580b51d22bd9" dependencies: - ansi-styles "^2.1.0" - cardinal "^0.5.0" + ansi-styles "^3.0.0" + cardinal "^1.0.0" cli-table "^0.3.1" - lodash.merge "^3.3.2" - markdown-it "^4.4.0" + lodash.merge "^4.6.0" + markdown-it "^8.3.1" -markdown-it@^4.4.0: - version "4.4.0" - resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-4.4.0.tgz#3df373dbea587a9a7fef3e56311b68908f75c414" - dependencies: - argparse "~1.0.2" - entities "~1.1.1" - linkify-it "~1.2.0" - mdurl "~1.0.0" - uc.micro "^1.0.0" - -markdown-it@^8.3.0: +markdown-it@^8.3.0, markdown-it@^8.3.1: version "8.4.1" resolved "https://registry.yarnpkg.com/markdown-it/-/markdown-it-8.4.1.tgz#206fe59b0e4e1b78a7c73250af9b34a4ad0aaf44" dependencies: @@ -6678,7 +6615,7 @@ md5.js@^1.3.4: hash-base "^3.0.0" inherits "^2.0.1" -mdurl@^1.0.1, mdurl@~1.0.0: +mdurl@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/mdurl/-/mdurl-1.0.1.tgz#fe85b2ec75a59037f2adfec100fd6c601761152e" @@ -8108,12 +8045,6 @@ redent@^1.0.0: indent-string "^2.1.0" strip-indent "^1.0.1" -redeyed@~0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-0.5.0.tgz#7ab000e60ee3875ac115d29edb32c1403c6c25d1" - dependencies: - esprima-fb "~12001.1.0-dev-harmony-fb" - redeyed@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/redeyed/-/redeyed-1.0.1.tgz#e96c193b40c0816b00aec842698e61185e55498a" @@ -8472,7 +8403,7 @@ route-recognizer@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.3.tgz#1d365e27fa6995e091675f7dc940a8c00353bd29" -rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3, rsvp@^3.4.0, rsvp@^3.5.0: +rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3, rsvp@^3.5.0: version "3.6.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" @@ -8733,6 +8664,10 @@ simple-html-tokenizer@^0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.3.0.tgz#9b8b5559d80e331a544dd13dd59382e5d0d94411" +simple-html-tokenizer@^0.4.1: + version "0.4.3" + resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.4.3.tgz#9b00b766e30058b4bb377c0d4f97566a13ab1be1" + simple-is@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0" @@ -9473,7 +9408,7 @@ typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" -uc.micro@^1.0.0, uc.micro@^1.0.1, uc.micro@^1.0.5: +uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376" From 2bc37d4a44cf861f1f877fb2e8c72cd31b15c433 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 1 May 2018 14:36:58 -0400 Subject: [PATCH 12/34] Upgrade ember-cli to 2.15 --- app/index.html | 6 +- package.json | 6 +- tests/acceptance/columns-test.js | 2 +- tests/acceptance/fork-test.js | 2 +- tests/acceptance/gist-test.js | 6 +- tests/acceptance/routing-test.js | 6 +- tests/helpers/wait-for-loaded-iframe.js | 8 +- tests/helpers/wait-for-unloaded-iframe.js | 10 +- yarn.lock | 171 +++++++++++----------- 9 files changed, 116 insertions(+), 101 deletions(-) diff --git a/app/index.html b/app/index.html index 4fde9303..8138d68b 100644 --- a/app/index.html +++ b/app/index.html @@ -10,9 +10,9 @@ {{content-for 'head'}} - - - + + + {{content-for 'head-footer'}} diff --git a/package.json b/package.json index e96ab9a4..030c8cbf 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "ember-ajax": "^3.0.0", "ember-api-actions": "~0.1.8", "ember-autoresize": "~0.6.1", - "ember-cli": "2.14.2", + "ember-cli": "2.15.1", "ember-cli-app-version": "^3.0.0", "ember-cli-babel": "^6.12.0", "ember-cli-bootstrap-sassy": "~0.5.8", @@ -44,7 +44,7 @@ "ember-cli-fastboot": "^1.0.0", "ember-cli-file-creator": "~0.4.0", "ember-cli-htmlbars": "^2.0.1", - "ember-cli-htmlbars-inline-precompile": "~0.4.4", + "ember-cli-htmlbars-inline-precompile": "^1.0.0", "ember-cli-inject-live-reload": "^1.7.0", "ember-cli-jstree": "^1.0.9", "ember-cli-legacy-blueprints": "~0.2.1", @@ -72,7 +72,7 @@ "ember-resolver": "^4.0.0", "ember-responsive": "^2.0.8", "ember-route-action-helper": "^2.0.6", - "ember-source": "~2.14.1", + "ember-source": "~2.15.0", "ember-test-helpers": "~0.6.3", "eslint-plugin-ember": "^5.1.0", "ivy-codemirror": "^2.1.0", diff --git a/tests/acceptance/columns-test.js b/tests/acceptance/columns-test.js index 46e8faf1..ee1497eb 100644 --- a/tests/acceptance/columns-test.js +++ b/tests/acceptance/columns-test.js @@ -93,5 +93,5 @@ test('you can add and remove columns', function(assert) { }); function urlHas(text) { - return decodeURIComponent(window.location.search).indexOf(text) > 0; + return decodeURIComponent(currentURL()).indexOf(text) > 0; } diff --git a/tests/acceptance/fork-test.js b/tests/acceptance/fork-test.js index 5e878ef1..eb05ce18 100644 --- a/tests/acceptance/fork-test.js +++ b/tests/acceptance/fork-test.js @@ -45,7 +45,7 @@ test('can fork a gist', function(assert) { andThen(function() { assert.equal(find('.test-unsaved-indicator').length, 0, "No unsaved indicator shown"); - let url = window.location.href; + let url = currentURL(); let route = url.substr(url.lastIndexOf('/')); assert.equal(route, '/bd9d8d69-a674-4e0f-867c-c8796ed151a0'); }); diff --git a/tests/acceptance/gist-test.js b/tests/acceptance/gist-test.js index c7c7a6e6..a5e4e794 100644 --- a/tests/acceptance/gist-test.js +++ b/tests/acceptance/gist-test.js @@ -3,7 +3,7 @@ import moduleForAcceptance from 'ember-twiddle/tests/helpers/module-for-acceptan import { findMapText } from 'ember-twiddle/tests/helpers/util'; import ErrorMessages from 'ember-twiddle/utils/error-messages'; import { stubValidSession } from 'ember-twiddle/tests/helpers/torii'; - +import { timeout } from 'ember-concurrency'; const firstColumn = '.code:eq(0)'; const firstFilePicker = firstColumn + ' .dropdown-toggle'; @@ -322,6 +322,10 @@ test('unsaved indicator', function(assert) { fillIn(firstColumnTextarea, "\"some text\";"); triggerEvent(firstColumnTextarea, "blur"); + andThen(function() { + return timeout(10); + }); + andThen(function() { assert.equal(find(indicator).length, 1, "Unsaved indicator reappears after editing"); }); diff --git a/tests/acceptance/routing-test.js b/tests/acceptance/routing-test.js index 94d89099..31ab557d 100644 --- a/tests/acceptance/routing-test.js +++ b/tests/acceptance/routing-test.js @@ -88,7 +88,7 @@ test('Able to do routing in a gist', function(assert) { andThen(() => { assert.equal(find(addressBar).val(), '/', "Correct URL is shown in address bar 0"); - assert.ok(decodeURIComponent(window.location.search).indexOf("route=") === -1, "URL is not added to route query string parameter 0"); + assert.ok(decodeURIComponent(currentURL()).indexOf("route=") === -1, "URL is not added to route query string parameter 0"); this.registerWaiter(); iframe_window = outputPane(); @@ -98,7 +98,7 @@ test('Able to do routing in a gist', function(assert) { andThen(() => { assert.equal(outputContents(outletText), 'About Page', 'About Link leads to About Page being displayed'); assert.equal(find(addressBar).val(), '/about', "Correct URL is shown in address bar 1"); - assert.ok(decodeURIComponent(window.location.search).indexOf("route=/about") > 0, "URL is added to route query string parameter 1"); + assert.ok(decodeURIComponent(currentURL()).indexOf("route=/about") > 0, "URL is added to route query string parameter 1"); this.registerWaiter(); iframe_window.click(iframe_window.find(indexLink)); @@ -107,7 +107,7 @@ test('Able to do routing in a gist', function(assert) { andThen(() => { assert.equal(outputContents(outletText), 'Main Page', 'Index Link leads to Main Page being displayed'); assert.equal(find(addressBar).val(), '/', "Correct URL is shown in address bar 2"); - assert.ok(decodeURIComponent(window.location.search).indexOf("route=") === -1, "URL is not added to route query string parameter 2"); + assert.ok(decodeURIComponent(currentURL()).indexOf("route=") === -1, "URL is not added to route query string parameter 2"); }); }); diff --git a/tests/helpers/wait-for-loaded-iframe.js b/tests/helpers/wait-for-loaded-iframe.js index 995e96fd..f0e36f68 100644 --- a/tests/helpers/wait-for-loaded-iframe.js +++ b/tests/helpers/wait-for-loaded-iframe.js @@ -38,7 +38,7 @@ export default function(app, url) { let times = 0; - return andThen(function tryVisit() { + andThen(function tryVisit() { url = url || "/"; if (times++ >= 10) { @@ -49,4 +49,10 @@ export default function(app, url) { run.later(tryVisit, 10) } }); + + return andThen(function() { + return new RSVP.Promise(function (resolve) { + run.later(resolve, 10); + }); + }); } diff --git a/tests/helpers/wait-for-unloaded-iframe.js b/tests/helpers/wait-for-unloaded-iframe.js index 727073f6..db848739 100644 --- a/tests/helpers/wait-for-unloaded-iframe.js +++ b/tests/helpers/wait-for-unloaded-iframe.js @@ -1,7 +1,8 @@ import Ember from 'ember'; import wait from 'ember-test-helpers/wait'; +import RSVP from 'rsvp'; -const { Test } = Ember; +const { Test, run } = Ember; function hasNoIframe() { return this.app.testHelpers.find('iframe').length > 0; @@ -13,5 +14,10 @@ export default function(app) { return wait().then(() => { Test.unregisterWaiter(ctx, hasNoIframe); + return RSVP.resolve(); + }).then(() => { + return new RSVP.Promise(function (resolve) { + run.later(resolve, 10); + }); }); -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index 4e3232b7..89cea07d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,51 +2,52 @@ # yarn lockfile v1 -"@glimmer/compiler@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.22.3.tgz#3aef9448460af1d320a82423323498a6ff38a0c6" - dependencies: - "@glimmer/syntax" "^0.22.3" - "@glimmer/util" "^0.22.3" - "@glimmer/wire-format" "^0.22.3" +"@glimmer/compiler@^0.25.3": + version "0.25.6" + resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.25.6.tgz#dcc2b8bfa6f36b70c34e41e85626f888315d3ad7" + dependencies: + "@glimmer/interfaces" "^0.25.6" + "@glimmer/syntax" "^0.25.6" + "@glimmer/util" "^0.25.6" + "@glimmer/wire-format" "^0.25.6" simple-html-tokenizer "^0.3.0" "@glimmer/di@^0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.0.tgz#73bfd4a6ee4148a80bf092e8a5d29bcac9d4ce7e" -"@glimmer/interfaces@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.22.3.tgz#1c2e3289ae41a750f0c8ddcc64529b9e90dda604" +"@glimmer/interfaces@^0.25.6": + version "0.25.6" + resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.25.6.tgz#88a6cdb4f414c3a82662cc5fc5cb5bfd91d4ef10" dependencies: - "@glimmer/wire-format" "^0.22.3" + "@glimmer/wire-format" "^0.25.6" -"@glimmer/node@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.22.3.tgz#ff33eea6e65147a20c1bd1f05fdc4a6c3595c54c" +"@glimmer/node@^0.25.3": + version "0.25.6" + resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.25.6.tgz#3887a79d8fd2cf9376511245babe87647e4349df" dependencies: - "@glimmer/runtime" "^0.22.3" + "@glimmer/runtime" "^0.25.6" simple-dom "^0.3.0" -"@glimmer/object-reference@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/object-reference/-/object-reference-0.22.3.tgz#31db68c8912324c63509b1ef83213f7ad4ef312b" +"@glimmer/object-reference@^0.25.6": + version "0.25.6" + resolved "https://registry.yarnpkg.com/@glimmer/object-reference/-/object-reference-0.25.6.tgz#ab45f51c9416bdaff402a0ea3cedd3b1807b1158" dependencies: - "@glimmer/reference" "^0.22.3" - "@glimmer/util" "^0.22.3" + "@glimmer/reference" "^0.25.6" + "@glimmer/util" "^0.25.6" -"@glimmer/object@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/object/-/object-0.22.3.tgz#1fc9fd7465c7d12e5b92464ad40038b595de8ed0" +"@glimmer/object@^0.25.6": + version "0.25.6" + resolved "https://registry.yarnpkg.com/@glimmer/object/-/object-0.25.6.tgz#a07860e551980488c2839c6393f7a2c071d68a6e" dependencies: - "@glimmer/object-reference" "^0.22.3" - "@glimmer/util" "^0.22.3" + "@glimmer/object-reference" "^0.25.6" + "@glimmer/util" "^0.25.6" -"@glimmer/reference@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.22.3.tgz#6f2ef8cd97fe756d89fef75f8c3c79003502a2a9" +"@glimmer/reference@^0.25.3", "@glimmer/reference@^0.25.6": + version "0.25.6" + resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.25.6.tgz#bc57ccc351fc4bcc5750bdb7760cec4b9ef628f4" dependencies: - "@glimmer/util" "^0.22.3" + "@glimmer/util" "^0.25.6" "@glimmer/resolver@^0.4.1": version "0.4.3" @@ -54,33 +55,35 @@ dependencies: "@glimmer/di" "^0.2.0" -"@glimmer/runtime@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.22.3.tgz#b8cb28efc9cc86c406ee996f5c2cf6730620d404" +"@glimmer/runtime@^0.25.3", "@glimmer/runtime@^0.25.6": + version "0.25.6" + resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.25.6.tgz#2a776dcdd3b8f844e1f6b4e7ca4478b6dc560133" dependencies: - "@glimmer/interfaces" "^0.22.3" - "@glimmer/object" "^0.22.3" - "@glimmer/object-reference" "^0.22.3" - "@glimmer/reference" "^0.22.3" - "@glimmer/util" "^0.22.3" - "@glimmer/wire-format" "^0.22.3" + "@glimmer/interfaces" "^0.25.6" + "@glimmer/object" "^0.25.6" + "@glimmer/object-reference" "^0.25.6" + "@glimmer/reference" "^0.25.6" + "@glimmer/util" "^0.25.6" + "@glimmer/wire-format" "^0.25.6" -"@glimmer/syntax@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.22.3.tgz#8528d19324bf7f920f5cfd31925e452e51781b44" +"@glimmer/syntax@^0.25.6": + version "0.25.6" + resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.25.6.tgz#aeed43004ece8715d09189b61037c793225b4e88" dependencies: + "@glimmer/interfaces" "^0.25.6" + "@glimmer/util" "^0.25.6" handlebars "^4.0.6" simple-html-tokenizer "^0.3.0" -"@glimmer/util@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.22.3.tgz#8272f50905d1bb904ee371e8ade83fd779b51508" +"@glimmer/util@^0.25.3", "@glimmer/util@^0.25.6": + version "0.25.6" + resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.25.6.tgz#de8dde7f5d30f9c0e3e2f083e3f6d3426a92b302" -"@glimmer/wire-format@^0.22.3": - version "0.22.3" - resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.22.3.tgz#19b226d9b93ba6ee54472d9ffb1d48e7c0d80a0d" +"@glimmer/wire-format@^0.25.6": + version "0.25.6" + resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.25.6.tgz#f0543801d234e133bf72d2bdec68dd2c36c06eca" dependencies: - "@glimmer/util" "^0.22.3" + "@glimmer/util" "^0.25.6" JSONStream@^1.0.3: version "1.3.2" @@ -187,12 +190,6 @@ alter@~0.2.0: dependencies: stable "~0.1.3" -amd-name-resolver@0.0.6: - version "0.0.6" - resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.6.tgz#d3e4ba2dfcaab1d820c1be9de947c67828cfe595" - dependencies: - ensure-posix-path "^1.0.1" - amd-name-resolver@0.0.7: version "0.0.7" resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-0.0.7.tgz#814301adfe8a2f109f6e84d5e935196efb669615" @@ -2702,6 +2699,10 @@ deep-extend@~0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" +deep-freeze@^0.0.1: + version "0.0.1" + resolved "https://registry.yarnpkg.com/deep-freeze/-/deep-freeze-0.0.1.tgz#3a0b0005de18672819dfd38cd31f91179c893e84" + deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -3223,13 +3224,14 @@ ember-cli-get-dependency-depth@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-get-dependency-depth/-/ember-cli-get-dependency-depth-1.0.0.tgz#e0afecf82a2d52f00f28ab468295281aec368d11" -ember-cli-htmlbars-inline-precompile@~0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-0.4.4.tgz#24a7617152630d64a047e553b72e00963a4f8d73" +ember-cli-htmlbars-inline-precompile@^1.0.0: + version "1.0.2" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-1.0.2.tgz#5b544f664d5d9911f08cd979c5f70d8cb0ca2add" dependencies: babel-plugin-htmlbars-inline-precompile "^0.2.3" ember-cli-version-checker "^2.0.0" hash-for-dep "^1.0.2" + heimdalljs-logger "^0.1.7" silent-error "^1.1.0" ember-cli-htmlbars@^1.0.3: @@ -3502,11 +3504,11 @@ ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0: resolve "^1.3.3" semver "^5.3.0" -ember-cli@2.14.2: - version "2.14.2" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.14.2.tgz#f2c8c75d486ce6cc6b7ffbc22ebef8b32bb242b7" +ember-cli@2.15.1: + version "2.15.1" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.15.1.tgz#773add3cc18e5068f1c5f43a77544efa2712e47b" dependencies: - amd-name-resolver "0.0.6" + amd-name-resolver "0.0.7" babel-plugin-transform-es2015-modules-amd "^6.24.0" bower-config "^1.3.0" bower-endpoint-parser "0.2.2" @@ -3531,9 +3533,9 @@ ember-cli@2.14.2: console-ui "^1.0.2" core-object "^3.1.3" dag-map "^2.0.2" + deep-freeze "^0.0.1" diff "^3.2.0" ember-cli-broccoli-sane-watcher "^2.0.4" - ember-cli-get-component-path-option "^1.0.0" ember-cli-is-package-missing "^1.0.0" ember-cli-legacy-blueprints "^0.1.2" ember-cli-lodash-subset "^1.0.11" @@ -3542,8 +3544,7 @@ ember-cli@2.14.2: ember-cli-string-utils "^1.0.0" ember-try "^0.2.15" ensure-posix-path "^1.0.2" - escape-string-regexp "^1.0.3" - execa "^0.6.0" + execa "^0.7.0" exists-sync "0.0.4" exit "^0.1.2" express "^4.12.3" @@ -3560,7 +3561,7 @@ ember-cli@2.14.2: heimdalljs-logger "^0.1.7" http-proxy "^1.9.0" inflection "^1.7.0" - is-git-url "^0.2.0" + is-git-url "^1.0.0" isbinaryfile "^3.0.0" js-yaml "^3.6.1" json-stable-stringify "^1.0.1" @@ -3584,7 +3585,7 @@ ember-cli@2.14.2: sort-package-json "^1.4.0" symlink-or-copy "^1.1.8" temp "0.8.3" - testem "^1.15.0" + testem "^1.18.0" tiny-lr "^1.0.3" tree-sync "^1.2.1" uuid "^3.0.0" @@ -3789,7 +3790,7 @@ ember-route-action-helper@^2.0.6: ember-cli-babel "^6.8.1" ember-getowner-polyfill "^2.0.0" -ember-router-generator@^1.0.0: +ember-router-generator@^1.0.0, ember-router-generator@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/ember-router-generator/-/ember-router-generator-1.2.3.tgz#8ed2ca86ff323363120fc14278191e9e8f1315ee" dependencies: @@ -3802,28 +3803,30 @@ ember-runtime-enumerable-includes-polyfill@^2.0.0: ember-cli-babel "^6.9.0" ember-cli-version-checker "^2.1.0" -ember-source@~2.14.1: - version "2.14.1" - resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.14.1.tgz#4abf0b4c916f2da8bf317349df4750905df7e628" +ember-source@~2.15.0: + version "2.15.3" + resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.15.3.tgz#064d358af42774269d45091cc5316df7e36edf9c" dependencies: - "@glimmer/compiler" "^0.22.3" - "@glimmer/node" "^0.22.3" - "@glimmer/reference" "^0.22.3" - "@glimmer/runtime" "^0.22.3" - "@glimmer/util" "^0.22.3" + "@glimmer/compiler" "^0.25.3" + "@glimmer/node" "^0.25.3" + "@glimmer/reference" "^0.25.3" + "@glimmer/runtime" "^0.25.3" + "@glimmer/util" "^0.25.3" broccoli-funnel "^1.2.0" broccoli-merge-trees "^2.0.0" ember-cli-get-component-path-option "^1.0.0" + ember-cli-is-package-missing "^1.0.0" ember-cli-normalize-entity-name "^1.0.0" ember-cli-path-utils "^1.0.0" ember-cli-string-utils "^1.1.0" ember-cli-test-info "^1.0.0" ember-cli-valid-component-name "^1.0.0" ember-cli-version-checker "^1.3.1" + ember-router-generator "^1.2.3" handlebars "^4.0.6" jquery "^3.2.1" resolve "^1.3.3" - rsvp "^3.5.0" + rsvp "^3.6.1" simple-dom "^0.3.0" simple-html-tokenizer "^0.4.1" @@ -4000,7 +4003,7 @@ escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" -escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.3, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -4179,9 +4182,9 @@ exec-sh@^0.2.0: dependencies: merge "^1.1.3" -execa@^0.6.0: - version "0.6.3" - resolved "https://registry.yarnpkg.com/execa/-/execa-0.6.3.tgz#57b69a594f081759c69e5370f0d17b9cb11658fe" +execa@^0.7.0: + version "0.7.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777" dependencies: cross-spawn "^5.0.1" get-stream "^3.0.0" @@ -5566,10 +5569,6 @@ is-fullwidth-code-point@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" -is-git-url@^0.2.0: - version "0.2.3" - resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-0.2.3.tgz#445200d6fbd6da028fb5e01440d9afc93f3ccb64" - is-git-url@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-git-url/-/is-git-url-1.0.0.tgz#53f684cd143285b52c3244b4e6f28253527af66b" @@ -8403,7 +8402,7 @@ route-recognizer@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.3.tgz#1d365e27fa6995e091675f7dc940a8c00353bd29" -rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3, rsvp@^3.5.0: +rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3, rsvp@^3.5.0, rsvp@^3.6.1: version "3.6.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" @@ -9194,7 +9193,7 @@ temp@0.8.3: os-tmpdir "^1.0.0" rimraf "~2.2.6" -testem@^1.15.0: +testem@^1.18.0: version "1.18.4" resolved "https://registry.yarnpkg.com/testem/-/testem-1.18.4.tgz#e45fed922bec2f54a616c43f11922598ac97eb41" dependencies: From b2f49da2e2a0ea6342ccfdc0fae19a40150f1fa8 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 10 May 2018 14:36:55 -0600 Subject: [PATCH 13/34] Added info about where the backend is --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c4d5ca72..b7d4e540 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -87,6 +87,6 @@ Make use of the many generators for code, try `ember help generate` for more det * Upgrading the ember-cli version is extremely difficult, because we are using private apis. Try to upgrade in small pieces. Consider forking ember-cli during the upgrade process to upgrade its dependencies one by one. Don't forget to revert to a standard ember-cli version when done. * Add tests with your PR. * Upgrading ember-cli is usually not necessary to upgrade Ember or Ember Data. -* New Ember versions will not work without upgrades to the backend. +* New Ember versions will not work without upgrades to the [backend](https://github.com/joostdevries/twiddle-backend). * The backend does not have tests. Until it does, please test by actually compiling addons with Docker and an AWS account before submitting PRs. * If you are going to use a local backend, make changes to environment.js using [`git update-index skip-worktree [...]`](https://medium.com/@igloude/git-skip-worktree-and-how-i-used-to-hate-config-files-e84a44a8c859) so that changes to your environment.js are not accidentally committed. From e0970146dac77331f50c507494570ddf29920435 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Fri, 11 May 2018 10:53:53 -0400 Subject: [PATCH 14/34] Fix didResize method undefined bug in canary (#613) --- app/components/dummy-app.js | 4 ++++ app/mixins/resize.js | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/components/dummy-app.js b/app/components/dummy-app.js index 295f7ba4..71c3a8ea 100644 --- a/app/components/dummy-app.js +++ b/app/components/dummy-app.js @@ -58,6 +58,10 @@ export default Ember.Component.extend(ResizeMixin, { didInsertElement() { this._super(); + this.didResize(); + }, + + didResize() { let offset = this.$().offset(), width = this.$().width(), height = this.$().height(); diff --git a/app/mixins/resize.js b/app/mixins/resize.js index 8e18b079..77e8262d 100644 --- a/app/mixins/resize.js +++ b/app/mixins/resize.js @@ -2,7 +2,6 @@ import Ember from 'ember'; import $ from 'jquery'; const { - computed, run } = Ember; @@ -17,7 +16,7 @@ export default Ember.Mixin.create({ $(window).off('resize', this.get("resizeHandler")); }, - resizeHandler: computed(function() { + resizeHandler() { return run.bind(this, 'didResize'); - }) + } }); From 03af7074f8e14e09f583cff3c7c62b7ef3ced647 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Mon, 7 May 2018 02:17:41 -0700 Subject: [PATCH 15/34] Support New module imports --- app/app.js | 4 +- app/router.js | 4 +- app/services/ember-cli.js | 8 +- ember-cli-build.js | 4 + package.json | 7 +- tests/helpers/destroy-app.js | 4 +- tests/helpers/module-for-acceptance.js | 6 +- tests/helpers/start-app.js | 6 +- yarn.lock | 620 ++++++++++++++++++------- 9 files changed, 474 insertions(+), 189 deletions(-) diff --git a/app/app.js b/app/app.js index c15f9359..b3b2bd67 100644 --- a/app/app.js +++ b/app/app.js @@ -1,9 +1,9 @@ -import Ember from 'ember'; +import Application from '@ember/application'; import Resolver from './resolver'; import loadInitializers from 'ember-load-initializers'; import config from './config/environment'; -const App = Ember.Application.extend({ +const App = Application.extend({ modulePrefix: config.modulePrefix, podModulePrefix: config.podModulePrefix, Resolver diff --git a/app/router.js b/app/router.js index 4966b641..f5149b3a 100644 --- a/app/router.js +++ b/app/router.js @@ -1,7 +1,7 @@ -import Ember from 'ember'; +import EmberRouter from '@ember/routing/router'; import config from './config/environment'; -const Router = Ember.Router.extend({ +const Router = EmberRouter.extend({ location: config.locationType, rootURL: config.rootURL }); diff --git a/app/services/ember-cli.js b/app/services/ember-cli.js index 408734d6..d951b2b8 100644 --- a/app/services/ember-cli.js +++ b/app/services/ember-cli.js @@ -1,6 +1,7 @@ import Babel from 'babel-core'; import Path from 'path'; import HbsPlugin from '../plugins/hbs-plugin'; +import NewModulesPlugin from 'babel-plugin-ember-modules-api-polyfill'; import blueprints from '../lib/blueprints'; import Ember from 'ember'; import moment from 'moment'; @@ -11,6 +12,7 @@ const { computed, inject, RSVP, run, $, testing } = Ember; const twiddleAppName = 'twiddle'; const oldTwiddleAppNames = ['demo-app', 'app']; const hbsPlugin = new HbsPlugin(Babel); +const newModulesPlugin = new NewModulesPlugin(Babel); // These files will be included if not present const boilerPlateJs = [ @@ -447,7 +449,8 @@ export default Ember.Service.extend({ compileJs(code, filePath) { code = this.fixTwiddleAppNames(code); let moduleName = this.nameWithModule(filePath); - return Babel.transform(code, babelOpts(moduleName)).code; + let output = Babel.transform(code, babelOpts(moduleName)).code; + return output; }, /** @@ -516,7 +519,8 @@ function babelOpts(moduleName) { loose: true, noInterop: true }], - hbsPlugin + hbsPlugin, + newModulesPlugin ] }; } diff --git a/ember-cli-build.js b/ember-cli-build.js index 29883e16..038353ed 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -102,6 +102,10 @@ module.exports = function(defaults) { app.import('vendor/bootstrap-dropdown-submenu-fix.css'); app.import('vendor/hint.css'); + app.import('node_modules/babel-plugin-ember-modules-api-polyfill/src/index.js', { + using: [{ transformation: 'cjs', as: 'babel-plugin-ember-modules-api-polyfill' }] + }); + let loaderTree = funnel(path.dirname(require.resolve('loader.js')), { files: ['loader.js'], destDir: '/assets' diff --git a/package.json b/package.json index 030c8cbf..e10a0a44 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "author": "Ember Twiddle Contributors", "license": "MIT", "devDependencies": { + "babel-plugin-ember-modules-api-polyfill": "^2.3.0", "babel-preset-es2017": "^6.24.1", "babel-standalone": "^6.26.0", "broccoli-asset-rev": "^2.4.5", @@ -29,11 +30,12 @@ "ember-ajax": "^3.0.0", "ember-api-actions": "~0.1.8", "ember-autoresize": "~0.6.1", - "ember-cli": "2.15.1", + "ember-cli": "2.16.2", "ember-cli-app-version": "^3.0.0", "ember-cli-babel": "^6.12.0", "ember-cli-bootstrap-sassy": "~0.5.8", "ember-cli-build-notifications": "~0.2.0", + "ember-cli-cjs-transform": "gaurav0/ember-cli-cjs-transform#json", "ember-cli-code-coverage": "~0.3.12 ", "ember-cli-dependency-checker": "^2.1.0", "ember-cli-deploy": "^1.0.2", @@ -71,8 +73,9 @@ "ember-notify": "^5.2.1", "ember-resolver": "^4.0.0", "ember-responsive": "^2.0.8", + "ember-rfc176-data": "~0.3.2", "ember-route-action-helper": "^2.0.6", - "ember-source": "~2.15.0", + "ember-source": "~2.16.0", "ember-test-helpers": "~0.6.3", "eslint-plugin-ember": "^5.1.0", "ivy-codemirror": "^2.1.0", diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js index 0b779a7f..01667f27 100644 --- a/tests/helpers/destroy-app.js +++ b/tests/helpers/destroy-app.js @@ -1,7 +1,7 @@ -import Ember from 'ember'; +import { run } from '@ember/runloop'; export default function destroyApp(application) { - Ember.run(() => { + run(() => { application.destroy(); window.server.shutdown(); }); diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js index 76996fd0..90a93bac 100644 --- a/tests/helpers/module-for-acceptance.js +++ b/tests/helpers/module-for-acceptance.js @@ -1,10 +1,8 @@ import { module } from 'qunit'; -import Ember from 'ember'; +import { resolve } from 'rsvp'; import startApp from '../helpers/start-app'; import destroyApp from '../helpers/destroy-app'; -const { RSVP: { Promise } } = Ember; - export default function(name, options = {}) { module(name, { beforeEach() { @@ -17,7 +15,7 @@ export default function(name, options = {}) { afterEach() { let afterEach = options.afterEach && options.afterEach.apply(this, arguments); - return Promise.resolve(afterEach).then(() => destroyApp(this.application)); + return resolve(afterEach).then(() => destroyApp(this.application)); } }); } diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js index ad31d2f8..cee6e6d4 100644 --- a/tests/helpers/start-app.js +++ b/tests/helpers/start-app.js @@ -1,9 +1,7 @@ -import Ember from 'ember'; import Application from '../../app'; import config from '../../config/environment'; - -const { run } = Ember; -const assign = Ember.assign || Ember.merge; +import { run } from '@ember/runloop'; +import { assign } from '@ember/polyfills'; export default function startApp(attrs) { let application; diff --git a/yarn.lock b/yarn.lock index 89cea07d..36c9b98d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,88 +2,23 @@ # yarn lockfile v1 -"@glimmer/compiler@^0.25.3": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@glimmer/compiler/-/compiler-0.25.6.tgz#dcc2b8bfa6f36b70c34e41e85626f888315d3ad7" - dependencies: - "@glimmer/interfaces" "^0.25.6" - "@glimmer/syntax" "^0.25.6" - "@glimmer/util" "^0.25.6" - "@glimmer/wire-format" "^0.25.6" - simple-html-tokenizer "^0.3.0" - "@glimmer/di@^0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.0.tgz#73bfd4a6ee4148a80bf092e8a5d29bcac9d4ce7e" -"@glimmer/interfaces@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@glimmer/interfaces/-/interfaces-0.25.6.tgz#88a6cdb4f414c3a82662cc5fc5cb5bfd91d4ef10" - dependencies: - "@glimmer/wire-format" "^0.25.6" - -"@glimmer/node@^0.25.3": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@glimmer/node/-/node-0.25.6.tgz#3887a79d8fd2cf9376511245babe87647e4349df" - dependencies: - "@glimmer/runtime" "^0.25.6" - simple-dom "^0.3.0" - -"@glimmer/object-reference@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@glimmer/object-reference/-/object-reference-0.25.6.tgz#ab45f51c9416bdaff402a0ea3cedd3b1807b1158" - dependencies: - "@glimmer/reference" "^0.25.6" - "@glimmer/util" "^0.25.6" - -"@glimmer/object@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@glimmer/object/-/object-0.25.6.tgz#a07860e551980488c2839c6393f7a2c071d68a6e" - dependencies: - "@glimmer/object-reference" "^0.25.6" - "@glimmer/util" "^0.25.6" - -"@glimmer/reference@^0.25.3", "@glimmer/reference@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@glimmer/reference/-/reference-0.25.6.tgz#bc57ccc351fc4bcc5750bdb7760cec4b9ef628f4" - dependencies: - "@glimmer/util" "^0.25.6" - "@glimmer/resolver@^0.4.1": version "0.4.3" resolved "https://registry.yarnpkg.com/@glimmer/resolver/-/resolver-0.4.3.tgz#b1baae5c3291b4621002ccf8d7870466097e841d" dependencies: "@glimmer/di" "^0.2.0" -"@glimmer/runtime@^0.25.3", "@glimmer/runtime@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@glimmer/runtime/-/runtime-0.25.6.tgz#2a776dcdd3b8f844e1f6b4e7ca4478b6dc560133" - dependencies: - "@glimmer/interfaces" "^0.25.6" - "@glimmer/object" "^0.25.6" - "@glimmer/object-reference" "^0.25.6" - "@glimmer/reference" "^0.25.6" - "@glimmer/util" "^0.25.6" - "@glimmer/wire-format" "^0.25.6" - -"@glimmer/syntax@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@glimmer/syntax/-/syntax-0.25.6.tgz#aeed43004ece8715d09189b61037c793225b4e88" - dependencies: - "@glimmer/interfaces" "^0.25.6" - "@glimmer/util" "^0.25.6" - handlebars "^4.0.6" - simple-html-tokenizer "^0.3.0" - -"@glimmer/util@^0.25.3", "@glimmer/util@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@glimmer/util/-/util-0.25.6.tgz#de8dde7f5d30f9c0e3e2f083e3f6d3426a92b302" +"@types/estree@0.0.38": + version "0.0.38" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2" -"@glimmer/wire-format@^0.25.6": - version "0.25.6" - resolved "https://registry.yarnpkg.com/@glimmer/wire-format/-/wire-format-0.25.6.tgz#f0543801d234e133bf72d2bdec68dd2c36c06eca" - dependencies: - "@glimmer/util" "^0.25.6" +"@types/node@*": + version "10.0.4" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.0.4.tgz#130598ee56e9a1210a53f557d64935571f05390d" JSONStream@^1.0.3: version "1.3.2" @@ -100,6 +35,12 @@ abbrev@1.0.x, abbrev@~1.0.7: version "1.0.9" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" +abstract-leveldown@~0.12.0, abstract-leveldown@~0.12.1: + version "0.12.4" + resolved "https://registry.yarnpkg.com/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz#29e18e632e60e4e221d5810247852a63d7b2e410" + dependencies: + xtend "~3.0.0" + accepts@1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca" @@ -196,6 +137,12 @@ amd-name-resolver@0.0.7: dependencies: ensure-posix-path "^1.0.1" +amd-name-resolver@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.0.0.tgz#0e593b28d6fa3326ab1798107edaea961046e8d8" + dependencies: + ensure-posix-path "^1.0.1" + amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" @@ -1235,6 +1182,12 @@ binary-extensions@^1.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/binaryextensions/-/binaryextensions-2.1.1.tgz#3209a51ca4a4ad541a3b8d3d6a6d5b83a2485935" +bl@~0.8.1: + version "0.8.2" + resolved "https://registry.yarnpkg.com/bl/-/bl-0.8.2.tgz#c9b6bca08d1bc2ea00fc8afb4f1a5fd1e1c66e4e" + dependencies: + readable-stream "~1.0.26" + bl@~1.0.0: version "1.0.3" resolved "https://registry.yarnpkg.com/bl/-/bl-1.0.3.tgz#fc5421a28fd4226036c3b3891a66a25bc64d226e" @@ -1503,7 +1456,7 @@ broccoli-config-replace@^1.1.2: debug "^2.2.0" fs-extra "^0.24.0" -broccoli-debug@^0.6.1, broccoli-debug@^0.6.2: +broccoli-debug@^0.6.1, broccoli-debug@^0.6.2, broccoli-debug@^0.6.3, broccoli-debug@^0.6.4: version "0.6.4" resolved "https://registry.yarnpkg.com/broccoli-debug/-/broccoli-debug-0.6.4.tgz#986eb3d2005e00e3bb91f9d0a10ab137210cd150" dependencies: @@ -1550,7 +1503,7 @@ broccoli-funnel-reducer@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/broccoli-funnel-reducer/-/broccoli-funnel-reducer-1.0.0.tgz#11365b2a785aec9b17972a36df87eef24c5cc0ea" -broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli-funnel@^1.0.6, broccoli-funnel@^1.1.0, broccoli-funnel@^1.2.0: +broccoli-funnel@^1.0.0, broccoli-funnel@^1.0.1, broccoli-funnel@^1.0.2, broccoli-funnel@^1.1.0, broccoli-funnel@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-1.2.0.tgz#cddc3afc5ff1685a8023488fff74ce6fb5a51296" dependencies: @@ -1847,6 +1800,14 @@ browserify-des@^1.0.0: des.js "^1.0.0" inherits "^2.0.1" +browserify-fs@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/browserify-fs/-/browserify-fs-1.0.0.tgz#f075aa8a729d4d1716d066620e386fcc1311a96f" + dependencies: + level-filesystem "^1.0.1" + level-js "^2.1.3" + levelup "^0.18.2" + browserify-rsa@^4.0.0: version "4.0.1" resolved "https://registry.yarnpkg.com/browserify-rsa/-/browserify-rsa-4.0.1.tgz#21e0abfaf6f2029cf2fafb133567a701d4135524" @@ -1945,6 +1906,10 @@ bser@^2.0.0: dependencies: node-int64 "^0.4.0" +buffer-es6@^4.9.2: + version "4.9.3" + resolved "https://registry.yarnpkg.com/buffer-es6/-/buffer-es6-4.9.3.tgz#f26347b82df76fd37e18bcb5288c4970cfd5c404" + buffer-from@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531" @@ -1972,6 +1937,10 @@ builtin-modules@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" +builtin-modules@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-2.0.0.tgz#60b7ef5ae6546bd7deefa74b08b62a43a232648e" + builtin-status-codes@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz#85982878e21b98e1c66425e03d0174788f569ee8" @@ -2119,6 +2088,14 @@ chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0: escape-string-regexp "^1.0.5" supports-color "^5.3.0" +chalk@^2.3.1: + version "2.4.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" + dependencies: + ansi-styles "^3.2.1" + escape-string-regexp "^1.0.5" + supports-color "^5.3.0" + chardet@^0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2" @@ -2191,7 +2168,7 @@ clean-up-path@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/clean-up-path/-/clean-up-path-1.0.0.tgz#de9e8196519912e749c9eaf67c13d64fac72a3e5" -cli-cursor@^1.0.1, cli-cursor@^1.0.2: +cli-cursor@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-1.0.2.tgz#64da3f7d56a54412e59794bd62dc35295e8f2987" dependencies: @@ -2203,9 +2180,9 @@ cli-cursor@^2.1.0: dependencies: restore-cursor "^2.0.0" -cli-spinners@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-0.1.2.tgz#bb764d88e185fb9e1e6a2a1f19772318f605e31c" +cli-spinners@^1.1.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.3.1.tgz#002c1990912d0d59580c93bd36c056de99e4259a" cli-table2@^0.2.0: version "0.2.0" @@ -2261,6 +2238,10 @@ clone@^2.0.0: version "2.1.2" resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" +clone@~0.1.9: + version "0.1.19" + resolved "https://registry.yarnpkg.com/clone/-/clone-0.1.19.tgz#613fb68639b26a494ac53253e15b1a6bd88ada85" + cmd-shim@~2.0.1: version "2.0.2" resolved "https://registry.yarnpkg.com/cmd-shim/-/cmd-shim-2.0.2.tgz#6fcbda99483a8fd15d7d30a196ca69d688a2efdb" @@ -2419,7 +2400,7 @@ concat-stream@1.6.0: readable-stream "^2.2.2" typedarray "^0.0.6" -concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0: +concat-stream@^1.4.4, concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" dependencies: @@ -2456,14 +2437,16 @@ console-control-strings@^1.0.0, console-control-strings@~1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e" -console-ui@^1.0.2: - version "1.0.3" - resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-1.0.3.tgz#31c524461b63422769f9e89c173495d91393721c" +console-ui@^2.0.0: + version "2.2.2" + resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-2.2.2.tgz#b294a2934de869dd06789ab4be69555411edef29" dependencies: - chalk "^1.1.3" - inquirer "^1.2.3" - ora "^0.2.0" + chalk "^2.1.0" + inquirer "^2" + json-stable-stringify "^1.0.1" + ora "^2.0.0" through "^2.3.8" + user-info "^1.0.0" consolidate@^0.14.0: version "0.14.5" @@ -2599,7 +2582,7 @@ cryptiles@3.x.x: dependencies: boom "5.x.x" -crypto-browserify@^3.0.0: +crypto-browserify@^3.0.0, crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" dependencies: @@ -2699,10 +2682,6 @@ deep-extend@~0.4.0: version "0.4.2" resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" -deep-freeze@^0.0.1: - version "0.0.1" - resolved "https://registry.yarnpkg.com/deep-freeze/-/deep-freeze-0.0.1.tgz#3a0b0005de18672819dfd38cd31f91179c893e84" - deep-is@~0.1.3: version "0.1.3" resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" @@ -2713,6 +2692,12 @@ defaults@^1.0.3: dependencies: clone "^1.0.2" +deferred-leveldown@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz#2cef1f111e1c57870d8bbb8af2650e587cd2f5b4" + dependencies: + abstract-leveldown "~0.12.1" + define-property@^0.2.5: version "0.2.5" resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116" @@ -3018,6 +3003,23 @@ ember-cli-build-notifications@~0.2.0: ember-cli-babel "^5.0.0" node-notifier "^4.1.1" +ember-cli-cjs-transform@gaurav0/ember-cli-cjs-transform#json: + version "1.2.0" + resolved "https://codeload.github.com/gaurav0/ember-cli-cjs-transform/tar.gz/e8a15967667c9e8f9d54634173ed0f670a9435db" + dependencies: + broccoli-debug "^0.6.4" + broccoli-plugin "^1.3.0" + ember-cli-babel "^6.6.0" + fs-extra "^5.0.0" + hash-for-dep "^1.2.3" + pkg-dir "^2.0.0" + rollup "^0.58.1" + rollup-plugin-commonjs "^9.1.0" + rollup-plugin-json "^2.3.0" + rollup-plugin-node-builtins "^2.1.2" + rollup-plugin-node-resolve "^3.3.0" + username "^3.0.0" + "ember-cli-code-coverage@~0.3.12 ": version "0.3.12" resolved "https://registry.yarnpkg.com/ember-cli-code-coverage/-/ember-cli-code-coverage-0.3.12.tgz#6139ad643e882c8dd738f6bc0b480fcfd3a4b351" @@ -3318,7 +3320,7 @@ ember-cli-lodash-subset@2.0.1, 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-lodash-subset@^1.0.11, ember-cli-lodash-subset@^1.0.7: +ember-cli-lodash-subset@^1.0.7: version "1.0.12" resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-1.0.12.tgz#af2e77eba5dcb0d77f3308d3a6fd7d3450f6e537" @@ -3504,11 +3506,11 @@ ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0: resolve "^1.3.3" semver "^5.3.0" -ember-cli@2.15.1: - version "2.15.1" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.15.1.tgz#773add3cc18e5068f1c5f43a77544efa2712e47b" +ember-cli@2.16.2: + version "2.16.2" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.16.2.tgz#53b922073a8e6f34255a6e0dcb1794a91ba3e1b7" dependencies: - amd-name-resolver "0.0.7" + amd-name-resolver "1.0.0" babel-plugin-transform-es2015-modules-amd "^6.24.0" bower-config "^1.3.0" bower-endpoint-parser "0.2.2" @@ -3518,7 +3520,8 @@ ember-cli@2.15.1: broccoli-concat "^3.2.2" broccoli-config-loader "^1.0.0" broccoli-config-replace "^1.1.2" - broccoli-funnel "^1.0.6" + broccoli-debug "^0.6.3" + broccoli-funnel "^2.0.0" broccoli-funnel-reducer "^1.0.0" broccoli-merge-trees "^2.0.0" broccoli-middleware "^1.0.0" @@ -3526,31 +3529,30 @@ ember-cli@2.15.1: broccoli-stew "^1.2.0" calculate-cache-key-for-tree "^1.0.0" capture-exit "^1.1.0" - chalk "^1.1.3" + chalk "^2.0.1" clean-base-url "^1.0.0" compression "^1.4.4" configstore "^3.0.0" - console-ui "^1.0.2" + console-ui "^2.0.0" core-object "^3.1.3" dag-map "^2.0.2" - deep-freeze "^0.0.1" diff "^3.2.0" ember-cli-broccoli-sane-watcher "^2.0.4" ember-cli-is-package-missing "^1.0.0" ember-cli-legacy-blueprints "^0.1.2" - ember-cli-lodash-subset "^1.0.11" + ember-cli-lodash-subset "^2.0.1" ember-cli-normalize-entity-name "^1.0.0" ember-cli-preprocess-registry "^3.1.0" ember-cli-string-utils "^1.0.0" ember-try "^0.2.15" ensure-posix-path "^1.0.2" - execa "^0.7.0" + execa "^0.8.0" exists-sync "0.0.4" exit "^0.1.2" express "^4.12.3" filesize "^3.1.3" find-up "^2.1.0" - fs-extra "^3.0.0" + fs-extra "^4.0.0" fs-tree-diff "^0.5.2" get-caller-file "^1.0.0" git-repo-info "^1.4.1" @@ -3578,7 +3580,7 @@ ember-cli@2.15.1: promise-map-series "^0.2.1" quick-temp "^0.1.8" resolve "^1.3.0" - rsvp "^3.3.3" + rsvp "^3.6.0" sane "^1.6.0" semver "^5.1.1" silent-error "^1.0.0" @@ -3779,7 +3781,7 @@ ember-rfc176-data@^0.2.0, ember-rfc176-data@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.2.7.tgz#bd355bc9b473e08096b518784170a23388bc973b" -ember-rfc176-data@^0.3.0: +ember-rfc176-data@^0.3.0, ember-rfc176-data@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.2.tgz#bde5538939529b263c142b53a47402f8127f8dce" @@ -3803,15 +3805,10 @@ ember-runtime-enumerable-includes-polyfill@^2.0.0: ember-cli-babel "^6.9.0" ember-cli-version-checker "^2.1.0" -ember-source@~2.15.0: - version "2.15.3" - resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.15.3.tgz#064d358af42774269d45091cc5316df7e36edf9c" +ember-source@~2.16.0: + version "2.16.4" + resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-2.16.4.tgz#d8d7317306a59a6981e151d5771c8976914b7738" dependencies: - "@glimmer/compiler" "^0.25.3" - "@glimmer/node" "^0.25.3" - "@glimmer/reference" "^0.25.3" - "@glimmer/runtime" "^0.25.3" - "@glimmer/util" "^0.25.3" broccoli-funnel "^1.2.0" broccoli-merge-trees "^2.0.0" ember-cli-get-component-path-option "^1.0.0" @@ -3823,12 +3820,10 @@ ember-source@~2.15.0: ember-cli-valid-component-name "^1.0.0" ember-cli-version-checker "^1.3.1" ember-router-generator "^1.2.3" - handlebars "^4.0.6" + fs-extra "^4.0.1" + inflection "^1.12.0" jquery "^3.2.1" resolve "^1.3.3" - rsvp "^3.6.1" - simple-dom "^0.3.0" - simple-html-tokenizer "^0.4.1" ember-string-ishtmlsafe-polyfill@^1.1.0: version "1.1.0" @@ -3932,6 +3927,12 @@ entities@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0" +errno@^0.1.1, errno@~0.1.1: + version "0.1.7" + resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618" + dependencies: + prr "~1.0.1" + error-ex@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.1.tgz#f855a86ce61adc4e8621c3cda21e7a7612c3a8dc" @@ -4138,6 +4139,14 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" +estree-walker@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa" + +estree-walker@^0.5.1: + version "0.5.2" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39" + esutils@^2.0.0, esutils@^2.0.2: version "2.0.2" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b" @@ -4176,6 +4185,14 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: md5.js "^1.3.4" safe-buffer "^5.1.1" +exec-file-sync@^2.0.0: + version "2.0.2" + resolved "https://registry.yarnpkg.com/exec-file-sync/-/exec-file-sync-2.0.2.tgz#58d441db46e40de6d1f30de5be022785bd89e328" + dependencies: + is-obj "^1.0.0" + object-assign "^4.0.1" + spawn-sync "^1.0.11" + exec-sh@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/exec-sh/-/exec-sh-0.2.1.tgz#163b98a6e89e6b65b47c2a28d215bc1f63989c38" @@ -4194,6 +4211,18 @@ execa@^0.7.0: signal-exit "^3.0.0" strip-eof "^1.0.0" +execa@^0.8.0: + version "0.8.0" + resolved "https://registry.yarnpkg.com/execa/-/execa-0.8.0.tgz#d8d76bbc1b55217ed190fd6dd49d3c774ecfc8da" + dependencies: + cross-spawn "^5.0.1" + get-stream "^3.0.0" + is-stream "^1.1.0" + npm-run-path "^2.0.0" + p-finally "^1.0.0" + signal-exit "^3.0.0" + strip-eof "^1.0.0" + exists-stat@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/exists-stat/-/exists-stat-1.0.0.tgz#0660e3525a2e89d9e446129440c272edfa24b529" @@ -4439,13 +4468,6 @@ fd-slicer@~1.0.1: dependencies: pend "~1.2.0" -figures@^1.3.5: - version "1.7.0" - resolved "https://registry.yarnpkg.com/figures/-/figures-1.7.0.tgz#cbe1e3affcf1cd44b80cadfed28dc793a9701d2e" - dependencies: - escape-string-regexp "^1.0.5" - object-assign "^4.1.0" - figures@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962" @@ -4566,6 +4588,10 @@ for-own@^0.1.4: dependencies: for-in "^1.0.1" +foreach@~2.0.1: + version "2.0.5" + resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99" + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -4656,17 +4682,17 @@ fs-extra@^2.0.0: graceful-fs "^4.1.2" jsonfile "^2.1.0" -fs-extra@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-3.0.1.tgz#3794f378c58b342ea7dbbb23095109c4b3b62291" +fs-extra@^4.0.0, fs-extra@^4.0.1, fs-extra@^4.0.2: + version "4.0.3" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" dependencies: graceful-fs "^4.1.2" - jsonfile "^3.0.0" + jsonfile "^4.0.0" universalify "^0.1.0" -fs-extra@^4.0.0, fs-extra@^4.0.2: - version "4.0.3" - resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" +fs-extra@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-5.0.0.tgz#414d0110cdd06705734d055652c5411260c31abd" dependencies: graceful-fs "^4.1.2" jsonfile "^4.0.0" @@ -4762,6 +4788,12 @@ functional-red-black-tree@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" +fwd-stream@^1.0.4: + version "1.0.4" + resolved "https://registry.yarnpkg.com/fwd-stream/-/fwd-stream-1.0.4.tgz#ed281cabed46feecf921ee32dc4c50b372ac7cfa" + dependencies: + readable-stream "~1.0.26-4" + gauge@~1.2.0, gauge@~1.2.5: version "1.2.7" resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" @@ -4991,7 +5023,7 @@ growly@^1.2.0, growly@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/growly/-/growly-1.3.0.tgz#f10748cbe76af964b7c96c93c6bcc28af120c081" -handlebars@^4.0.1, handlebars@^4.0.4, handlebars@^4.0.6: +handlebars@^4.0.1, handlebars@^4.0.4: version "4.0.11" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.0.11.tgz#630a35dfe0294bc281edae6ffc5d329fc7982dcc" dependencies: @@ -5118,7 +5150,7 @@ hash-base@^3.0.0: inherits "^2.0.1" safe-buffer "^5.0.1" -hash-for-dep@^1.0.2: +hash-for-dep@^1.0.2, hash-for-dep@^1.2.3: version "1.2.3" resolved "https://registry.yarnpkg.com/hash-for-dep/-/hash-for-dep-1.2.3.tgz#5ec69fca32c23523972d52acb5bb65ffc3664cab" dependencies: @@ -5306,6 +5338,10 @@ iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@^0.4.5, iconv-lite@~0.4.13: version "0.4.19" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" +idb-wrapper@^1.5.0: + version "1.7.2" + resolved "https://registry.yarnpkg.com/idb-wrapper/-/idb-wrapper-1.7.2.tgz#8251afd5e77fe95568b1c16152eb44b396767ea2" + ieee754@1.1.8: version "1.1.8" resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.8.tgz#be33d40ac10ef1926701f6f08a2d86fbfd1ad3e4" @@ -5340,11 +5376,11 @@ indent-string@^2.1.0: dependencies: repeating "^2.0.0" -indexof@0.0.1: +indexof@0.0.1, indexof@~0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d" -inflection@^1.7.0, inflection@^1.7.1, inflection@^1.8.0: +inflection@^1.12.0, inflection@^1.7.0, inflection@^1.7.1, inflection@^1.8.0: version "1.12.0" resolved "https://registry.yarnpkg.com/inflection/-/inflection-1.12.0.tgz#a200935656d6f5f6bc4dc7502e1aecb703228416" @@ -5396,22 +5432,22 @@ inline-source-map@~0.6.0: dependencies: source-map "~0.5.3" -inquirer@^1.2.3: - version "1.2.3" - resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-1.2.3.tgz#4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918" +inquirer@^2: + version "2.0.0" + resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-2.0.0.tgz#e1351687b90d150ca403ceaa3cefb1e3065bef4b" dependencies: ansi-escapes "^1.1.0" chalk "^1.0.0" cli-cursor "^1.0.1" cli-width "^2.0.0" external-editor "^1.1.0" - figures "^1.3.5" + figures "^2.0.0" lodash "^4.3.0" mute-stream "0.0.6" pinkie-promise "^2.0.0" run-async "^2.2.0" rx "^4.1.0" - string-width "^1.0.1" + string-width "^2.0.0" strip-ansi "^3.0.0" through "^2.3.6" @@ -5591,6 +5627,10 @@ is-integer@^1.0.4: dependencies: is-finite "^1.0.0" +is-module@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591" + is-my-ip-valid@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz#7b351b8e8edd4d3995d4d066680e664d94696824" @@ -5625,6 +5665,10 @@ is-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" +is-object@~0.1.2: + version "0.1.2" + resolved "https://registry.yarnpkg.com/is-object/-/is-object-0.1.2.tgz#00efbc08816c33cfc4ac8251d132e10dc65098d7" + is-odd@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24" @@ -5699,6 +5743,10 @@ is-windows@^1.0.1, is-windows@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d" +is@~0.2.6: + version "0.2.7" + resolved "https://registry.yarnpkg.com/is/-/is-0.2.7.tgz#3b34a2c48f359972f35042849193ae7264b63562" + isarray@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf" @@ -5715,6 +5763,10 @@ isbinaryfile@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-3.0.2.tgz#4a3e974ec0cba9004d3fc6cde7209ea69368a621" +isbuffer@~0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/isbuffer/-/isbuffer-0.0.0.tgz#38c146d9df528b8bf9b0701c3d43cf12df3fc39b" + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -5873,12 +5925,6 @@ jsonfile@^2.1.0: optionalDependencies: graceful-fs "^4.1.6" -jsonfile@^3.0.0: - version "3.0.1" - resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-3.0.1.tgz#a5ecc6f65f53f662c4415c7675a0331d0992ec66" - optionalDependencies: - graceful-fs "^4.1.6" - jsonfile@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb" @@ -5962,6 +6008,82 @@ leek@0.0.24: lodash.assign "^3.2.0" rsvp "^3.0.21" +level-blobs@^0.1.7: + version "0.1.7" + resolved "https://registry.yarnpkg.com/level-blobs/-/level-blobs-0.1.7.tgz#9ab9b97bb99f1edbf9f78a3433e21ed56386bdaf" + dependencies: + level-peek "1.0.6" + once "^1.3.0" + readable-stream "^1.0.26-4" + +level-filesystem@^1.0.1: + version "1.2.0" + resolved "https://registry.yarnpkg.com/level-filesystem/-/level-filesystem-1.2.0.tgz#a00aca9919c4a4dfafdca6a8108d225aadff63b3" + dependencies: + concat-stream "^1.4.4" + errno "^0.1.1" + fwd-stream "^1.0.4" + level-blobs "^0.1.7" + level-peek "^1.0.6" + level-sublevel "^5.2.0" + octal "^1.0.0" + once "^1.3.0" + xtend "^2.2.0" + +level-fix-range@2.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/level-fix-range/-/level-fix-range-2.0.0.tgz#c417d62159442151a19d9a2367868f1724c2d548" + dependencies: + clone "~0.1.9" + +level-fix-range@~1.0.2: + version "1.0.2" + resolved "https://registry.yarnpkg.com/level-fix-range/-/level-fix-range-1.0.2.tgz#bf15b915ae36d8470c821e883ddf79cd16420828" + +"level-hooks@>=4.4.0 <5": + version "4.5.0" + resolved "https://registry.yarnpkg.com/level-hooks/-/level-hooks-4.5.0.tgz#1b9ae61922930f3305d1a61fc4d83c8102c0dd93" + dependencies: + string-range "~1.2" + +level-js@^2.1.3: + version "2.2.4" + resolved "https://registry.yarnpkg.com/level-js/-/level-js-2.2.4.tgz#bc055f4180635d4489b561c9486fa370e8c11697" + dependencies: + abstract-leveldown "~0.12.0" + idb-wrapper "^1.5.0" + isbuffer "~0.0.0" + ltgt "^2.1.2" + typedarray-to-buffer "~1.0.0" + xtend "~2.1.2" + +level-peek@1.0.6, level-peek@^1.0.6: + version "1.0.6" + resolved "https://registry.yarnpkg.com/level-peek/-/level-peek-1.0.6.tgz#bec51c72a82ee464d336434c7c876c3fcbcce77f" + dependencies: + level-fix-range "~1.0.2" + +level-sublevel@^5.2.0: + version "5.2.3" + resolved "https://registry.yarnpkg.com/level-sublevel/-/level-sublevel-5.2.3.tgz#744c12c72d2e72be78dde3b9b5cd84d62191413a" + dependencies: + level-fix-range "2.0" + level-hooks ">=4.4.0 <5" + string-range "~1.2.1" + xtend "~2.0.4" + +levelup@^0.18.2: + version "0.18.6" + resolved "https://registry.yarnpkg.com/levelup/-/levelup-0.18.6.tgz#e6a01cb089616c8ecc0291c2a9bd3f0c44e3e5eb" + dependencies: + bl "~0.8.1" + deferred-leveldown "~0.2.0" + errno "~0.1.1" + prr "~0.0.0" + readable-stream "~1.0.26" + semver "~2.3.1" + xtend "~3.0.0" + leven@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/leven/-/leven-1.0.2.tgz#9144b6eebca5f1d0680169f1a6770dcea60b75c3" @@ -6489,6 +6611,12 @@ lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0, lo version "4.17.5" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" +log-symbols@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" + dependencies: + chalk "^2.0.1" + longest@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097" @@ -6521,6 +6649,16 @@ lru-cache@^4.0.1: pseudomap "^1.0.2" yallist "^2.1.2" +ltgt@^2.1.2: + version "2.2.1" + resolved "https://registry.yarnpkg.com/ltgt/-/ltgt-2.2.1.tgz#f35ca91c493f7b73da0e07495304f17b31f87ee5" + +magic-string@^0.22.4: + version "0.22.5" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e" + dependencies: + vlq "^0.2.2" + make-array@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/make-array/-/make-array-0.1.2.tgz#335e36ebb0c5a43154d21213a1ecaeae2a1bb3ef" @@ -6622,13 +6760,19 @@ media-typer@0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748" +mem@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76" + dependencies: + mimic-fn "^1.0.0" + memory-streams@^0.1.0: version "0.1.3" resolved "https://registry.yarnpkg.com/memory-streams/-/memory-streams-0.1.3.tgz#d9b0017b4b87f1d92f55f2745c9caacb1dc93ceb" dependencies: readable-stream "~1.0.2" -meow@^3.7.0: +meow@^3.4.0, meow@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb" dependencies: @@ -6673,7 +6817,7 @@ methods@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee" -micromatch@^2.1.5, micromatch@^2.3.7: +micromatch@^2.1.5, micromatch@^2.3.11, micromatch@^2.3.7: version "2.3.11" resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565" dependencies: @@ -7305,6 +7449,18 @@ object-copy@^0.1.0: define-property "^0.2.5" kind-of "^3.0.3" +object-keys@~0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.2.0.tgz#cddec02998b091be42bf1035ae32e49f1cb6ea67" + dependencies: + foreach "~2.0.1" + indexof "~0.0.1" + is "~0.2.6" + +object-keys@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-0.4.0.tgz#28a6aae7428dd2c3a92f3d95f21335dd204e0336" + object-visit@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb" @@ -7324,6 +7480,10 @@ object.pick@^1.3.0: dependencies: isobject "^3.0.1" +octal@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/octal/-/octal-1.0.0.tgz#63e7162a68efbeb9e213588d58e989d1e5c4530b" + on-finished@~2.3.0: version "2.3.0" resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947" @@ -7382,14 +7542,16 @@ options@>=0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" -ora@^0.2.0: - version "0.2.3" - resolved "https://registry.yarnpkg.com/ora/-/ora-0.2.3.tgz#37527d220adcd53c39b73571d754156d5db657a4" +ora@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/ora/-/ora-2.1.0.tgz#6caf2830eb924941861ec53a173799e008b51e5b" dependencies: - chalk "^1.1.1" - cli-cursor "^1.0.2" - cli-spinners "^0.1.2" - object-assign "^4.0.1" + chalk "^2.3.1" + cli-cursor "^2.1.0" + cli-spinners "^1.1.0" + log-symbols "^2.2.0" + strip-ansi "^4.0.0" + wcwidth "^1.0.1" os-browserify@~0.3.0: version "0.3.0" @@ -7536,6 +7698,12 @@ pascalcase@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14" +passwd-user@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/passwd-user/-/passwd-user-1.2.1.tgz#a01a5dc639ef007dc56364b8178569080ad3a7b8" + dependencies: + exec-file-sync "^2.0.0" + path-array@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-array/-/path-array-1.0.1.tgz#7e2f0f35f07a2015122b868b7eac0eb2c4fec271" @@ -7654,6 +7822,12 @@ pinkie@^2.0.0: version "2.0.4" resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" +pkg-dir@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b" + dependencies: + find-up "^2.1.0" + pluralize@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/pluralize/-/pluralize-7.0.0.tgz#298b89df8b93b0221dbf421ad2b1b1ea23fc6777" @@ -7693,6 +7867,10 @@ private@^0.1.6, private@^0.1.7, private@~0.1.5: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" +process-es6@^0.11.2: + version "0.11.6" + resolved "https://registry.yarnpkg.com/process-es6/-/process-es6-0.11.6.tgz#c6bb389f9a951f82bd4eb169600105bd2ff9c778" + process-nextick-args@~1.0.6: version "1.0.7" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3" @@ -7754,6 +7932,14 @@ proxy-agent@^2.0.0: pac-proxy-agent "^2.0.0" socks-proxy-agent "^3.0.0" +prr@~0.0.0: + version "0.0.0" + resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" + +prr@~1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/prr/-/prr-1.0.1.tgz#d3fc114ba06995a45ec6893f484ceb1d78f5f476" + pseudomap@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" @@ -7956,7 +8142,7 @@ read@1, read@~1.0.1, read@~1.0.7: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readable-stream@1.1.x: +readable-stream@1.1.x, readable-stream@^1.0.26-4: version "1.1.14" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9" dependencies: @@ -7965,7 +8151,7 @@ readable-stream@1.1.x: isarray "0.0.1" string_decoder "~0.10.x" -readable-stream@~1.0.2: +readable-stream@~1.0.2, readable-stream@~1.0.26, readable-stream@~1.0.26-4: version "1.0.34" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c" dependencies: @@ -8388,12 +8574,58 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^2.0.0" inherits "^2.0.1" +rollup-plugin-commonjs@^9.1.0: + version "9.1.3" + resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.1.3.tgz#37bfbf341292ea14f512438a56df8f9ca3ba4d67" + dependencies: + estree-walker "^0.5.1" + magic-string "^0.22.4" + resolve "^1.5.0" + rollup-pluginutils "^2.0.1" + +rollup-plugin-json@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-2.3.0.tgz#3c07a452c1b5391be28006fbfff3644056ce0add" + dependencies: + rollup-pluginutils "^2.0.1" + +rollup-plugin-node-builtins@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/rollup-plugin-node-builtins/-/rollup-plugin-node-builtins-2.1.2.tgz#24a1fed4a43257b6b64371d8abc6ce1ab14597e9" + dependencies: + browserify-fs "^1.0.0" + buffer-es6 "^4.9.2" + crypto-browserify "^3.11.0" + process-es6 "^0.11.2" + +rollup-plugin-node-resolve@^3.3.0: + version "3.3.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-3.3.0.tgz#c26d110a36812cbefa7ce117cadcd3439aa1c713" + dependencies: + builtin-modules "^2.0.0" + is-module "^1.0.0" + resolve "^1.1.6" + +rollup-pluginutils@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0" + dependencies: + estree-walker "^0.3.0" + micromatch "^2.3.11" + rollup@^0.41.4: version "0.41.6" resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.41.6.tgz#e0d05497877a398c104d816d2733a718a7a94e2a" dependencies: source-map-support "^0.4.0" +rollup@^0.58.1: + version "0.58.2" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.58.2.tgz#2feddea8c0c022f3e74b35c48e3c21b3433803ce" + dependencies: + "@types/estree" "0.0.38" + "@types/node" "*" + route-recognizer@^0.2.3: version "0.2.10" resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.10.tgz#024b2283c2e68d13a7c7f5173a5924645e8902df" @@ -8402,7 +8634,7 @@ route-recognizer@^0.3.3: version "0.3.3" resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.3.3.tgz#1d365e27fa6995e091675f7dc940a8c00353bd29" -rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3, rsvp@^3.5.0, rsvp@^3.6.1: +rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0.6, rsvp@^3.1.0, rsvp@^3.2.1, rsvp@^3.3.3, rsvp@^3.5.0, rsvp@^3.6.0: version "3.6.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" @@ -8510,6 +8742,10 @@ semver@^4.3.1: version "4.3.6" resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da" +semver@~2.3.1: + version "2.3.2" + resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52" + semver@~5.0.1: version "5.0.3" resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a" @@ -8641,10 +8877,6 @@ silent-error@^1.0.0, silent-error@^1.0.1, silent-error@^1.1.0: dependencies: debug "^2.2.0" -simple-dom@^0.3.0: - version "0.3.2" - resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-0.3.2.tgz#0663d10f1556f1500551d518f56e3aba0871371d" - simple-dom@^1.0.0: version "1.3.0" resolved "https://registry.yarnpkg.com/simple-dom/-/simple-dom-1.3.0.tgz#8473e0d34e340544b061410dba3faf4f1b7aa282" @@ -8659,14 +8891,6 @@ simple-git@^1.57.0: dependencies: debug "^3.1.0" -simple-html-tokenizer@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.3.0.tgz#9b8b5559d80e331a544dd13dd59382e5d0d94411" - -simple-html-tokenizer@^0.4.1: - version "0.4.3" - resolved "https://registry.yarnpkg.com/simple-html-tokenizer/-/simple-html-tokenizer-0.4.3.tgz#9b00b766e30058b4bb377c0d4f97566a13ab1be1" - simple-is@~0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/simple-is/-/simple-is-0.2.0.tgz#2abb75aade39deb5cc815ce10e6191164850baf0" @@ -8891,7 +9115,7 @@ spawn-args@^0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/spawn-args/-/spawn-args-0.2.0.tgz#fb7d0bd1d70fd4316bd9e3dec389e65f9d6361bb" -spawn-sync@^1.0.15: +spawn-sync@^1.0.11, spawn-sync@^1.0.15: version "1.0.15" resolved "https://registry.yarnpkg.com/spawn-sync/-/spawn-sync-1.0.15.tgz#b00799557eb7fb0c8376c29d44e8a1ea67e57476" dependencies: @@ -9012,6 +9236,10 @@ stream-splicer@^2.0.0: inherits "^2.0.1" readable-stream "^2.0.2" +string-range@~1.2, string-range@~1.2.1: + version "1.2.2" + resolved "https://registry.yarnpkg.com/string-range/-/string-range-1.2.2.tgz#a893ed347e72299bc83befbbf2a692a8d239d5dd" + string-template@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add" @@ -9024,7 +9252,7 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -string-width@^2.1.0, string-width@^2.1.1: +string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" dependencies: @@ -9403,6 +9631,10 @@ type-is@~1.6.15, type-is@~1.6.16: media-typer "0.3.0" mime-types "~2.1.18" +typedarray-to-buffer@~1.0.0: + version "1.0.4" + resolved "https://registry.yarnpkg.com/typedarray-to-buffer/-/typedarray-to-buffer-1.0.4.tgz#9bb8ba0e841fb3f4cf1fe7c245e9f3fa8a5fe99c" + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" @@ -9534,10 +9766,31 @@ user-home@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/user-home/-/user-home-1.1.1.tgz#2b5be23a32b63a7c9deb8d0f28d485724a3df190" +user-info@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/user-info/-/user-info-1.0.0.tgz#81c82b7ed63e674c2475667653413b3c76fde239" + dependencies: + os-homedir "^1.0.1" + passwd-user "^1.2.1" + username "^1.0.1" + username-sync@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/username-sync/-/username-sync-1.0.1.tgz#1cde87eefcf94b8822984d938ba2b797426dae1f" +username@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/username/-/username-1.0.1.tgz#e1f72295e3e58e06f002c6327ce06897a99cd67f" + dependencies: + meow "^3.4.0" + +username@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/username/-/username-3.0.0.tgz#b3dba982a72b4ce59d52f159fa1aeba266af5fc8" + dependencies: + execa "^0.7.0" + mem "^1.1.0" + util-deprecate@^1.0.2, util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" @@ -9595,6 +9848,10 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +vlq@^0.2.2: + version "0.2.3" + resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" + vm-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.0.0.tgz#88768214567fd00a27be2f553712c9fc5aeb548f" @@ -9632,7 +9889,7 @@ watch@~0.18.0: exec-sh "^0.2.0" minimist "^1.2.0" -wcwidth@^1.0.0: +wcwidth@^1.0.0, wcwidth@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/wcwidth/-/wcwidth-1.0.1.tgz#f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8" dependencies: @@ -9770,10 +10027,31 @@ xregexp@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943" +xtend@^2.2.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.2.0.tgz#eef6b1f198c1c8deafad8b1765a04dad4a01c5a9" + xtend@^4.0.0, xtend@^4.0.1, xtend@~4.0.0, xtend@~4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af" +xtend@~2.0.4: + version "2.0.6" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.0.6.tgz#5ea657a6dba447069c2e59c58a1138cb0c5e6cee" + dependencies: + is-object "~0.1.2" + object-keys "~0.2.0" + +xtend@~2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-2.1.2.tgz#6efecc2a4dad8e6962c4901b337ce7ba87b5d28b" + dependencies: + object-keys "~0.4.0" + +xtend@~3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a" + y18n@^3.2.0, y18n@^3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/y18n/-/y18n-3.2.1.tgz#6d15fba884c08679c0d77e88e7759e811e07fa41" From d2a2d787a6cc35b253881697276307d1dc8db1b3 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Mon, 7 May 2018 17:32:51 -0400 Subject: [PATCH 16/34] Changes after making ember-cli-cjs-transform configurable --- ember-cli-build.js | 9 +++++- package.json | 2 ++ yarn.lock | 75 ++++++++++++++++++++++++++++++++++------------ 3 files changed, 66 insertions(+), 20 deletions(-) diff --git a/ember-cli-build.js b/ember-cli-build.js index 038353ed..59a94e01 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -102,8 +102,15 @@ module.exports = function(defaults) { app.import('vendor/bootstrap-dropdown-submenu-fix.css'); app.import('vendor/hint.css'); + const nodeBuiltins = require('rollup-plugin-node-builtins'); + const json = require('rollup-plugin-json'); + app.import('node_modules/babel-plugin-ember-modules-api-polyfill/src/index.js', { - using: [{ transformation: 'cjs', as: 'babel-plugin-ember-modules-api-polyfill' }] + using: [{ + transformation: 'cjs', + as: 'babel-plugin-ember-modules-api-polyfill', + plugins: [nodeBuiltins(), json()] + }] }); let loaderTree = funnel(path.dirname(require.resolve('loader.js')), { diff --git a/package.json b/package.json index e10a0a44..551de49d 100644 --- a/package.json +++ b/package.json @@ -83,6 +83,8 @@ "moment": "^2.22.0", "moment-timezone": "~0.5.14", "path-browser": "^2.2.1", + "rollup-plugin-json": "^2.3.0", + "rollup-plugin-node-builtins": "^2.1.2", "torii": "~0.10.1" }, "engines": { diff --git a/yarn.lock b/yarn.lock index 36c9b98d..fb2a3666 100644 --- a/yarn.lock +++ b/yarn.lock @@ -543,7 +543,31 @@ babel-core@^5.0.0, babel-core@^5.8.38: trim-right "^1.0.0" try-resolve "^1.0.0" -babel-core@^6.14.0, babel-core@^6.24.1, babel-core@^6.26.0: +babel-core@^6.14.0, babel-core@^6.26.0: + version "6.26.3" + resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" + dependencies: + babel-code-frame "^6.26.0" + babel-generator "^6.26.0" + babel-helpers "^6.24.1" + babel-messages "^6.23.0" + babel-register "^6.26.0" + babel-runtime "^6.26.0" + babel-template "^6.26.0" + babel-traverse "^6.26.0" + babel-types "^6.26.0" + babylon "^6.18.0" + convert-source-map "^1.5.1" + debug "^2.6.9" + json5 "^0.5.1" + lodash "^4.17.4" + minimatch "^3.0.4" + path-is-absolute "^1.0.1" + private "^0.1.8" + slash "^1.0.0" + source-map "^0.5.7" + +babel-core@^6.24.1: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8" dependencies: @@ -882,8 +906,8 @@ babel-plugin-transform-es2015-modules-amd@^6.22.0, babel-plugin-transform-es2015 babel-template "^6.24.1" babel-plugin-transform-es2015-modules-commonjs@^6.23.0, babel-plugin-transform-es2015-modules-commonjs@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.0.tgz#0d8394029b7dc6abe1a97ef181e00758dd2e5d8a" + version "6.26.2" + resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz#58a793863a9e7ca870bdc5a881117ffac27db6f3" dependencies: babel-plugin-transform-strict-mode "^6.24.1" babel-runtime "^6.26.0" @@ -2025,8 +2049,8 @@ can-symlink@^1.0.0: tmp "0.0.28" caniuse-lite@^1.0.30000792: - version "1.0.30000823" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000823.tgz#b79842a5b5a48eaa416b73f5a5d7a23f52d26014" + version "1.0.30000835" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000835.tgz#517c4d3807a8527b0cbce1d84c85d4487f877268" caniuse-lite@^1.0.30000821: version "1.0.30000828" @@ -2235,8 +2259,8 @@ clone@^1.0.2: resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e" clone@^2.0.0: - version "2.1.2" - resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f" + version "2.1.1" + resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb" clone@~0.1.9: version "0.1.19" @@ -2499,8 +2523,8 @@ core-js@^1.0.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" core-js@^2.4.0, core-js@^2.5.0: - version "2.5.4" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.4.tgz#f2c8bf181f2a80b92f360121429ce63a2f0aeae0" + version "2.5.6" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.6.tgz#0fe6d45bf3cac3ac364a9d72de7576f4eb221b9d" core-object@2.0.6: version "2.0.6" @@ -2638,7 +2662,7 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" -debug@2, debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.4.0, debug@^2.6.8: +debug@2, debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.4.0, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: @@ -2904,7 +2928,11 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.41: +electron-to-chromium@^1.3.30: + version "1.3.45" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.45.tgz#458ac1b1c5c760ce8811a16d2bfbd97ec30bafb8" + +electron-to-chromium@^1.3.41: version "1.3.42" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz#95c33bf01d0cc405556aec899fe61fd4d76ea0f9" @@ -3005,7 +3033,7 @@ ember-cli-build-notifications@~0.2.0: ember-cli-cjs-transform@gaurav0/ember-cli-cjs-transform#json: version "1.2.0" - resolved "https://codeload.github.com/gaurav0/ember-cli-cjs-transform/tar.gz/e8a15967667c9e8f9d54634173ed0f670a9435db" + resolved "https://codeload.github.com/gaurav0/ember-cli-cjs-transform/tar.gz/40fd8cccd1fb918508df8cd35a1924680a7fe864" dependencies: broccoli-debug "^0.6.4" broccoli-plugin "^1.3.0" @@ -3015,8 +3043,6 @@ ember-cli-cjs-transform@gaurav0/ember-cli-cjs-transform#json: pkg-dir "^2.0.0" rollup "^0.58.1" rollup-plugin-commonjs "^9.1.0" - rollup-plugin-json "^2.3.0" - rollup-plugin-node-builtins "^2.1.2" rollup-plugin-node-resolve "^3.3.0" username "^3.0.0" @@ -3499,13 +3525,20 @@ ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.7, ember-cli-ve dependencies: semver "^5.3.0" -ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0: +ember-cli-version-checker@^2.0.0: version "2.1.0" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.1.0.tgz#fc79a56032f3717cf844ada7cbdec1a06fedb604" dependencies: resolve "^1.3.3" semver "^5.3.0" +ember-cli-version-checker@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.1.2.tgz#305ce102390c66e4e0f1432dea9dc5c7c19fed98" + dependencies: + resolve "^1.3.3" + semver "^5.3.0" + ember-cli@2.16.2: version "2.16.2" resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-2.16.2.tgz#53b922073a8e6f34255a6e0dcb1794a91ba3e1b7" @@ -6607,10 +6640,14 @@ lodash@^3.10.0, lodash@^3.10.1, lodash@^3.9.3: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.11.1, lodash@^4.14.0, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1, lodash@~4.17.4: +lodash@^4.0.0, lodash@^4.11.1, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1, lodash@~4.17.4: version "4.17.5" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" +lodash@^4.14.0, lodash@^4.17.4: + version "4.17.10" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" + log-symbols@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-2.2.0.tgz#5740e1c5d6f0dfda4ad9323b5332107ef6b4c40a" @@ -7863,7 +7900,7 @@ printf@^0.2.3: version "0.2.5" resolved "https://registry.yarnpkg.com/printf/-/printf-0.2.5.tgz#c438ca2ca33e3927671db4ab69c0e52f936a4f0f" -private@^0.1.6, private@^0.1.7, private@~0.1.5: +private@^0.1.6, private@^0.1.7, private@^0.1.8, private@~0.1.5: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" @@ -8511,13 +8548,13 @@ resolve@1.5.0: dependencies: path-parse "^1.0.5" -resolve@^1.1.2, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0: +resolve@^1.1.2, resolve@^1.1.4, resolve@^1.1.7: version "1.6.0" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c" dependencies: path-parse "^1.0.5" -resolve@^1.3.0: +resolve@^1.1.6, resolve@^1.3.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0: version "1.7.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3" dependencies: From c607ed4a49bcc5d2be1a8368a2bed528089d8c5f Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Sat, 2 Jun 2018 00:06:44 -0700 Subject: [PATCH 17/34] Update ember-cli-cjs-transform --- package.json | 2 +- tests/acceptance/run-now-test.js | 1 + yarn.lock | 25 +++++++++++++------------ 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index 551de49d..1549145e 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "ember-cli-babel": "^6.12.0", "ember-cli-bootstrap-sassy": "~0.5.8", "ember-cli-build-notifications": "~0.2.0", - "ember-cli-cjs-transform": "gaurav0/ember-cli-cjs-transform#json", + "ember-cli-cjs-transform": "^1.3.0", "ember-cli-code-coverage": "~0.3.12 ", "ember-cli-dependency-checker": "^2.1.0", "ember-cli-deploy": "^1.0.2", diff --git a/tests/acceptance/run-now-test.js b/tests/acceptance/run-now-test.js index cb8b7597..b998e8d4 100644 --- a/tests/acceptance/run-now-test.js +++ b/tests/acceptance/run-now-test.js @@ -26,6 +26,7 @@ test('Able to reload the Twiddle', function(assert) { assert.equal(outputPane().find('input').val(), 'new value'); click(".run-now"); + waitForUnloadedIFrame(); waitForLoadedIFrame(); }); diff --git a/yarn.lock b/yarn.lock index fb2a3666..a079beb3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12,9 +12,9 @@ dependencies: "@glimmer/di" "^0.2.0" -"@types/estree@0.0.38": - version "0.0.38" - resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2" +"@types/estree@0.0.39": + version "0.0.39" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" "@types/node@*": version "10.0.4" @@ -3031,9 +3031,9 @@ ember-cli-build-notifications@~0.2.0: ember-cli-babel "^5.0.0" node-notifier "^4.1.1" -ember-cli-cjs-transform@gaurav0/ember-cli-cjs-transform#json: - version "1.2.0" - resolved "https://codeload.github.com/gaurav0/ember-cli-cjs-transform/tar.gz/40fd8cccd1fb918508df8cd35a1924680a7fe864" +ember-cli-cjs-transform@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/ember-cli-cjs-transform/-/ember-cli-cjs-transform-1.3.0.tgz#73a24a9335067b83a4acac9c5fe4deb51a62391a" dependencies: broccoli-debug "^0.6.4" broccoli-plugin "^1.3.0" @@ -3041,7 +3041,8 @@ ember-cli-cjs-transform@gaurav0/ember-cli-cjs-transform#json: fs-extra "^5.0.0" hash-for-dep "^1.2.3" pkg-dir "^2.0.0" - rollup "^0.58.1" + resolve "^1.7.1" + rollup "^0.59.0" rollup-plugin-commonjs "^9.1.0" rollup-plugin-node-resolve "^3.3.0" username "^3.0.0" @@ -8554,7 +8555,7 @@ resolve@^1.1.2, resolve@^1.1.4, resolve@^1.1.7: dependencies: path-parse "^1.0.5" -resolve@^1.1.6, resolve@^1.3.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0: +resolve@^1.1.6, resolve@^1.3.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3" dependencies: @@ -8656,11 +8657,11 @@ rollup@^0.41.4: dependencies: source-map-support "^0.4.0" -rollup@^0.58.1: - version "0.58.2" - resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.58.2.tgz#2feddea8c0c022f3e74b35c48e3c21b3433803ce" +rollup@^0.59.0: + version "0.59.4" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.59.4.tgz#6f80f7017c22667ff1bf3e62adf8624a44cc44aa" dependencies: - "@types/estree" "0.0.38" + "@types/estree" "0.0.39" "@types/node" "*" route-recognizer@^0.2.3: From 3c9c056fec7232690439b1fef9a501e7b4327de7 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Sat, 2 Jun 2018 02:12:25 -0700 Subject: [PATCH 18/34] Support Ember 2.17 and 2.18 --- app/services/dependency-resolver.js | 4 ++-- blueprints/twiddle.json | 12 ++++++------ bower.json | 2 +- package.json | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/services/dependency-resolver.js b/app/services/dependency-resolver.js index fa7f6344..e5c860a8 100644 --- a/app/services/dependency-resolver.js +++ b/app/services/dependency-resolver.js @@ -5,8 +5,8 @@ import { task, timeout } from 'ember-concurrency'; const { computed, inject, RSVP, testing } = Ember; -const EMBER_VERSIONS = ['2.16.2', '2.15.3', '2.14.1', '2.13.0', '2.12.0', '2.11.2', '2.10.2', '2.9.1', '2.8.2', '2.7.3', '2.6.2', '2.5.1', '2.4.5', '2.3.2', '2.2.2', '2.1.2', '2.0.3', '1.13.13', '1.12.2']; -const EMBER_DATA_VERSIONS = ['2.16.3', '2.15.3', '2.14.10', '2.13.2', '2.12.2', '2.11.3', '2.10.0', '2.9.0', '2.8.1', '2.7.0', '2.6.2', '2.5.5', '2.4.3', '2.3.3', '2.2.1', '2.1.0', '2.0.1', '1.13.15']; +const EMBER_VERSIONS = ['2.18.2', '2.17.2', '2.16.2', '2.15.3', '2.14.1', '2.13.0', '2.12.0', '2.11.2', '2.10.2', '2.9.1', '2.8.2', '2.7.3', '2.6.2', '2.5.1', '2.4.5', '2.3.2', '2.2.2', '2.1.2', '2.0.3', '1.13.13', '1.12.2']; +const EMBER_DATA_VERSIONS = ['2.18.2', '2.17.1', '2.16.3', '2.15.3', '2.14.10', '2.13.2', '2.12.2', '2.11.3', '2.10.0', '2.9.0', '2.8.1', '2.7.0', '2.6.2', '2.5.5', '2.4.3', '2.3.3', '2.2.1', '2.1.0', '2.0.1', '1.13.15']; const VERSION_REGEX = /^\d+.\d+.\d+(-beta\.\d+)?$/; diff --git a/blueprints/twiddle.json b/blueprints/twiddle.json index ebfe6f1a..b903fdb6 100644 --- a/blueprints/twiddle.json +++ b/blueprints/twiddle.json @@ -1,5 +1,5 @@ { - "version": "0.13.1", + "version": "0.14.0", "EmberENV": { "FEATURES": {} }, @@ -8,12 +8,12 @@ "enable-testing": false }, "dependencies": { - "jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.js", - "ember": "2.16.2", - "ember-template-compiler": "2.16.2", - "ember-testing": "2.16.2" + "jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js", + "ember": "2.18.2", + "ember-template-compiler": "2.18.2", + "ember-testing": "2.18.2" }, "addons": { - "ember-data": "2.16.3" + "ember-data": "2.18.2" } } diff --git a/bower.json b/bower.json index 60e7caa3..2961129a 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "ember-twiddle", - "version": "0.13.1", + "version": "0.14.0", "dependencies": { "jquery": "1.11.3", "bootstrap-sass": "~3.3.5", diff --git a/package.json b/package.json index 1549145e..41837fbe 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-twiddle", - "version": "0.13.1", + "version": "0.14.0", "description": "https://ember-twiddle.com", "private": true, "directories": { From 45bb4ebef4b59bb89c10e0036d5529d2cef9b7af Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Mon, 4 Jun 2018 03:22:58 -0700 Subject: [PATCH 19/34] Fix ability to sign in via github --- app/routes/gist-base-route.js | 4 +++- app/routes/gist.js | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/routes/gist-base-route.js b/app/routes/gist-base-route.js index f4b97b31..d25b96aa 100644 --- a/app/routes/gist-base-route.js +++ b/app/routes/gist-base-route.js @@ -32,6 +32,8 @@ export default Ember.Route.extend({ showRevision() {}, showCurrentVersion() {}, - signInViaGithub() {} + signInViaGithub() { + this.send('signInWithGithub'); + } } }); diff --git a/app/routes/gist.js b/app/routes/gist.js index 21737742..5ca33dea 100644 --- a/app/routes/gist.js +++ b/app/routes/gist.js @@ -99,7 +99,7 @@ export default Ember.Route.extend({ }); }, - signInViaGithub() { + signInWithGithub() { this.session.open(this.get('toriiProvider')).catch(function(error) { if (alert) { alert('Could not sign you in: ' + error.message); From 5573411154a8944bc43e348c102ab4def12195b3 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Mon, 4 Jun 2018 04:00:15 -0700 Subject: [PATCH 20/34] v0.14.1 --- blueprints/twiddle.json | 2 +- bower.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blueprints/twiddle.json b/blueprints/twiddle.json index b903fdb6..6538c8fa 100644 --- a/blueprints/twiddle.json +++ b/blueprints/twiddle.json @@ -1,5 +1,5 @@ { - "version": "0.14.0", + "version": "0.14.1", "EmberENV": { "FEATURES": {} }, diff --git a/bower.json b/bower.json index 2961129a..cabf1c55 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "ember-twiddle", - "version": "0.14.0", + "version": "0.14.1", "dependencies": { "jquery": "1.11.3", "bootstrap-sass": "~3.3.5", diff --git a/package.json b/package.json index 41837fbe..580b3b89 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-twiddle", - "version": "0.14.0", + "version": "0.14.1", "description": "https://ember-twiddle.com", "private": true, "directories": { From e6f80aba0b7293ab7f24eeb5bf42779912450ca2 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Thu, 7 Jun 2018 13:39:02 -0400 Subject: [PATCH 21/34] yarn upgrade --- package.json | 2 +- testem.js | 10 + tests/test-helper.js | 2 +- yarn.lock | 1179 +++++++++++++++++++----------------------- 4 files changed, 540 insertions(+), 653 deletions(-) diff --git a/package.json b/package.json index 580b3b89..10770031 100644 --- a/package.json +++ b/package.json @@ -67,7 +67,7 @@ "ember-git-version": "~0.1.2", "ember-inflector": "~2.0.0", "ember-load": "~0.0.12", - "ember-load-initializers": "^1.0.0", + "ember-load-initializers": "~1.0.0", "ember-lodash": "^4.18.0", "ember-moment": "^7.6.0", "ember-notify": "^5.2.1", diff --git a/testem.js b/testem.js index e907cd62..d00b4d5e 100644 --- a/testem.js +++ b/testem.js @@ -9,6 +9,16 @@ let options = { ] }; +// I need this on Ubuntu Linux 16.04 LTS due to bugs +if (process.env.TESTEM_CHROME_NO_SANDBOX) { + options.browser_args = { + Chrome: [ + '--no-sandbox', + '--disable-gpu' + ] + }; +} + if (process.env.TRAVIS) { options.browser_args = { Chrome: [ diff --git a/tests/test-helper.js b/tests/test-helper.js index 2ff16b8d..8cbb085a 100644 --- a/tests/test-helper.js +++ b/tests/test-helper.js @@ -20,7 +20,7 @@ Ember.Test.registerHelper('outputPane', function(app) { Ember.Test.registerHelper('outputContents', function(app, selector) { let output = app.testHelpers.outputPane(); - return output.find(selector).text().trim(); + return output.document.querySelector(selector).textContent.trim(); }); Ember.Test.registerHelper('createGist', createGist); diff --git a/yarn.lock b/yarn.lock index a079beb3..a2f5ac2a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17,12 +17,12 @@ resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" "@types/node@*": - version "10.0.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.0.4.tgz#130598ee56e9a1210a53f557d64935571f05390d" + version "10.3.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.1.tgz#51092fbacaed768a122a293814474fbf6e5e8b6d" JSONStream@^1.0.3: - version "1.3.2" - resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.2.tgz#c102371b6ec3a7cf3b847ca00c20bb0fce4c6dea" + version "1.3.3" + resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.3.tgz#27b4b8fbbfeab4e71bcf551e7f27be8d952239bf" dependencies: jsonparse "^1.2.0" through ">=2.2.7 <3" @@ -77,21 +77,14 @@ acorn@^4.0.3: resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" acorn@^5.2.1, acorn@^5.4.1, acorn@^5.5.0: - version "5.5.3" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9" + version "5.6.2" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.6.2.tgz#b1da1d7be2ac1b4a327fb9eab851702c5045b4e7" after@0.8.1: version "0.8.1" resolved "https://registry.yarnpkg.com/after/-/after-0.8.1.tgz#ab5d4fb883f596816d3515f8f791c0af486dd627" -agent-base@2, agent-base@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-2.1.1.tgz#d6de10d5af6132d5bd692427d46fc538539094c7" - dependencies: - extend "~3.0.0" - semver "~5.0.1" - -agent-base@^4.1.0, agent-base@^4.2.0: +agent-base@4, agent-base@^4.1.0, agent-base@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.0.tgz#9838b5c3392b962bad031e6a4c5e1024abec45ce" dependencies: @@ -101,13 +94,6 @@ ajv-keywords@^2.1.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-2.1.1.tgz#617997fc5f60576894c435f940d819e135b80762" -ajv@^4.9.1: - version "4.11.8" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" - dependencies: - co "^4.6.0" - json-stable-stringify "^1.0.1" - ajv@^5.1.0, ajv@^5.2.3, ajv@^5.3.0: version "5.5.2" resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965" @@ -143,6 +129,12 @@ amd-name-resolver@1.0.0: dependencies: ensure-posix-path "^1.0.1" +amd-name-resolver@1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.2.0.tgz#fc41b3848824b557313897d71f8d5a0184fbe679" + dependencies: + ensure-posix-path "^1.0.1" + amdefine@>=0.0.4: version "1.0.1" resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5" @@ -155,10 +147,6 @@ ansi-escapes@^3.0.0: version "3.1.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30" -ansi-regex@^0.2.0, ansi-regex@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9" - ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -167,10 +155,6 @@ ansi-regex@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" -ansi-styles@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de" - ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -245,8 +229,8 @@ are-we-there-yet@~1.0.0: readable-stream "^2.0.0 || ^1.1.13" are-we-there-yet@~1.1.2: - version "1.1.4" - resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.4.tgz#bb5dca382bb94f05e15194373d16fd3ba1ca110d" + version "1.1.5" + resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21" dependencies: delegates "^1.0.0" readable-stream "^2.0.6" @@ -393,8 +377,8 @@ ast-types@0.9.6: resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.6.tgz#102c9e9e9005d3e7e3829bf0c4fa24ee862ee9b9" ast-types@0.x.x: - version "0.11.3" - resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.3.tgz#c20757fe72ee71278ea0ff3d87e5c2ca30d9edf8" + version "0.11.5" + resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.11.5.tgz#9890825d660c03c28339f315e9fa0a360e31ec28" astw@^2.0.0: version "2.2.0" @@ -440,10 +424,10 @@ async@1.x, async@^1.4.0, async@^1.5.2: resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a" async@^2.0.1, async@^2.4.1: - version "2.6.0" - resolved "https://registry.yarnpkg.com/async/-/async-2.6.0.tgz#61a29abb6fcc026fea77e56d1c6ec53a795951f4" + version "2.6.1" + resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610" dependencies: - lodash "^4.14.0" + lodash "^4.17.10" async@~0.2.9: version "0.2.10" @@ -453,13 +437,13 @@ asynckit@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79" -atob@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.0.tgz#ab2b150e51d7b122b9efc8d7340c06b6c41076bc" +atob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.1.tgz#ae2d5a729477f289d60dd7f96a6314a22dd6c22a" aws-sdk@^2.1.48, aws-sdk@^2.6.12: - version "2.220.1" - resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.220.1.tgz#7b56a253309c1f741693b3cba639310dcea22240" + version "2.252.1" + resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.252.1.tgz#4ce45b16dc408883e20a564bd86270c67f25bb60" dependencies: buffer "4.9.1" events "1.1.1" @@ -470,7 +454,6 @@ aws-sdk@^2.1.48, aws-sdk@^2.6.12: url "0.10.3" uuid "3.1.0" xml2js "0.4.17" - xmlbuilder "4.2.1" aws-sign2@~0.6.0: version "0.6.0" @@ -481,8 +464,8 @@ aws-sign2@~0.7.0: resolved "https://registry.yarnpkg.com/aws-sign2/-/aws-sign2-0.7.0.tgz#b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8" aws4@^1.2.1, aws4@^1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.6.0.tgz#83ef5ca860b2b32e4a0deedee8c771b9db57471e" + version "1.7.0" + resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.7.0.tgz#d4d0e9b9dbfca77bf08eeb0a8a471550fe39e289" babel-code-frame@^6.22.0, babel-code-frame@^6.26.0: version "6.26.0" @@ -543,7 +526,7 @@ babel-core@^5.0.0, babel-core@^5.8.38: trim-right "^1.0.0" try-resolve "^1.0.0" -babel-core@^6.14.0, babel-core@^6.26.0: +babel-core@^6.24.1, babel-core@^6.26.0: version "6.26.3" resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.3.tgz#b2e2f09e342d0f0c88e2f02e067794125e75c207" dependencies: @@ -567,30 +550,6 @@ babel-core@^6.14.0, babel-core@^6.26.0: slash "^1.0.0" source-map "^0.5.7" -babel-core@^6.24.1: - version "6.26.0" - resolved "https://registry.yarnpkg.com/babel-core/-/babel-core-6.26.0.tgz#af32f78b31a6fcef119c87b0fd8d9753f03a0bb8" - dependencies: - babel-code-frame "^6.26.0" - babel-generator "^6.26.0" - babel-helpers "^6.24.1" - babel-messages "^6.23.0" - babel-register "^6.26.0" - babel-runtime "^6.26.0" - babel-template "^6.26.0" - babel-traverse "^6.26.0" - babel-types "^6.26.0" - babylon "^6.18.0" - convert-source-map "^1.5.0" - debug "^2.6.8" - json5 "^0.5.1" - lodash "^4.17.4" - minimatch "^3.0.4" - path-is-absolute "^1.0.1" - private "^0.1.7" - slash "^1.0.0" - source-map "^0.5.6" - babel-generator@^6.26.0: version "6.26.1" resolved "https://registry.yarnpkg.com/babel-generator/-/babel-generator-6.26.1.tgz#1844408d3b8f0d35a404ea7ac180f087a601bd90" @@ -755,9 +714,9 @@ babel-plugin-filter-imports@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/babel-plugin-filter-imports/-/babel-plugin-filter-imports-0.3.1.tgz#e7859b56886b175dd2616425d277b219e209ea8b" -babel-plugin-htmlbars-inline-precompile@^0.2.3: - version "0.2.4" - resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-0.2.4.tgz#54b48168432bbc03f1f26f2e9090cb222bc78c75" +babel-plugin-htmlbars-inline-precompile@^0.2.5: + version "0.2.5" + resolved "https://registry.yarnpkg.com/babel-plugin-htmlbars-inline-precompile/-/babel-plugin-htmlbars-inline-precompile-0.2.5.tgz#7a7c37cf22c73fb57a1f828c76520f0360c5c5f3" babel-plugin-inline-environment-variables@^1.0.1: version "1.0.1" @@ -1020,7 +979,7 @@ babel-plugin-undefined-to-void@^1.1.6: version "1.1.6" resolved "https://registry.yarnpkg.com/babel-plugin-undefined-to-void/-/babel-plugin-undefined-to-void-1.1.6.tgz#7f578ef8b78dfae6003385d8417a61eda06e2f81" -babel-polyfill@^6.16.0: +babel-polyfill@^6.26.0: version "6.26.0" resolved "https://registry.yarnpkg.com/babel-polyfill/-/babel-polyfill-6.26.0.tgz#379937abc67d7895970adc621f284cd966cf2153" dependencies: @@ -1028,9 +987,9 @@ babel-polyfill@^6.16.0: core-js "^2.5.0" regenerator-runtime "^0.10.5" -babel-preset-env@^1.5.1: - version "1.6.1" - resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.1.tgz#a18b564cc9b9afdf4aae57ae3c1b0d99188e6f48" +babel-preset-env@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a" dependencies: babel-plugin-check-es2015-constants "^6.22.0" babel-plugin-syntax-trailing-function-commas "^6.22.0" @@ -1059,7 +1018,7 @@ babel-preset-env@^1.5.1: babel-plugin-transform-es2015-unicode-regex "^6.22.0" babel-plugin-transform-exponentiation-operator "^6.22.0" babel-plugin-transform-regenerator "^6.22.0" - browserslist "^2.1.2" + browserslist "^3.2.6" invariant "^2.2.2" semver "^5.3.0" @@ -1161,8 +1120,8 @@ base64-arraybuffer@0.1.5: resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz#73926771923b5a19747ad666aa5cd4bf9c6e9ce8" base64-js@^1.0.2: - version "1.2.3" - resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.3.tgz#fb13668233d9614cf5fb4bce95a9ba4096cdf801" + version "1.3.0" + resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3" base64id@0.1.0: version "0.1.0" @@ -1244,7 +1203,7 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0: version "4.11.8" resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f" -body-parser@1.18.2, body-parser@^1.15.0: +body-parser@1.18.2: version "1.18.2" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.2.tgz#87678a19d84b47d859b83199bd59bce222b10454" dependencies: @@ -1259,6 +1218,21 @@ body-parser@1.18.2, body-parser@^1.15.0: raw-body "2.3.2" type-is "~1.6.15" +body-parser@^1.15.0: + version "1.18.3" + resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4" + dependencies: + bytes "3.0.0" + content-type "~1.0.4" + debug "2.6.9" + depd "~1.1.2" + http-errors "~1.6.3" + iconv-lite "0.4.23" + on-finished "~2.3.0" + qs "6.5.2" + raw-body "2.3.3" + type-is "~1.6.16" + body@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/body/-/body-5.1.0.tgz#e4ba0ce410a46936323367609ecb4e6553125069" @@ -1274,18 +1248,6 @@ boom@2.x.x: dependencies: hoek "2.x.x" -boom@4.x.x: - version "4.3.1" - resolved "https://registry.yarnpkg.com/boom/-/boom-4.3.1.tgz#4f8a3005cb4a7e3889f749030fd25b96e01d2e31" - dependencies: - hoek "4.x.x" - -boom@5.x.x: - version "5.2.0" - resolved "https://registry.yarnpkg.com/boom/-/boom-5.2.0.tgz#5dd9da6ee3a5f302077436290cb717d3f4a54e02" - dependencies: - hoek "4.x.x" - bootstrap-sass@^3.0.0: version "3.3.7" resolved "https://registry.yarnpkg.com/bootstrap-sass/-/bootstrap-sass-3.3.7.tgz#6596c7ab40f6637393323ab0bc80d064fc630498" @@ -1320,16 +1282,14 @@ braces@^1.8.2: repeat-element "^1.1.2" braces@^2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.1.tgz#7086c913b4e5a08dbe37ac0ee6a2500c4ba691bb" + version "2.3.2" + resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729" dependencies: arr-flatten "^1.1.0" array-unique "^0.3.2" - define-property "^1.0.0" extend-shallow "^2.0.1" fill-range "^4.0.0" isobject "^3.0.1" - kind-of "^6.0.2" repeat-element "^1.1.2" snapdragon "^0.8.1" snapdragon-node "^2.0.1" @@ -1372,19 +1332,19 @@ broccoli-babel-transpiler@^5.6.2: rsvp "^3.5.0" workerpool "^2.3.0" -broccoli-babel-transpiler@^6.0.0, broccoli-babel-transpiler@^6.1.2, broccoli-babel-transpiler@^6.1.4: - version "6.1.4" - resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.1.4.tgz#8be8074c42abf2e17ff79b2d2a21df5c51143c82" +broccoli-babel-transpiler@^6.0.0, broccoli-babel-transpiler@^6.1.4, broccoli-babel-transpiler@^6.4.2: + version "6.4.3" + resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.4.3.tgz#06e399298d41700cdc10d675b1d808a89ef6b2d0" dependencies: - babel-core "^6.14.0" - broccoli-funnel "^1.0.0" - broccoli-merge-trees "^1.0.0" - broccoli-persistent-filter "^1.4.0" + babel-core "^6.26.0" + broccoli-funnel "^2.0.1" + broccoli-merge-trees "^2.0.0" + broccoli-persistent-filter "^1.4.3" clone "^2.0.0" - hash-for-dep "^1.0.2" + hash-for-dep "^1.2.3" heimdalljs-logger "^0.1.7" json-stable-stringify "^1.0.0" - rsvp "^3.5.0" + rsvp "^4.8.2" workerpool "^2.3.0" broccoli-brocfile-loader@^0.18.0: @@ -1394,9 +1354,10 @@ broccoli-brocfile-loader@^0.18.0: findup-sync "^0.4.2" broccoli-builder@^0.18.8: - version "0.18.11" - resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.11.tgz#a42393c7b10bb0380df255a616307945f5e26efb" + version "0.18.14" + resolved "https://registry.yarnpkg.com/broccoli-builder/-/broccoli-builder-0.18.14.tgz#4b79e2f844de11a4e1b816c3f49c6df4776c312d" dependencies: + broccoli-node-info "^1.1.0" heimdalljs "^0.2.0" promise-map-series "^0.2.1" quick-temp "^0.1.2" @@ -1491,18 +1452,7 @@ broccoli-debug@^0.6.1, broccoli-debug@^0.6.2, broccoli-debug@^0.6.3, broccoli-de symlink-or-copy "^1.1.8" tree-sync "^1.2.2" -broccoli-file-creator@^1.0.0, broccoli-file-creator@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-1.1.1.tgz#1b35b67d215abdfadd8d49eeb69493c39e6c3450" - dependencies: - broccoli-kitchen-sink-helpers "~0.2.0" - broccoli-plugin "^1.1.0" - broccoli-writer "~0.1.1" - mkdirp "^0.5.1" - rsvp "~3.0.6" - symlink-or-copy "^1.0.1" - -broccoli-file-creator@^1.1.1: +broccoli-file-creator@^1.0.0, broccoli-file-creator@^1.1.0, broccoli-file-creator@^1.1.1: version "1.2.0" resolved "https://registry.yarnpkg.com/broccoli-file-creator/-/broccoli-file-creator-1.2.0.tgz#27f1b25b1b00e7bb7bf3d5d7abed5f4d5388df4d" dependencies: @@ -1564,7 +1514,7 @@ broccoli-funnel@^2.0.0, broccoli-funnel@^2.0.1: symlink-or-copy "^1.0.0" walk-sync "^0.3.1" -broccoli-kitchen-sink-helpers@^0.2.5, broccoli-kitchen-sink-helpers@~0.2.0: +broccoli-kitchen-sink-helpers@^0.2.5: version "0.2.9" resolved "https://registry.yarnpkg.com/broccoli-kitchen-sink-helpers/-/broccoli-kitchen-sink-helpers-0.2.9.tgz#a5e0986ed8d76fb5984b68c3f0450d3a96e36ecc" dependencies: @@ -1630,7 +1580,11 @@ broccoli-module-alchemist-install@^0.1.6: dependencies: debug "^2.2.0" -broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0, broccoli-persistent-filter@^1.4.0, broccoli-persistent-filter@^1.4.2, broccoli-persistent-filter@^1.4.3: +broccoli-node-info@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-1.1.0.tgz#3aa2e31e07e5bdb516dd25214f7c45ba1c459412" + +broccoli-persistent-filter@^1.0.3, broccoli-persistent-filter@^1.1.5, broccoli-persistent-filter@^1.1.6, broccoli-persistent-filter@^1.2.0, broccoli-persistent-filter@^1.4.2, broccoli-persistent-filter@^1.4.3: version "1.4.3" resolved "https://registry.yarnpkg.com/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.3.tgz#3511bc52fc53740cda51621f58a28152d9911bc1" dependencies: @@ -1748,8 +1702,8 @@ broccoli-string-replace@^0.1.1: minimatch "^3.0.3" broccoli-uglify-sourcemap@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-2.1.1.tgz#33005537e18a322a181a5aea3e46d145b3355630" + version "2.2.0" + resolved "https://registry.yarnpkg.com/broccoli-uglify-sourcemap/-/broccoli-uglify-sourcemap-2.2.0.tgz#2ff49389bdf342a550c3596750ba2dde95a8f7d4" dependencies: async-promise-queue "^1.0.4" broccoli-plugin "^1.2.1" @@ -1759,7 +1713,7 @@ broccoli-uglify-sourcemap@^2.1.1: mkdirp "^0.5.0" source-map-url "^0.4.0" symlink-or-copy "^1.0.1" - uglify-es "^3.1.3" + terser "^3.7.5" walk-sync "^0.3.2" workerpool "^2.3.0" @@ -1769,13 +1723,6 @@ broccoli-unwatched-tree@^0.1.1: dependencies: broccoli-source "^1.1.0" -broccoli-writer@~0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/broccoli-writer/-/broccoli-writer-0.1.1.tgz#d4d71aa8f2afbc67a3866b91a2da79084b96ab2d" - dependencies: - quick-temp "^0.1.0" - rsvp "^3.0.6" - brorand@^1.0.1: version "1.1.0" resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f" @@ -1809,16 +1756,16 @@ browserify-aes@^1.0.0, browserify-aes@^1.0.4: safe-buffer "^5.0.1" browserify-cipher@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.0.tgz#9988244874bf5ed4e28da95666dcd66ac8fc363a" + version "1.0.1" + resolved "https://registry.yarnpkg.com/browserify-cipher/-/browserify-cipher-1.0.1.tgz#8d6474c1b870bfdabcd3bcfcc1934a10e94f15f0" dependencies: browserify-aes "^1.0.4" browserify-des "^1.0.0" evp_bytestokey "^1.0.0" browserify-des@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.0.tgz#daa277717470922ed2fe18594118a175439721dd" + version "1.0.1" + resolved "https://registry.yarnpkg.com/browserify-des/-/browserify-des-1.0.1.tgz#3343124db6d7ad53e26a8826318712bdc8450f9c" dependencies: cipher-base "^1.0.1" des.js "^1.0.0" @@ -1858,8 +1805,8 @@ browserify-zlib@~0.2.0: pako "~1.0.5" browserify@^16.2.0: - version "16.2.0" - resolved "https://registry.yarnpkg.com/browserify/-/browserify-16.2.0.tgz#04ba47c4150555532978453818160666aa3bd8a7" + version "16.2.2" + resolved "https://registry.yarnpkg.com/browserify/-/browserify-16.2.2.tgz#4b1f66ba0e54fa39dbc5aa4be9629142143d91b0" dependencies: JSONStream "^1.0.3" assert "^1.4.0" @@ -1910,19 +1857,12 @@ browserify@^16.2.0: vm-browserify "^1.0.0" xtend "^4.0.0" -browserslist@^2.1.2: - version "2.11.3" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2" - dependencies: - caniuse-lite "^1.0.30000792" - electron-to-chromium "^1.3.30" - -browserslist@^3.1.1: - version "3.2.4" - resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.4.tgz#fb9ad70fd09875137ae943a31ab815ed76896031" +browserslist@^3.1.1, browserslist@^3.2.6: + version "3.2.8" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6" dependencies: - caniuse-lite "^1.0.30000821" - electron-to-chromium "^1.3.41" + caniuse-lite "^1.0.30000844" + electron-to-chromium "^1.3.47" bser@^2.0.0: version "2.0.0" @@ -1935,8 +1875,8 @@ buffer-es6@^4.9.2: resolved "https://registry.yarnpkg.com/buffer-es6/-/buffer-es6-4.9.3.tgz#f26347b82df76fd37e18bcb5288c4970cfd5c404" buffer-from@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531" + version "1.1.0" + resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04" buffer-xor@^1.0.3: version "1.0.3" @@ -2048,15 +1988,11 @@ can-symlink@^1.0.0: dependencies: tmp "0.0.28" -caniuse-lite@^1.0.30000792: - version "1.0.30000835" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000835.tgz#517c4d3807a8527b0cbce1d84c85d4487f877268" - -caniuse-lite@^1.0.30000821: - version "1.0.30000828" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000828.tgz#048f98de213f7a3c047bf78a9523c611855d4fdd" +caniuse-lite@^1.0.30000844: + version "1.0.30000850" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000850.tgz#e68a88db4ea598b4c33b8419f7385473e4802495" -capture-exit@^1.1.0: +capture-exit@^1.1.0, capture-exit@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/capture-exit/-/capture-exit-1.2.0.tgz#1c5fcc489fd0ab00d4f1ac7ae1072e3173fbab6f" dependencies: @@ -2084,16 +2020,6 @@ center-align@^0.1.1: align-text "^0.1.3" lazy-cache "^1.0.3" -chalk@^0.5.1: - version "0.5.1" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-0.5.1.tgz#663b3a648b68b55d04690d49167aa837858f2174" - dependencies: - ansi-styles "^1.1.0" - escape-string-regexp "^1.0.0" - has-ansi "^0.1.0" - strip-ansi "^0.3.0" - supports-color "^0.2.0" - chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98" @@ -2104,15 +2030,7 @@ chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.3.2.tgz#250dc96b07491bfd601e648d66ddf5f60c7a5c65" - dependencies: - ansi-styles "^3.2.1" - escape-string-regexp "^1.0.5" - supports-color "^5.3.0" - -chalk@^2.3.1: +chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.3.1: version "2.4.1" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e" dependencies: @@ -2289,9 +2207,9 @@ coffee-script@^1.10.0: version "1.12.7" resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53" -coffee-script@~1.7.1: - version "1.7.1" - resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.7.1.tgz#62996a861780c75e6d5069d13822723b73404bfc" +coffeescript@~1.8.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/coffeescript/-/coffeescript-1.8.0.tgz#4c503e2dbdf268aee33fdd34cb259d53ff963518" dependencies: mkdirp "~0.3.5" @@ -2317,8 +2235,8 @@ colors@1.0.3: resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" colors@^1.1.2: - version "1.2.1" - resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.1.tgz#f4a3d302976aaf042356ba1ade3b1a2c62d9d794" + version "1.3.0" + resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.0.tgz#5f20c9fef6945cb1134260aab33bfbdc8295e04e" columnify@~1.5.4: version "1.5.4" @@ -2356,9 +2274,9 @@ commander@^2.5.0, commander@^2.6.0, commander@^2.9.0: version "2.15.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" -commander@~2.13.0: - version "2.13.0" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" +commander@~2.14.1: + version "2.14.1" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" commoner@~0.10.3: version "0.10.8" @@ -2386,19 +2304,15 @@ component-emitter@1.2.1, component-emitter@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.2.1.tgz#137918d6d78283f7df7a6b7c5a63e140e69425e6" -component-indexof@0.0.3: - version "0.0.3" - resolved "https://registry.yarnpkg.com/component-indexof/-/component-indexof-0.0.3.tgz#11d091312239eb8f32c8f25ae9cb002ffe8d3c24" - component-inherit@0.0.3: version "0.0.3" resolved "https://registry.yarnpkg.com/component-inherit/-/component-inherit-0.0.3.tgz#645fc4adf58b72b649d5cae65135619db26ff143" compressible@~2.0.13: - version "2.0.13" - resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.13.tgz#0d1020ab924b2fdb4d6279875c7d6daba6baa7a9" + version "2.0.14" + resolved "https://registry.yarnpkg.com/compressible/-/compressible-2.0.14.tgz#326c5f507fbb055f54116782b969a81b67a29da7" dependencies: - mime-db ">= 1.33.0 < 2" + mime-db ">= 1.34.0 < 2" compression@^1.4.4: version "1.7.2" @@ -2416,15 +2330,7 @@ concat-map@0.0.1: version "0.0.1" resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b" -concat-stream@1.6.0: - version "1.6.0" - resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.0.tgz#0aac662fd52be78964d5532f694784e70110acf7" - dependencies: - inherits "^2.0.3" - readable-stream "^2.2.2" - typedarray "^0.0.6" - -concat-stream@^1.4.4, concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0: +concat-stream@1.6.2, concat-stream@^1.4.4, concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0: version "1.6.2" resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34" dependencies: @@ -2494,7 +2400,7 @@ continuable-cache@^0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f" -convert-source-map@^1.1.0, convert-source-map@^1.5.0, convert-source-map@^1.5.1: +convert-source-map@^1.1.0, convert-source-map@^1.5.1: version "1.5.1" resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5" @@ -2523,8 +2429,8 @@ core-js@^1.0.0: resolved "https://registry.yarnpkg.com/core-js/-/core-js-1.2.7.tgz#652294c14651db28fa93bd2d5ff2983a4f08c636" core-js@^2.4.0, core-js@^2.5.0: - version "2.5.6" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.6.tgz#0fe6d45bf3cac3ac364a9d72de7576f4eb221b9d" + version "2.5.7" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e" core-object@2.0.6: version "2.0.6" @@ -2553,24 +2459,25 @@ core-util-is@1.0.2, core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" create-ecdh@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.0.tgz#888c723596cdf7612f6498233eebd7a35301737d" + version "4.0.3" + resolved "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz#c9111b6f33045c4697f144787f9254cdc77c45ff" dependencies: bn.js "^4.1.0" elliptic "^6.0.0" create-hash@^1.1.0, create-hash@^1.1.2: - version "1.1.3" - resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.1.3.tgz#606042ac8b9262750f483caddab0f5819172d8fd" + version "1.2.0" + resolved "https://registry.yarnpkg.com/create-hash/-/create-hash-1.2.0.tgz#889078af11a63756bcfb59bd221996be3a9ef196" dependencies: cipher-base "^1.0.1" inherits "^2.0.1" - ripemd160 "^2.0.0" + md5.js "^1.3.4" + ripemd160 "^2.0.1" sha.js "^2.4.0" create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4: - version "1.1.6" - resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.6.tgz#acb9e221a4e17bdb076e90657c42b93e3726cf06" + version "1.1.7" + resolved "https://registry.yarnpkg.com/create-hmac/-/create-hmac-1.1.7.tgz#69170c78b3ab957147b2b8b04572e47ead2243ff" dependencies: cipher-base "^1.0.3" create-hash "^1.1.0" @@ -2600,12 +2507,6 @@ cryptiles@2.x.x: dependencies: boom "2.x.x" -cryptiles@3.x.x: - version "3.1.2" - resolved "https://registry.yarnpkg.com/cryptiles/-/cryptiles-3.1.2.tgz#a89fbb220f5ce25ec56e8c4aa8a4fd7b5b0d29fe" - dependencies: - boom "5.x.x" - crypto-browserify@^3.0.0, crypto-browserify@^3.11.0: version "3.12.0" resolved "https://registry.yarnpkg.com/crypto-browserify/-/crypto-browserify-3.12.0.tgz#396cf9f3137f03e4b8e532c58f698254e00f80ec" @@ -2662,7 +2563,7 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" -debug@2, debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.4.0, debug@^2.6.8, debug@^2.6.9: +debug@2, debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.4.0, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" dependencies: @@ -2680,7 +2581,7 @@ debug@2.3.3: dependencies: ms "0.7.2" -debug@^3.0.0, debug@^3.1.0: +debug@3.1.0, debug@^3.0.0, debug@^3.1.0: version "3.1.0" resolved "https://registry.yarnpkg.com/debug/-/debug-3.1.0.tgz#5bb5a0672628b64149566ba16819e61518c67261" dependencies: @@ -2702,9 +2603,9 @@ dedent@~0.7.0: version "0.7.0" resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" -deep-extend@~0.4.0: - version "0.4.2" - resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.4.2.tgz#48b699c27e334bf89f10892be432f6e4c7d34a7f" +deep-extend@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac" deep-is@~0.1.3: version "0.1.3" @@ -2840,6 +2741,10 @@ detect-indent@^4.0.0: dependencies: repeating "^2.0.0" +detect-indent@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-5.0.0.tgz#3871cc0a6a002e8c3e5b3cf7f336264675f06b9d" + detect-libc@^1.0.2: version "1.0.3" resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b" @@ -2871,8 +2776,8 @@ diff@^3.2.0: resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12" diffie-hellman@^5.0.0: - version "5.0.2" - resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.2.tgz#b5835739270cfe26acf632099fded2a07f209e5e" + version "5.0.3" + resolved "https://registry.yarnpkg.com/diffie-hellman/-/diffie-hellman-5.0.3.tgz#40e8ee98f55a2149607146921c63e1ae5f3d2875" dependencies: bn.js "^4.1.0" miller-rabin "^4.0.0" @@ -2928,13 +2833,9 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" -electron-to-chromium@^1.3.30: - version "1.3.45" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.45.tgz#458ac1b1c5c760ce8811a16d2bfbd97ec30bafb8" - -electron-to-chromium@^1.3.41: - version "1.3.42" - resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.42.tgz#95c33bf01d0cc405556aec899fe61fd4d76ea0f9" +electron-to-chromium@^1.3.47: + version "1.3.48" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz#d3b0d8593814044e092ece2108fc3ac9aea4b900" elliptic@^6.0.0: version "6.4.0" @@ -2969,11 +2870,11 @@ ember-autoresize@~0.6.1: ember-cli-node-assets "^0.2.2" ember-cli-app-version@^3.0.0: - version "3.1.3" - resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-3.1.3.tgz#26d25f5e653ff0106f0b39da6d75518ba8ed282d" + version "3.2.0" + resolved "https://registry.yarnpkg.com/ember-cli-app-version/-/ember-cli-app-version-3.2.0.tgz#7b9ad0e1b63ae0518648356ee24c703e922bc26e" dependencies: - ember-cli-babel "^6.8.0" - git-repo-version "^1.0.0" + ember-cli-babel "^6.12.0" + git-repo-version "^1.0.2" ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cli-babel@^5.1.7, ember-cli-babel@^5.2.1: version "5.2.8" @@ -2985,23 +2886,23 @@ ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.5, ember-cli-babel@^5.1.6, ember-cl ember-cli-version-checker "^1.0.2" resolve "^1.1.2" -ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.0: - version "6.12.0" - resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.12.0.tgz#3adcdbe1278da1fcd0b9038f1360cb4ac5d4414c" +ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.1.0, ember-cli-babel@^6.10.0, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.3.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.7.2, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2, ember-cli-babel@^6.9.0: + version "6.14.1" + resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.14.1.tgz#796339229035910b625593caffbc2683792ada68" dependencies: - amd-name-resolver "0.0.7" + amd-name-resolver "1.2.0" babel-plugin-debug-macros "^0.1.11" babel-plugin-ember-modules-api-polyfill "^2.3.0" babel-plugin-transform-es2015-modules-amd "^6.24.0" - babel-polyfill "^6.16.0" - babel-preset-env "^1.5.1" - broccoli-babel-transpiler "^6.1.2" - broccoli-debug "^0.6.2" - broccoli-funnel "^1.0.0" + babel-polyfill "^6.26.0" + babel-preset-env "^1.7.0" + broccoli-babel-transpiler "^6.4.2" + broccoli-debug "^0.6.4" + broccoli-funnel "^2.0.0" broccoli-source "^1.1.0" clone "^2.0.0" - ember-cli-version-checker "^2.1.0" - semver "^5.4.1" + ember-cli-version-checker "^2.1.2" + semver "^5.5.0" ember-cli-bootstrap-sassy@~0.5.8: version "0.5.8" @@ -3069,10 +2970,11 @@ ember-cli-cjs-transform@^1.3.0: string.prototype.startswith "^0.2.0" ember-cli-dependency-checker@^2.1.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-2.1.0.tgz#9d66286a7c778e94733eaf21320d129c4fd0dd64" + version "2.1.1" + resolved "https://registry.yarnpkg.com/ember-cli-dependency-checker/-/ember-cli-dependency-checker-2.1.1.tgz#0421f9ca53fe8b237a53575be7dbe36e88ac83a6" dependencies: - chalk "^1.1.3" + chalk "^2.3.0" + find-yarn-workspace-root "^1.1.0" is-git-url "^1.0.0" resolve "^1.5.0" semver "^5.3.0" @@ -3163,28 +3065,28 @@ ember-cli-deploy-s3-pack@^1.0.0-beta.2: ember-cli-deploy-s3-index "^1.0.0" ember-cli-deploy-s3@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/ember-cli-deploy-s3/-/ember-cli-deploy-s3-1.2.0.tgz#7e9e9621da4157fdcf09a2d56c42c61ef6b1f2e4" + version "1.3.0" + resolved "https://registry.yarnpkg.com/ember-cli-deploy-s3/-/ember-cli-deploy-s3-1.3.0.tgz#d93537034af257713fb213d1e828ab964cc0f95f" dependencies: aws-sdk "^2.6.12" chalk "^1.0.0" core-object "^2.0.0" ember-cli-deploy-plugin "^0.2.2" lodash "^4.17.4" - mime "^1.3.4" + mime "^2.3.1" minimatch "^3.0.3" proxy-agent "^2.0.0" rsvp "^3.5.0" ember-cli-deploy-slack@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/ember-cli-deploy-slack/-/ember-cli-deploy-slack-1.0.0.tgz#b7449ffa2c568bbed0db0a9afc99274af01f749e" + version "1.0.1" + resolved "https://registry.yarnpkg.com/ember-cli-deploy-slack/-/ember-cli-deploy-slack-1.0.1.tgz#9dba64b6362c720529bb832d4e58f44e5417427c" dependencies: chalk "^1.0.0" core-object "^2.0.0" ember-cli-deploy-plugin "^0.2.3" moment "^2.17.1" - node-slackr "^0.1.0" + node-slackr "^0.2.0" rsvp "^3.5.0" silent-error "^1.0.0" @@ -3254,13 +3156,13 @@ ember-cli-get-dependency-depth@^1.0.0: resolved "https://registry.yarnpkg.com/ember-cli-get-dependency-depth/-/ember-cli-get-dependency-depth-1.0.0.tgz#e0afecf82a2d52f00f28ab468295281aec368d11" ember-cli-htmlbars-inline-precompile@^1.0.0: - version "1.0.2" - resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-1.0.2.tgz#5b544f664d5d9911f08cd979c5f70d8cb0ca2add" + version "1.0.3" + resolved "https://registry.yarnpkg.com/ember-cli-htmlbars-inline-precompile/-/ember-cli-htmlbars-inline-precompile-1.0.3.tgz#332ff96c06fc522965162f1090d78a615379c3c2" dependencies: - babel-plugin-htmlbars-inline-precompile "^0.2.3" - ember-cli-version-checker "^2.0.0" - hash-for-dep "^1.0.2" - heimdalljs-logger "^0.1.7" + babel-plugin-htmlbars-inline-precompile "^0.2.5" + ember-cli-version-checker "^2.1.2" + hash-for-dep "^1.2.3" + heimdalljs-logger "^0.1.9" silent-error "^1.1.0" ember-cli-htmlbars@^1.0.3: @@ -3352,8 +3254,8 @@ ember-cli-lodash-subset@^1.0.7: resolved "https://registry.yarnpkg.com/ember-cli-lodash-subset/-/ember-cli-lodash-subset-1.0.12.tgz#af2e77eba5dcb0d77f3308d3a6fd7d3450f6e537" ember-cli-mirage@~0.4.4: - version "0.4.4" - resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.4.4.tgz#cd11160df63e9972540d8da55dc30ef2aa281693" + version "0.4.7" + resolved "https://registry.yarnpkg.com/ember-cli-mirage/-/ember-cli-mirage-0.4.7.tgz#aa7cf2d7247703b03d216b2fe6ca5b9d514eaf84" dependencies: broccoli-funnel "^1.0.2" broccoli-merge-trees "^1.1.0" @@ -3526,14 +3428,7 @@ ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.7, ember-cli-ve dependencies: semver "^5.3.0" -ember-cli-version-checker@^2.0.0: - version "2.1.0" - resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.1.0.tgz#fc79a56032f3717cf844ada7cbdec1a06fedb604" - dependencies: - resolve "^1.3.3" - semver "^5.3.0" - -ember-cli-version-checker@^2.1.0: +ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0, ember-cli-version-checker@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.1.2.tgz#305ce102390c66e4e0f1432dea9dc5c7c19fed98" dependencies: @@ -3636,8 +3531,8 @@ ember-component-inbound-actions@1.1.0: ember-cli-babel "^5.1.5" ember-concurrency@~0.8.17: - version "0.8.17" - resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.8.17.tgz#be47a90342f1960f4f57284c2fe5f7ce2396142a" + version "0.8.19" + resolved "https://registry.yarnpkg.com/ember-concurrency/-/ember-concurrency-0.8.19.tgz#71b9c175ba077865310029cb4bdb880e17d5155e" dependencies: babel-core "^6.24.1" ember-cli-babel "^6.8.2" @@ -3716,8 +3611,8 @@ ember-git-version@~0.1.2: git-repo-info "^1.0.2" ember-inflector@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-2.2.0.tgz#edd273dfd1a29be27f14b195e2f0ed70e812d9e0" + version "2.3.0" + resolved "https://registry.yarnpkg.com/ember-inflector/-/ember-inflector-2.3.0.tgz#94797eba0eea98d902aa1e5da0f0aeef6053317f" dependencies: ember-cli-babel "^6.0.0" @@ -3727,7 +3622,7 @@ ember-inflector@~2.0.0: dependencies: ember-cli-babel "^6.0.0" -ember-load-initializers@^1.0.0: +ember-load-initializers@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-load-initializers/-/ember-load-initializers-1.0.0.tgz#4919eaf06f6dfeca7e134633d8c05a6c9921e6e7" dependencies: @@ -3753,8 +3648,8 @@ ember-lodash@^4.17.3, ember-lodash@^4.18.0: lodash-es "^4.17.4" ember-macro-helpers@^0.17.0: - version "0.17.0" - resolved "https://registry.yarnpkg.com/ember-macro-helpers/-/ember-macro-helpers-0.17.0.tgz#5e64a49f476e38c1916aff75f949455533cd1abe" + version "0.17.1" + resolved "https://registry.yarnpkg.com/ember-macro-helpers/-/ember-macro-helpers-0.17.1.tgz#34836e9158cc260ee1c540935371d11f52ec98d9" dependencies: ember-cli-babel "^6.6.0" ember-cli-string-utils "^1.1.0" @@ -3771,8 +3666,8 @@ ember-maybe-import-regenerator@^0.1.5: regenerator-runtime "^0.9.5" ember-moment@^7.6.0: - version "7.6.0" - resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-7.6.0.tgz#f82beba81a6b9f4ea3bb0ac2463cc5d2c5cbd8e6" + version "7.7.0" + resolved "https://registry.yarnpkg.com/ember-moment/-/ember-moment-7.7.0.tgz#febf7cc5bfc665c8f1d45fa24e5c7a5f5f91afa5" dependencies: ember-cli-babel "^6.7.2" ember-getowner-polyfill "^2.0.1" @@ -3811,13 +3706,13 @@ ember-responsive@^2.0.8: dependencies: ember-cli-babel "^6.6.0" -ember-rfc176-data@^0.2.0, ember-rfc176-data@^0.2.7: +ember-rfc176-data@^0.2.0: version "0.2.7" resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.2.7.tgz#bd355bc9b473e08096b518784170a23388bc973b" -ember-rfc176-data@^0.3.0, ember-rfc176-data@~0.3.2: - version "0.3.2" - resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.2.tgz#bde5538939529b263c142b53a47402f8127f8dce" +ember-rfc176-data@^0.3.0, ember-rfc176-data@^0.3.3, ember-rfc176-data@~0.3.2: + version "0.3.3" + resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.3.tgz#27fba08d540a7463a4366c48eaa19c5a44971a39" ember-route-action-helper@^2.0.6: version "2.0.6" @@ -3981,8 +3876,8 @@ error@^7.0.0: xtend "~4.0.0" es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14: - version "0.10.42" - resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.42.tgz#8c07dd33af04d5dcd1310b5cef13bea63a89ba8d" + version "0.10.45" + resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.45.tgz#0bfdf7b473da5919d5adf3bd25ceb754fccc3653" dependencies: es6-iterator "~2.0.3" es6-symbol "~3.1.1" @@ -4038,7 +3933,7 @@ escape-html@~1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988" -escape-string-regexp@^1.0.0, escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: +escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" @@ -4065,11 +3960,10 @@ escodegen@1.x.x, escodegen@^1.8.0: source-map "~0.6.1" eslint-plugin-ember@^5.1.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-5.1.0.tgz#fb96abd2d8bf105678a0aa81dadd99d7ca441ba1" + version "5.2.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-5.2.0.tgz#fa436e0497dfc01d1d38608229cd616e7c5b6067" dependencies: - ember-rfc176-data "^0.2.7" - require-folder-tree "^1.4.5" + ember-rfc176-data "^0.3.3" snake-case "^2.1.0" eslint-scope@^3.7.1: @@ -4173,11 +4067,7 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" -estree-walker@^0.3.0: - version "0.3.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.3.1.tgz#e6b1a51cf7292524e7237c312e5fe6660c1ce1aa" - -estree-walker@^0.5.1: +estree-walker@^0.5.1, estree-walker@^0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39" @@ -4196,9 +4086,9 @@ event-emitter@~0.3.5: d "1" es5-ext "~0.10.14" -eventemitter3@1.x.x: - version "1.2.0" - resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-1.2.0.tgz#1c86991d816ad1e504750e73874224ecf3bec508" +eventemitter3@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163" events-to-array@^1.0.1: version "1.1.2" @@ -4209,8 +4099,8 @@ events@1.1.1: resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924" events@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/events/-/events-2.0.0.tgz#cbbb56bf3ab1ac18d71c43bb32c86255062769f2" + version "2.1.0" + resolved "https://registry.yarnpkg.com/events/-/events-2.1.0.tgz#2a9a1e18e6106e0e812aa9ebd4a819b3c29c0ba5" evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: version "1.0.3" @@ -4401,12 +4291,12 @@ extglob@^2.0.4: to-regex "^3.0.1" extract-zip@^1.6.5: - version "1.6.6" - resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.6.tgz#1290ede8d20d0872b429fd3f351ca128ec5ef85c" + version "1.6.7" + resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-1.6.7.tgz#a840b4b8af6403264c8db57f4f1a74333ef81fe9" dependencies: - concat-stream "1.6.0" + concat-stream "1.6.2" debug "2.6.9" - mkdirp "0.5.0" + mkdirp "0.5.1" yauzl "2.4.1" extsprintf@1.3.0: @@ -4444,10 +4334,10 @@ fast-ordered-set@^1.0.0, fast-ordered-set@^1.0.2: blank-object "^1.0.1" fast-sourcemap-concat@^1.0.1: - version "1.2.5" - resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-1.2.5.tgz#196db60ffefa9c616291512cd89113210e3cb747" + version "1.3.0" + resolved "https://registry.yarnpkg.com/fast-sourcemap-concat/-/fast-sourcemap-concat-1.3.0.tgz#cc618e4d6f68106b598a532e174076075bb82400" dependencies: - chalk "^0.5.1" + chalk "^2.0.0" fs-extra "^0.30.0" heimdalljs-logger "^0.1.7" memory-streams "^0.1.0" @@ -4457,11 +4347,11 @@ fast-sourcemap-concat@^1.0.1: sourcemap-validator "^1.0.5" fastboot-express-middleware@^1.1.0: - version "1.1.1" - resolved "https://registry.yarnpkg.com/fastboot-express-middleware/-/fastboot-express-middleware-1.1.1.tgz#b6e156a3acbaecef42b1f023ebb8405a934c28e6" + version "1.2.0" + resolved "https://registry.yarnpkg.com/fastboot-express-middleware/-/fastboot-express-middleware-1.2.0.tgz#3f32fb21d8d01ad7c0c7d876b278601665ea17fa" dependencies: chalk "^2.0.1" - fastboot "^1.1.2" + fastboot "^1.2.0" request "^2.81.0" fastboot-transform@^0.1.2: @@ -4471,9 +4361,9 @@ fastboot-transform@^0.1.2: broccoli-stew "^1.5.0" convert-source-map "^1.5.1" -fastboot@^1.1.2, fastboot@^1.1.3: - version "1.1.3" - resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-1.1.3.tgz#56c5f56415c5ae8de2db539c0d3ecbcd65538f8b" +fastboot@^1.1.3, fastboot@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/fastboot/-/fastboot-1.2.0.tgz#35c5747db1943d082f2ba619226d16cd7281e946" dependencies: chalk "^2.0.1" cookie "^0.3.1" @@ -4528,12 +4418,12 @@ filesize@^3.1.3: resolved "https://registry.yarnpkg.com/filesize/-/filesize-3.6.1.tgz#090bb3ee01b6f801a8a8be99d31710b3422bb317" fill-range@^2.1.0: - version "2.2.3" - resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.3.tgz#50b77dfd7e469bc7492470963699fe7a8485a723" + version "2.2.4" + resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-2.2.4.tgz#eb1e773abb056dcd8df2bfdf6af59b8b3a936565" dependencies: is-number "^2.1.0" isobject "^2.0.0" - randomatic "^1.1.3" + randomatic "^3.0.0" repeat-element "^1.1.2" repeat-string "^1.5.2" @@ -4575,6 +4465,13 @@ find-up@^2.1.0: dependencies: locate-path "^2.0.0" +find-yarn-workspace-root@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/find-yarn-workspace-root/-/find-yarn-workspace-root-1.1.0.tgz#9817b6748cb90719f4dc37b4538bb200c697356f" + dependencies: + fs-extra "^4.0.3" + micromatch "^3.1.4" + findup-sync@2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-2.0.0.tgz#9326b1488c22d1a6088650a86901b2d9a90a2cbc" @@ -4612,6 +4509,12 @@ flat-cache@^1.2.1: graceful-fs "^4.1.2" write "^0.2.1" +follow-redirects@^1.0.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.5.0.tgz#234f49cf770b7f35b40e790f636ceba0c3a0ab77" + dependencies: + debug "^3.1.0" + for-in@^1.0.1, for-in@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80" @@ -4716,7 +4619,7 @@ fs-extra@^2.0.0: graceful-fs "^4.1.2" jsonfile "^2.1.0" -fs-extra@^4.0.0, fs-extra@^4.0.1, fs-extra@^4.0.2: +fs-extra@^4.0.0, fs-extra@^4.0.1, fs-extra@^4.0.2, fs-extra@^4.0.3: version "4.0.3" resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94" dependencies: @@ -4732,6 +4635,12 @@ fs-extra@^5.0.0: jsonfile "^4.0.0" universalify "^0.1.0" +fs-minipass@^1.2.5: + version "1.2.5" + resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d" + dependencies: + minipass "^2.2.1" + fs-readdir-recursive@^0.1.0: version "0.1.2" resolved "https://registry.yarnpkg.com/fs-readdir-recursive/-/fs-readdir-recursive-0.1.2.tgz#315b4fb8c1ca5b8c47defef319d073dad3568059" @@ -4776,14 +4685,14 @@ fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" -fsevents@^1.0.0, fsevents@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.1.3.tgz#11f82318f5fe7bb2cd22965a108e9306208216d8" +fsevents@^1.0.0, fsevents@^1.2.3: + version "1.2.4" + resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426" dependencies: - nan "^2.3.0" - node-pre-gyp "^0.6.39" + nan "^2.9.2" + node-pre-gyp "^0.10.0" -fstream-ignore@^1.0.0, fstream-ignore@^1.0.5: +fstream-ignore@^1.0.0: version "1.0.5" resolved "https://registry.yarnpkg.com/fstream-ignore/-/fstream-ignore-1.0.5.tgz#9c31dae34767018fe1d249b24dada67d092da105" dependencies: @@ -4798,7 +4707,7 @@ fstream-npm@~1.0.7: fstream-ignore "^1.0.0" inherits "2" -fstream@^1.0.0, fstream@^1.0.10, fstream@^1.0.2, fstream@~1.0.8: +fstream@^1.0.0, fstream@^1.0.2, fstream@~1.0.8: version "1.0.11" resolved "https://registry.yarnpkg.com/fstream/-/fstream-1.0.11.tgz#5c1fb1f117477114f0632a0eb4b71b3cb0fd3171" dependencies: @@ -4814,7 +4723,7 @@ ftp@~0.3.10: readable-stream "1.1.x" xregexp "2.0.0" -function-bind@^1.0.2: +function-bind@^1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d" @@ -4852,8 +4761,8 @@ gauge@~2.7.3: wide-align "^1.1.0" gaze@^1.0.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.2.tgz#847224677adb8870d679257ed3388fdb61e40105" + version "1.1.3" + resolved "https://registry.yarnpkg.com/gaze/-/gaze-1.1.3.tgz#c441733e13b927ac8c0ff0b4c3b033f28812924a" dependencies: globule "^1.0.0" @@ -4880,8 +4789,8 @@ get-stream@^3.0.0: resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14" get-uri@^2.0.0: - version "2.0.1" - resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.1.tgz#dbdcacacd8c608a38316869368117697a1631c59" + version "2.0.2" + resolved "https://registry.yarnpkg.com/get-uri/-/get-uri-2.0.2.tgz#5c795e71326f6ca1286f2fc82575cd2bab2af578" dependencies: data-uri-to-buffer "1" debug "2" @@ -4904,7 +4813,7 @@ git-repo-info@^1.0.2, git-repo-info@^1.1.2, git-repo-info@^1.3.0, git-repo-info@ version "1.4.1" resolved "https://registry.yarnpkg.com/git-repo-info/-/git-repo-info-1.4.1.tgz#2a072823254aaf62fcf0766007d7b6651bd41943" -git-repo-version@^1.0.0: +git-repo-version@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/git-repo-version/-/git-repo-version-1.0.2.tgz#2c8e9bee5d970cafc0dd58480f9dc56d9afe8e4f" dependencies: @@ -5015,8 +4924,8 @@ global-prefix@^1.0.1: which "^1.2.14" globals@^11.0.1: - version "11.4.0" - resolved "https://registry.yarnpkg.com/globals/-/globals-11.4.0.tgz#b85c793349561c16076a3c13549238a27945f1bc" + version "11.5.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-11.5.0.tgz#6bc840de6771173b191f13d3a9c94d441ee92642" globals@^6.4.0: version "6.4.1" @@ -5038,11 +4947,11 @@ globby@^5.0.0: pinkie-promise "^2.0.0" globule@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.0.tgz#1dc49c6822dd9e8a2fa00ba2a295006e8664bd09" + version "1.2.1" + resolved "https://registry.yarnpkg.com/globule/-/globule-1.2.1.tgz#5dffb1b191f22d20797a9369b49eab4e9839696d" dependencies: glob "~7.1.1" - lodash "~4.17.4" + lodash "~4.17.10" minimatch "~3.0.2" graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.4, graceful-fs@^4.1.6, graceful-fs@^4.1.9, graceful-fs@~4.1.2: @@ -5067,10 +4976,6 @@ handlebars@^4.0.1, handlebars@^4.0.4: optionalDependencies: uglify-js "^2.6" -har-schema@^1.0.5: - version "1.0.5" - resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-1.0.5.tgz#d263135f43307c02c602afc8fe95970c0151369e" - har-schema@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/har-schema/-/har-schema-2.0.0.tgz#a94c2224ebcac04782a0d9035521f24735b7ec92" @@ -5084,13 +4989,6 @@ har-validator@~2.0.2, har-validator@~2.0.6: is-my-json-valid "^2.12.4" pinkie-promise "^2.0.0" -har-validator@~4.2.1: - version "4.2.1" - resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-4.2.1.tgz#33481d0f1bbff600dd203d75812a6a5fba002e2a" - dependencies: - ajv "^4.9.1" - har-schema "^1.0.5" - har-validator@~5.0.3: version "5.0.3" resolved "https://registry.yarnpkg.com/har-validator/-/har-validator-5.0.3.tgz#ba402c266194f15956ef15e0fcf242993f6a7dfd" @@ -5098,12 +4996,6 @@ har-validator@~5.0.3: ajv "^5.1.0" har-schema "^2.0.0" -has-ansi@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-0.1.0.tgz#84f265aae8c0e6a88a12d7022894b7568894c62e" - dependencies: - ansi-regex "^0.2.0" - has-ansi@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91" @@ -5166,16 +5058,10 @@ has-values@^1.0.0: kind-of "^4.0.0" has@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28" - dependencies: - function-bind "^1.0.2" - -hash-base@^2.0.0: - version "2.0.2" - resolved "https://registry.yarnpkg.com/hash-base/-/hash-base-2.0.2.tgz#66ea1d856db4e8a5470cadf6fce23ae5244ef2e1" + version "1.0.3" + resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796" dependencies: - inherits "^2.0.1" + function-bind "^1.1.1" hash-base@^3.0.0: version "3.0.4" @@ -5207,7 +5093,7 @@ hasha@^2.2.0: is-stream "^1.0.1" pinkie-promise "^2.0.0" -hawk@3.1.3, hawk@~3.1.0, hawk@~3.1.3: +hawk@~3.1.0, hawk@~3.1.3: version "3.1.3" resolved "https://registry.yarnpkg.com/hawk/-/hawk-3.1.3.tgz#078444bd7c1640b0fe540d2c9b73d59678e8e1c4" dependencies: @@ -5216,18 +5102,9 @@ hawk@3.1.3, hawk@~3.1.0, hawk@~3.1.3: hoek "2.x.x" sntp "1.x.x" -hawk@~6.0.2: - version "6.0.2" - resolved "https://registry.yarnpkg.com/hawk/-/hawk-6.0.2.tgz#af4d914eb065f9b5ce4d9d11c1cb2126eecc3038" - dependencies: - boom "4.x.x" - cryptiles "3.x.x" - hoek "4.x.x" - sntp "2.x.x" - heimdalljs-fs-monitor@^0.1.0: - version "0.1.0" - resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-0.1.0.tgz#d404a65688c6714c485469ed3495da4853440272" + version "0.1.1" + resolved "https://registry.yarnpkg.com/heimdalljs-fs-monitor/-/heimdalljs-fs-monitor-0.1.1.tgz#acaf5ebf7137bc2fc98e811e31ae4b121c3a75a3" dependencies: heimdalljs "^0.2.0" heimdalljs-logger "^0.1.7" @@ -5267,10 +5144,6 @@ hoek@2.x.x: version "2.16.3" resolved "https://registry.yarnpkg.com/hoek/-/hoek-2.16.3.tgz#20bb7403d3cea398e91dc4710a8ff1b8274a25ed" -hoek@4.x.x: - version "4.2.1" - resolved "https://registry.yarnpkg.com/hoek/-/hoek-4.2.1.tgz#9634502aa12c445dd5a7c5734b572bb8738aacbb" - home-or-tmp@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/home-or-tmp/-/home-or-tmp-1.0.0.tgz#4b9f1e40800c3e50c6c27f781676afcce71f3985" @@ -5312,7 +5185,7 @@ http-errors@1.6.2: setprototypeof "1.0.3" statuses ">= 1.3.1 < 2" -http-errors@~1.6.2: +http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3: version "1.6.3" resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d" dependencies: @@ -5322,23 +5195,23 @@ http-errors@~1.6.2: statuses ">= 1.4.0 < 2" http-parser-js@>=0.4.0: - version "0.4.11" - resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.11.tgz#5b720849c650903c27e521633d94696ee95f3529" + version "0.4.13" + resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137" -http-proxy-agent@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-1.0.0.tgz#cc1ce38e453bf984a0f7702d2dd59c73d081284a" +http-proxy-agent@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405" dependencies: - agent-base "2" - debug "2" - extend "3" + agent-base "4" + debug "3.1.0" http-proxy@^1.13.1, http-proxy@^1.9.0: - version "1.16.2" - resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.16.2.tgz#06dff292952bf64dbe8471fa9df73066d4f37742" + version "1.17.0" + resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a" dependencies: - eventemitter3 "1.x.x" - requires-port "1.x.x" + eventemitter3 "^3.0.0" + follow-redirects "^1.0.0" + requires-port "^1.0.0" http-signature@~1.1.0: version "1.1.1" @@ -5360,18 +5233,23 @@ https-browserify@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73" -https-proxy-agent@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-1.0.0.tgz#35f7da6c48ce4ddbfa264891ac593ee5ff8671e6" +https-proxy-agent@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz#51552970fa04d723e04c56d04178c3f92592bbc0" dependencies: - agent-base "2" - debug "2" - extend "3" + agent-base "^4.1.0" + debug "^3.1.0" -iconv-lite@0.4.19, iconv-lite@^0.4.17, iconv-lite@^0.4.5, iconv-lite@~0.4.13: +iconv-lite@0.4.19: version "0.4.19" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b" +iconv-lite@0.4.23, iconv-lite@^0.4.17, iconv-lite@^0.4.4, iconv-lite@^0.4.5, iconv-lite@~0.4.13: + version "0.4.23" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63" + dependencies: + safer-buffer ">= 2.1.2 < 3" + idb-wrapper@^1.5.0: version "1.7.2" resolved "https://registry.yarnpkg.com/idb-wrapper/-/idb-wrapper-1.7.2.tgz#8251afd5e77fe95568b1c16152eb44b396767ea2" @@ -5388,9 +5266,15 @@ iferr@^0.1.5, iferr@~0.1.5: version "0.1.5" resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501" +ignore-walk@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.1.tgz#a83e62e7d272ac0e3b551aaa82831a19b69f82f8" + dependencies: + minimatch "^3.0.4" + ignore@^3.3.3: - version "3.3.7" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.7.tgz#612289bfb3c220e186a58118618d5be8c1bab021" + version "3.3.8" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.8.tgz#3f8e9c35d38708a3a7e0e9abb6c73e7ee7707b2b" imurmurhash@^0.1.4: version "0.1.4" @@ -5505,14 +5389,15 @@ inquirer@^3.0.6: through "^2.3.6" insert-module-globals@^7.0.0: - version "7.0.5" - resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.0.5.tgz#6d0a6f28d4a7e0eae171ad305e0f47bdfe0c258e" + version "7.1.0" + resolved "https://registry.yarnpkg.com/insert-module-globals/-/insert-module-globals-7.1.0.tgz#dbb3cea71d3a43d5a07ef0310fe5f078aa4dbf35" dependencies: JSONStream "^1.0.3" combine-source-map "^0.8.0" concat-stream "^1.6.1" is-buffer "^1.1.0" lexical-scope "^1.2.0" + path-is-absolute "^1.0.1" process "~0.11.0" through2 "^2.0.0" xtend "^4.0.0" @@ -5867,8 +5752,8 @@ jquery@^3.2.1: resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca" js-base64@^2.1.8: - version "2.4.3" - resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.3.tgz#2e545ec2b0f2957f41356510205214e98fad6582" + version "2.4.5" + resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.5.tgz#e293cd3c7c82f070d700fc7a1ca0a2e69f101f92" js-reporters@1.2.1: version "1.2.1" @@ -5883,8 +5768,8 @@ js-tokens@^3.0.0, js-tokens@^3.0.2: resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b" js-yaml@3.x, js-yaml@^3.2.5, js-yaml@^3.2.7, js-yaml@^3.3.0, js-yaml@^3.6.1, js-yaml@^3.9.1: - version "3.11.0" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef" + version "3.12.0" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1" dependencies: argparse "^1.0.7" esprima "^4.0.0" @@ -6167,12 +6052,14 @@ locate-path@^2.0.0: path-exists "^3.0.0" lockfile@~1.0.1: - version "1.0.3" - resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.3.tgz#2638fc39a0331e9cac1a04b71799931c9c50df79" + version "1.0.4" + resolved "https://registry.yarnpkg.com/lockfile/-/lockfile-1.0.4.tgz#07f819d25ae48f87e538e6578b6964a4981a5609" + dependencies: + signal-exit "^3.0.2" lodash-es@^4.17.4: - version "4.17.8" - resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.8.tgz#6fa8c8c5d337481df0bdf1c0d899d42473121e45" + version "4.17.10" + resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.10.tgz#62cd7104cdf5dd87f235a837f0ede0e8e5117e05" lodash._arraycopy@^3.0.0: version "3.0.0" @@ -6633,19 +6520,11 @@ lodash.without@~3.2.1: lodash._basedifference "^3.0.0" lodash.restparam "^3.0.0" -lodash@3.8.0: - version "3.8.0" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.8.0.tgz#376eb98bdcd9382a9365c33c4cb8250de1325b91" - lodash@^3.10.0, lodash@^3.10.1, lodash@^3.9.3: version "3.10.1" resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6" -lodash@^4.0.0, lodash@^4.11.1, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1, lodash@~4.17.4: - version "4.17.5" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.5.tgz#99a92d65c0272debe8c96b6057bc8fbfa3bed511" - -lodash@^4.14.0, lodash@^4.17.4: +lodash@^4.0.0, lodash@^4.11.1, lodash@^4.17.10, lodash@^4.17.4, lodash@^4.3.0, lodash@^4.5.1, lodash@^4.6.1, lodash@~4.17.10: version "4.17.10" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.10.tgz#1b7793cf7259ea38fb3661d4d38b3260af8ae4e7" @@ -6676,13 +6555,13 @@ lower-case@^1.1.1: version "1.1.4" resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" -lru-cache@2, lru-cache@^2.6.5: +lru-cache@2: version "2.7.3" resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.7.3.tgz#6d4524e8b955f95d4f5b58851ce21dd72fb4e952" -lru-cache@^4.0.1: - version "4.1.2" - resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f" +lru-cache@^4.0.1, lru-cache@^4.1.2: + version "4.1.3" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c" dependencies: pseudomap "^1.0.2" yallist "^2.1.2" @@ -6702,8 +6581,8 @@ make-array@^0.1.2: resolved "https://registry.yarnpkg.com/make-array/-/make-array-0.1.2.tgz#335e36ebb0c5a43154d21213a1ecaeae2a1bb3ef" make-dir@^1.0.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.2.0.tgz#6d6a49eead4aae296c53bbf3a1a008bd6c89469b" + version "1.3.0" + resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c" dependencies: pify "^3.0.0" @@ -6767,6 +6646,10 @@ matcher-collection@^1.0.0, matcher-collection@^1.0.5: dependencies: minimatch "^3.0.2" +math-random@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac" + md5-hex@^1.3.0: version "1.3.0" resolved "https://registry.yarnpkg.com/md5-hex/-/md5-hex-1.3.0.tgz#d2c4afe983c4370662179b8cad145219135046c4" @@ -6898,7 +6781,11 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -"mime-db@>= 1.33.0 < 2", mime-db@~1.33.0: +"mime-db@>= 1.34.0 < 2": + version "1.34.0" + resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.34.0.tgz#452d0ecff5c30346a6dc1e64b1eaee0d3719ff9a" + +mime-db@~1.33.0: version "1.33.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.33.0.tgz#a3492050a5cb9b63450541e39d9788d2272783db" @@ -6912,17 +6799,17 @@ mime@1.4.1: version "1.4.1" resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6" -mime@^1.3.4: - version "1.6.0" - resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1" +mime@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/mime/-/mime-2.3.1.tgz#b1621c54d63b97c47d3cfe7f7215f7d64517c369" mimic-fn@^1.0.0: version "1.2.0" resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022" minimalistic-assert@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz#702be2dda6b37f4836bcb3f5db56641b64a1d3d3" + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" minimalistic-crypto-utils@^1.0.0, minimalistic-crypto-utils@^1.0.1: version "1.0.1" @@ -6959,6 +6846,19 @@ minimist@~0.0.1: version "0.0.10" resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf" +minipass@^2.2.1, minipass@^2.3.3: + version "2.3.3" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.3.tgz#a7dcc8b7b833f5d368759cce544dccb55f50f233" + dependencies: + safe-buffer "^5.1.2" + yallist "^3.0.0" + +minizlib@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb" + dependencies: + minipass "^2.2.1" + mixin-deep@^1.2.0: version "1.3.1" resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.1.tgz#a49e7268dce1a0d9698e45326c5626df3543d0fe" @@ -6966,13 +6866,7 @@ mixin-deep@^1.2.0: for-in "^1.0.2" is-extendable "^1.0.1" -mkdirp@0.5.0: - version "0.5.0" - resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.0.tgz#1d73076a6df986cd9344e15e71fcc05a4c9abf12" - dependencies: - minimist "0.0.8" - -mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: +mkdirp@0.5.1, mkdirp@0.5.x, "mkdirp@>=0.5 0", mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.0, mkdirp@~0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" dependencies: @@ -6987,8 +6881,8 @@ mktemp@~0.4.0: resolved "https://registry.yarnpkg.com/mktemp/-/mktemp-0.4.0.tgz#6d0515611c8a8c84e484aa2000129b98e981ff0b" module-deps@^6.0.0: - version "6.0.2" - resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.0.2.tgz#660217d1602b863ac8d4d16951a3720dd9aa4c80" + version "6.1.0" + resolved "https://registry.yarnpkg.com/module-deps/-/module-deps-6.1.0.tgz#d1e1efc481c6886269f7112c52c3236188e16479" dependencies: JSONStream "^1.0.3" browser-resolve "^1.7.0" @@ -7013,14 +6907,14 @@ moment-timezone@^0.3.0: moment ">= 2.6.0" moment-timezone@^0.5.0, moment-timezone@~0.5.14: - version "0.5.14" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.14.tgz#4eb38ff9538b80108ba467a458f3ed4268ccfcb1" + version "0.5.17" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.17.tgz#3c8fef32051d84c3af174d91dc52977dcb0ad7e5" dependencies: moment ">= 2.9.0" "moment@>= 2.6.0", "moment@>= 2.9.0", moment@^2.13.0, moment@^2.17.1, moment@^2.18.0, moment@^2.22.0: - version "2.22.0" - resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.0.tgz#7921ade01017dd45186e7fee5f424f0b8663a730" + version "2.22.2" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66" morgan@^1.8.1: version "1.9.0" @@ -7068,7 +6962,7 @@ najax@^1.0.2: lodash.defaultsdeep "^4.6.0" qs "^6.2.0" -nan@^2.10.0, nan@^2.3.0: +nan@^2.10.0, nan@^2.9.2: version "2.10.0" resolved "https://registry.yarnpkg.com/nan/-/nan-2.10.0.tgz#96d0cd610ebd58d4b4de9cc0c6828cda99c7548f" @@ -7093,6 +6987,14 @@ natural-compare@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" +needle@^2.2.0: + version "2.2.1" + resolved "https://registry.yarnpkg.com/needle/-/needle-2.2.1.tgz#b5e325bd3aae8c2678902fa296f729455d1d3a7d" + dependencies: + debug "^2.1.2" + iconv-lite "^0.4.4" + sax "^1.2.4" + negotiator@0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9" @@ -7196,25 +7098,24 @@ node-notifier@^5.0.1: shellwords "^0.1.1" which "^1.3.0" -node-pre-gyp@^0.6.39: - version "0.6.39" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.6.39.tgz#c00e96860b23c0e1420ac7befc5044e1d78d8649" +node-pre-gyp@^0.10.0: + version "0.10.0" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz#6e4ef5bb5c5203c6552448828c852c40111aac46" dependencies: detect-libc "^1.0.2" - hawk "3.1.3" mkdirp "^0.5.1" + needle "^2.2.0" nopt "^4.0.1" + npm-packlist "^1.1.6" npmlog "^4.0.2" rc "^1.1.7" - request "2.81.0" rimraf "^2.6.1" semver "^5.3.0" - tar "^2.2.1" - tar-pack "^3.4.0" + tar "^4" node-sass@^4.7.2: - version "4.8.3" - resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.8.3.tgz#d077cc20a08ac06f661ca44fb6f19cd2ed41debb" + version "4.9.0" + resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.9.0.tgz#d1b8aa855d98ed684d6848db929a20771cc2ae52" dependencies: async-foreach "^0.1.3" chalk "^1.1.1" @@ -7236,11 +7137,11 @@ node-sass@^4.7.2: stdout-stream "^1.4.0" "true-case-path" "^1.0.2" -node-slackr@^0.1.0: - version "0.1.4" - resolved "https://registry.yarnpkg.com/node-slackr/-/node-slackr-0.1.4.tgz#625da8ac93c00f251b7ad6d713d6009e75ffa3ca" +node-slackr@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/node-slackr/-/node-slackr-0.2.0.tgz#65d4b7958465b6cb2ca24d41dcdde5955bbb4bdb" dependencies: - coffee-script "~1.7.1" + coffeescript "~1.8.0" lodash "^4.11.1" request "^2.72.0" @@ -7289,6 +7190,10 @@ normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1: dependencies: remove-trailing-separator "^1.0.1" +npm-bundled@^1.0.1: + version "1.0.3" + resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.3.tgz#7e71703d973af3370a9591bafe3a63aca0be2308" + npm-cache-filename@~1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/npm-cache-filename/-/npm-cache-filename-1.0.2.tgz#ded306c5b0bfc870a9e9faf823bc5f283e05ae11" @@ -7327,6 +7232,13 @@ npm-package-arg@~4.1.0: hosted-git-info "^2.1.4" semver "4 || 5" +npm-packlist@^1.1.6: + version "1.1.10" + resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.10.tgz#1039db9e985727e464df066f4cf0ab6ef85c398a" + dependencies: + ignore-walk "^3.0.1" + npm-bundled "^1.0.1" + npm-registry-client@~7.0.9: version "7.0.9" resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-7.0.9.tgz#1baf86ee5285c4e6d38d4556208ded56049231bb" @@ -7532,7 +7444,7 @@ on-headers@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.1.tgz#928f5d0f470d49342651ea6794b0857c100693f7" -once@1.x, once@^1.3.0, once@^1.3.3: +once@1.x, once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" dependencies: @@ -7633,8 +7545,8 @@ p-finally@^1.0.0: resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae" p-limit@^1.1.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c" + version "1.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8" dependencies: p-try "^1.0.0" @@ -7648,15 +7560,15 @@ p-try@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3" -pac-proxy-agent@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-2.0.0.tgz#beb17cd2b06a20b379d57e1b2e2c29be0dfe5f9a" +pac-proxy-agent@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz#90d9f6730ab0f4d2607dcdcd4d3d641aa26c3896" dependencies: - agent-base "^2.1.1" - debug "^2.6.8" + agent-base "^4.2.0" + debug "^3.1.0" get-uri "^2.0.0" - http-proxy-agent "^1.0.0" - https-proxy-agent "^1.0.0" + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.1" pac-resolver "^3.0.0" raw-body "^2.2.0" socks-proxy-agent "^3.0.0" @@ -7682,8 +7594,8 @@ parents@^1.0.0, parents@^1.0.1: path-platform "~0.11.15" parse-asn1@^5.0.0: - version "5.1.0" - resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.0.tgz#37c4f9b7ed3ab65c74817b5f2480937fbf97c712" + version "5.1.1" + resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8" dependencies: asn1.js "^4.0.0" browserify-aes "^1.0.0" @@ -7807,8 +7719,8 @@ path-type@^1.0.0: pinkie-promise "^2.0.0" pbkdf2@^3.0.3: - version "3.0.14" - resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.14.tgz#a35e13c64799b06ce15320f459c230e68e73bade" + version "3.0.16" + resolved "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.16.tgz#7404208ec6b01b62d85bf83853a8064f8d9c2a5c" dependencies: create-hash "^1.1.2" create-hmac "^1.1.4" @@ -7820,10 +7732,6 @@ pend@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50" -performance-now@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-0.2.0.tgz#33ef30c5c77d4ea21c5a53869d91b56d8f2555e5" - performance-now@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b" @@ -7901,7 +7809,7 @@ printf@^0.2.3: version "0.2.5" resolved "https://registry.yarnpkg.com/printf/-/printf-0.2.5.tgz#c438ca2ca33e3927671db4ab69c0e52f936a4f0f" -private@^0.1.6, private@^0.1.7, private@^0.1.8, private@~0.1.5: +private@^0.1.6, private@^0.1.8, private@~0.1.5: version "0.1.8" resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff" @@ -7959,17 +7867,22 @@ proxy-addr@~2.0.3: ipaddr.js "1.6.0" proxy-agent@^2.0.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-2.2.0.tgz#e853cd8400013562d23c8dc9e1deaf9b0b0a153a" + version "2.3.1" + resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-2.3.1.tgz#3d49d863d46cf5f37ca8394848346ea02373eac6" dependencies: agent-base "^4.2.0" - debug "^2.6.8" - http-proxy-agent "^1.0.0" - https-proxy-agent "^1.0.0" - lru-cache "^2.6.5" - pac-proxy-agent "^2.0.0" + debug "^3.1.0" + http-proxy-agent "^2.1.0" + https-proxy-agent "^2.2.1" + lru-cache "^4.1.2" + pac-proxy-agent "^2.0.1" + proxy-from-env "^1.0.0" socks-proxy-agent "^3.0.0" +proxy-from-env@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.0.0.tgz#33c50398f70ea7eb96d21f7b817630a55791c7ee" + prr@~0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/prr/-/prr-0.0.0.tgz#1a84b85908325501411853d0081ee3fa86e2926a" @@ -7983,8 +7896,8 @@ pseudomap@^1.0.2: resolved "https://registry.yarnpkg.com/pseudomap/-/pseudomap-1.0.2.tgz#f052a28da70e618917ef0a8ac34c1ae5a68286b3" public-encrypt@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.0.tgz#39f699f3a46560dd5ebacbca693caf7c65c18cc6" + version "4.0.2" + resolved "https://registry.yarnpkg.com/public-encrypt/-/public-encrypt-4.0.2.tgz#46eb9107206bf73489f8b85b69d91334c6610994" dependencies: bn.js "^4.1.0" browserify-rsa "^4.0.0" @@ -8004,10 +7917,14 @@ q@^1.1.2: version "1.5.1" resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7" -qs@6.5.1, qs@^6.2.0, qs@^6.4.0, qs@~6.5.1: +qs@6.5.1: version "6.5.1" resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.1.tgz#349cdf6eef89ec45c12d7d5eb3fc0c870343a6d8" +qs@6.5.2, qs@^6.2.0, qs@^6.4.0, qs@~6.5.1: + version "6.5.2" + resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36" + qs@~5.2.0: version "5.2.1" resolved "https://registry.yarnpkg.com/qs/-/qs-5.2.1.tgz#801fee030e0b9450d6385adc48a4cc55b44aedfc" @@ -8016,10 +7933,6 @@ qs@~6.3.0: version "6.3.2" resolved "https://registry.yarnpkg.com/qs/-/qs-6.3.2.tgz#e75bd5f6e268122a2a0e0bda630b2550c166502c" -qs@~6.4.0: - version "6.4.0" - resolved "https://registry.yarnpkg.com/qs/-/qs-6.4.0.tgz#13e26d28ad6b0ffaa91312cd3bf708ed351e7233" - querystring-es3@~0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/querystring-es3/-/querystring-es3-0.2.1.tgz#9ec61f79049875707d69414596fd907a4d711e73" @@ -8028,7 +7941,7 @@ querystring@0.2.0: version "0.2.0" resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620" -quick-temp@^0.1.0, quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8: +quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8: version "0.1.8" resolved "https://registry.yarnpkg.com/quick-temp/-/quick-temp-0.1.8.tgz#bab02a242ab8fb0dd758a3c9776b32f9a5d94408" dependencies: @@ -8041,8 +7954,8 @@ qunit-notifications@^0.1.1: resolved "https://registry.yarnpkg.com/qunit-notifications/-/qunit-notifications-0.1.1.tgz#3001afc6a6a77dfbd962ccbcddde12dec5286c09" qunit@^2.4.1: - version "2.6.0" - resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.6.0.tgz#347b34686e2aa67a9f81f81d39f0771603ed628c" + version "2.6.1" + resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.6.1.tgz#3a2a5f05307f873174e0f5859010fb7380380e3c" dependencies: chokidar "1.7.0" commander "2.12.2" @@ -8052,12 +7965,13 @@ qunit@^2.4.1: resolve "1.5.0" walk-sync "0.3.2" -randomatic@^1.1.3: - version "1.1.7" - resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c" +randomatic@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-3.0.0.tgz#d35490030eb4f7578de292ce6dfb04a91a128923" dependencies: - is-number "^3.0.0" - kind-of "^4.0.0" + is-number "^4.0.0" + kind-of "^6.0.0" + math-random "^1.0.1" randombytes@^2.0.0, randombytes@^2.0.1, randombytes@^2.0.5: version "2.0.6" @@ -8076,7 +7990,7 @@ range-parser@~1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e" -raw-body@2.3.2, raw-body@^2.2.0: +raw-body@2.3.2: version "2.3.2" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.2.tgz#bcd60c77d3eb93cde0050295c3f379389bc88f89" dependencies: @@ -8085,6 +7999,15 @@ raw-body@2.3.2, raw-body@^2.2.0: iconv-lite "0.4.19" unpipe "1.0.0" +raw-body@2.3.3, raw-body@^2.2.0: + version "2.3.3" + resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3" + dependencies: + bytes "3.0.0" + http-errors "1.6.3" + iconv-lite "0.4.23" + unpipe "1.0.0" + raw-body@~1.1.0: version "1.1.7" resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-1.1.7.tgz#1d027c2bfa116acc6623bca8f00016572a87d425" @@ -8093,10 +8016,10 @@ raw-body@~1.1.0: string_decoder "0.10" rc@^1.1.7: - version "1.2.6" - resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.6.tgz#eb18989c6d4f4f162c399f79ddd29f3835568092" + version "1.2.8" + resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" dependencies: - deep-extend "~0.4.0" + deep-extend "^0.6.0" ini "~1.3.0" minimist "^1.2.0" strip-json-comments "~2.0.1" @@ -8168,7 +8091,7 @@ read@1, read@~1.0.1, read@~1.0.7: dependencies: mute-stream "~0.0.4" -"readable-stream@1 || 2", readable-stream@2, readable-stream@^2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3: +"readable-stream@1 || 2", readable-stream@2, readable-stream@^2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" dependencies: @@ -8275,8 +8198,8 @@ redeyed@~1.0.0: esprima "~3.0.0" regenerate@^1.2.1: - version "1.3.3" - resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.3.3.tgz#0c336d3980553d755c39b586ae3b20aa49c82b7f" + version "1.4.0" + resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz#4a856ec4b56e4077c557589cae85e7a4c8869a11" regenerator-runtime@^0.10.5: version "0.10.5" @@ -8385,8 +8308,8 @@ request-progress@^2.0.1: throttleit "^1.0.0" request@2, request@^2.47.0, request@^2.72.0, request@^2.81.0: - version "2.85.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.85.0.tgz#5a03615a47c61420b3eb99b7dba204f83603e1fa" + version "2.87.0" + resolved "https://registry.yarnpkg.com/request/-/request-2.87.0.tgz#32f00235cd08d482b4d0d68db93a829c0ed5756e" dependencies: aws-sign2 "~0.7.0" aws4 "^1.6.0" @@ -8396,7 +8319,6 @@ request@2, request@^2.47.0, request@^2.72.0, request@^2.81.0: forever-agent "~0.6.1" form-data "~2.3.1" har-validator "~5.0.3" - hawk "~6.0.2" http-signature "~1.2.0" is-typedarray "~1.0.0" isstream "~0.1.2" @@ -8406,38 +8328,10 @@ request@2, request@^2.47.0, request@^2.72.0, request@^2.81.0: performance-now "^2.1.0" qs "~6.5.1" safe-buffer "^5.1.1" - stringstream "~0.0.5" tough-cookie "~2.3.3" tunnel-agent "^0.6.0" uuid "^3.1.0" -request@2.81.0: - version "2.81.0" - resolved "https://registry.yarnpkg.com/request/-/request-2.81.0.tgz#c6928946a0e06c5f8d6f8a9333469ffda46298a0" - dependencies: - aws-sign2 "~0.6.0" - aws4 "^1.2.1" - caseless "~0.12.0" - combined-stream "~1.0.5" - extend "~3.0.0" - forever-agent "~0.6.1" - form-data "~2.1.1" - har-validator "~4.2.1" - hawk "~3.1.3" - http-signature "~1.1.0" - is-typedarray "~1.0.0" - isstream "~0.1.2" - json-stringify-safe "~5.0.1" - mime-types "~2.1.7" - oauth-sign "~0.8.1" - performance-now "^0.2.0" - qs "~6.4.0" - safe-buffer "^5.0.1" - stringstream "~0.0.4" - tough-cookie "~2.3.0" - tunnel-agent "^0.6.0" - uuid "^3.0.0" - request@~2.67.0: version "2.67.0" resolved "https://registry.yarnpkg.com/request/-/request-2.67.0.tgz#8af74780e2bf11ea0ae9aa965c11f11afd272742" @@ -8496,12 +8390,6 @@ require-directory@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42" -require-folder-tree@^1.4.5: - version "1.4.5" - resolved "https://registry.yarnpkg.com/require-folder-tree/-/require-folder-tree-1.4.5.tgz#dfe553cbab98cc88e1c56a3f2f358f06ef85bcb0" - dependencies: - lodash "3.8.0" - require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" @@ -8513,7 +8401,7 @@ require-uncached@^1.0.3: caller-path "^0.1.0" resolve-from "^1.0.0" -requires-port@1.x.x: +requires-port@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff" @@ -8549,13 +8437,7 @@ resolve@1.5.0: dependencies: path-parse "^1.0.5" -resolve@^1.1.2, resolve@^1.1.4, resolve@^1.1.7: - version "1.6.0" - resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.6.0.tgz#0fbd21278b27b4004481c395349e7aba60a9ff5c" - dependencies: - path-parse "^1.0.5" - -resolve@^1.1.6, resolve@^1.3.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.7.1: +resolve@^1.1.2, resolve@^1.1.4, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.3.0, resolve@^1.3.3, resolve@^1.4.0, resolve@^1.5.0, resolve@^1.7.1: version "1.7.1" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.7.1.tgz#aadd656374fd298aee895bc026b8297418677fd3" dependencies: @@ -8589,7 +8471,7 @@ right-align@^0.1.1: dependencies: align-text "^0.1.1" -rimraf@2, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.1, rimraf@^2.5.2, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: +rimraf@2, rimraf@^2.2.8, rimraf@^2.3.2, rimraf@^2.3.4, rimraf@^2.4.3, rimraf@^2.4.4, rimraf@^2.5.2, rimraf@^2.5.3, rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.2: version "2.6.2" resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36" dependencies: @@ -8606,10 +8488,10 @@ rimraf@~2.5.0: glob "^7.0.5" ripemd160@^2.0.0, ripemd160@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.1.tgz#0f4584295c53a3628af7e6d79aca21ce57d1c6e7" + version "2.0.2" + resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c" dependencies: - hash-base "^2.0.0" + hash-base "^3.0.0" inherits "^2.0.1" rollup-plugin-commonjs@^9.1.0: @@ -8622,8 +8504,8 @@ rollup-plugin-commonjs@^9.1.0: rollup-pluginutils "^2.0.1" rollup-plugin-json@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-2.3.0.tgz#3c07a452c1b5391be28006fbfff3644056ce0add" + version "2.3.1" + resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-2.3.1.tgz#9759d27f33dcd2c896de18b6235df162b88edd77" dependencies: rollup-pluginutils "^2.0.1" @@ -8645,10 +8527,10 @@ rollup-plugin-node-resolve@^3.3.0: resolve "^1.1.6" rollup-pluginutils@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.0.1.tgz#7ec95b3573f6543a46a6461bd9a7c544525d0fc0" + version "2.3.0" + resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.0.tgz#478ace04bd7f6da2e724356ca798214884738fc4" dependencies: - estree-walker "^0.3.0" + estree-walker "^0.5.2" micromatch "^2.3.11" rollup@^0.41.4: @@ -8676,14 +8558,10 @@ rsvp@^3.0.14, rsvp@^3.0.16, rsvp@^3.0.17, rsvp@^3.0.18, rsvp@^3.0.21, rsvp@^3.0. version "3.6.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.6.2.tgz#2e96491599a96cde1b515d5674a8f7a91452926a" -rsvp@^4.6.1, rsvp@^4.7.0: +rsvp@^4.6.1, rsvp@^4.7.0, rsvp@^4.8.2: version "4.8.2" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-4.8.2.tgz#9d5647108735784eb13418cdddb56f75b919d722" -rsvp@~3.0.6: - version "3.0.21" - resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.0.21.tgz#49c588fe18ef293bcd0ab9f4e6756e6ac433359f" - rsvp@~3.2.1: version "3.2.1" resolved "https://registry.yarnpkg.com/rsvp/-/rsvp-3.2.1.tgz#07cb4a5df25add9e826ebc67dcc9fd89db27d84a" @@ -8708,10 +8586,14 @@ rx@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/rx/-/rx-4.1.0.tgz#a5f13ff79ef3b740fe30aa803fb09f98805d4782" -safe-buffer@5.1.1, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@~5.1.0, safe-buffer@~5.1.1: +safe-buffer@5.1.1: version "5.1.1" resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853" +safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1: + version "5.1.2" + resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" + safe-json-parse@~1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57" @@ -8722,6 +8604,10 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" +"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + sane@^1.6.0: version "1.7.0" resolved "https://registry.yarnpkg.com/sane/-/sane-1.7.0.tgz#b3579bccb45c94cf20355cc81124990dfd346e30" @@ -8735,10 +8621,11 @@ sane@^1.6.0: watch "~0.10.0" sane@^2.4.1: - version "2.5.0" - resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.0.tgz#6359cd676f5efd9988b264d8ce3b827dd6b27bec" + version "2.5.2" + resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa" dependencies: anymatch "^2.0.0" + capture-exit "^1.2.0" exec-sh "^0.2.0" fb-watchman "^2.0.0" micromatch "^3.1.4" @@ -8746,7 +8633,7 @@ sane@^2.4.1: walker "~1.0.5" watch "~0.18.0" optionalDependencies: - fsevents "^1.1.1" + fsevents "^1.2.3" sass-graph@^2.2.4: version "2.2.4" @@ -8761,7 +8648,7 @@ sax@1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a" -sax@>=0.6.0: +sax@>=0.6.0, sax@^1.2.4: version "1.2.4" resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9" @@ -8772,7 +8659,7 @@ scss-tokenizer@^0.2.3: js-base64 "^2.1.8" source-map "^0.4.2" -"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.1.0, semver@^5.1.1, semver@^5.3.0, semver@^5.4.1: +"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", "semver@2.x || 3.x || 4 || 5", "semver@4 || 5", "semver@^2.3.0 || 3.x || 4 || 5", semver@^5.1.0, semver@^5.1.1, semver@^5.3.0, semver@^5.4.1, semver@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.0.tgz#dc4bbc7a6ca9d916dee5d43516f0092b58f7b8ab" @@ -8784,10 +8671,6 @@ semver@~2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/semver/-/semver-2.3.2.tgz#b9848f25d6cf36333073ec9ef8856d42f1233e52" -semver@~5.0.1: - version "5.0.3" - resolved "https://registry.yarnpkg.com/semver/-/semver-5.0.3.tgz#77466de589cd5d3c95f138aa78bc569a3cb5d27a" - semver@~5.1.0: version "5.1.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.1.1.tgz#a3292a373e6f3e0798da0b20641b9a9c5bc47e19" @@ -8924,8 +8807,8 @@ simple-fmt@~0.1.0: resolved "https://registry.yarnpkg.com/simple-fmt/-/simple-fmt-0.1.0.tgz#191bf566a59e6530482cb25ab53b4a8dc85c3a6b" simple-git@^1.57.0: - version "1.92.0" - resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.92.0.tgz#6061468eb7d19f0141078fc742e62457e910f547" + version "1.95.1" + resolved "https://registry.yarnpkg.com/simple-git/-/simple-git-1.95.1.tgz#8f23b998f0d9e877b12e0291200ce115e004878c" dependencies: debug "^3.1.0" @@ -8990,12 +8873,6 @@ sntp@1.x.x: dependencies: hoek "2.x.x" -sntp@2.x.x: - version "2.1.0" - resolved "https://registry.yarnpkg.com/sntp/-/sntp-2.1.0.tgz#2c6cec14fedc2222739caf9b5c3d85d1cc5a2cc8" - dependencies: - hoek "4.x.x" - socket.io-adapter@0.5.0: version "0.5.0" resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-0.5.0.tgz#cb6d4bb8bec81e1078b99677f9ced0046066bb8b" @@ -9059,9 +8936,10 @@ sort-object-keys@^1.1.1: resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.2.tgz#d3a6c48dc2ac97e6bc94367696e03f6d09d37952" sort-package-json@^1.4.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.11.0.tgz#b7b59ebdfaf3f8719ec0bc2056264e937868cbfb" + version "1.15.0" + resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.15.0.tgz#3c732cc8312eb4aa12f6eccab1bc3dea89b11dff" dependencies: + detect-indent "^5.0.0" sort-object-keys "^1.1.1" sorted-object@~1.0.0: @@ -9069,10 +8947,10 @@ sorted-object@~1.0.0: resolved "https://registry.yarnpkg.com/sorted-object/-/sorted-object-1.0.0.tgz#5d1f4f9c1fb2cd48965967304e212eb44cfb6d05" source-map-resolve@^0.5.0: - version "0.5.1" - resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.1.tgz#7ad0f593f2281598e854df80f19aae4b92d7a11a" + version "0.5.2" + resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259" dependencies: - atob "^2.0.0" + atob "^2.1.1" decode-uri-component "^0.2.0" resolve-url "^0.2.1" source-map-url "^0.4.0" @@ -9091,9 +8969,10 @@ source-map-support@^0.4.0, source-map-support@^0.4.15: source-map "^0.5.6" source-map-support@^0.5.0: - version "0.5.4" - resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.4.tgz#54456efa89caa9270af7cd624cc2f123e51fbae8" + version "0.5.6" + resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.6.tgz#4435cee46b1aab62b8e8610ce60f788091c51c13" dependencies: + buffer-from "^1.0.0" source-map "^0.6.0" source-map-url@^0.3.0: @@ -9205,13 +9084,14 @@ sri-toolbox@^0.2.0: resolved "https://registry.yarnpkg.com/sri-toolbox/-/sri-toolbox-0.2.0.tgz#a7fea5c3fde55e675cf1c8c06f3ebb5c2935835e" sshpk@^1.7.0: - version "1.14.1" - resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.1.tgz#130f5975eddad963f1d56f92b9ac6c51fa9f83eb" + version "1.14.2" + resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.14.2.tgz#c6fc61648a3d9c4e764fd3fcdf4ea105e492ba98" dependencies: asn1 "~0.2.3" assert-plus "^1.0.0" dashdash "^1.12.0" getpass "^0.1.1" + safer-buffer "^2.0.2" optionalDependencies: bcrypt-pbkdf "^1.0.0" ecc-jsbn "~0.1.1" @@ -9219,8 +9099,8 @@ sshpk@^1.7.0: tweetnacl "~0.14.0" stable@~0.1.3: - version "0.1.6" - resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.6.tgz#910f5d2aed7b520c6e777499c1f32e139fdecb10" + version "0.1.8" + resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf" static-extend@^0.1.1: version "0.1.2" @@ -9258,12 +9138,12 @@ stream-combiner2@^1.1.1: readable-stream "^2.0.2" stream-http@^2.0.0: - version "2.8.1" - resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.1.tgz#d0441be1a457a73a733a8a7b53570bebd9ef66a4" + version "2.8.3" + resolved "https://registry.yarnpkg.com/stream-http/-/stream-http-2.8.3.tgz#b2d242469288a5a27ec4fe8933acf623de6514fc" dependencies: builtin-status-codes "^3.0.0" inherits "^2.0.1" - readable-stream "^2.3.3" + readable-stream "^2.3.6" to-arraybuffer "^1.0.0" xtend "^4.0.0" @@ -9290,7 +9170,7 @@ string-width@^1.0.1, string-width@^1.0.2: is-fullwidth-code-point "^1.0.0" strip-ansi "^3.0.0" -string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: +"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.0, string-width@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e" dependencies: @@ -9319,15 +9199,9 @@ stringset@~0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/stringset/-/stringset-0.2.1.tgz#ef259c4e349344377fcd1c913dd2e848c9c042b5" -stringstream@~0.0.4, stringstream@~0.0.5: - version "0.0.5" - resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.5.tgz#4e484cd4de5a0bbbee18e46307710a8a81621878" - -strip-ansi@^0.3.0: - version "0.3.0" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-0.3.0.tgz#25f48ea22ca79187f3174a4db8759347bb126220" - dependencies: - ansi-regex "^0.2.1" +stringstream@~0.0.4: + version "0.0.6" + resolved "https://registry.yarnpkg.com/stringstream/-/stringstream-0.0.6.tgz#7880225b0d4ad10e30927d167a1d6f2fd3b33a72" strip-ansi@^3.0.0, strip-ansi@^3.0.1: version "3.0.1" @@ -9381,10 +9255,6 @@ sum-up@^1.0.1: dependencies: chalk "^1.0.0" -supports-color@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-0.2.0.tgz#d92de2694eb3f67323973d7ae3d8b55b4c22190a" - supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -9396,8 +9266,8 @@ supports-color@^3.1.0: has-flag "^1.0.0" supports-color@^5.3.0: - version "5.3.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.3.0.tgz#5b24ac15db80fa927cf5227a4a33fd3c4c7676c0" + version "5.4.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.4.0.tgz#1c6b337402c2137605efe19f10fec390f6faab54" dependencies: has-flag "^3.0.0" @@ -9431,20 +9301,7 @@ tap-parser@^5.1.0: optionalDependencies: readable-stream "^2" -tar-pack@^3.4.0: - version "3.4.1" - resolved "https://registry.yarnpkg.com/tar-pack/-/tar-pack-3.4.1.tgz#e1dbc03a9b9d3ba07e896ad027317eb679a10a1f" - dependencies: - debug "^2.2.0" - fstream "^1.0.10" - fstream-ignore "^1.0.5" - once "^1.3.3" - readable-stream "^2.1.4" - rimraf "^2.5.1" - tar "^2.2.1" - uid-number "^0.0.6" - -tar@^2.0.0, tar@^2.2.1, tar@~2.2.1: +tar@^2.0.0, tar@~2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/tar/-/tar-2.2.1.tgz#8e4d2a256c0e2185c6b18ad694aec968b83cb1d1" dependencies: @@ -9452,6 +9309,18 @@ tar@^2.0.0, tar@^2.2.1, tar@~2.2.1: fstream "^1.0.2" inherits "2" +tar@^4: + version "4.4.4" + resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.4.tgz#ec8409fae9f665a4355cc3b4087d0820232bb8cd" + dependencies: + chownr "^1.0.1" + fs-minipass "^1.2.5" + minipass "^2.3.3" + minizlib "^1.1.0" + mkdirp "^0.5.0" + safe-buffer "^5.1.2" + yallist "^3.0.2" + temp@0.8.3: version "0.8.3" resolved "https://registry.yarnpkg.com/temp/-/temp-0.8.3.tgz#e0c6bc4d26b903124410e4fed81103014dfc1f59" @@ -9459,9 +9328,16 @@ temp@0.8.3: os-tmpdir "^1.0.0" rimraf "~2.2.6" +terser@^3.7.5: + version "3.7.6" + resolved "https://registry.yarnpkg.com/terser/-/terser-3.7.6.tgz#0b3c609f22278c089780ac1cdc63627071e3b96a" + dependencies: + commander "~2.14.1" + source-map "~0.6.1" + testem@^1.18.0: - version "1.18.4" - resolved "https://registry.yarnpkg.com/testem/-/testem-1.18.4.tgz#e45fed922bec2f54a616c43f11922598ac97eb41" + version "1.18.5" + resolved "https://registry.yarnpkg.com/testem/-/testem-1.18.5.tgz#912f3bfd4773519fa3cce0a8fd0e354763cbd545" dependencies: backbone "^1.1.2" bluebird "^3.4.6" @@ -9681,13 +9557,6 @@ uc.micro@^1.0.1, uc.micro@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/uc.micro/-/uc.micro-1.0.5.tgz#0c65f15f815aa08b560a61ce8b4db7ffc3f45376" -uglify-es@^3.1.3: - version "3.3.9" - resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677" - dependencies: - commander "~2.13.0" - source-map "~0.6.1" - uglify-js@^2.6: version "2.8.29" resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-2.8.29.tgz#29c5733148057bb4e1f75df35b7a9cb72e6a59dd" @@ -9701,7 +9570,7 @@ uglify-to-browserify@~1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz#6e0924d6bda6b5afe349e39a6d632850a0f882b7" -uid-number@0.0.6, uid-number@^0.0.6: +uid-number@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/uid-number/-/uid-number-0.0.6.tgz#0ea10e8035e8eb5b8e4449f06da1c730663baa81" @@ -9725,8 +9594,8 @@ underscore.string@~3.3.4: util-deprecate "^1.0.2" underscore@>=1.8.3: - version "1.8.3" - resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.8.3.tgz#4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022" + version "1.9.1" + resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.1.tgz#06dce34a0e68a7babc29b365b8e74b8925203961" union-value@^1.0.0: version "1.0.0" @@ -9837,12 +9706,18 @@ util-extend@^1.0.1: version "1.0.3" resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f" -util@0.10.3, util@~0.10.1: +util@0.10.3: version "0.10.3" resolved "https://registry.yarnpkg.com/util/-/util-0.10.3.tgz#7afb1afe50805246489e3db7fe0ed379336ac0f9" dependencies: inherits "2.0.1" +util@~0.10.1: + version "0.10.4" + resolved "https://registry.yarnpkg.com/util/-/util-0.10.4.tgz#3aa0125bfe668a4672de58857d3ace27ecb76901" + dependencies: + inherits "2.0.3" + utils-merge@1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" @@ -9891,10 +9766,8 @@ vlq@^0.2.2: resolved "https://registry.yarnpkg.com/vlq/-/vlq-0.2.3.tgz#8f3e4328cf63b1540c0d67e1b2778386f8975b26" vm-browserify@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.0.0.tgz#88768214567fd00a27be2f553712c9fc5aeb548f" - dependencies: - component-indexof "0.0.3" + version "1.0.1" + resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.0.1.tgz#a15d7762c4c48fa6bf9f3309a21340f00ed23063" walk-sync@0.3.2, walk-sync@^0.3.0, walk-sync@^0.3.1, walk-sync@^0.3.2: version "0.3.2" @@ -9949,8 +9822,8 @@ which-module@^1.0.0: resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f" which@1, which@^1.0.5, which@^1.1.1, which@^1.2.10, which@^1.2.12, which@^1.2.14, which@^1.2.9, which@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a" + version "1.3.1" + resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" dependencies: isexe "^2.0.0" @@ -9961,10 +9834,10 @@ which@~1.2.1: isexe "^2.0.0" wide-align@^1.1.0: - version "1.1.2" - resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.2.tgz#571e0f1b0604636ebc0dfc21b0339bbe31341710" + version "1.1.3" + resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457" dependencies: - string-width "^1.0.2" + string-width "^1.0.2 || 2" window-size@0.1.0: version "0.1.0" @@ -10047,7 +9920,7 @@ xml2js@0.4.17: sax ">=0.6.0" xmlbuilder "^4.1.0" -xmlbuilder@4.2.1, xmlbuilder@^4.1.0: +xmlbuilder@^4.1.0: version "4.2.1" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-4.2.1.tgz#aa58a3041a066f90eaa16c2f5389ff19f3f461a5" dependencies: @@ -10098,6 +9971,10 @@ yallist@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" +yallist@^3.0.0, yallist@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" + yam@0.0.22: version "0.0.22" resolved "https://registry.yarnpkg.com/yam/-/yam-0.0.22.tgz#38a76cb79a19284d9206ed49031e359a1340bd06" From 76bed8847e2dd0829bcc69b797dc5cce47ea1aa9 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Fri, 8 Jun 2018 08:42:09 -0400 Subject: [PATCH 22/34] Deprecate old versions of Ember --- app/components/build-messages.js | 2 +- app/services/dependency-resolver.js | 43 ++++++++++++++++++---- blueprints/twiddle.json | 2 +- bower.json | 2 +- ember-cli-build.js | 2 + package.json | 3 +- tests/acceptance/dependency-test.js | 57 ++++++++++++++++++++--------- vendor/shims/compare-versions.js | 12 ++++++ yarn.lock | 4 ++ 9 files changed, 99 insertions(+), 28 deletions(-) create mode 100644 vendor/shims/compare-versions.js diff --git a/app/components/build-messages.js b/app/components/build-messages.js index decac78b..aad04f0a 100644 --- a/app/components/build-messages.js +++ b/app/components/build-messages.js @@ -10,7 +10,7 @@ export default Ember.Component.extend({ // eslint-disable-next-line no-console console.error(error); }); - this.get('notify').info('Errors were dumped to console'); + this.get('notify').error('Errors were dumped to console'); } } }); diff --git a/app/services/dependency-resolver.js b/app/services/dependency-resolver.js index e5c860a8..7109ee9d 100644 --- a/app/services/dependency-resolver.js +++ b/app/services/dependency-resolver.js @@ -2,31 +2,36 @@ import Ember from 'ember'; import config from '../config/environment'; import { task, timeout } from 'ember-concurrency'; +import compareVersions from 'compare-versions'; -const { computed, inject, RSVP, testing } = Ember; +const { computed, deprecate, inject, RSVP, testing } = Ember; -const EMBER_VERSIONS = ['2.18.2', '2.17.2', '2.16.2', '2.15.3', '2.14.1', '2.13.0', '2.12.0', '2.11.2', '2.10.2', '2.9.1', '2.8.2', '2.7.3', '2.6.2', '2.5.1', '2.4.5', '2.3.2', '2.2.2', '2.1.2', '2.0.3', '1.13.13', '1.12.2']; -const EMBER_DATA_VERSIONS = ['2.18.2', '2.17.1', '2.16.3', '2.15.3', '2.14.10', '2.13.2', '2.12.2', '2.11.3', '2.10.0', '2.9.0', '2.8.1', '2.7.0', '2.6.2', '2.5.5', '2.4.3', '2.3.3', '2.2.1', '2.1.0', '2.0.1', '1.13.15']; +const EMBER_VERSIONS = ['2.18.2', '2.17.2', '2.16.2', '2.15.3', '2.14.1', '2.13.0', '2.12.0']; +const EMBER_DATA_VERSIONS = ['2.18.2', '2.17.1', '2.16.4', '2.15.3', '2.14.10', '2.13.2', '2.12.2']; const VERSION_REGEX = /^\d+.\d+.\d+(-beta\.\d+)?$/; const CDN_MAP = { 'ember': { + pakage: 'ember-source', library: 'ember.js', fileName: 'ember.debug.js' }, 'ember-template-compiler': { + pakage: 'ember-source', library: 'ember.js', fileName: 'ember-template-compiler.js' }, 'ember-testing': { + pakage: 'ember-source', library: 'ember.js', fileName: 'ember-testing.js' }, 'ember-data': { + pakage: 'ember-data', library: 'ember-data.js', fileName: 'ember-data.js' } @@ -48,7 +53,7 @@ export default Ember.Service.extend({ resolveDependencies(dependencies) { Object.keys(dependencies).forEach((name) => { - var value = dependencies[name]; + let value = dependencies[name]; dependencies[name] = this.resolveDependency(name, value); }); @@ -148,15 +153,39 @@ export default Ember.Service.extend({ }, channelURL(name, channel) { - var fileName = CHANNEL_FILENAME_MAP[name]; + let fileName = CHANNEL_FILENAME_MAP[name]; return `//s3.amazonaws.com/builds.emberjs.com/${channel}/${fileName}`; }, cdnURL(name, version) { - var { library, fileName } = CDN_MAP[name]; + let { pakage, library, fileName } = CDN_MAP[name]; - return `//cdnjs.cloudflare.com/ajax/libs/${library}/${version}/${fileName}`; + let deprecatedUrl = `//cdnjs.cloudflare.com/ajax/libs/${library}/${version}/${fileName}`; + + if (name === 'ember-data') { + const msg = 'It is recommended you use ember-data as an addon'; + deprecate(msg, false, { + id: 'ember-twiddle.deprecate-ember-data-as-dependency', + until: '0.16.0', + }); + this.get('notify').warning(msg); + + return deprecatedUrl; + } + + if (compareVersions(version, '2.12.0') === -1) { + const msg = 'Versions of Ember prior to 2.12.0 are no longer supported in Ember Twiddle'; + deprecate(msg, false, { + id: 'ember-twiddle.deprecate-ember-versions-before-2-12', + until: '0.16.0', + }); + this.get('notify').warning(msg); + + return deprecatedUrl; + } + + return `//cdn.jsdelivr.net/npm/${pakage}@${version}/dist/${fileName}`; }, emberVersions: computed(function() { diff --git a/blueprints/twiddle.json b/blueprints/twiddle.json index 6538c8fa..dac1298c 100644 --- a/blueprints/twiddle.json +++ b/blueprints/twiddle.json @@ -1,5 +1,5 @@ { - "version": "0.14.1", + "version": "0.15.0", "EmberENV": { "FEATURES": {} }, diff --git a/bower.json b/bower.json index cabf1c55..aea3ac85 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "ember-twiddle", - "version": "0.14.1", + "version": "0.15.0", "dependencies": { "jquery": "1.11.3", "bootstrap-sass": "~3.3.5", diff --git a/ember-cli-build.js b/ember-cli-build.js index 59a94e01..b7436d5e 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -101,6 +101,8 @@ module.exports = function(defaults) { } app.import('vendor/bootstrap-dropdown-submenu-fix.css'); app.import('vendor/hint.css'); + app.import('node_modules/compare-versions/index.js'); + app.import('vendor/shims/compare-versions.js'); const nodeBuiltins = require('rollup-plugin-node-builtins'); const json = require('rollup-plugin-json'); diff --git a/package.json b/package.json index 10770031..f7dcc043 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ember-twiddle", - "version": "0.14.1", + "version": "0.15.0", "description": "https://ember-twiddle.com", "private": true, "directories": { @@ -26,6 +26,7 @@ "broccoli-funnel": "^2.0.1", "broccoli-merge-trees": "^3.0.0", "browserify": "^16.2.0", + "compare-versions": "^3.2.1", "dedent": "~0.7.0", "ember-ajax": "^3.0.0", "ember-api-actions": "~0.1.8", diff --git a/tests/acceptance/dependency-test.js b/tests/acceptance/dependency-test.js index 4a1355ec..8e973038 100644 --- a/tests/acceptance/dependency-test.js +++ b/tests/acceptance/dependency-test.js @@ -3,6 +3,26 @@ import moduleForAcceptance from 'ember-twiddle/tests/helpers/module-for-acceptan moduleForAcceptance('Acceptance | dependencies'); +const oldVersionContent = ` +{ +"dependencies": { +"jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.js", +"ember": "1.13.10", +"ember-data": "1.13.15" +} +} +`; + +const newVersionContent = ` +{ +"dependencies": { +"jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.js", +"ember": "2.17.0", +"ember-data": "2.18.0" +} +} +`; + const TWIDDLE_SHOWING_VERSIONS = [ { filename: "application.template.hbs", @@ -24,16 +44,7 @@ const TWIDDLE_SHOWING_VERSIONS = [ ` }, { - filename: 'twiddle.json', - content: ` - { - "dependencies": { - "jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.3/jquery.js", - "ember": "1.13.10", - "ember-data": "1.13.15" - } - } - ` + filename: 'twiddle.json' } ]; @@ -73,7 +84,18 @@ test('Able to run a gist using an external dependency', function(assert) { }); }); -test('Able to resolve ember / ember-data dependencies via version only', function(assert) { +test('Able to resolve ember / ember-data dependencies via version only (new versions)', function(assert) { + TWIDDLE_SHOWING_VERSIONS[2].content = newVersionContent; + runGist(TWIDDLE_SHOWING_VERSIONS); + + andThen(function() { + assert.equal(outputContents('.ember-version'), '2.17.0'); + assert.equal(outputContents('.ember-data-version'), '2.18.0'); + }); +}); + +test('Able to resolve ember / ember-data dependencies via version only (old versions)', function(assert) { + TWIDDLE_SHOWING_VERSIONS[2].content = oldVersionContent; runGist(TWIDDLE_SHOWING_VERSIONS); andThen(function() { @@ -83,25 +105,26 @@ test('Able to resolve ember / ember-data dependencies via version only', functio }); test('Dependencies can be changed via the UI', function(assert) { + TWIDDLE_SHOWING_VERSIONS[2].content = newVersionContent; runGist(TWIDDLE_SHOWING_VERSIONS); andThen(function() { - assert.equal(outputContents('.ember-version'), '1.13.10'); - assert.equal(outputContents('.ember-data-version'), '1.13.15'); + assert.equal(outputContents('.ember-version'), '2.17.0'); + assert.equal(outputContents('.ember-data-version'), '2.18.0'); }); andThen(function() { click('.versions-menu .dropdown-toggle'); - click('.test-set-ember-data-version:contains("2.1.0")'); + click('.test-set-ember-data-version:contains("2.16.4")'); click('.versions-menu .dropdown-toggle'); - click('.test-set-ember-version:contains("2.1.2")'); + click('.test-set-ember-version:contains("2.15.3")'); waitForLoadedIFrame(); }); andThen(function() { - assert.equal(outputContents('.ember-version'), '2.1.2'); - assert.equal(outputContents('.ember-data-version'), '2.1.0'); + assert.equal(outputContents('.ember-version'), '2.15.3'); + assert.equal(outputContents('.ember-data-version'), '2.16.4'); }); }); diff --git a/vendor/shims/compare-versions.js b/vendor/shims/compare-versions.js new file mode 100644 index 00000000..0d6a5191 --- /dev/null +++ b/vendor/shims/compare-versions.js @@ -0,0 +1,12 @@ +(function() { + function vendorModule() { + 'use strict'; + + return { + 'default': self['compareVersions'], + __esModule: true, + }; + } + + define('compare-versions', [], vendorModule); +})(); diff --git a/yarn.lock b/yarn.lock index a2f5ac2a..2fa86d80 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2292,6 +2292,10 @@ commoner@~0.10.3: q "^1.1.2" recast "^0.11.17" +compare-versions@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.2.1.tgz#a49eb7689d4caaf0b6db5220173fd279614000f7" + component-bind@1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/component-bind/-/component-bind-1.0.0.tgz#00c608ab7dcd93897c0009651b1d3a8e1e73bbd1" From 34492fe4188de90f59579dba442a761cf0579541 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Fri, 8 Jun 2018 15:16:23 -0400 Subject: [PATCH 23/34] Support Ember 3.0 - 3.2 --- app/services/dependency-resolver.js | 8 ++++---- blueprints/twiddle.json | 8 ++++---- tests/acceptance/gist-test.js | 6 ++++++ tests/integration/components/build-messages-test.js | 10 ++++++---- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/app/services/dependency-resolver.js b/app/services/dependency-resolver.js index 7109ee9d..a24b4c5d 100644 --- a/app/services/dependency-resolver.js +++ b/app/services/dependency-resolver.js @@ -6,8 +6,8 @@ import compareVersions from 'compare-versions'; const { computed, deprecate, inject, RSVP, testing } = Ember; -const EMBER_VERSIONS = ['2.18.2', '2.17.2', '2.16.2', '2.15.3', '2.14.1', '2.13.0', '2.12.0']; -const EMBER_DATA_VERSIONS = ['2.18.2', '2.17.1', '2.16.4', '2.15.3', '2.14.10', '2.13.2', '2.12.2']; +const EMBER_VERSIONS = ['3.2.0', '3.1.2', '3.0.0', '2.18.2', '2.17.2', '2.16.2', '2.15.3', '2.14.1', '2.13.0', '2.12.0']; +const EMBER_DATA_VERSIONS = ['3.1.1', '3.0.2', '2.18.2', '2.17.1', '2.16.4', '2.15.3', '2.14.10', '2.13.2', '2.12.2']; const VERSION_REGEX = /^\d+.\d+.\d+(-beta\.\d+)?$/; @@ -165,7 +165,7 @@ export default Ember.Service.extend({ if (name === 'ember-data') { const msg = 'It is recommended you use ember-data as an addon'; - deprecate(msg, false, { + deprecate(msg, testing, { id: 'ember-twiddle.deprecate-ember-data-as-dependency', until: '0.16.0', }); @@ -176,7 +176,7 @@ export default Ember.Service.extend({ if (compareVersions(version, '2.12.0') === -1) { const msg = 'Versions of Ember prior to 2.12.0 are no longer supported in Ember Twiddle'; - deprecate(msg, false, { + deprecate(msg, testing, { id: 'ember-twiddle.deprecate-ember-versions-before-2-12', until: '0.16.0', }); diff --git a/blueprints/twiddle.json b/blueprints/twiddle.json index dac1298c..a4d4cf03 100644 --- a/blueprints/twiddle.json +++ b/blueprints/twiddle.json @@ -9,11 +9,11 @@ }, "dependencies": { "jquery": "https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.js", - "ember": "2.18.2", - "ember-template-compiler": "2.18.2", - "ember-testing": "2.18.2" + "ember": "3.2.0", + "ember-template-compiler": "3.2.0", + "ember-testing": "3.2.0" }, "addons": { - "ember-data": "2.18.2" + "ember-data": "3.1.1" } } diff --git a/tests/acceptance/gist-test.js b/tests/acceptance/gist-test.js index a5e4e794..be5b16b7 100644 --- a/tests/acceptance/gist-test.js +++ b/tests/acceptance/gist-test.js @@ -321,6 +321,7 @@ test('unsaved indicator', function(assert) { click(firstColumnTextarea); fillIn(firstColumnTextarea, "\"some text\";"); triggerEvent(firstColumnTextarea, "blur"); + triggerEvent(firstColumnTextarea, "focusout"); andThen(function() { return timeout(10); @@ -362,6 +363,11 @@ test('editing a file updates gist', function(assert) { click(firstColumnTextarea); fillIn(firstColumnTextarea, '
some text
'); triggerEvent(firstColumnTextarea, "blur"); + triggerEvent(firstColumnTextarea, "focusout"); + + andThen(function() { + return timeout(10); + }); andThen(function() { assert.equal(find(firstColumnTextarea).val(), '
some text
'); diff --git a/tests/integration/components/build-messages-test.js b/tests/integration/components/build-messages-test.js index cbf6685f..64a4982d 100644 --- a/tests/integration/components/build-messages-test.js +++ b/tests/integration/components/build-messages-test.js @@ -19,7 +19,8 @@ test('it shows the number of build messages', function(assert) { this.set('buildErrors', []); this.set('isBuilding', false); this.set('notify', { - info() {} + info() {}, + error() {} }); this.render(hbs`{{build-messages buildErrors=buildErrors isBuilding=isBuilding notify=notify}}`); @@ -31,12 +32,13 @@ test('it shows the number of build messages', function(assert) { assert.equal(this.$('span').text().replace(/\s+/g, " ").trim(), 'Output ( 2 build errors )', 'shows number of build errors'); }); -test('it calls notify.info() when clicking on build errors', function(assert) { +test('it calls notify.errpr() when clicking on build errors', function(assert) { assert.expect(1); let notifyObject = Ember.Object.create({ called: false, - info() { + info() {}, + error() { this.set('called', true); } }); @@ -50,5 +52,5 @@ test('it calls notify.info() when clicking on build errors', function(assert) { this.$('span a').click(); - assert.ok(notifyObject.get('called'), "notify.info() was called"); + assert.ok(notifyObject.get('called'), "notify.error() was called"); }); From 383de91d26a3fa654a2b65c2115d64bdf74fa91c Mon Sep 17 00:00:00 2001 From: Gokul Kathirvel Date: Thu, 14 Jun 2018 22:59:37 +0530 Subject: [PATCH 24/34] updates contribution guide (#621) --- CONTRIBUTING.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index b7d4e540..2ce965f2 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -40,7 +40,7 @@ You will need the following things properly installed on your computer. ### Running / Development Without Docker (Recommended) -* `node server.js` from your gatekeeper folder +* `node index.js` from your gatekeeper folder * `yarn` from ember twiddle folder * `bower install` from ember twiddle folder * `ember server` from ember twiddle folder @@ -55,7 +55,7 @@ You will need the following things properly installed on your computer. #### Instructions -* `node server.js` from your gatekeeper folder +* `node index.js` from your gatekeeper folder * `docker-compose up` from ember twiddle folder * Visit your app at [http://localhost:4200](http://localhost:4200). From c1325b01ce3786a8126863bf820ad270878a5c19 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Mon, 18 Jun 2018 12:12:01 -0400 Subject: [PATCH 25/34] Try to upgrade ember-cli-qunit to 4.3.x --- app/services/ember-cli.js | 10 ++++---- ember-cli-build.js | 15 ++++++++--- package.json | 2 +- yarn.lock | 52 ++++++++++++++++++++++----------------- 4 files changed, 46 insertions(+), 33 deletions(-) diff --git a/app/services/ember-cli.js b/app/services/ember-cli.js index d951b2b8..4fee603d 100644 --- a/app/services/ember-cli.js +++ b/app/services/ember-cli.js @@ -384,8 +384,8 @@ export default Ember.Service.extend({
`; - let moreCode = "requirejs.entries['ember-cli/test-loader'] = requirejs.entries['ember-cli-test-loader/test-support/index'] || requirejs.entries['assets/test-loader'] || requirejs.entries['ember-cli/test-loader'];\n"; - testStuff += ``; + let moreCode = "window.requirejs.entries['ember-cli/test-loader'] = window.requirejs.entries['ember-cli-test-loader/test-support/index'] || requirejs.entries['assets/test-loader'] || window.requirejs.entries['ember-cli/test-loader'];\n"; + testStuff += ``; } if (testing || isTestingEnabled) { @@ -396,7 +396,7 @@ export default Ember.Service.extend({ }); testStuff += ``; } @@ -546,11 +546,11 @@ function contentForAppBoot(content, config) { } monkeyPatchModules.forEach(function(mod) { - content.push(' require("'+mod+'").__esModule=true;'); + content.push(' window.require("'+mod+'").__esModule=true;'); }); if (!config.testingEnabled || config.legacyTesting) { - content.push(' require("' + + content.push(' window.require("' + config.modulePrefix + '/app")["default"].create(' + calculateAppConfig(config) + diff --git a/ember-cli-build.js b/ember-cli-build.js index b7436d5e..6c7c07be 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -149,8 +149,11 @@ module.exports = function(defaults) { let transpiledInitializersTree = babelTranspiler(baseInitializersTree, babelOpts()); - let finalQUnitTree = buildAddonTree('ember-qunit'); let finalTestHelpersTree = buildAddonTree('ember-test-helpers'); + console.log(app.preprocessJs); + let finalQUnitTree = buildAddonTree('ember-qunit', { + excludes: ['addon-test-support/ember-qunit/legacy-2-x/**/*.js'] + }); let mergedDepsTree = mergeTrees([bowerTree, shimsTree, transpiledInitializersTree, transpiledResolverTree, emberDataShims]); @@ -164,17 +167,21 @@ module.exports = function(defaults) { outputFile: '/assets/twiddle-deps.js' }); - return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree, finalQUnitTree, finalTestHelpersTree])); + return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree, finalTestHelpersTree, finalQUnitTree])); }; -function buildAddonTree(addonName) { +function buildAddonTree(addonName, options = {}) { const funnel = require('broccoli-funnel'); const concat = require('broccoli-concat'); const babelTranspiler = require('broccoli-babel-transpiler'); const path = require('path'); + let { excludes } = options; + excludes = excludes || []; + let baseTree = funnel(path.dirname(require.resolve(addonName)), { - include: ['**/*.js'] + include: ['**/*.js'], + exclude: ['index.js', 'ember-cli-build.js', 'testem.js', 'lib/**/*.js', 'config/**/*.js', 'tests/**/*.js'].concat(excludes) }); let transpiledTree = babelTranspiler(baseTree, babelOpts()); diff --git a/package.json b/package.json index f7dcc043..00c01b2f 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,7 @@ "ember-cli-mirage": "~0.4.4", "ember-cli-moment-shim": "^2.2.1", "ember-cli-node-assets": "~0.2.2", - "ember-cli-qunit": "~4.0.0", + "ember-cli-qunit": "~4.3.0", "ember-cli-release": "1.0.0-beta.2", "ember-cli-sass": "^6.2.0", "ember-cli-shims": "~1.0.2", diff --git a/yarn.lock b/yarn.lock index 2fa86d80..8bde627b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,6 +2,14 @@ # yarn lockfile v1 +"@ember/test-helpers@^0.7.18": + version "0.7.25" + resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-0.7.25.tgz#b4014c108b40ffaf74f3c4d5918800917541541d" + dependencies: + broccoli-funnel "^2.0.1" + ember-cli-babel "^6.12.0" + ember-cli-htmlbars-inline-precompile "^1.0.0" + "@glimmer/di@^0.2.0": version "0.2.0" resolved "https://registry.yarnpkg.com/@glimmer/di/-/di-0.2.0.tgz#73bfd4a6ee4148a80bf092e8a5d29bcac9d4ce7e" @@ -2278,6 +2286,10 @@ commander@~2.14.1: version "2.14.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.14.1.tgz#2235123e37af8ca3c65df45b026dbd357b01b9aa" +common-tags@^1.4.0: + version "1.8.0" + resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937" + commoner@~0.10.3: version "0.10.8" resolved "https://registry.yarnpkg.com/commoner/-/commoner-0.10.8.tgz#34fc3672cd24393e8bb47e70caa0293811f4f2c5" @@ -3336,20 +3348,12 @@ ember-cli-preprocess-registry@^3.1.0: process-relative-require "^1.0.0" silent-error "^1.0.0" -ember-cli-qunit@~4.0.0: - version "4.0.2" - resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-4.0.2.tgz#4d4d9cad106ccf1be658d35015d344efbbcf8951" +ember-cli-qunit@~4.3.0: + version "4.3.2" + resolved "https://registry.yarnpkg.com/ember-cli-qunit/-/ember-cli-qunit-4.3.2.tgz#cfd89ad3b0dbc28a9c2223d532b52eeade7c602c" dependencies: - broccoli-funnel "^2.0.0" - broccoli-merge-trees "^2.0.0" - ember-cli-babel "^6.8.1" - ember-cli-test-loader "^2.2.0" - ember-cli-version-checker "^2.0.0" - ember-qunit "^2.2.0" - qunit "^2.4.1" - qunit-notifications "^0.1.1" - resolve "^1.4.0" - silent-error "^1.1.0" + ember-cli-babel "^6.11.0" + ember-qunit "^3.3.2" ember-cli-release@1.0.0-beta.2: version "1.0.0-beta.2" @@ -3686,11 +3690,17 @@ ember-notify@^5.2.1: ember-string-ishtmlsafe-polyfill "^1.1.0" object-assign "^4.1.0" -ember-qunit@^2.2.0: - version "2.2.0" - resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-2.2.0.tgz#3cdf400031c93a38de781a7304819738753b7f99" +ember-qunit@^3.3.2: + version "3.4.1" + resolved "https://registry.yarnpkg.com/ember-qunit/-/ember-qunit-3.4.1.tgz#204a2d39a5d44d494c56bf17cf3fd12f06210359" dependencies: - ember-test-helpers "^0.6.3" + "@ember/test-helpers" "^0.7.18" + broccoli-funnel "^2.0.1" + broccoli-merge-trees "^2.0.0" + common-tags "^1.4.0" + ember-cli-babel "^6.8.2" + ember-cli-test-loader "^2.2.0" + qunit "^2.5.0" ember-resolver@^4.0.0: version "4.5.5" @@ -3765,7 +3775,7 @@ ember-string-ishtmlsafe-polyfill@^1.1.0: ember-cli-babel "^5.1.7" ember-cli-version-checker "^1.2.0" -ember-test-helpers@^0.6.3, ember-test-helpers@~0.6.3: +ember-test-helpers@~0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/ember-test-helpers/-/ember-test-helpers-0.6.3.tgz#f864cdf6f4e75f3f8768d6537785b5ab6e82d907" @@ -7953,11 +7963,7 @@ quick-temp@^0.1.2, quick-temp@^0.1.3, quick-temp@^0.1.5, quick-temp@^0.1.8: rimraf "^2.5.4" underscore.string "~3.3.4" -qunit-notifications@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/qunit-notifications/-/qunit-notifications-0.1.1.tgz#3001afc6a6a77dfbd962ccbcddde12dec5286c09" - -qunit@^2.4.1: +qunit@^2.5.0: version "2.6.1" resolved "https://registry.yarnpkg.com/qunit/-/qunit-2.6.1.tgz#3a2a5f05307f873174e0f5859010fb7380380e3c" dependencies: From 109a7576eab3bfb2f2e84afc2343dd6899ac7db3 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Mon, 18 Jun 2018 17:30:14 -0400 Subject: [PATCH 26/34] Fixed the damn ember-cli-qunit build --- .gitignore | 1 + ember-cli-build.js | 50 ++++++++++++++--- package.json | 7 +++ yarn.lock | 134 +++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 178 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 02e4107c..bc65e3d2 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ npm-debug.log* yarn-error.log testem.log +.vscode # ember-try .node_modules.ember-try/ diff --git a/ember-cli-build.js b/ember-cli-build.js index 6c7c07be..6a83c0fa 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -7,6 +7,7 @@ module.exports = function(defaults) { const concat = require('broccoli-concat'); const mergeTrees = require('broccoli-merge-trees'); const babelTranspiler = require('broccoli-babel-transpiler'); + const Rollup = require('broccoli-rollup'); const browserify = require('browserify'); const path = require('path'); const fs = require('fs'); @@ -150,9 +151,42 @@ module.exports = function(defaults) { let transpiledInitializersTree = babelTranspiler(baseInitializersTree, babelOpts()); let finalTestHelpersTree = buildAddonTree('ember-test-helpers'); - console.log(app.preprocessJs); - let finalQUnitTree = buildAddonTree('ember-qunit', { - excludes: ['addon-test-support/ember-qunit/legacy-2-x/**/*.js'] + + let preprocessJs = app.registry.registry.js[0].toTree; + let buildPreprocessedAddon = function(addonName) { + return preprocessJs(path.dirname(require.resolve(addonName)) + '/addon-test-support', { + registry: app.registry + }); + }; + let qunitTree = buildPreprocessedAddon('ember-qunit'); + let testHelpersTreeForQUnit = buildPreprocessedAddon('@ember/test-helpers'); + let testLoaderTreeForQUnit = funnel("node_modules/ember-cli-test-loader/addon-test-support", { + files: ['index.js'], + getDestinationPath: function() { + return "ember-cli-test-loader/test-support/index.js"; + } + }); + testLoaderTreeForQUnit = new Rollup(testLoaderTreeForQUnit, { + rollup: { + input: 'ember-cli-test-loader/test-support/index.js', + output: { + file: 'ember-cli-test-loader/test-support/index.js', + format: 'es' + }, + plugins: [ + require('rollup-plugin-commonjs')(), + // require('rollup-plugin-babel')({ + // babelrc: false, + // modules: false, + // externalHelpers: true + // }) + ] + } + }); + testLoaderTreeForQUnit = babelTranspiler(testLoaderTreeForQUnit, babelOpts()); + let finalQUnitTree = concat(mergeTrees([qunitTree, testHelpersTreeForQUnit, testLoaderTreeForQUnit]), { + inputFiles: ['**/*.js'], + outputFile: '/assets/ember-qunit.js' }); let mergedDepsTree = mergeTrees([bowerTree, shimsTree, transpiledInitializersTree, transpiledResolverTree, emberDataShims]); @@ -170,18 +204,15 @@ module.exports = function(defaults) { return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree, finalTestHelpersTree, finalQUnitTree])); }; -function buildAddonTree(addonName, options = {}) { +function buildAddonTree(addonName) { const funnel = require('broccoli-funnel'); const concat = require('broccoli-concat'); const babelTranspiler = require('broccoli-babel-transpiler'); const path = require('path'); - let { excludes } = options; - excludes = excludes || []; - let baseTree = funnel(path.dirname(require.resolve(addonName)), { include: ['**/*.js'], - exclude: ['index.js', 'ember-cli-build.js', 'testem.js', 'lib/**/*.js', 'config/**/*.js', 'tests/**/*.js'].concat(excludes) + exclude: ['index.js', 'ember-cli-build.js', 'testem.js', 'lib/**/*.js', 'config/**/*.js', 'tests/**/*.js'] }); let transpiledTree = babelTranspiler(baseTree, babelOpts()); @@ -200,7 +231,8 @@ function babelOpts() { ['transform-es2015-modules-amd', { loose: true, noInterop: true - }] + }], + ['babel-plugin-ember-modules-api-polyfill'] ] }; } diff --git a/package.json b/package.json index 00c01b2f..12a267d7 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,9 @@ "author": "Ember Twiddle Contributors", "license": "MIT", "devDependencies": { + "@ember/test-helpers": "~0.7.18", "babel-plugin-ember-modules-api-polyfill": "^2.3.0", + "babel-preset-env": "^1.7.0", "babel-preset-es2017": "^6.24.1", "babel-standalone": "^6.26.0", "broccoli-asset-rev": "^2.4.5", @@ -25,6 +27,7 @@ "broccoli-concat": "^3.2.2", "broccoli-funnel": "^2.0.1", "broccoli-merge-trees": "^3.0.0", + "broccoli-rollup": "^2.1.1", "browserify": "^16.2.0", "compare-versions": "^3.2.1", "dedent": "~0.7.0", @@ -54,6 +57,7 @@ "ember-cli-mirage": "~0.4.4", "ember-cli-moment-shim": "^2.2.1", "ember-cli-node-assets": "~0.2.2", + "ember-cli-preprocess-registry": "^3.1.1", "ember-cli-qunit": "~4.3.0", "ember-cli-release": "1.0.0-beta.2", "ember-cli-sass": "^6.2.0", @@ -84,6 +88,9 @@ "moment": "^2.22.0", "moment-timezone": "~0.5.14", "path-browser": "^2.2.1", + "rollup": "^0.60.7", + "rollup-plugin-babel": "^3.0.4", + "rollup-plugin-commonjs": "^9.1.3", "rollup-plugin-json": "^2.3.0", "rollup-plugin-node-builtins": "^2.1.2", "torii": "~0.10.1" diff --git a/yarn.lock b/yarn.lock index 8bde627b..5c534a09 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@ember/test-helpers@^0.7.18": +"@ember/test-helpers@^0.7.18", "@ember/test-helpers@~0.7.18": version "0.7.25" resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-0.7.25.tgz#b4014c108b40ffaf74f3c4d5918800917541541d" dependencies: @@ -20,14 +20,28 @@ dependencies: "@glimmer/di" "^0.2.0" -"@types/estree@0.0.39": +"@types/acorn@^4.0.3": + version "4.0.3" + resolved "https://registry.yarnpkg.com/@types/acorn/-/acorn-4.0.3.tgz#d1f3e738dde52536f9aad3d3380d14e448820afd" + dependencies: + "@types/estree" "*" + +"@types/estree@*", "@types/estree@0.0.39": version "0.0.39" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f" +"@types/estree@0.0.38": + version "0.0.38" + resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.38.tgz#c1be40aa933723c608820a99a373a16d215a1ca2" + "@types/node@*": version "10.3.1" resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.1.tgz#51092fbacaed768a122a293814474fbf6e5e8b6d" +"@types/node@^9.6.0": + version "9.6.22" + resolved "https://registry.yarnpkg.com/@types/node/-/node-9.6.22.tgz#05b55093faaadedea7a4b3f76e9a61346a6dd209" + JSONStream@^1.0.3: version "1.3.3" resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.3.tgz#27b4b8fbbfeab4e71bcf551e7f27be8d952239bf" @@ -63,6 +77,12 @@ accepts@~1.3.4, accepts@~1.3.5: mime-types "~2.1.18" negotiator "0.6.1" +acorn-dynamic-import@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278" + dependencies: + acorn "^5.0.0" + acorn-jsx@^3.0.0: version "3.0.1" resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-3.0.1.tgz#afdf9488fb1ecefc8348f6fb22f464e32a58b36b" @@ -84,6 +104,10 @@ acorn@^4.0.3: version "4.0.13" resolved "https://registry.yarnpkg.com/acorn/-/acorn-4.0.13.tgz#105495ae5361d697bd195c825192e1ad7f253787" +acorn@^5.0.0, acorn@^5.5.3: + version "5.7.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.1.tgz#f095829297706a7c9776958c0afc8930a9b9d9d8" + acorn@^5.2.1, acorn@^5.4.1, acorn@^5.5.0: version "5.6.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.6.2.tgz#b1da1d7be2ac1b4a327fb9eab851702c5045b4e7" @@ -137,7 +161,7 @@ amd-name-resolver@1.0.0: dependencies: ensure-posix-path "^1.0.1" -amd-name-resolver@1.2.0: +amd-name-resolver@1.2.0, amd-name-resolver@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.2.0.tgz#fc41b3848824b557313897d71f8d5a0184fbe679" dependencies: @@ -1652,6 +1676,22 @@ broccoli-rollup@^1.2.0: symlink-or-copy "^1.1.8" walk-sync "^0.3.1" +broccoli-rollup@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/broccoli-rollup/-/broccoli-rollup-2.1.1.tgz#0b77dc4b7560a53e998ea85f3b56772612d4988d" + dependencies: + "@types/node" "^9.6.0" + amd-name-resolver "^1.2.0" + broccoli-plugin "^1.2.1" + fs-tree-diff "^0.5.2" + heimdalljs "^0.2.1" + heimdalljs-logger "^0.1.7" + magic-string "^0.24.0" + node-modules-path "^1.0.1" + rollup "^0.57.1" + symlink-or-copy "^1.1.8" + walk-sync "^0.3.1" + broccoli-sass-source-maps@^2.0.0: version "2.2.0" resolved "https://registry.yarnpkg.com/broccoli-sass-source-maps/-/broccoli-sass-source-maps-2.2.0.tgz#1f1a0794136152b096188638b59b42b17a4bdc68" @@ -2579,6 +2619,12 @@ date-now@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/date-now/-/date-now-0.1.4.tgz#eaf439fd4d4848ad74e5cc7dbef200672b9e345b" +date-time@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/date-time/-/date-time-2.1.0.tgz#0286d1b4c769633b3ca13e1e62558d2dbdc2eba2" + dependencies: + time-zone "^1.0.0" + debug@2, debug@2.6.9, debug@^2.1.0, debug@^2.1.1, debug@^2.1.2, debug@^2.1.3, debug@^2.2.0, debug@^2.3.3, debug@^2.4.0, debug@^2.6.8, debug@^2.6.9: version "2.6.9" resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f" @@ -3335,7 +3381,7 @@ ember-cli-path-utils@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/ember-cli-path-utils/-/ember-cli-path-utils-1.0.0.tgz#4e39af8b55301cddc5017739b77a804fba2071ed" -ember-cli-preprocess-registry@^3.1.0: +ember-cli-preprocess-registry@^3.1.0, ember-cli-preprocess-registry@^3.1.1: version "3.1.1" resolved "https://registry.yarnpkg.com/ember-cli-preprocess-registry/-/ember-cli-preprocess-registry-3.1.1.tgz#38456c21c4d2b64945850cf9ec68db6ba769288a" dependencies: @@ -4081,6 +4127,10 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" +estree-walker@^0.2.1: + version "0.2.1" + resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e" + estree-walker@^0.5.1, estree-walker@^0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39" @@ -5646,6 +5696,12 @@ is-property@^1.0.0: version "1.0.2" resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84" +is-reference@^1.1.0: + version "1.1.0" + resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.1.0.tgz#50e6ef3f64c361e2c53c0416cdc9420037f2685b" + dependencies: + "@types/estree" "0.0.38" + is-resolvable@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88" @@ -6058,6 +6114,10 @@ loader.js@^4.7.0: version "4.7.0" resolved "https://registry.yarnpkg.com/loader.js/-/loader.js-4.7.0.tgz#a1a52902001c83631efde9688b8ab3799325ef1f" +locate-character@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/locate-character/-/locate-character-2.0.5.tgz#f2d2614d49820ecb3c92d80d193b8db755f74c0f" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -6590,6 +6650,12 @@ magic-string@^0.22.4: dependencies: vlq "^0.2.2" +magic-string@^0.24.0: + version "0.24.1" + resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.24.1.tgz#7e38e5f126cae9f15e71f0cf8e450818ca7d5a8f" + dependencies: + sourcemap-codec "^1.4.1" + make-array@^0.1.2: version "0.1.2" resolved "https://registry.yarnpkg.com/make-array/-/make-array-0.1.2.tgz#335e36ebb0c5a43154d21213a1ecaeae2a1bb3ef" @@ -7632,6 +7698,10 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" +parse-ms@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d" + parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" @@ -7819,6 +7889,12 @@ pretender@^1.6.1: fake-xml-http-request "^1.6.0" route-recognizer "^0.3.3" +pretty-ms@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-3.2.0.tgz#87a8feaf27fc18414d75441467d411d6e6098a25" + dependencies: + parse-ms "^1.0.0" + printf@^0.2.3: version "0.2.5" resolved "https://registry.yarnpkg.com/printf/-/printf-0.2.5.tgz#c438ca2ca33e3927671db4ab69c0e52f936a4f0f" @@ -8404,6 +8480,10 @@ require-main-filename@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1" +require-relative@^0.8.7: + version "0.8.7" + resolved "https://registry.yarnpkg.com/require-relative/-/require-relative-0.8.7.tgz#7999539fc9e047a37928fa196f8e1563dabd36de" + require-uncached@^1.0.3: version "1.0.3" resolved "https://registry.yarnpkg.com/require-uncached/-/require-uncached-1.0.3.tgz#4e0d56d6c9662fd31e43011c4b95aa49955421d3" @@ -8504,7 +8584,13 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rollup-plugin-commonjs@^9.1.0: +rollup-plugin-babel@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-3.0.4.tgz#41b3e762fe64450dd61da3105a2cf7ad76be4edc" + dependencies: + rollup-pluginutils "^1.5.0" + +rollup-plugin-commonjs@^9.1.0, rollup-plugin-commonjs@^9.1.3: version "9.1.3" resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.1.3.tgz#37bfbf341292ea14f512438a56df8f9ca3ba4d67" dependencies: @@ -8536,6 +8622,13 @@ rollup-plugin-node-resolve@^3.3.0: is-module "^1.0.0" resolve "^1.1.6" +rollup-pluginutils@^1.5.0: + version "1.5.2" + resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408" + dependencies: + estree-walker "^0.2.1" + minimatch "^3.0.2" + rollup-pluginutils@^2.0.1: version "2.3.0" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.0.tgz#478ace04bd7f6da2e724356ca798214884738fc4" @@ -8549,6 +8642,22 @@ rollup@^0.41.4: dependencies: source-map-support "^0.4.0" +rollup@^0.57.1: + version "0.57.1" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.57.1.tgz#0bb28be6151d253f67cf4a00fea48fb823c74027" + dependencies: + "@types/acorn" "^4.0.3" + acorn "^5.5.3" + acorn-dynamic-import "^3.0.0" + date-time "^2.1.0" + is-reference "^1.1.0" + locate-character "^2.0.5" + pretty-ms "^3.1.0" + require-relative "^0.8.7" + rollup-pluginutils "^2.0.1" + signal-exit "^3.0.2" + sourcemap-codec "^1.4.1" + rollup@^0.59.0: version "0.59.4" resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.59.4.tgz#6f80f7017c22667ff1bf3e62adf8624a44cc44aa" @@ -8556,6 +8665,13 @@ rollup@^0.59.0: "@types/estree" "0.0.39" "@types/node" "*" +rollup@^0.60.7: + version "0.60.7" + resolved "https://registry.yarnpkg.com/rollup/-/rollup-0.60.7.tgz#2b62ef9306f719b1ab85a7814b3e6596ac51fae8" + dependencies: + "@types/estree" "0.0.39" + "@types/node" "*" + route-recognizer@^0.2.3: version "0.2.10" resolved "https://registry.yarnpkg.com/route-recognizer/-/route-recognizer-0.2.10.tgz#024b2283c2e68d13a7c7f5173a5924645e8902df" @@ -9029,6 +9145,10 @@ source-map@~0.2.0: dependencies: amdefine ">=0.0.4" +sourcemap-codec@^1.4.1: + version "1.4.1" + resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.1.tgz#c8fd92d91889e902a07aee392bdd2c5863958ba2" + sourcemap-validator@^1.0.5: version "1.1.0" resolved "https://registry.yarnpkg.com/sourcemap-validator/-/sourcemap-validator-1.1.0.tgz#00454547d1682186e1498a7208e022e8dfa8738f" @@ -9403,6 +9523,10 @@ thunkify@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/thunkify/-/thunkify-2.1.2.tgz#faa0e9d230c51acc95ca13a361ac05ca7e04553d" +time-zone@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/time-zone/-/time-zone-1.0.0.tgz#99c5bf55958966af6d06d83bdf3800dc82faec5d" + timers-browserify@^1.0.1: version "1.4.2" resolved "https://registry.yarnpkg.com/timers-browserify/-/timers-browserify-1.4.2.tgz#c9c58b575be8407375cb5e2462dacee74359f41d" From 05b0c9f5e600381e542c35c01868ba1c94ca7849 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 19 Jun 2018 09:10:41 -0400 Subject: [PATCH 27/34] cleanup --- ember-cli-build.js | 7 +------ package.json | 4 +--- yarn.lock | 27 +++++---------------------- 3 files changed, 7 insertions(+), 31 deletions(-) diff --git a/ember-cli-build.js b/ember-cli-build.js index 6a83c0fa..538014b3 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -174,12 +174,7 @@ module.exports = function(defaults) { format: 'es' }, plugins: [ - require('rollup-plugin-commonjs')(), - // require('rollup-plugin-babel')({ - // babelrc: false, - // modules: false, - // externalHelpers: true - // }) + require('rollup-plugin-commonjs')() ] } }); diff --git a/package.json b/package.json index 12a267d7..99fee295 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "devDependencies": { "@ember/test-helpers": "~0.7.18", "babel-plugin-ember-modules-api-polyfill": "^2.3.0", - "babel-preset-env": "^1.7.0", "babel-preset-es2017": "^6.24.1", "babel-standalone": "^6.26.0", "broccoli-asset-rev": "^2.4.5", @@ -89,9 +88,8 @@ "moment-timezone": "~0.5.14", "path-browser": "^2.2.1", "rollup": "^0.60.7", - "rollup-plugin-babel": "^3.0.4", "rollup-plugin-commonjs": "^9.1.3", - "rollup-plugin-json": "^2.3.0", + "rollup-plugin-json": "^3.0.0", "rollup-plugin-node-builtins": "^2.1.2", "torii": "~0.10.1" }, diff --git a/yarn.lock b/yarn.lock index 5c534a09..1ee7625b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4127,10 +4127,6 @@ estraverse@^4.0.0, estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13" -estree-walker@^0.2.1: - version "0.2.1" - resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.2.1.tgz#bdafe8095383d8414d5dc2ecf4c9173b6db9412e" - estree-walker@^0.5.1, estree-walker@^0.5.2: version "0.5.2" resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.5.2.tgz#d3850be7529c9580d815600b53126515e146dd39" @@ -8584,12 +8580,6 @@ ripemd160@^2.0.0, ripemd160@^2.0.1: hash-base "^3.0.0" inherits "^2.0.1" -rollup-plugin-babel@^3.0.4: - version "3.0.4" - resolved "https://registry.yarnpkg.com/rollup-plugin-babel/-/rollup-plugin-babel-3.0.4.tgz#41b3e762fe64450dd61da3105a2cf7ad76be4edc" - dependencies: - rollup-pluginutils "^1.5.0" - rollup-plugin-commonjs@^9.1.0, rollup-plugin-commonjs@^9.1.3: version "9.1.3" resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-9.1.3.tgz#37bfbf341292ea14f512438a56df8f9ca3ba4d67" @@ -8599,11 +8589,11 @@ rollup-plugin-commonjs@^9.1.0, rollup-plugin-commonjs@^9.1.3: resolve "^1.5.0" rollup-pluginutils "^2.0.1" -rollup-plugin-json@^2.3.0: - version "2.3.1" - resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-2.3.1.tgz#9759d27f33dcd2c896de18b6235df162b88edd77" +rollup-plugin-json@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/rollup-plugin-json/-/rollup-plugin-json-3.0.0.tgz#aeed2ff36e6c4fd0c60c4a8fc3d0884479e9dfce" dependencies: - rollup-pluginutils "^2.0.1" + rollup-pluginutils "^2.2.0" rollup-plugin-node-builtins@^2.1.2: version "2.1.2" @@ -8622,14 +8612,7 @@ rollup-plugin-node-resolve@^3.3.0: is-module "^1.0.0" resolve "^1.1.6" -rollup-pluginutils@^1.5.0: - version "1.5.2" - resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-1.5.2.tgz#1e156e778f94b7255bfa1b3d0178be8f5c552408" - dependencies: - estree-walker "^0.2.1" - minimatch "^3.0.2" - -rollup-pluginutils@^2.0.1: +rollup-pluginutils@^2.0.1, rollup-pluginutils@^2.2.0: version "2.3.0" resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.3.0.tgz#478ace04bd7f6da2e724356ca798214884738fc4" dependencies: From 607bd697296e9c0f037dfa03a775d95c74ed0913 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 19 Jun 2018 11:38:18 -0400 Subject: [PATCH 28/34] Fix tests for tests --- app/index.html | 1 - app/services/ember-cli.js | 4 ++-- ember-cli-build.js | 4 +--- tests/index.html | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/index.html b/app/index.html index 8138d68b..ebfb629c 100644 --- a/app/index.html +++ b/app/index.html @@ -37,7 +37,6 @@ testSupport: "{{rootURL}}assets/test-support.js", testSupportCss: "{{rootURL}}assets/test-support.css", testLoader: "{{rootURL}}assets/test-loader.js", - emberTestHelpers: "{{rootURL}}assets/ember-test-helpers.js", emberQUnit: "{{rootURL}}assets/ember-qunit.js" }; diff --git a/app/services/ember-cli.js b/app/services/ember-cli.js index 4fee603d..e5f57a11 100644 --- a/app/services/ember-cli.js +++ b/app/services/ember-cli.js @@ -333,7 +333,7 @@ export default Ember.Service.extend({ `; diff --git a/ember-cli-build.js b/ember-cli-build.js index 538014b3..6efb4b03 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -149,8 +149,6 @@ module.exports = function(defaults) { }); let transpiledInitializersTree = babelTranspiler(baseInitializersTree, babelOpts()); - - let finalTestHelpersTree = buildAddonTree('ember-test-helpers'); let preprocessJs = app.registry.registry.js[0].toTree; let buildPreprocessedAddon = function(addonName) { @@ -196,7 +194,7 @@ module.exports = function(defaults) { outputFile: '/assets/twiddle-deps.js' }); - return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree, finalTestHelpersTree, finalQUnitTree])); + return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree, finalQUnitTree])); }; function buildAddonTree(addonName) { diff --git a/tests/index.html b/tests/index.html index a7992078..2f0df857 100644 --- a/tests/index.html +++ b/tests/index.html @@ -38,7 +38,6 @@ testSupport: "{{rootURL}}assets/test-support.js", testSupportCss: "{{rootURL}}assets/test-support.css", testLoader: "{{rootURL}}assets/test-loader.js", - emberTestHelpers: "{{rootURL}}assets/ember-test-helpers.js", emberQUnit: "{{rootURL}}assets/ember-qunit.js" }; From d13b09f1f043b2f96cec9ec55b1bb0bdd7770282 Mon Sep 17 00:00:00 2001 From: Gaurav Munjal Date: Tue, 19 Jun 2018 12:53:06 -0400 Subject: [PATCH 29/34] Refactor and reorganize ember-cli-build.js --- ember-cli-build.js | 169 ++++++++++---------------------- lib/babel-opts.js | 17 ++++ lib/build-addon-tree.js | 22 +++++ lib/get-ember-cli-blueprints.js | 69 +++++++++++++ 4 files changed, 159 insertions(+), 118 deletions(-) create mode 100644 lib/babel-opts.js create mode 100644 lib/build-addon-tree.js create mode 100644 lib/get-ember-cli-blueprints.js diff --git a/ember-cli-build.js b/ember-cli-build.js index 6efb4b03..ae6e4a13 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -4,13 +4,12 @@ module.exports = function(defaults) { const EmberApp = require('ember-cli/lib/broccoli/ember-app'); const funnel = require('broccoli-funnel'); - const concat = require('broccoli-concat'); const mergeTrees = require('broccoli-merge-trees'); const babelTranspiler = require('broccoli-babel-transpiler'); - const Rollup = require('broccoli-rollup'); const browserify = require('browserify'); const path = require('path'); const fs = require('fs'); + const babelOpts = require('./lib/babel-opts'); const env = EmberApp.env(); const deployTarget = process.env.DEPLOY_TARGET; @@ -27,7 +26,7 @@ module.exports = function(defaults) { } } - const blueprintsCode = getEmberCLIBlueprints(); + const blueprintsCode = require('./lib/get-ember-cli-blueprints')(); let app = new EmberApp(defaults, { SRI: { @@ -129,41 +128,40 @@ module.exports = function(defaults) { }); testLoaderTree = babelTranspiler(testLoaderTree, babelOpts()); - let emberDataShims = funnel('vendor', { - files: ['ember-data-shims.js'] - }); - - let bowerTree = funnel('bower_components'); - let shimsTree = funnel('node_modules/ember-cli-shims/vendor/ember-cli-shims' , { - destDir: 'ember-cli-shims' - }); - - let baseResolverTree = funnel('node_modules/ember-resolver/addon', { - destDir: 'ember-resolver' - }); + let finalQUnitTree = buildQUnitTree(app); - let transpiledResolverTree = babelTranspiler(baseResolverTree, babelOpts()); + let twiddleVendorTree = buildTwiddleVendorTree(); - let baseInitializersTree = funnel('node_modules/ember-load-initializers/addon', { - destDir: 'ember-load-initializers' - }); + return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree, finalQUnitTree])); +}; - let transpiledInitializersTree = babelTranspiler(baseInitializersTree, babelOpts()); +function buildQUnitTree(app) { + const funnel = require('broccoli-funnel'); + const concat = require('broccoli-concat'); + const mergeTrees = require('broccoli-merge-trees'); + const babelTranspiler = require('broccoli-babel-transpiler'); + const Rollup = require('broccoli-rollup'); + const path = require('path'); + const babelOpts = require('./lib/babel-opts'); let preprocessJs = app.registry.registry.js[0].toTree; + let buildPreprocessedAddon = function(addonName) { return preprocessJs(path.dirname(require.resolve(addonName)) + '/addon-test-support', { registry: app.registry }); }; + let qunitTree = buildPreprocessedAddon('ember-qunit'); let testHelpersTreeForQUnit = buildPreprocessedAddon('@ember/test-helpers'); + let testLoaderTreeForQUnit = funnel("node_modules/ember-cli-test-loader/addon-test-support", { files: ['index.js'], getDestinationPath: function() { return "ember-cli-test-loader/test-support/index.js"; } }); + testLoaderTreeForQUnit = new Rollup(testLoaderTreeForQUnit, { rollup: { input: 'ember-cli-test-loader/test-support/index.js', @@ -176,121 +174,56 @@ module.exports = function(defaults) { ] } }); + testLoaderTreeForQUnit = babelTranspiler(testLoaderTreeForQUnit, babelOpts()); + let finalQUnitTree = concat(mergeTrees([qunitTree, testHelpersTreeForQUnit, testLoaderTreeForQUnit]), { inputFiles: ['**/*.js'], outputFile: '/assets/ember-qunit.js' }); - let mergedDepsTree = mergeTrees([bowerTree, shimsTree, transpiledInitializersTree, transpiledResolverTree, emberDataShims]); - - let twiddleVendorTree = concat(mergedDepsTree, { - inputFiles: [ - 'ember-cli-shims/app-shims.js', - 'ember-load-initializers/**/*.js', - 'ember-resolver/**/*.js', - 'ember-data-shims.js' - ], - outputFile: '/assets/twiddle-deps.js' - }); - - return app.toTree(mergeTrees([twiddleVendorTree, loaderTree, testLoaderTree, finalQUnitTree])); -}; + return finalQUnitTree; +} -function buildAddonTree(addonName) { +function buildTwiddleVendorTree() { const funnel = require('broccoli-funnel'); const concat = require('broccoli-concat'); + const mergeTrees = require('broccoli-merge-trees'); const babelTranspiler = require('broccoli-babel-transpiler'); - const path = require('path'); + const babelOpts = require('./lib/babel-opts'); - let baseTree = funnel(path.dirname(require.resolve(addonName)), { - include: ['**/*.js'], - exclude: ['index.js', 'ember-cli-build.js', 'testem.js', 'lib/**/*.js', 'config/**/*.js', 'tests/**/*.js'] + let emberDataShims = funnel('vendor', { + files: ['ember-data-shims.js'] }); - let transpiledTree = babelTranspiler(baseTree, babelOpts()); + let bowerTree = funnel('bower_components'); + let shimsTree = funnel('node_modules/ember-cli-shims/vendor/ember-cli-shims' , { + destDir: 'ember-cli-shims' + }); - return concat(transpiledTree, { - inputFiles: ['**/*.js'], - outputFile: '/assets/' + addonName + '.js' + let baseResolverTree = funnel('node_modules/ember-resolver/addon', { + destDir: 'ember-resolver' }); -} -function babelOpts() { - return { - presets: ['babel-preset-es2017'].map(require.resolve), - moduleIds: true, - plugins: [ - ['transform-es2015-modules-amd', { - loose: true, - noInterop: true - }], - ['babel-plugin-ember-modules-api-polyfill'] - ] - }; -} + let transpiledResolverTree = babelTranspiler(baseResolverTree, babelOpts()); -// This copies code out of ember-cli's blueprints into -// app/lib/blueprints so we don't have to maintain our -// own blueprints -function getEmberCLIBlueprints() { - const fs = require('fs'); - const path = require('path'); - let fileMap = {}; - - let blueprintFiles = { - "cliBlueprintFiles": { - "path": "node_modules/ember-cli", - "files": { - "app": "app/files/app/app.js", - "router": "app/files/app/router.js", - "test-helper": 'app/files/tests/test-helper.js', - "test-resolver": 'app/files/tests/helpers/resolver.js', - "test-destroy-app": 'app/files/tests/helpers/destroy-app.js', - "test-module-for-acceptance": 'app/files/tests/helpers/module-for-acceptance.js' - } - }, - "legacyBlueprintFiles": { - "path": path.dirname(require.resolve('ember-cli-legacy-blueprints')), - "files": { - 'component-hbs': 'component/files/__root__/__templatepath__/__templatename__.hbs', - 'component-js': 'component/files/__root__/__path__/__name__.js', - 'controller': 'controller/files/__root__/__path__/__name__.js', - 'route': 'route/files/__root__/__path__/__name__.js', - 'service': 'service/files/__root__/__path__/__name__.js', - 'template': 'template/files/__root__/__path__/__name__.hbs', - 'helper': 'helper/files/__root__/helpers/__name__.js', - 'controller-test': 'controller-test/qunit-files/tests/unit/__path__/__test__.js', - 'route-test': 'route-test/qunit-files/tests/unit/__path__/__test__.js', - 'service-test': 'service-test/qunit-files/tests/unit/__path__/__test__.js', - 'component-test': 'component-test/qunit-files/tests/__testType__/__path__/__test__.js', - 'acceptance-test': 'acceptance-test/qunit-files/tests/acceptance/__name__-test.js' - } - } - }; + let baseInitializersTree = funnel('node_modules/ember-load-initializers/addon', { + destDir: 'ember-load-initializers' + }); - for (let list in blueprintFiles) { - let blueprintPath = blueprintFiles[list].path; - let files = blueprintFiles[list].files; - for (let blueprintName in files) { - let filePath = blueprintPath + '/blueprints/' + files[blueprintName]; - fileMap[blueprintName] = fs.readFileSync(filePath).toString(); - } - } + let transpiledInitializersTree = babelTranspiler(baseInitializersTree, babelOpts()); + + let mergedDepsTree = mergeTrees([bowerTree, shimsTree, transpiledInitializersTree, transpiledResolverTree, emberDataShims]); + + let twiddleVendorTree = concat(mergedDepsTree, { + inputFiles: [ + 'ember-cli-shims/app-shims.js', + 'ember-load-initializers/**/*.js', + 'ember-resolver/**/*.js', + 'ember-data-shims.js' + ], + outputFile: '/assets/twiddle-deps.js' + }); - // Location should be 'none' in router.js - fileMap['router'] = fileMap['router'].replace(/config\.locationType/, "'none'"); - - fileMap['resolver'] = fs.readFileSync('app/resolver.js').toString(); - fileMap['twiddle.json'] = fs.readFileSync('blueprints/twiddle.json').toString(); - fileMap['initializers/router'] = fs.readFileSync('blueprints/router_initializer.js').toString(); - fileMap['initializers/mouse-events'] = fs.readFileSync('blueprints/mouse_events_initializer.js').toString(); - fileMap['controllers/application'] = fs.readFileSync('blueprints/application_controller.js').toString(); - fileMap['templates/application'] = fs.readFileSync('blueprints/application_template.hbs').toString(); - fileMap['app.css'] = fs.readFileSync('blueprints/app.css').toString(); - fileMap['index.html'] = fs.readFileSync('blueprints/index.html').toString(); - fileMap['test-start-app'] = fs.readFileSync('blueprints/start-app.js').toString(); - fileMap['model'] = fs.readFileSync('blueprints/model.js').toString(); - - return 'export default ' + JSON.stringify(fileMap); + return twiddleVendorTree; } diff --git a/lib/babel-opts.js b/lib/babel-opts.js new file mode 100644 index 00000000..2ff06906 --- /dev/null +++ b/lib/babel-opts.js @@ -0,0 +1,17 @@ +/* global module, require */ + +function babelOpts() { + return { + presets: ['babel-preset-es2017'].map(require.resolve), + moduleIds: true, + plugins: [ + ['transform-es2015-modules-amd', { + loose: true, + noInterop: true + }], + ['babel-plugin-ember-modules-api-polyfill'] + ] + }; +} + +module.exports = babelOpts; \ No newline at end of file diff --git a/lib/build-addon-tree.js b/lib/build-addon-tree.js new file mode 100644 index 00000000..af4991ff --- /dev/null +++ b/lib/build-addon-tree.js @@ -0,0 +1,22 @@ +/* global require, module */ +function buildAddonTree(addonName) { + const funnel = require('broccoli-funnel'); + const concat = require('broccoli-concat'); + const babelTranspiler = require('broccoli-babel-transpiler'); + const path = require('path'); + const babelOpts = require('./babel-opts'); + + let baseTree = funnel(path.dirname(require.resolve(addonName)), { + include: ['**/*.js'], + exclude: ['index.js', 'ember-cli-build.js', 'testem.js', 'lib/**/*.js', 'config/**/*.js', 'tests/**/*.js'] + }); + + let transpiledTree = babelTranspiler(baseTree, babelOpts()); + + return concat(transpiledTree, { + inputFiles: ['**/*.js'], + outputFile: '/assets/' + addonName + '.js' + }); +} + +module.exports = buildAddonTree; \ No newline at end of file diff --git a/lib/get-ember-cli-blueprints.js b/lib/get-ember-cli-blueprints.js new file mode 100644 index 00000000..b376a6ef --- /dev/null +++ b/lib/get-ember-cli-blueprints.js @@ -0,0 +1,69 @@ +/* global require, module */ + +// This copies code out of ember-cli's blueprints into +// app/lib/blueprints so we don't have to maintain our +// own blueprints +function getEmberCLIBlueprints() { + const fs = require('fs'); + const path = require('path'); + let fileMap = {}; + + let blueprintFiles = { + "cliBlueprintFiles": { + "path": "node_modules/ember-cli", + "files": { + "app": "app/files/app/app.js", + "router": "app/files/app/router.js", + "test-helper": 'app/files/tests/test-helper.js', + "test-resolver": 'app/files/tests/helpers/resolver.js', + "test-destroy-app": 'app/files/tests/helpers/destroy-app.js', + "test-module-for-acceptance": 'app/files/tests/helpers/module-for-acceptance.js' + } + }, + "legacyBlueprintFiles": { + "path": path.dirname(require.resolve('ember-cli-legacy-blueprints')), + "files": { + 'component-hbs': 'component/files/__root__/__templatepath__/__templatename__.hbs', + 'component-js': 'component/files/__root__/__path__/__name__.js', + 'controller': 'controller/files/__root__/__path__/__name__.js', + 'route': 'route/files/__root__/__path__/__name__.js', + 'service': 'service/files/__root__/__path__/__name__.js', + 'template': 'template/files/__root__/__path__/__name__.hbs', + 'helper': 'helper/files/__root__/helpers/__name__.js', + 'controller-test': 'controller-test/qunit-files/tests/unit/__path__/__test__.js', + 'route-test': 'route-test/qunit-files/tests/unit/__path__/__test__.js', + 'service-test': 'service-test/qunit-files/tests/unit/__path__/__test__.js', + 'component-test': 'component-test/qunit-files/tests/__testType__/__path__/__test__.js', + 'acceptance-test': 'acceptance-test/qunit-files/tests/acceptance/__name__-test.js' + } + } + } + + for (let list in blueprintFiles) { + let blueprintPath = blueprintFiles[list].path; + let files = blueprintFiles[list].files; + for (let blueprintName in files) { + let filePath = blueprintPath + '/blueprints/' + files[blueprintName]; + fileMap[blueprintName] = fs.readFileSync(filePath).toString(); + } + } + + // Location should be 'none' in router.js + fileMap['router'] = fileMap['router'].replace(/config\.locationType/, "'none'"); + + fileMap['resolver'] = fs.readFileSync('app/resolver.js').toString(); + fileMap['twiddle.json'] = fs.readFileSync('blueprints/twiddle.json').toString(); + fileMap['initializers/router'] = fs.readFileSync('blueprints/router_initializer.js').toString(); + fileMap['initializers/mouse-events'] = fs.readFileSync('blueprints/mouse_events_initializer.js').toString(); + fileMap['controllers/application'] = fs.readFileSync('blueprints/application_controller.js').toString(); + fileMap['templates/application'] = fs.readFileSync('blueprints/application_template.hbs').toString(); + fileMap['app.css'] = fs.readFileSync('blueprints/app.css').toString(); + fileMap['index.html'] = fs.readFileSync('blueprints/index.html').toString(); + fileMap['test-start-app'] = fs.readFileSync('blueprints/start-app.js').toString(); + fileMap['model'] = fs.readFileSync('blueprints/model.js').toString(); + + return 'export default ' + JSON.stringify(fileMap); +} + +module.exports = getEmberCLIBlueprints; + From 1f0c6828b5eb6a87d23f50304adaf6cba794870b Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Fri, 22 Jun 2018 11:33:23 -0400 Subject: [PATCH 30/34] Migrate to using babel-preset-env. (#627) * Drop transpilation for IE. `last 2 versions` will target IE10 and IE11, which we don't support... * Migrate to using babel-preset-env. This will lead to less transpilation (e.g. we can use native async/await now, instead of transpiling). --- app/services/ember-cli.js | 11 ++++- config/targets.js | 5 ++- ember-cli-build.js | 5 ++- package.json | 1 + yarn.lock | 95 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 114 insertions(+), 3 deletions(-) diff --git a/app/services/ember-cli.js b/app/services/ember-cli.js index e5f57a11..f98141b3 100644 --- a/app/services/ember-cli.js +++ b/app/services/ember-cli.js @@ -511,7 +511,16 @@ export default Ember.Service.extend({ */ function babelOpts(moduleName) { return { - presets: ['es2017'], + presets: [['env', { + targets: { + browsers: [ + 'last 2 chrome versions', + 'last 2 firefox versions', + 'last 2 safari versions', + 'last 2 edge versions' + ] + } + }]], moduleIds: true, moduleId: moduleName, plugins: [ diff --git a/config/targets.js b/config/targets.js index 6c6b86ef..fb56b47d 100644 --- a/config/targets.js +++ b/config/targets.js @@ -2,6 +2,9 @@ module.exports = { browsers: [ - 'last 2 versions' + 'last 2 chrome versions', + 'last 2 firefox versions', + 'last 2 safari versions', + 'last 2 edge versions' ] }; diff --git a/ember-cli-build.js b/ember-cli-build.js index ae6e4a13..b3514e95 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -57,6 +57,9 @@ module.exports = function(defaults) { }, 'babel-standalone': { import: ['babel.js'] + }, + 'babel-preset-env-standalone': { + import: ['babel-preset-env.js'] } }, sourcemaps: { @@ -143,7 +146,7 @@ function buildQUnitTree(app) { const Rollup = require('broccoli-rollup'); const path = require('path'); const babelOpts = require('./lib/babel-opts'); - + let preprocessJs = app.registry.registry.js[0].toTree; let buildPreprocessedAddon = function(addonName) { diff --git a/package.json b/package.json index 99fee295..d6e2136e 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "devDependencies": { "@ember/test-helpers": "~0.7.18", "babel-plugin-ember-modules-api-polyfill": "^2.3.0", + "babel-preset-env-standalone": "^1.6.2", "babel-preset-es2017": "^6.24.1", "babel-standalone": "^6.26.0", "broccoli-asset-rev": "^2.4.5", diff --git a/yarn.lock b/yarn.lock index 1ee7625b..00c0f3dc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -722,6 +722,13 @@ babel-plugin-debug-macros@^0.1.10, babel-plugin-debug-macros@^0.1.11: dependencies: semver "^5.3.0" +babel-plugin-dynamic-import-webpack@^1.0.1: + version "1.0.2" + resolved "https://registry.yarnpkg.com/babel-plugin-dynamic-import-webpack/-/babel-plugin-dynamic-import-webpack-1.0.2.tgz#cb83435833e073f1600c0188a95edacfdc07c256" + dependencies: + babel-plugin-syntax-dynamic-import "^6.18.0" + babel-template "^6.26.0" + babel-plugin-ember-modules-api-polyfill@^1.4.2: version "1.6.0" resolved "https://registry.yarnpkg.com/babel-plugin-ember-modules-api-polyfill/-/babel-plugin-ember-modules-api-polyfill-1.6.0.tgz#abd1afa4237b3121cb51222f9bf3283cad8990aa" @@ -796,6 +803,10 @@ babel-plugin-syntax-async-functions@^6.8.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95" +babel-plugin-syntax-dynamic-import@^6.18.0: + version "6.18.0" + resolved "https://registry.yarnpkg.com/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz#8d6a26229c83745a9982a441051572caa179b1da" + babel-plugin-syntax-exponentiation-operator@^6.8.0: version "6.13.0" resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de" @@ -1019,6 +1030,75 @@ babel-polyfill@^6.26.0: core-js "^2.5.0" regenerator-runtime "^0.10.5" +babel-preset-env-standalone@^1.6.2: + version "1.6.2" + resolved "https://registry.yarnpkg.com/babel-preset-env-standalone/-/babel-preset-env-standalone-1.6.2.tgz#c3a386027c5215f7fb1790226c27de5b0eb98212" + dependencies: + babel-plugin-check-es2015-constants "^6.22.0" + babel-plugin-dynamic-import-webpack "^1.0.1" + babel-plugin-syntax-trailing-function-commas "^6.22.0" + babel-plugin-transform-async-to-generator "^6.22.0" + babel-plugin-transform-es2015-arrow-functions "^6.22.0" + babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" + babel-plugin-transform-es2015-block-scoping "^6.23.0" + babel-plugin-transform-es2015-classes "^6.23.0" + babel-plugin-transform-es2015-computed-properties "^6.22.0" + babel-plugin-transform-es2015-destructuring "^6.23.0" + babel-plugin-transform-es2015-duplicate-keys "^6.22.0" + babel-plugin-transform-es2015-for-of "^6.23.0" + babel-plugin-transform-es2015-function-name "^6.22.0" + babel-plugin-transform-es2015-literals "^6.22.0" + babel-plugin-transform-es2015-modules-amd "^6.22.0" + babel-plugin-transform-es2015-modules-commonjs "^6.23.0" + babel-plugin-transform-es2015-modules-systemjs "^6.23.0" + babel-plugin-transform-es2015-modules-umd "^6.23.0" + babel-plugin-transform-es2015-object-super "^6.22.0" + babel-plugin-transform-es2015-parameters "^6.23.0" + babel-plugin-transform-es2015-shorthand-properties "^6.22.0" + babel-plugin-transform-es2015-spread "^6.22.0" + babel-plugin-transform-es2015-sticky-regex "^6.22.0" + babel-plugin-transform-es2015-template-literals "^6.22.0" + babel-plugin-transform-es2015-typeof-symbol "^6.23.0" + babel-plugin-transform-es2015-unicode-regex "^6.22.0" + babel-plugin-transform-exponentiation-operator "^6.22.0" + babel-plugin-transform-regenerator "^6.22.0" + babel-preset-env "1.6.0" + +babel-preset-env@1.6.0: + version "1.6.0" + resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.6.0.tgz#2de1c782a780a0a5d605d199c957596da43c44e4" + dependencies: + babel-plugin-check-es2015-constants "^6.22.0" + babel-plugin-syntax-trailing-function-commas "^6.22.0" + babel-plugin-transform-async-to-generator "^6.22.0" + babel-plugin-transform-es2015-arrow-functions "^6.22.0" + babel-plugin-transform-es2015-block-scoped-functions "^6.22.0" + babel-plugin-transform-es2015-block-scoping "^6.23.0" + babel-plugin-transform-es2015-classes "^6.23.0" + babel-plugin-transform-es2015-computed-properties "^6.22.0" + babel-plugin-transform-es2015-destructuring "^6.23.0" + babel-plugin-transform-es2015-duplicate-keys "^6.22.0" + babel-plugin-transform-es2015-for-of "^6.23.0" + babel-plugin-transform-es2015-function-name "^6.22.0" + babel-plugin-transform-es2015-literals "^6.22.0" + babel-plugin-transform-es2015-modules-amd "^6.22.0" + babel-plugin-transform-es2015-modules-commonjs "^6.23.0" + babel-plugin-transform-es2015-modules-systemjs "^6.23.0" + babel-plugin-transform-es2015-modules-umd "^6.23.0" + babel-plugin-transform-es2015-object-super "^6.22.0" + babel-plugin-transform-es2015-parameters "^6.23.0" + babel-plugin-transform-es2015-shorthand-properties "^6.22.0" + babel-plugin-transform-es2015-spread "^6.22.0" + babel-plugin-transform-es2015-sticky-regex "^6.22.0" + babel-plugin-transform-es2015-template-literals "^6.22.0" + babel-plugin-transform-es2015-typeof-symbol "^6.23.0" + babel-plugin-transform-es2015-unicode-regex "^6.22.0" + babel-plugin-transform-exponentiation-operator "^6.22.0" + babel-plugin-transform-regenerator "^6.22.0" + browserslist "^2.1.2" + invariant "^2.2.2" + semver "^5.3.0" + babel-preset-env@^1.7.0: version "1.7.0" resolved "https://registry.yarnpkg.com/babel-preset-env/-/babel-preset-env-1.7.0.tgz#dea79fa4ebeb883cd35dab07e260c1c9c04df77a" @@ -1905,6 +1985,13 @@ browserify@^16.2.0: vm-browserify "^1.0.0" xtend "^4.0.0" +browserslist@^2.1.2: + version "2.11.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-2.11.3.tgz#fe36167aed1bbcde4827ebfe71347a2cc70b99b2" + dependencies: + caniuse-lite "^1.0.30000792" + electron-to-chromium "^1.3.30" + browserslist@^3.1.1, browserslist@^3.2.6: version "3.2.8" resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-3.2.8.tgz#b0005361d6471f0f5952797a76fc985f1f978fc6" @@ -2036,6 +2123,10 @@ can-symlink@^1.0.0: dependencies: tmp "0.0.28" +caniuse-lite@^1.0.30000792: + version "1.0.30000856" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000856.tgz#ecc16978135a6f219b138991eb62009d25ee8daa" + caniuse-lite@^1.0.30000844: version "1.0.30000850" resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000850.tgz#e68a88db4ea598b4c33b8419f7385473e4802495" @@ -2895,6 +2986,10 @@ ee-first@1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d" +electron-to-chromium@^1.3.30: + version "1.3.50" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.50.tgz#7438b76f92b41b919f3fbdd350fbd0757dacddf7" + electron-to-chromium@^1.3.47: version "1.3.48" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.48.tgz#d3b0d8593814044e092ece2108fc3ac9aea4b900" From 0e360281357a56cbd2ac64851f9a3a325c9ef108 Mon Sep 17 00:00:00 2001 From: Gokul Kathirvel Date: Sat, 23 Jun 2018 02:28:54 +0530 Subject: [PATCH 31/34] Adds keyboard shortcut option to comment javascript code. (#622) * adds shortcut comment option for javascript code * Adds test * change from `keypress` to `keydown` to trigger events * comment logic moved to initializer * fix test server shutdown --- .eslintrc.js | 3 +- app/initializers/app-initializer.js | 11 ++++ app/templates/components/editor-mode-menu.hbs | 2 +- app/templates/components/gist-header.hbs | 2 +- app/templates/components/main-gist.hbs | 1 + ember-cli-build.js | 3 +- tests/acceptance/code-comment-test.js | 53 +++++++++++++++++++ tests/helpers/destroy-app.js | 2 +- .../unit/initializers/app-initializer-test.js | 26 +++++++++ 9 files changed, 98 insertions(+), 5 deletions(-) create mode 100644 app/initializers/app-initializer.js create mode 100644 tests/acceptance/code-comment-test.js create mode 100644 tests/unit/initializers/app-initializer-test.js diff --git a/.eslintrc.js b/.eslintrc.js index 84b74261..d0158edd 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -31,7 +31,8 @@ module.exports = { visit: true, waitForLoadedIFrame: true, waitForUnloadedIFrame: true, - '$': true + '$': true, + CodeMirror: false }, rules: { 'ember/new-module-imports': 'off' diff --git a/app/initializers/app-initializer.js b/app/initializers/app-initializer.js new file mode 100644 index 00000000..b59f0a18 --- /dev/null +++ b/app/initializers/app-initializer.js @@ -0,0 +1,11 @@ +export function initialize(/* application */) { + // adds "toggleCommentIndented" command to codemirror for default keymap + + if (CodeMirror) { + CodeMirror.keyMap.default['Cmd-/'] = 'toggleCommentIndented'; + } +} + +export default { + initialize +}; diff --git a/app/templates/components/editor-mode-menu.hbs b/app/templates/components/editor-mode-menu.hbs index e6021a59..783ade62 100644 --- a/app/templates/components/editor-mode-menu.hbs +++ b/app/templates/components/editor-mode-menu.hbs @@ -1,5 +1,5 @@ - Keystroke Mode + Keystroke - {{selectedKeyMap}}
    diff --git a/app/templates/components/gist-header.hbs b/app/templates/components/gist-header.hbs index a2b8b6af..4c8f8586 100644 --- a/app/templates/components/gist-header.hbs +++ b/app/templates/components/gist-header.hbs @@ -37,7 +37,7 @@ downloadProject=(route-action "downloadProject") }} - {{editor-mode-menu setKeyMap=(action this.attrs.setEditorKeyMap)}} + {{editor-mode-menu selectedKeyMap=selectedKeyMap setKeyMap=(action this.attrs.setEditorKeyMap)}} {{versions-menu versionSelected=(action this.attrs.versionSelected) emberVersions=emberVersions diff --git a/app/templates/components/main-gist.hbs b/app/templates/components/main-gist.hbs index 4e2f1e7c..72516c49 100644 --- a/app/templates/components/main-gist.hbs +++ b/app/templates/components/main-gist.hbs @@ -4,6 +4,7 @@ activeEditorCol=activeEditorCol activeFile=activeFile isRevision=isRevision + selectedKeyMap=settings.keyMap titleChanged=(action "titleChanged") addFile=(action "addFile") addHelper=(action "addHelper") diff --git a/ember-cli-build.js b/ember-cli-build.js index b3514e95..a1b5df89 100644 --- a/ember-cli-build.js +++ b/ember-cli-build.js @@ -40,7 +40,8 @@ module.exports = function(defaults) { }, codemirror: { modes: ['xml', 'javascript', 'handlebars', 'htmlmixed', 'css'], - keyMaps: ['emacs', 'sublime', 'vim'] + keyMaps: ['emacs', 'sublime', 'vim'], + addonFiles: ['comment/comment.js'] }, 'ember-cli-bootstrap-sassy': { 'js': ['dropdown', 'collapse'] diff --git a/tests/acceptance/code-comment-test.js b/tests/acceptance/code-comment-test.js new file mode 100644 index 00000000..cd7589f6 --- /dev/null +++ b/tests/acceptance/code-comment-test.js @@ -0,0 +1,53 @@ +import { test } from 'qunit'; +import moduleForAcceptance from 'ember-twiddle/tests/helpers/module-for-acceptance'; + +moduleForAcceptance('Acceptance | code comment'); + +test('checks javascript comment option', async function(assert) { + const files = [ + { + filename: "application.controller.js", + content: `import Ember from "ember"; + export default Ember.Controller.extend({ + appName: 'Ember Twiddle' + });` + }, + { + filename: "application.template.hbs", + content: "Welcome to {{appName}}" + } + ]; + + + await runGist(files); + + let textboxNode = 'textarea:eq(1)'; + textboxNode = '.CodeMirror textarea'; + await click(textboxNode); + + await triggerEvent(textboxNode, 'keydown', { + keyCode: 65, // 'A' + metaKey: true + }); + + await triggerEvent(textboxNode, 'keydown', { + keyCode: 191, // '/' + metaKey: true + }); + + let [firstLine] = find('.CodeMirror-line'); + let content = firstLine.textContent; + + assert.ok(content.startsWith('//'), 'Line has been commented'); + + await triggerEvent(textboxNode, 'keydown', { + keyCode: 191, // '/' + metaKey: true + }); + + [firstLine] = find('.CodeMirror-line'); + content = firstLine.textContent; + + assert.notOk(content.startsWith('//'), 'Line has been uncommented'); + +}); diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js index 01667f27..1eb6491b 100644 --- a/tests/helpers/destroy-app.js +++ b/tests/helpers/destroy-app.js @@ -3,6 +3,6 @@ import { run } from '@ember/runloop'; export default function destroyApp(application) { run(() => { application.destroy(); - window.server.shutdown(); + window.server && window.server.shutdown(); }); } diff --git a/tests/unit/initializers/app-initializer-test.js b/tests/unit/initializers/app-initializer-test.js new file mode 100644 index 00000000..8fa0dc1c --- /dev/null +++ b/tests/unit/initializers/app-initializer-test.js @@ -0,0 +1,26 @@ +import Application from '@ember/application'; +import { run } from '@ember/runloop'; + +import { initialize } from 'ember-twiddle/initializers/app-initializer'; +import { module, test } from 'qunit'; +import destroyApp from '../../helpers/destroy-app'; + +module('Unit | Initializer | app initializer', { + beforeEach() { + run(() => { + this.application = Application.create(); + this.application.deferReadiness(); + }); + }, + afterEach() { + destroyApp(this.application); + } +}); + +// Replace this with your real tests. +test('it works', function(assert) { + initialize(this.application); + + // you would normally confirm the results of the initializer here + assert.ok(true); +}); From d8f5bc310027844c31781e96e80e5e2a3484b55f Mon Sep 17 00:00:00 2001 From: Gokul Kathirvel Date: Mon, 2 Jul 2018 02:05:43 +0530 Subject: [PATCH 32/34] adds keyboard shortcuts for `run now` and `save` (#628) * adds keyboard shortcuts for `run now` and `save` * adds deps for unit test * using e-keyboard test helper * minor tweaks --- app/components/main-gist.js | 22 +++++++++++-- app/routes/gist.js | 5 ++- app/templates/components/gist-header.hbs | 2 +- app/templates/components/main-gist.hbs | 1 + .../components/saved-state-indicator.hbs | 4 ++- app/templates/gist.hbs | 2 ++ package.json | 1 + tests/acceptance/code-comment-test.js | 3 +- tests/acceptance/run-now-test.js | 32 +++++++++++++++---- tests/acceptance/save-test.js | 15 +++++++++ tests/helpers/start-app.js | 2 ++ tests/unit/components/main-gist-test.js | 3 +- yarn.lock | 6 ++++ 13 files changed, 82 insertions(+), 16 deletions(-) diff --git a/app/components/main-gist.js b/app/components/main-gist.js index a6d37967..74bf5212 100644 --- a/app/components/main-gist.js +++ b/app/components/main-gist.js @@ -4,10 +4,11 @@ import ColumnsMixin from "../mixins/columns"; import FilesMixin from "../mixins/files"; import TestFilesMixin from "../mixins/test-files"; import AppBuilderMixin from "../mixins/app-builder"; +import { keyDown, EKMixin } from 'ember-keyboard'; -const { inject, computed, run } = Ember; +const { inject, computed, run, on } = Ember; -export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin, TestFilesMixin, { +export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin, TestFilesMixin, EKMixin, { emberCli: inject.service(), dependencyResolver: inject.service(), notify: inject.service(), @@ -24,9 +25,24 @@ export default Ember.Component.extend(AppBuilderMixin, ColumnsMixin, FilesMixin, isFastBoot: this.get('fastboot.isFastBoot') })); this.createColumns(); - this.set('activeEditorCol', '1'); + this.setProperties({ + activeEditorCol: '1', + keyboardActivated: true + }); }, + // eslint-disable-next-line ember/no-on-calls-in-components + onReloadCommand: on(keyDown('Enter+cmd'), function () { + this.send('runNow'); + }), + + // eslint-disable-next-line ember/no-on-calls-in-components + onSaveCommand: on(keyDown('cmd+KeyS'), function (event) { + this.saveGist(this.get('model')); + this.send('runNow'); + event.preventDefault(); + }), + /** * Output from the build, sets the `code` attr on the component * @type {String} diff --git a/app/routes/gist.js b/app/routes/gist.js index 5ca33dea..e1ed94ad 100644 --- a/app/routes/gist.js +++ b/app/routes/gist.js @@ -49,10 +49,12 @@ export default Ember.Route.extend({ actions: { saveGist(gist) { var newGist = gist.get('isNew'); + let controller = this.get('controller'); if (!newGist && gist.get('ownerLogin') !== this.get('session.currentUser.login')) { this.send('fork', gist); return; } + controller.set('isGistSaving', true); gist.save().then(() => { this.get('notify').info(`Saved to Gist ${gist.get('id')} on Github`); this.send('setSaved'); @@ -60,7 +62,8 @@ export default Ember.Route.extend({ gist.set('gistId', gist.get('id')); this.transitionTo('gist.edit', gist); } - }).catch((this.catchSaveError.bind(this))); + }).catch((this.catchSaveError.bind(this))) + .finally(() => controller.set('isGistSaving', false)); }, deleteGist(gist) { diff --git a/app/templates/components/gist-header.hbs b/app/templates/components/gist-header.hbs index 4c8f8586..450e21c4 100644 --- a/app/templates/components/gist-header.hbs +++ b/app/templates/components/gist-header.hbs @@ -2,7 +2,7 @@
    {{title-input value=model.description titleChanged=(action this.attrs.titleChanged)}} - {{saved-state-indicator model=model unsaved=unsaved}} + {{saved-state-indicator model=model unsaved=unsaved isGistSaving=isGistSaving}}