Skip to content

Commit 2a75bed

Browse files
committed
⬆️ v3.6.1...v3.7.1
1 parent 78b9276 commit 2a75bed

8 files changed

Lines changed: 67 additions & 66 deletions

File tree

.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
@@ -71,6 +71,11 @@ ember install ember-cli-bootstrap3-tooltip
7171

7272
**As mentioned, you must install Bootstrap3's tooltip styles and script plugin. See the requirements section above.**
7373

74+
## Compatibility
75+
76+
- Ember.js v2.18 or above
77+
- Ember CLI v2.13 or above
78+
7479
### Upgrading
7580

7681
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
@@ -57,7 +57,7 @@
5757
"bootstrap-sass": "3.4.1",
5858
"bootswatch": "3.4.1",
5959
"broccoli-asset-rev": "^3.0.0",
60-
"ember-cli": "~3.6.1",
60+
"ember-cli": "~3.7.1",
6161
"ember-cli-app-version": "^3.1.0",
6262
"ember-cli-clock": "^3.0.0",
6363
"ember-cli-dependency-checker": "^3.0.0",
@@ -78,7 +78,7 @@
7878
"ember-maybe-import-regenerator": "^0.1.6",
7979
"ember-qunit": "^3.4.1",
8080
"ember-resolver": "^7.0.0",
81-
"ember-source": "~3.6.0",
81+
"ember-source": "~3.7.0",
8282
"ember-source-channel-url": "^2.0.1",
8383
"ember-try": "^1.0.0",
8484
"eslint-plugin-ember": "^5.2.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
@@ -1272,7 +1272,7 @@
12721272
dependencies:
12731273
"@babel/helper-plugin-utils" "^7.8.0"
12741274

1275-
"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7":
1275+
"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7", "@babel/plugin-transform-modules-amd@^7.2.0":
12761276
version "7.16.7"
12771277
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186"
12781278
integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g==
@@ -2185,7 +2185,7 @@ amd-name-resolver@1.2.0:
21852185
dependencies:
21862186
ensure-posix-path "^1.0.1"
21872187

2188-
amd-name-resolver@^1.2.0, amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.1:
2188+
amd-name-resolver@^1.2.1, amd-name-resolver@^1.3.1:
21892189
version "1.3.1"
21902190
resolved "https://registry.yarnpkg.com/amd-name-resolver/-/amd-name-resolver-1.3.1.tgz#ffe71c683c6e7191fc4ae1bb3aaed15abea135d9"
21912191
integrity sha512-26qTEWqZQ+cxSYygZ4Cf8tsjDBLceJahhtewxtKZA3SRa4PluuqYCuheemDQD+7Mf5B7sr+zhTDWAHDh02a1Dw==
@@ -3423,36 +3423,36 @@ broccoli-babel-transpiler@^6.5.0:
34233423
rsvp "^4.8.2"
34243424
workerpool "^2.3.0"
34253425

3426-
broccoli-babel-transpiler@^7.3.0:
3427-
version "7.3.0"
3428-
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.3.0.tgz#a0ad3a37dbf74469664bbca403d652070c2c1317"
3429-
integrity sha512-tsXNvDf3gp6g8rGkz234AhbaIRUsCdd6CM3ikfkJVB0EpC8ZAczGsFKTjENLy1etx4s7FkruW/QjI7Wfdhx6Ng==
3426+
broccoli-babel-transpiler@^7.1.1, broccoli-babel-transpiler@^7.8.0:
3427+
version "7.8.0"
3428+
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.0.tgz#7e0f01fce5739f49bbadeee7f1e625ca51cad66e"
3429+
integrity sha512-dv30Td5uL7dO3NzQUqQKQs+Iq7JGKnCNtvc6GBO76uVPqGnRlsQZcYqdBVr33JrctR+ZrpTUf7TjsFKeDRFA8Q==
34303430
dependencies:
3431-
"@babel/core" "^7.3.3"
3432-
"@babel/polyfill" "^7.0.0"
3431+
"@babel/core" "^7.12.0"
3432+
"@babel/polyfill" "^7.11.5"
34333433
broccoli-funnel "^2.0.2"
34343434
broccoli-merge-trees "^3.0.2"
34353435
broccoli-persistent-filter "^2.2.1"
34363436
clone "^2.1.2"
34373437
hash-for-dep "^1.4.7"
3438+
heimdalljs "^0.2.1"
34383439
heimdalljs-logger "^0.1.9"
34393440
json-stable-stringify "^1.0.1"
34403441
rsvp "^4.8.4"
34413442
workerpool "^3.1.1"
34423443

