Skip to content

Commit 301c95a

Browse files
committed
Make compatible with jQuery 3. Fixes #21. Fixes #28.
Use `eonasdan-bootstrap-datetimepicker-npm` (custom build) that is compatible with jQuery 3.
1 parent 1422661 commit 301c95a

File tree

3 files changed

+61
-38
lines changed

3 files changed

+61
-38
lines changed

blueprints/ember-cli-bootstrap-datetimepicker/index.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ module.exports = {
99
https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1783
1010
*/
1111
return this.addPackagesToProject([
12-
{ name: 'ember-cli-moment-shim', target: '2.2.1' },
13-
{ name: 'eonasdan-bootstrap-datetimepicker-npm', target: '4.17.37' },
12+
{ name: 'ember-cli-moment-shim', target: '3.0.1' },
13+
{ name: 'eonasdan-bootstrap-datetimepicker-npm', target: '4.17.42' },
1414
{ name: 'moment', target: '^2.17.1' },
15-
{ name: 'moment-timezone', target: '^0.5.10' }
15+
{ name: 'moment-timezone', target: '^0.5.11' }
1616
]);
1717
}
1818
};

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"ember-export-application-global": "^1.0.5",
5353
"ember-load-initializers": "^0.5.1",
5454
"ember-resolver": "^2.0.3",
55-
"eonasdan-bootstrap-datetimepicker-npm": "4.17.37",
55+
"eonasdan-bootstrap-datetimepicker-npm": "4.17.42",
5656
"loader.js": "^4.0.1",
5757
"moment": "^2.17.1",
5858
"moment-timezone": "^0.5.11"

yarn.lock

+57-34
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ ansi-escapes@^1.1.0:
4949
version "1.4.0"
5050
resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e"
5151

52+
ansi-regex@*, ansi-regex@^2.0.0:
53+
version "2.0.0"
54+
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.0.0.tgz#c5061b6e0ef8a81775e50f5d66151bf6bf371107"
55+
5256
ansi-regex@^0.2.0, ansi-regex@^0.2.1:
5357
version "0.2.1"
5458
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-0.2.1.tgz#0d8e946967a3d8143f93e24e298525fc1b2235f9"
5559

56-
ansi-regex@^2.0.0:
57-
version "2.0.0"
58-
resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.0.0.tgz#c5061b6e0ef8a81775e50f5d66151bf6bf371107"
59-
6060
ansi-styles@^1.1.0:
6161
version "1.1.0"
6262
resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-1.1.0.tgz#eaecbf66cd706882760b2f4691582b8f55d7a7de"
@@ -180,6 +180,10 @@ ast-types@0.8.12:
180180
version "0.8.12"
181181
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.12.tgz#a0d90e4351bb887716c83fd637ebf818af4adfcc"
182182

183+
ast-types@0.8.15:
184+
version "0.8.15"
185+
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.8.15.tgz#8eef0827f04dff0ec8857ba925abe3fea6194e52"
186+
183187
ast-types@0.9.2:
184188
version "0.9.2"
185189
resolved "https://registry.yarnpkg.com/ast-types/-/ast-types-0.9.2.tgz#2cc19979d15c655108bf565323b8e7ee38751f6b"
@@ -1163,7 +1167,7 @@ debug@^2.1.0, debug@^2.1.1, debug@^2.1.3, debug@^2.2.0:
11631167
dependencies:
11641168
ms "0.7.2"
11651169

1166-
debuglog@^1.0.1:
1170+
debuglog@*, debuglog@^1.0.1:
11671171
version "1.0.1"
11681172
resolved "https://registry.yarnpkg.com/debuglog/-/debuglog-1.0.1.tgz#aa24ffb9ac3df9a2351837cfb2d279360cd78492"
11691173

@@ -1723,14 +1727,14 @@ entities@~1.1.1:
17231727
version "1.1.1"
17241728
resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
17251729

1726-
eonasdan-bootstrap-datetimepicker-npm@4.17.37:
1727-
version "4.17.37"
1728-
resolved "https://registry.yarnpkg.com/eonasdan-bootstrap-datetimepicker-npm/-/eonasdan-bootstrap-datetimepicker-npm-4.17.37.tgz#9fbca532cd7592200c078d45547df7c2e660d1b6"
1730+
eonasdan-bootstrap-datetimepicker-npm@4.17.42:
1731+
version "4.17.42"
1732+
resolved "https://registry.yarnpkg.com/eonasdan-bootstrap-datetimepicker-npm/-/eonasdan-bootstrap-datetimepicker-npm-4.17.42.tgz#6accbfb722088b43aad110ef303e6685b47477c9"
17291733
dependencies:
17301734
bootstrap "^3.3"
1731-
jquery ">=1.8.3 <2.2.0"
1732-
moment "~2.8"
1733-
moment-timezone "~0.4"
1735+
jquery "^1.8.3 || ^2.0"
1736+
moment "^2.10"
1737+
moment-timezone "^0.4.0"
17341738

