Skip to content

Commit 6485f6a

Browse files
committed
⬆️ v3.6.1...v3.7.1
1 parent 6650763 commit 6485f6a

File tree

8 files changed

+67
-66
lines changed

8 files changed

+67
-66
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/node_modules/
1010

1111
# misc
12+
/.env*
1213
/.sass-cache
1314
/connect.lock
1415
/coverage/

.npmignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
/.bowerrc
1010
/.editorconfig
1111
/.ember-cli
12+
/.env*
1213
/.eslintignore
1314
/.eslintrc.js
1415
/.gitignore

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ jobs:
4444
# we recommend new addons test the current and previous LTS
4545
# as well as latest stable release (bonus points to beta/canary)
4646
- stage: "Additional Tests"
47-
env: EMBER_TRY_SCENARIO=ember-lts-2.16
48-
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
47+
env: EMBER_TRY_SCENARIO=ember-lts-2.18
4948
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
5049
- env: EMBER_TRY_SCENARIO=ember-release
5150
- env: EMBER_TRY_SCENARIO=ember-beta

README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ ember install ember-cli-bootstrap3-popover
5151

5252
**As mentioned, you must install Bootstrap3 along with the tooltip plugin. See the requirements section above.**
5353

54+
## Compatibility
55+
56+
- Ember.js v2.18 or above
57+
- Ember CLI v2.13 or above
58+
5459
### Upgrading
5560

5661
When working through the Ember upgrade process, I recommend