3443-
broccoli-babel-transpiler@^7.8.0:
3444-
version "7.8.0"
3445-
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.8.0.tgz#7e0f01fce5739f49bbadeee7f1e625ca51cad66e"
3446-
integrity sha512-dv30Td5uL7dO3NzQUqQKQs+Iq7JGKnCNtvc6GBO76uVPqGnRlsQZcYqdBVr33JrctR+ZrpTUf7TjsFKeDRFA8Q==
3444+
broccoli-babel-transpiler@^7.3.0:
3445+
version "7.3.0"
3446+
resolved "https://registry.yarnpkg.com/broccoli-babel-transpiler/-/broccoli-babel-transpiler-7.3.0.tgz#a0ad3a37dbf74469664bbca403d652070c2c1317"
3447+
integrity sha512-tsXNvDf3gp6g8rGkz234AhbaIRUsCdd6CM3ikfkJVB0EpC8ZAczGsFKTjENLy1etx4s7FkruW/QjI7Wfdhx6Ng==
34473448
dependencies:
3448-
"@babel/core" "^7.12.0"
3449-
"@babel/polyfill" "^7.11.5"
3449+
"@babel/core" "^7.3.3"
3450+
"@babel/polyfill" "^7.0.0"
34503451
broccoli-funnel "^2.0.2"
34513452
broccoli-merge-trees "^3.0.2"
34523453
broccoli-persistent-filter "^2.2.1"
34533454
clone "^2.1.2"
34543455
hash-for-dep "^1.4.7"
3455-
heimdalljs "^0.2.1"
34563456
heimdalljs-logger "^0.1.9"
34573457
json-stable-stringify "^1.0.1"
34583458
rsvp "^4.8.4"
@@ -4300,7 +4300,7 @@ chownr@~1.0.1:
43004300
resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
43014301
integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
43024302

4303-
ci-info@^1.1.3, ci-info@^1.5.0:
4303+
ci-info@^1.5.0:
43044304
version "1.6.0"
43054305
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.6.0.tgz#2ca20dbb9ceb32d4524a683303313f0304b1e497"
43064306
integrity sha512-vsGdkwSCDpWmP80ncATX7iea5DWQemg1UgCW5J8tqjU3lYw4FBYuj89J0CTVomA7BEfvSZd84GmHko+MxFQU2A==
@@ -5270,16 +5270,16 @@ ember-cli-babel@^7.11.0, ember-cli-babel@^7.11.1, ember-cli-babel@^7.13.2:
52705270
ensure-posix-path "^1.0.2"
52715271
semver "^5.5.0"
52725272

5273-
ember-cli-broccoli-sane-watcher@^2.1.1:
5274-
version "2.2.2"
5275-
resolved "https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-2.2.2.tgz#9bb1b04ddeb2c086aecd8693cbaeca1d88dc160c"
5276-
integrity sha512-9OLy8x3pdNKC/6xR00IjTL8XyiQU3rb2HLyQSAqHuaZpZcSTKkbAse2ERTsELSINoo/zi/W7qPP5vd5SsHsraw==
5273+
ember-cli-broccoli-sane-watcher@^3.0.0:
5274+
version "3.0.0"
5275+
resolved "https://registry.yarnpkg.com/ember-cli-broccoli-sane-watcher/-/ember-cli-broccoli-sane-watcher-3.0.0.tgz#dc1812c047e1ceec4413d3c41b51a9ffc61b4cfe"
5276+
integrity sha512-sLn+wy6FJpGMHtSwAGUjQK3nJFvw2b6H8bR2EgMIXxkUI3DYFLi6Xnyxm02XlMTcfTxF10yHFhHJe0O+PcJM7A==
52775277
dependencies:
52785278
broccoli-slow-trees "^3.0.1"
52795279
heimdalljs "^0.2.1"
52805280
heimdalljs-logger "^0.1.7"
52815281
rsvp "^3.0.18"
5282-
sane "^2.4.1"
5282+
sane "^4.0.0"
52835283

52845284
ember-cli-clock@^3.0.0:
52855285
version "3.0.0"
@@ -5555,18 +5555,19 @@ ember-cli-version-checker@^4.1.0:
55555555
semver "^6.3.0"
55565556
silent-error "^1.1.1"
55575557

