From 101ab1ab3abe24fe6704d10d0782f6fdc01b4183 Mon Sep 17 00:00:00 2001 From: Robert Wagner Date: Sun, 21 Jul 2019 08:45:00 -0400 Subject: [PATCH 1/2] Ember 3.11 --- .eslintrc.js | 3 +- .travis.yml | 2 + README.md | 2 +- config/ember-try.js | 182 ++++++++++++++++++++++---------------------- package.json | 4 +- yarn.lock | 71 ++++++++++------- 6 files changed, 143 insertions(+), 121 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 9a5ae098..d836b1e7 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -42,8 +42,7 @@ module.exports = { 'tests/dummy/app/**' ], parserOptions: { - sourceType: 'script', - ecmaVersion: 2015 + sourceType: 'script' }, env: { browser: false, diff --git a/.travis.yml b/.travis.yml index 97937bf9..2457509a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,6 +56,8 @@ jobs: - env: EMBER_TRY_SCENARIO=ember-lts-2.16 - env: EMBER_TRY_SCENARIO=ember-lts-2.18 - env: EMBER_TRY_SCENARIO=ember-lts-3.4 + - env: EMBER_TRY_SCENARIO=ember-lts-3.4 + - env: EMBER_TRY_SCENARIO=ember-lts-3.8 - env: EMBER_TRY_SCENARIO=ember-release - env: EMBER_TRY_SCENARIO=ember-beta - env: EMBER_TRY_SCENARIO=ember-canary diff --git a/README.md b/README.md index 76c3812a..49cb6777 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This is an Ember wrapper for the [Shepherd](https://github.com/shipshapecode/she Compatibility ------------------------------------------------------------------------------ -* Ember.js v2.18 or above +* Ember.js v3.4 or above * Ember CLI v2.13 or above * Node.js v8 or above diff --git a/config/ember-try.js b/config/ember-try.js index 4dd73582..8baa802d 100644 --- a/config/ember-try.js +++ b/config/ember-try.js @@ -2,107 +2,109 @@ const getChannelURL = require('ember-source-channel-url'); -module.exports = function() { - return Promise.all([ - getChannelURL('release'), - getChannelURL('beta'), - getChannelURL('canary') - ]).then((urls) => { - return { - useYarn: true, - scenarios: [ - { - name: 'ember-lts-2.12', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }) - }, - npm: { - devDependencies: { - '@ember/jquery': '^0.5.1', - 'ember-source': '~2.12.0' - } - } +module.exports = async function() { + return { + useYarn: true, + scenarios: [ + { + name: 'ember-lts-2.12', + env: { + EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }) }, - { - name: 'ember-lts-2.16', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }) - }, - npm: { - devDependencies: { - '@ember/jquery': '^0.5.1', - 'ember-source': '~2.16.0' - } + npm: { + devDependencies: { + '@ember/jquery': '^0.5.1', + 'ember-source': '~2.12.0' } + } + }, + { + name: 'ember-lts-2.16', + env: { + EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }) }, - { - name: 'ember-lts-2.18', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }) - }, - npm: { - devDependencies: { - '@ember/jquery': '^0.5.1', - 'ember-source': '~2.18.0' - } + npm: { + devDependencies: { + '@ember/jquery': '^0.5.1', + 'ember-source': '~2.16.0' } + } + }, + { + name: 'ember-lts-2.18', + env: { + EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }) }, - { - name: 'ember-lts-3.4', - npm: { - devDependencies: { - 'ember-source': '~3.4.0' - } + npm: { + devDependencies: { + '@ember/jquery': '^0.5.1', + 'ember-source': '~2.18.0' } - }, - { - name: 'ember-release', - npm: { - devDependencies: { - 'ember-source': urls[0] - } + } + }, + { + name: 'ember-lts-3.4', + npm: { + devDependencies: { + 'ember-source': '~3.4.0' } - }, - { - name: 'ember-beta', - npm: { - devDependencies: { - 'ember-source': urls[1] - } + } + }, + { + name: 'ember-lts-3.8', + npm: { + devDependencies: { + 'ember-source': '~3.8.0' } - }, - { - name: 'ember-canary', - npm: { - devDependencies: { - 'ember-source': urls[2] - } + } + }, + { + name: 'ember-release', + npm: { + devDependencies: { + 'ember-source': await getChannelURL('release') } - }, - // The default `.travis.yml` runs this scenario via `yarn test`, - // not via `ember try`. It's still included here so that running - // `ember try:each` manually or from a customized CI config will run it - // along with all the other scenarios. - { - name: 'ember-default', - npm: { - devDependencies: {} + } + }, + { + name: 'ember-beta', + npm: { + devDependencies: { + 'ember-source': await getChannelURL('beta') } + } + }, + { + name: 'ember-canary', + npm: { + devDependencies: { + 'ember-source': await getChannelURL('canary') + } + } + }, + // The default `.travis.yml` runs this scenario via `yarn test`, + // not via `ember try`. It's still included here so that running + // `ember try:each` manually or from a customized CI config will run it + // along with all the other scenarios. + { + name: 'ember-default', + npm: { + devDependencies: {} + } + }, + { + name: 'ember-default-with-jquery', + env: { + EMBER_OPTIONAL_FEATURES: JSON.stringify({ + 'jquery-integration': true + }) }, - { - name: 'ember-default-with-jquery', - env: { - EMBER_OPTIONAL_FEATURES: JSON.stringify({ - 'jquery-integration': true - }) - }, - npm: { - devDependencies: { - '@ember/jquery': '^0.5.1' - } + npm: { + devDependencies: { + '@ember/jquery': '^0.5.1' } } - ] - }; - }); + } + ] + }; }; diff --git a/package.json b/package.json index ffc185dd..3e8fbd56 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "babel-eslint": "^10.0.2", "broccoli-asset-rev": "^3.0.0", "codeclimate-test-reporter": "^0.5.1", - "ember-cli": "~3.10.1", + "ember-cli": "~3.11.0", "ember-cli-addon-docs": "^0.6.13", "ember-cli-addon-docs-yuidoc": "^0.2.1", "ember-cli-code-coverage": "^1.0.0-beta.8", @@ -91,7 +91,7 @@ "ember-prism": "^0.4.0", "ember-qunit": "^4.4.1", "ember-resolver": "^5.0.1", - "ember-source": "~3.10.0", + "ember-source": "~3.11.1", "ember-source-channel-url": "^2.0.1", "ember-svg-jar": "^1.2.2", "ember-try": "^1.2.1", diff --git a/yarn.lock b/yarn.lock index 18c3cbb9..8ead0345 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1324,6 +1324,11 @@ ansi-escapes@^3.0.0, ansi-escapes@^3.2.0: resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" integrity sha512-cBhpre4ma+U0T1oM5fXg7Dy1Jw7zzwv7lt/GoCpr+hDQJoYnKVPLL4dCvSEFMmQurOQvSrwT7SL/DAlhBI97RQ== +ansi-html@^0.0.7: + version "0.0.7" + resolved "https://registry.yarnpkg.com/ansi-html/-/ansi-html-0.0.7.tgz#813584021962a9e9e6fd039f940d12f56ca7859e" + integrity sha1-gTWEAhliqenm/QOflA0S9WynhZ4= + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df" @@ -2820,12 +2825,12 @@ broccoli-module-unification-reexporter@^1.0.0: mkdirp "^0.5.1" walk-sync "^0.3.2" -broccoli-node-info@1.1.0, broccoli-node-info@^1.1.0: +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" integrity sha1-OqLjHgflvbUW3SUhT3xFuhxFlBI= -broccoli-node-info@~2.0.0: +broccoli-node-info@^2.0.0, broccoli-node-info@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/broccoli-node-info/-/broccoli-node-info-2.0.0.tgz#652a7940ede40630b84ad009c6236f4bc548b556" integrity sha512-xfnzPYdf8Uu3mfhEPkh3CX1suGHNNW4k3f730llzr4Dl7UXvI5T8RUb7X04BSvJfvqYTekM/JTmYrjB01WAsCg== @@ -3069,16 +3074,18 @@ broccoli-writer@^0.1.1: quick-temp "^0.1.0" rsvp "^3.0.6" -broccoli@^2.3.0: - version "2.3.0" - resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-2.3.0.tgz#b3f71b2c3d02fc042988e208827a09c75dd7b350" - integrity sha512-TeYMYlCGFK8EGk4Wce1G1uU3i52+YxRqP3WPOVDojC1zUk+Gi40wHBzUT2fncQZDl26dmCQMNugtHKjvUpcGQg== +broccoli@^3.1.1: + version "3.1.2" + resolved "https://registry.yarnpkg.com/broccoli/-/broccoli-3.1.2.tgz#31a8758aa087a26d62f1dab65c1d0af87cbced73" + integrity sha512-lSQB5sReBO1yPnWvQEqrAtLomK1BB1lsFQjc/whszK9j37v0tvvuCOeHX40x7iw3D2V4CyiBrYUUPY4pBjwdzA== dependencies: - broccoli-node-info "1.1.0" + ansi-html "^0.0.7" + broccoli-node-info "^2.0.0" broccoli-slow-trees "^3.0.1" broccoli-source "^1.1.0" commander "^2.15.1" connect "^3.6.6" + console-ui "^3.0.4" esm "^3.2.4" findup-sync "^2.0.0" handlebars "^4.0.11" @@ -3907,6 +3914,17 @@ console-ui@^3.0.2: ora "^3.4.0" through2 "^3.0.1" +console-ui@^3.0.4: + version "3.1.1" + resolved "https://registry.yarnpkg.com/console-ui/-/console-ui-3.1.1.tgz#681a0414e8b0a23ed679d0a2802e39d920801171" + integrity sha512-22y+uk4AGq9quz6kofKQjkeCIAm86+MTxT/RZMFm8fMArP2lAkzxjUjNyrw7S6wXnnB+qRnC+/2ANMTke68RTQ== + dependencies: + chalk "^2.1.0" + inquirer "^6" + json-stable-stringify "^1.0.1" + ora "^3.4.0" + through2 "^3.0.1" + consolidate@^0.15.1: version "0.15.1" resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7" @@ -5094,10 +5112,10 @@ ember-cli-version-checker@^3.0.0, ember-cli-version-checker@^3.0.1, ember-cli-ve resolve-package-path "^1.2.6" semver "^5.6.0" -ember-cli@~3.10.1: - version "3.10.1" - resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.10.1.tgz#068b63bab00ec8a229097d45b809ccc5e1a9dd53" - integrity sha512-MQdZAxkwSR2wGJhVMP0Wm7cSYXfMW0Hku/kWtqDm1Ig1dIcWWRpTNxQ12uxBSiE8uQNrXpF3cl5ZDpMVnhbdqw== +ember-cli@~3.11.0: + version "3.11.0" + resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.11.0.tgz#05c055fde0803b2f4034a3b5a68daaed408e632d" + integrity sha512-YU+nGUZ3l3MbqW5BiFX9c9k3szgm41EPRGjFFLEXerOXuyFByRWYPBZDtBOGmtdWmZpiqv53JXYRweMANHWLvA== dependencies: "@babel/core" "^7.4.3" "@babel/plugin-transform-modules-amd" "^7.2.0" @@ -5105,7 +5123,7 @@ ember-cli@~3.10.1: babel-plugin-module-resolver "^3.2.0" bower-config "^1.4.1" bower-endpoint-parser "0.2.2" - broccoli "^2.3.0" + broccoli "^3.1.1" broccoli-amd-funnel "^2.0.1" broccoli-babel-transpiler "^7.2.0" broccoli-builder "^0.18.14" @@ -5119,6 +5137,7 @@ ember-cli@~3.10.1: broccoli-middleware "^2.0.1" broccoli-module-normalizer "^1.3.0" broccoli-module-unification-reexporter "^1.0.0" + broccoli-slow-trees "^3.0.1" broccoli-source "^1.1.0" broccoli-stew "^2.1.0" calculate-cache-key-for-tree "^2.0.0" @@ -5147,10 +5166,10 @@ ember-cli@~3.10.1: find-up "^3.0.0" find-yarn-workspace-root "^1.2.1" fs-extra "^7.0.1" - fs-tree-diff "^2.0.0" + fs-tree-diff "^2.0.1" get-caller-file "^2.0.5" git-repo-info "^2.1.0" - glob "^7.1.3" + glob "^7.1.4" heimdalljs "^0.2.6" heimdalljs-fs-monitor "^0.2.2" heimdalljs-graph "^0.3.5" @@ -5172,9 +5191,10 @@ ember-cli@~3.10.1: p-defer "^2.1.0" portfinder "^1.0.20" promise-map-series "^0.2.3" + promise.prototype.finally "^3.1.0" quick-temp "^0.1.8" - resolve "^1.10.0" - resolve-package-path "^1.2.6" + resolve "^1.10.1" + resolve-package-path "^1.2.7" rsvp "^4.8.4" sane "^4.1.0" semver "^6.0.0" @@ -5186,7 +5206,6 @@ ember-cli@~3.10.1: tiny-lr "^1.1.1" tree-sync "^1.4.0" uuid "^3.3.2" - validate-npm-package-name "^3.0.0" walk-sync "^1.1.3" watch-detector "^0.1.0" yam "^1.0.0" @@ -5507,10 +5526,10 @@ ember-source-channel-url@^2.0.1: dependencies: got "^8.0.1" -ember-source@~3.10.0: - version "3.10.2" - resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.10.2.tgz#17a0405f1e470698f601622b3383cce7f80e2d31" - integrity sha512-7WRBikgS5riwO0DiBtKQDQhk80mqppMbghSAHXvfJAYpkGFxuH//MxjO1eRXP9xjzmdMhfDmixrMnNBtc5D6mA== +ember-source@~3.11.1: + version "3.11.1" + resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.11.1.tgz#2318fbe600c88d3a8abbf56fc2f3a61645ee42d8" + integrity sha512-FPHHHu/5FBbKQ3o1D2HXEIniBUVqG1N4vDB66BaP0ht2ZcO6EB3HMjGxVH8Ad3Of8QOcXtZrBfXDHZdIWLW4lQ== dependencies: broccoli-funnel "^2.0.2" broccoli-merge-trees "^3.0.2" @@ -5524,8 +5543,8 @@ ember-source@~3.10.0: ember-cli-version-checker "^3.1.3" ember-router-generator "^1.2.3" inflection "^1.12.0" - jquery "^3.3.1" - resolve "^1.10.0" + jquery "^3.4.1" + resolve "^1.10.1" ember-svg-jar@^1.2.2: version "1.2.2" @@ -6499,7 +6518,7 @@ fs-tree-diff@^1.0.0: path-posix "^1.0.0" symlink-or-copy "^1.1.8" -fs-tree-diff@^2.0.0: +fs-tree-diff@^2.0.0, fs-tree-diff@^2.0.1: version "2.0.1" resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz#343e4745ab435ec39ebac5f9059ad919cd034afa" integrity sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A== @@ -7814,7 +7833,7 @@ joi@^12.0.0: isemail "3.x.x" topo "2.x.x" -jquery@^3.3.1: +jquery@^3.4.1: version "3.4.1" resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2" integrity sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw== @@ -10865,7 +10884,7 @@ resolve-from@^5.0.0: resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69" integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw== -resolve-package-path@^1.0.11, resolve-package-path@^1.2.6: +resolve-package-path@^1.0.11, resolve-package-path@^1.2.6, resolve-package-path@^1.2.7: version "1.2.7" resolved "https://registry.yarnpkg.com/resolve-package-path/-/resolve-package-path-1.2.7.tgz#2a7bc37ad96865e239330e3102c31322847e652e" integrity sha512-fVEKHGeK85bGbVFuwO9o1aU0n3vqQGrezPc51JGu9UTXpFQfWq5qCeKxyaRUSvephs+06c5j5rPq/dzHGEo8+Q== From 4a2630f00ee85b1a256504a535aaa80f9f34ac2b Mon Sep 17 00:00:00 2001 From: Robert Wagner Date: Sun, 21 Jul 2019 09:01:06 -0400 Subject: [PATCH 2/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 49cb6777..f84499fc 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This is an Ember wrapper for the [Shepherd](https://github.com/shipshapecode/she Compatibility ------------------------------------------------------------------------------ -* Ember.js v3.4 or above +* Tested with Ember.js >= v2.16, but may work with earlier versions as well * Ember CLI v2.13 or above * Node.js v8 or above