17351739
error@^7.0.0:
17361740
version "7.0.2"
@@ -2430,7 +2434,7 @@ iferr@^0.1.5, iferr@~0.1.5:
24302434
version "0.1.5"
24312435
resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
24322436

2433-
imurmurhash@^0.1.4:
2437+
imurmurhash@*, imurmurhash@^0.1.4:
24342438
version "0.1.4"
24352439
resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
24362440

@@ -2664,9 +2668,9 @@ jodid25519@^1.0.0:
26642668
dependencies:
26652669
jsbn "~0.1.0"
26662670

2667-
"jquery@>=1.8.3 <2.2.0":
2668-
version "2.1.4"
2669-
resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.1.4.tgz#228bde698a0c61431dc2630a6a154f15890d2317"
2671+
"jquery@^1.8.3 || ^2.0":
2672+
version "2.2.4"
2673+
resolved "https://registry.yarnpkg.com/jquery/-/jquery-2.2.4.tgz#2c89d6889b5eac522a7eea32c14521559c6cbf02"
26702674

26712675
js-tokens@1.0.1:
26722676
version "1.0.1"
@@ -2849,17 +2853,25 @@ lodash._basefor@^3.0.0:
28492853
version "3.0.3"
28502854
resolved "https://registry.yarnpkg.com/lodash._basefor/-/lodash._basefor-3.0.3.tgz#7550b4e9218ef09fad24343b612021c79b4c20c2"
28512855

2856+
lodash._baseindexof@*:
2857+
version "3.1.0"
2858+
resolved "https://registry.yarnpkg.com/lodash._baseindexof/-/lodash._baseindexof-3.1.0.tgz#fe52b53a1c6761e42618d654e4a25789ed61822c"
2859+
28522860
lodash._baseuniq@~4.6.0:
28532861
version "4.6.0"
28542862
resolved "https://registry.yarnpkg.com/lodash._baseuniq/-/lodash._baseuniq-4.6.0.tgz#0ebb44e456814af7905c6212fa2c9b2d51b841e8"
28552863
dependencies:
28562864
lodash._createset "~4.0.0"
28572865
lodash._root "~3.0.0"
28582866

2859-
lodash._bindcallback@^3.0.0:
2867+
lodash._bindcallback@*, lodash._bindcallback@^3.0.0:
28602868
version "3.0.1"
28612869
resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
28622870

2871+
lodash._cacheindexof@*:
2872+
version "3.0.2"
2873+
resolved "https://registry.yarnpkg.com/lodash._cacheindexof/-/lodash._cacheindexof-3.0.2.tgz#3dc69ac82498d2ee5e3ce56091bafd2adc7bde92"
2874+
28632875
lodash._createassigner@^3.0.0:
28642876
version "3.1.1"
28652877
resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
@@ -2868,11 +2880,17 @@ lodash._createassigner@^3.0.0:
28682880
lodash._isiterateecall "^3.0.0"
28692881
lodash.restparam "^3.0.0"
28702882

2883+
lodash._createcache@*:
2884+
version "3.1.2"
2885+
resolved "https://registry.yarnpkg.com/lodash._createcache/-/lodash._createcache-3.1.2.tgz#56d6a064017625e79ebca6b8018e17440bdcf093"
2886+
dependencies:
2887+
lodash._getnative "^3.0.0"
2888+
28712889
lodash._createset@~4.0.0:
28722890
version "4.0.3"
28732891
resolved "https://registry.yarnpkg.com/lodash._createset/-/lodash._createset-4.0.3.tgz#0f4659fbb09d75194fa9e2b88a6644d363c9fe26"
28742892

2875-
lodash._getnative@^3.0.0:
2893+
lodash._getnative@*, lodash._getnative@^3.0.0:
28762894
version "3.9.1"
28772895
resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
28782896

@@ -2995,7 +3013,7 @@ lodash.omit@^4.1.0:
29953013
version "4.5.0"
29963014
resolved "https://registry.yarnpkg.com/lodash.omit/-/lodash.omit-4.5.0.tgz#6eb19ae5a1ee1dd9df0b969e66ce0b7fa30b5e60"
29973015

2998-
lodash.restparam@^3.0.0:
3016+
lodash.restparam@*, lodash.restparam@^3.0.0:
29993017
version "3.6.1"
30003018
resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
30013019

@@ -3224,26 +3242,22 @@ moment-timezone@^0.3.0:
32243242
dependencies:
32253243
moment ">= 2.6.0"
32263244

3227-
moment-timezone@^0.5.0, moment-timezone@^0.5.11:
3228-
version "0.5.11"
3229-
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.11.tgz#9b76c03d8ef514c7e4249a7bbce649eed39ef29f"
3245+
moment-timezone@^0.4.0:
3246+
version "0.4.1"
3247+
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.4.1.tgz#81f598c3ad5e22cdad796b67ecd8d88d0f5baa06"
32303248
dependencies:
32313249
moment ">= 2.6.0"
32323250