5558-
ember-cli@~3.6.1:
5559-
version "3.6.1"
5560-
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.6.1.tgz#2a8394bb6d3859d3cdb9e6e79d6d7455f80db9e1"
5561-
integrity sha512-66q6pyeJP5SotkLX6HgKTBEOqDBm4u0BzkdT2JQPZ1Syey9/M8aek6tUnEun2rjJaLhee1tXwgQgAw4QJqscTA==
5558+
ember-cli@~3.7.1:
5559+
version "3.7.1"
5560+
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.7.1.tgz#f307bcd68aaf083612717ab32133120272d89170"
5561+
integrity sha512-hlQK32xZEubHRdAo8s6JKvDTBB41wKghW3m0IewS+sZTV92Z6DJoZXlH5taETcnc5qMR1Ifml25Z2ezyNL/OBA==
55625562
dependencies:
5563-
amd-name-resolver "^1.2.0"
5564-
babel-plugin-transform-es2015-modules-amd "^6.24.1"
5563+
"@babel/plugin-transform-modules-amd" "^7.2.0"
5564+
amd-name-resolver "^1.3.1"
5565+
babel-plugin-module-resolver "^3.1.1"
55655566
bower-config "^1.3.0"
55665567
bower-endpoint-parser "0.2.2"
55675568
broccoli "^2.0.0"
55685569
broccoli-amd-funnel "^2.0.1"
5569-
broccoli-babel-transpiler "^6.5.0"
5570+
broccoli-babel-transpiler "^7.1.1"
55705571
broccoli-builder "^0.18.14"
55715572
broccoli-concat "^3.7.3"
55725573
broccoli-config-loader "^1.0.1"
@@ -5583,15 +5584,15 @@ ember-cli@~3.6.1:
55835584
calculate-cache-key-for-tree "^1.1.0"
55845585
capture-exit "^1.2.0"
55855586
chalk "^2.4.1"
5586-
ci-info "^1.1.3"
5587+
ci-info "^2.0.0"
55875588
clean-base-url "^1.0.0"
55885589
compression "^1.7.3"
55895590
configstore "^4.0.0"
55905591
console-ui "^2.2.2"
55915592
core-object "^3.1.5"
55925593
dag-map "^2.0.2"
55935594
diff "^3.5.0"
5594-
ember-cli-broccoli-sane-watcher "^2.1.1"
5595+
ember-cli-broccoli-sane-watcher "^3.0.0"
55955596
ember-cli-is-package-missing "^1.0.0"
55965597
ember-cli-lodash-subset "^2.0.1"
55975598
ember-cli-normalize-entity-name "^1.0.0"
@@ -5607,8 +5608,8 @@ ember-cli@~3.6.1:
56075608
fixturify "^0.3.4"
56085609
fixturify-project "^1.5.3"
56095610
fs-extra "^7.0.0"
5610-
fs-tree-diff "^0.5.7"
5611-
get-caller-file "^1.0.0"
5611+
fs-tree-diff "^1.0.0"
5612+
get-caller-file "^2.0.0"
56125613
git-repo-info "^2.0.0"
56135614
glob "^7.1.2"
56145615
heimdalljs "^0.2.5"
@@ -5646,9 +5647,9 @@ ember-cli@~3.6.1:
56465647
tree-sync "^1.2.2"
56475648
uuid "^3.3.2"
56485649
validate-npm-package-name "^3.0.0"
5649-
walk-sync "^0.3.2"
5650+
walk-sync "^1.0.0"
56505651
watch-detector "^0.1.0"
5651-
yam "^0.0.24"
5652+
yam "^1.0.0"
56525653

56535654
ember-disable-prototype-extensions@^1.1.3:
56545655
version "1.1.3"
@@ -5733,13 +5734,13 @@ ember-source-channel-url@^2.0.1:
57335734
dependencies:
57345735
got "^8.0.1"
57355736