config/ember-try.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,18 +10,6 @@ module.exports = function() {
1010
]).then((urls) => {
1111
return {
1212
scenarios: [
13-
{
14-
name: 'ember-lts-2.16',
15-
env: {
16-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
17-
},
18-
npm: {
19-
devDependencies: {
20-
'@ember/jquery': '^0.5.1',
21-
'ember-source': '~2.16.0'
22-
}
23-
}
24-
},
2513
{
2614
name: 'ember-lts-2.18',
2715
env: {

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
"bootstrap-sass": "3.4.1",
5454
"bootswatch": "^3.3.7",
5555
"broccoli-asset-rev": "^3.0.0",
56-
"ember-cli": "~3.6.1",
56+
"ember-cli": "~3.7.1",
5757
"ember-cli-clock": "^3.0.0",
5858
"ember-cli-dependency-checker": "^3.0.0",
5959
"ember-cli-deploy": "^1.0.1",
@@ -73,7 +73,7 @@
7373
"ember-maybe-import-regenerator": "^0.1.6",
7474
"ember-qunit": "^3.4.1",
7575
"ember-resolver": "^7.0.0",
76-
"ember-source": "~3.6.0",
76+
"ember-source": "~3.7.0",
7777
"ember-source-channel-url": "^2.0.1",
7878
"ember-try": "^1.0.0",
7979
"ember-welcome-page": "^4.0.0",

tests/dummy/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.6.1",
6+
"version": "3.7.1",
77
"blueprints": [
88
{
99
"name": "addon",

yarn.lock

Lines changed: 56 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1213,7 +1213,7 @@
12131213
dependencies:
12141214
"@babel/helper-plugin-utils" "^7.0.0"
12151215

1216-
"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7":
1216+
"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7", "@babel/plugin-transform-modules-amd@^7.2.0":
12171217
version "7.16.7"
12181218
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
12191219
integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
@@ -2119,7 +2119,7 @@ [email protected]:
21192119
dependencies:
21202120
ensure-posix-path "^1.0.1"
21212121

2122-
amd-name-resolver@^1.2.0, amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.1:
2122+
amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.1:
21232123
version "1.3.1"
21242124
resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
21252125
integrity sha512-26qTEWqZQ+cxSYygZ4Cf8tsjDBLceJahhtewxtKZA3SRa4PluuqYCuheemDQD+7Mf5B7sr+zhTDWAHDh02a1Dw==
@@ -3356,36 +3356,36 @@ broccoli-babel-transpiler@^6.5.0:
33563356
rsvp "^4.8.2"
33573357
workerpool "^2.3.0"
33583358

3359-
broccoli-babel-transpiler@^7.3.0:
3360-
version "7.3.0"
3361-
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.3.0.tgz#a0ad3a37dbf74469664bbca403d652070c2c1317"
3362-
integrity sha512-tsXNvDf3gp6g8rGkz234AhbaIRUsCdd6CM3ikfkJVB0EpC8ZAczGsFKTjENLy1etx4s7FkruW/QjI7Wfdhx6Ng==
3359+
broccoli-babel-transpiler@^7.1.1, broccoli-babel-transpiler@^7.8.0:
3360+
version "7.8.0"
3361+
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.0.tgz#7e0f01fce5739f49bbadeee7f1e625ca51cad66e"
3362+
integrity sha512-dv30Td5uL7dO3NzQUqQKQs+Iq7JGKnCNtvc6GBO76uVPqGnRlsQZcYqdBVr33JrctR+ZrpTUf7TjsFKeDRFA8Q==
33633363
dependencies:
3364-
"@babel/core" "^7.3.3"
3365-
"@babel/polyfill" "^7.0.0"
3364+
"@babel/core" "^7.12.0"
3365+
"@babel/polyfill" "^7.11.5"
33663366
broccoli-funnel "^2.0.2"
33673367
broccoli-merge-trees "^3.0.2"
33683368
broccoli-persistent-filter "^2.2.1"
33693369
clone "^2.1.2"
33703370
hash-for-dep "^1.4.7"
3371+
heimdalljs "^0.2.1"
33713372
heimdalljs-logger "^0.1.9"
33723373
json-stable-stringify "^1.0.1"
33733374
rsvp "^4.8.4"
33743375
workerpool "^3.1.1"
33753376

3376-
broccoli-babel-transpiler@^7.8.0:
3377-
version "7.8.0"
3378-
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.0.tgz#7e0f01fce5739f49bbadeee7f1e625ca51cad66e"
3379-
integrity sha512-dv30Td5uL7dO3NzQUqQKQs+Iq7JGKnCNtvc6GBO76uVPqGnRlsQZcYqdBVr33JrctR+ZrpTUf7TjsFKeDRFA8Q==
3377+
broccoli-babel-transpiler@^7.3.0:
3378+
version "7.3.0"
3379+
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.3.0.tgz#a0ad3a37dbf74469664bbca403d652070c2c1317"
3380+
integrity sha512-tsXNvDf3gp6g8rGkz234AhbaIRUsCdd6CM3ikfkJVB0EpC8ZAczGsFKTjENLy1etx4s7FkruW/QjI7Wfdhx6Ng==
33803381
dependencies:
3381-
"@babel/core" "^7.12.0"
3382-
"@babel/polyfill" "^7.11.5"
3382+
"@babel/core" "^7.3.3"
3383+
"@babel/polyfill" "^7.0.0"
33833384
broccoli-funnel "^2.0.2"
33843385
broccoli-merge-trees "^3.0.2"
33853386
broccoli-persistent-filter "^2.2.1"
33863387
clone "^2.1.2"
33873388
hash-for-dep "^1.4.7"
3388-
heimdalljs "^0.2.1"
33893389
heimdalljs-logger "^0.1.9"
33903390
json-stable-stringify "^1.0.1"
33913391
rsvp "^4.8.4"
@@ -4238,7 +4238,7 @@ chownr@~1.0.1:
42384238
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
42394239
integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
42404240

4241-
ci-info@^1.1.3, ci-info@^1.5.0:
4241+
ci-info@^1.5.0:
42424242
version "1.6.0"
42434243
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
42444244
integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
@@ -5214,16 +5214,16 @@ ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.13.2, ember
52145214
ensure-posix-path "^1.0.2"
52155215
semver "^5.5.0"
52165216

5217-
ember-cli-broccoli-sane-watcher@^2.1.1:
5218-
version "2.2.2"
5219-
resolved "https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-2.2.2.tgz#9bb1b04ddeb2c086aecd8693cbaeca1d88dc160c"
5220-
integrity sha512-9OLy8x3pdNKC/6xR00IjTL8XyiQU3rb2HLyQSAqHuaZpZcSTKkbAse2ERTsELSINoo/zi/W7qPP5vd5SsHsraw==
5217+
ember-cli-broccoli-sane-watcher@^3.0.0:
5218+
version "3.0.0"
5219+
resolved "https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-3.0.0.tgz#dc1812c047e1ceec4413d3c41b51a9ffc61b4cfe"
5220+
integrity sha512-sLn+wy6FJpGMHtSwAGUjQK3nJFvw2b6H8bR2EgMIXxkUI3DYFLi6Xnyxm02XlMTcfTxF10yHFhHJe0O+PcJM7A==
52215221
dependencies:
52225222
broccoli-slow-trees "^3.0.1"
52235223
heimdalljs "^0.2.1"
52245224
heimdalljs-logger "^0.1.7"
52255225
rsvp "^3.0.18"
5226-
sane "^2.4.1"
5226+
sane "^4.0.0"
52275227

52285228
ember-cli-clock@^3.0.0:
52295229
version "3.0.0"
@@ -5510,18 +5510,19 @@ ember-cli-version-checker@^4.1.0:
55105510
semver "^6.3.0"
55115511
silent-error "^1.1.1"
55125512

5513-
ember-cli@~3.6.1:
5514-
version "3.6.1"
5515-
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.6.1.tgz#2a8394bb6d3859d3cdb9e6e79d6d7455f80db9e1"
5516-
integrity sha512-66q6pyeJP5SotkLX6HgKTBEOqDBm4u0BzkdT2JQPZ1Syey9/M8aek6tUnEun2rjJaLhee1tXwgQgAw4QJqscTA==
5513+
ember-cli@~3.7.1:
5514+
version "3.7.1"
5515+
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.7.1.tgz#f307bcd68aaf083612717ab32133120272d89170"
5516+
integrity sha512-hlQK32xZEubHRdAo8s6JKvDTBB41wKghW3m0IewS+sZTV92Z6DJoZXlH5taETcnc5qMR1Ifml25Z2ezyNL/OBA==
55175517
dependencies:
5518-
amd-name-resolver "^1.2.0"
5519-
babel-plugin-transform-es2015-modules-amd "^6.24.1"
5518+
"@babel/plugin-transform-modules-amd" "^7.2.0"
5519+
amd-name-resolver "^1.3.1"
5520+
babel-plugin-module-resolver "^3.1.1"
55205521
bower-config "^1.3.0"
55215522
bower-endpoint-parser "0.2.2"
55225523
broccoli "^2.0.0"
55235524
broccoli-amd-funnel "^2.0.1"
5524-
broccoli-babel-transpiler "^6.5.0"
5525+
broccoli-babel-transpiler "^7.1.1"
55255526
broccoli-builder "^0.18.14"
55265527
broccoli-concat "^3.7.3"
55275528
broccoli-config-loader "^1.0.1"
@@ -5538,15 +5539,15 @@ ember-cli@~3.6.1:
55385539
calculate-cache-key-for-tree "^1.1.0"
55395540
capture-exit "^1.2.0"
55405541
chalk "^2.4.1"
5541-
ci-info "^1.1.3"
5542+
ci-info "^2.0.0"
55425543
clean-base-url "^1.0.0"
55435544
compression "^1.7.3"
55445545
configstore "^4.0.0"
55455546
console-ui "^2.2.2"
55465547
core-object "^3.1.5"
55475548
dag-map "^2.0.2"
55485549
diff "^3.5.0"
5549-
ember-cli-broccoli-sane-watcher "^2.1.1"
5550+
ember-cli-broccoli-sane-watcher "^3.0.0"
55505551
ember-cli-is-package-missing "^1.0.0"
55515552
ember-cli-lodash-subset "^2.0.1"
55525553
ember-cli-normalize-entity-name "^1.0.0"
@@ -5562,8 +5563,8 @@ ember-cli@~3.6.1:
55625563
fixturify "^0.3.4"
55635564
fixturify-project "^1.5.3"
55645565
fs-extra "^7.0.0"
5565-
fs-tree-diff "^0.5.7"
5566-
get-caller-file "^1.0.0"
5566+
fs-tree-diff "^1.0.0"
5567+
get-caller-file "^2.0.0"
55675568
git-repo-info "^2.0.0"
55685569
glob "^7.1.2"
55695570
heimdalljs "^0.2.5"
@@ -5601,9 +5602,9 @@ ember-cli@~3.6.1:
56015602
tree-sync "^1.2.2"
56025603
uuid "^3.3.2"
56035604
validate-npm-package-name "^3.0.0"
5604-
walk-sync "^0.3.2"
5605+
walk-sync "^1.0.0"
56055606
watch-detector "^0.1.0"
5606-
yam "^0.0.24"
5607+
yam "^1.0.0"
56075608

56085609
ember-compatibility-helpers@^1.1.2:
56095610
version "1.2.0"
@@ -5697,13 +5698,13 @@ ember-source-channel-url@^2.0.1:
56975698
dependencies:
56985699
got "^8.0.1"
56995700

5700-
ember-source@~3.6.0:
5701-
version "3.6.1"
5702-
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.6.1.tgz#61a286e4a954e2e514a25df6d97bfe5a380c1cfd"
5703-
integrity sha512-hkUvGz4XBLhmac1iCZBjGZGDY3y1ke6fMyfzxP6QutlGUtlQOaQsKOk0HuP3DR7pNggLzQfK8Qxjr5/bNQ1lPw==
5701+
ember-source@~3.7.0:
5702+
version "3.7.3"
5703+
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.7.3.tgz#ae66f5c37d928908d2cc6891dab46d24a8168678"
5704+
integrity sha512-K+jUCR0Q4ef71bBJnq380e0TgsE1KSDP430n3c/vA07HMnvg3BCakpy21TUJuGxpH07Jeuf7HNehI0ZHyIiW/w==
57045705
dependencies:
57055706
broccoli-funnel "^2.0.1"
5706-
broccoli-merge-trees "^2.0.0"
5707+
broccoli-merge-trees "^3.0.2"
57075708
chalk "^2.3.0"
57085709
ember-cli-babel "^7.1.3"
57095710
ember-cli-get-component-path-option "^1.0.0"
@@ -6873,6 +6874,16 @@ fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5
68736874
path-posix "^1.0.0"
68746875
symlink-or-copy "^1.1.8"
68756876

6877+
fs-tree-diff@^1.0.0:
6878+
version "1.0.2"
6879+
resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-1.0.2.tgz#0e2931733a85b55feb3472c0b89a20b0c03ac0de"
6880+
integrity sha512-Zro2ACaPVDgVOx9+s5s5AfPlAD0kMJdbwGvTGF6KC1SjxjiGWxJvV4mUTDkFVSy3OUw2C/f1qpdjF81hGqSBAw==
6881+
dependencies:
6882+
heimdalljs-logger "^0.1.7"
6883+
object-assign "^4.1.0"
6884+
path-posix "^1.0.0"
6885+
symlink-or-copy "^1.1.8"
6886+
68766887
fs-tree-diff@^2.0.0, fs-tree-diff@^2.0.1:
68776888
version "2.0.1"
68786889
resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz#343e4745ab435ec39ebac5f9059ad919cd034afa"
@@ -6999,16 +7010,12 @@ gensync@^1.0.0-beta.2:
69997010
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
70007011
integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
70017012

7002-
get-caller-file@^1.0.0:
7003-
version "1.0.2"
7004-
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
7005-
70067013
get-caller-file@^1.0.1:
70077014
version "1.0.3"
70087015
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
70097016
integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
70107017

7011-
get-caller-file@^2.0.1:
7018+
get-caller-file@^2.0.0, get-caller-file@^2.0.1:
70127019
version "2.0.5"
70137020
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
70147021
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -11616,7 +11623,7 @@ safe-regex@^1.1.0:
1161611623
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
1161711624
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
1161811625

11619-
sane@^2.4.1, sane@^2.5.2:
11626+
sane@^2.5.2:
1162011627
version "2.5.2"
1162111628
resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
1162211629
integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o=
@@ -13522,10 +13529,10 @@ yallist@^4.0.0:
1352213529
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
1352313530
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
1352413531

13525-
yam@^0.0.24:
13526-
version "0.0.24"
13527-
resolved "https://registry.yarnpkg.com/yam/-/yam-0.0.24.tgz#11e9630444735f66a561d29221407de6d037cd95"
13528-
integrity sha512-llPF60oFLV8EQimNPR6+KorSaj59L32C4c1db4cr72GaWVWapnhTS2VZeK2K2xLyEOveWtRcNa+dLJBW7EfhYQ==
13532+
yam@^1.0.0:
13533+
version "1.0.0"
13534+
resolved "https://registry.yarnpkg.com/yam/-/yam-1.0.0.tgz#7f6c91dc0f5de75a031e6da6b3907c3d25ab0de5"
13535+
integrity sha512-Hv9xxHtsJ9228wNhk03xnlDReUuWVvHwM4rIbjdAXYvHLs17xjuyF50N6XXFMN6N0omBaqgOok/MCK3At9fTAg==
1352913536
dependencies:
1353013537
fs-extra "^4.0.2"
1353113538
lodash.merge "^4.6.0"

0 commit comments

Comments
 (0)