3233-
moment-timezone@~0.4:
3234-
version "0.4.1"
3235-
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.4.1.tgz#81f598c3ad5e22cdad796b67ecd8d88d0f5baa06"
3251+
moment-timezone@^0.5.0, moment-timezone@^0.5.11:
3252+
version "0.5.11"
3253+
resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.11.tgz#9b76c03d8ef514c7e4249a7bbce649eed39ef29f"
32363254
dependencies:
32373255
moment ">= 2.6.0"
32383256

3239-
"moment@>= 2.6.0", moment@^2.13.0, moment@^2.17.1:
3257+
"moment@>= 2.6.0", moment@^2.10, moment@^2.13.0, moment@^2.17.1:
32403258
version "2.17.1"
32413259
resolved "https://registry.yarnpkg.com/moment/-/moment-2.17.1.tgz#fed9506063f36b10f066c8b59a144d7faebe1d82"
32423260

3243-
moment@~2.8:
3244-
version "2.8.4"
3245-
resolved "https://registry.yarnpkg.com/moment/-/moment-2.8.4.tgz#cc174aabb19223efff5699a9467805a2789838bf"
3246-
32473261
morgan@^1.5.2:
32483262
version "1.7.0"
32493263
resolved "https://registry.yarnpkg.com/morgan/-/morgan-1.7.0.tgz#eb10ca8e50d1abe0f8d3dad5c0201d052d981c62"
@@ -3813,7 +3827,7 @@ read@1, read@~1.0.1, read@~1.0.7:
38133827
dependencies:
38143828
mute-stream "~0.0.4"
38153829

3816-
"readable-stream@1 || 2", readable-stream@^2, readable-stream@^2.0.2, readable-stream@~2.1.5:
3830+
"readable-stream@1 || 2", readable-stream@^2, "readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.0.2, readable-stream@~2.1.5:
38173831
version "2.1.5"
38183832
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.1.5.tgz#66fa8b720e1438b364681f2ad1a63c618448c9d0"
38193833
dependencies:
@@ -3834,7 +3848,7 @@ readable-stream@1.1:
38343848
isarray "0.0.1"
38353849
string_decoder "~0.10.x"
38363850

3837-
"readable-stream@^2.0.0 || ^1.1.13", readable-stream@^2.2.2:
3851+
readable-stream@^2.2.2:
38383852
version "2.2.2"
38393853
resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.2.tgz#a9e6fec3c7dda85f8bb1b3ba7028604556fc825e"
38403854
dependencies:
@@ -3866,7 +3880,7 @@ readable-stream@~2.0.5:
38663880
string_decoder "~0.10.x"
38673881
util-deprecate "~1.0.1"
38683882

3869-
readdir-scoped-modules@^1.0.0:
3883+
readdir-scoped-modules@*, readdir-scoped-modules@^1.0.0:
38703884
version "1.0.2"
38713885
resolved "https://registry.yarnpkg.com/readdir-scoped-modules/-/readdir-scoped-modules-1.0.2.tgz#9fafa37d286be5d92cbaebdee030dc9b5f406747"
38723886
dependencies:
@@ -3882,7 +3896,7 @@ realize-package-specifier@~3.0.3:
38823896
dezalgo "^1.0.1"
38833897
npm-package-arg "^4.1.1"
38843898

3885-
recast@0.10.33, recast@^0.10.10:
3899+
recast@0.10.33:
38863900
version "0.10.33"
38873901
resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.33.tgz#942808f7aa016f1fa7142c461d7e5704aaa8d697"
38883902
dependencies:
@@ -3891,6 +3905,15 @@ recast@0.10.33, recast@^0.10.10:
38913905
private "~0.1.5"
38923906
source-map "~0.5.0"
38933907

3908+
recast@^0.10.10:
3909+
version "0.10.43"
3910+
resolved "https://registry.yarnpkg.com/recast/-/recast-0.10.43.tgz#b95d50f6d60761a5f6252e15d80678168491ce7f"
3911+
dependencies:
3912+
ast-types "0.8.15"
3913+
esprima-fb "~15001.1001.0-dev-harmony-fb"
3914+
private "~0.1.5"
3915+
source-map "~0.5.0"
3916+
38943917
recast@^0.11.17, recast@^0.11.3:
38953918
version "0.11.18"
38963919
resolved "https://registry.yarnpkg.com/recast/-/recast-0.11.18.tgz#07af6257ca769868815209401d4d60eef1b5b947"
@@ -4626,7 +4649,7 @@ uuid@^2.0.1:
46264649
version "2.0.3"
46274650
resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
46284651

4629-
validate-npm-package-license@^3.0.1:
4652+
validate-npm-package-license@*, validate-npm-package-license@^3.0.1:
46304653
version "3.0.1"
46314654
resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz#2804babe712ad3379459acfbe24746ab2c303fbc"
46324655
dependencies:

0 commit comments

Comments
 (0)