5736-
ember-source@~3.6.0:
5737-
version "3.6.1"
5738-
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.6.1.tgz#61a286e4a954e2e514a25df6d97bfe5a380c1cfd"
5739-
integrity sha512-hkUvGz4XBLhmac1iCZBjGZGDY3y1ke6fMyfzxP6QutlGUtlQOaQsKOk0HuP3DR7pNggLzQfK8Qxjr5/bNQ1lPw==
5737+
ember-source@~3.7.0:
5738+
version "3.7.3"
5739+
resolved "https://registry.yarnpkg.com/ember-source/-/ember-source-3.7.3.tgz#ae66f5c37d928908d2cc6891dab46d24a8168678"
5740+
integrity sha512-K+jUCR0Q4ef71bBJnq380e0TgsE1KSDP430n3c/vA07HMnvg3BCakpy21TUJuGxpH07Jeuf7HNehI0ZHyIiW/w==
57405741
dependencies:
57415742
broccoli-funnel "^2.0.1"
5742-
broccoli-merge-trees "^2.0.0"
5743+
broccoli-merge-trees "^3.0.2"
57435744
chalk "^2.3.0"
57445745
ember-cli-babel "^7.1.3"
57455746
ember-cli-get-component-path-option "^1.0.0"
@@ -6886,6 +6887,16 @@ fs-tree-diff@^0.5.2, fs-tree-diff@^0.5.3, fs-tree-diff@^0.5.4, fs-tree-diff@^0.5
68866887
path-posix "^1.0.0"
68876888
symlink-or-copy "^1.1.8"
68886889

6890+
fs-tree-diff@^1.0.0:
6891+
version "1.0.2"
6892+
resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-1.0.2.tgz#0e2931733a85b55feb3472c0b89a20b0c03ac0de"
6893+
integrity sha512-Zro2ACaPVDgVOx9+s5s5AfPlAD0kMJdbwGvTGF6KC1SjxjiGWxJvV4mUTDkFVSy3OUw2C/f1qpdjF81hGqSBAw==
6894+
dependencies:
6895+
heimdalljs-logger "^0.1.7"
6896+
object-assign "^4.1.0"
6897+
path-posix "^1.0.0"
6898+
symlink-or-copy "^1.1.8"
6899+
68896900
fs-tree-diff@^2.0.0, fs-tree-diff@^2.0.1:
68906901
version "2.0.1"
68916902
resolved "https://registry.yarnpkg.com/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz#343e4745ab435ec39ebac5f9059ad919cd034afa"
@@ -7017,16 +7028,12 @@ gensync@^1.0.0-beta.2:
70177028
resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
70187029
integrity sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==
70197030

7020-
get-caller-file@^1.0.0:
7021-
version "1.0.2"
7022-
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.2.tgz#f702e63127e7e231c160a80c1554acb70d5047e5"
7023-
70247031
get-caller-file@^1.0.1:
70257032
version "1.0.3"
70267033
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
70277034
integrity sha512-3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==
70287035

7029-
get-caller-file@^2.0.1:
7036+
get-caller-file@^2.0.0, get-caller-file@^2.0.1:
70307037
version "2.0.5"
70317038
resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
70327039
integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
@@ -11669,7 +11676,7 @@ safe-regex@^1.1.0:
1166911676
resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
1167011677
integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
1167111678

11672-
sane@^2.4.1, sane@^2.5.2:
11679+
sane@^2.5.2:
1167311680
version "2.5.2"
1167411681
resolved "https://registry.yarnpkg.com/sane/-/sane-2.5.2.tgz#b4dc1861c21b427e929507a3e751e2a2cb8ab3fa"
1167511682
integrity sha1-tNwYYcIbQn6SlQej51HiosuKs/o=
@@ -13556,10 +13563,10 @@ yallist@^4.0.0:
1355613563
resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
1355713564
integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
1355813565

13559-
yam@^0.0.24:
13560-
version "0.0.24"
13561-
resolved "https://registry.yarnpkg.com/yam/-/yam-0.0.24.tgz#11e9630444735f66a561d29221407de6d037cd95"
13562-
integrity sha512-llPF60oFLV8EQimNPR6+KorSaj59L32C4c1db4cr72GaWVWapnhTS2VZeK2K2xLyEOveWtRcNa+dLJBW7EfhYQ==
13566+
yam@^1.0.0:
13567+
version "1.0.0"
13568+
resolved "https://registry.yarnpkg.com/yam/-/yam-1.0.0.tgz#7f6c91dc0f5de75a031e6da6b3907c3d25ab0de5"
13569+
integrity sha512-Hv9xxHtsJ9228wNhk03xnlDReUuWVvHwM4rIbjdAXYvHLs17xjuyF50N6XXFMN6N0omBaqgOok/MCK3At9fTAg==
1356313570
dependencies:
1356413571
fs-extra "^4.0.2"
1356513572
lodash.merge "^4.6.0"

0 commit comments

Comments
 (0)