Skip to content

Commit a5fd975

Browse files
committed
Update ember-cli to 2.3.0.
Use `npm` instead of `bower` to import the library.
1 parent a04ec10 commit a5fd975

File tree

5 files changed

+50
-31
lines changed

5 files changed

+50
-31
lines changed

app/components/bs-datetimepicker.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
export { default } from 'ember-cli-bootstrap-datetimepicker/components/bs-datetimepicker';
1+
export { default } from 'ember-cli-bootstrap-datetimepicker/components/bs-datetimepicker';

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

+7-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@ module.exports = {
44
normalizeEntityName: function() {},
55

66
afterInstall: function(options) {
7-
var blueprint = this;
8-
9-
return blueprint.addAddonToProject('ember-cli-moment-shim', '0.6.2').then(function() {
10-
return blueprint.addBowerPackageToProject('eonasdan-bootstrap-datetimepicker', '4.17.37');
11-
});
7+
/* Use custom build until official is published
8+
https://github.com/Eonasdan/bootstrap-datetimepicker/issues/1438
9+
*/
10+
return this.addPackagesToProject([
11+
{ name: 'ember-cli-moment-shim', target: '1.0.0' },
12+
{ name: 'eonasdan-bootstrap-datetimepicker-ie ', target: '4.17.42' }
13+
]);
1214
}
1315
};

bower.json

+4-12
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
11
{
22
"name": "ember-cli-bootstrap-datetimepicker",
33
"dependencies": {
4-
"ember": "1.13.11",
5-
"ember-cli-shims": "0.0.6",
6-
"ember-cli-test-loader": "0.2.1",
7-
"ember-data": "1.13.15",
8-
"ember-load-initializers": "0.1.7",
9-
"ember-qunit": "0.4.16",
10-
"ember-qunit-notifications": "0.1.0",
11-
"ember-resolver": "~0.1.20",
12-
"eonasdan-bootstrap-datetimepicker": "4.17.37",
13-
"jquery": "^1.11.3",
14-
"loader.js": "ember-cli/loader.js#3.4.0",
15-
"qunit": "~1.20.0"
4+
"ember": "~2.3.1",
5+
"ember-cli-shims": "0.1.0",
6+
"ember-cli-test-loader": "0.2.2",
7+
"ember-qunit-notifications": "0.1.0"
168
}
179
}

index.js

+23-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
/* jshint node: true */
22
'use strict';
33

4-
var path = require('path');
4+
const Funnel = require('broccoli-funnel');
5+
const path = require('path');
6+
const mergeTrees = require('broccoli-merge-trees');
57

68
module.exports = {
79
name: 'ember-cli-bootstrap-datetimepicker',
@@ -10,7 +12,25 @@ module.exports = {
1012
this._super.included(app);
1113

1214
// Import unminified css and js
13-
app.import(path.join(app.bowerDirectory, '/eonasdan-bootstrap-datetimepicker/build/css/bootstrap-datetimepicker.css'));
14-
app.import(path.join(app.bowerDirectory , '/eonasdan-bootstrap-datetimepicker/src/js/bootstrap-datetimepicker.js'));
15+
let basePath = `${this.treePaths.vendor}/eonasdan-bootstrap-datetimepicker`;
16+
app.import(`${basePath}/build/css/bootstrap-datetimepicker.css`);
17+
app.import(`${basePath}/src/js/bootstrap-datetimepicker.js`);
18+
},
19+
20+
treeForVendor: function(vendorTree) {
21+
let trees = [];
22+
23+
if (vendorTree) {
24+
trees.push(vendorTree);
25+
}
26+
27+
let datetimepickerJs = require.resolve('eonasdan-bootstrap-datetimepicker');
28+
let datetimepickerPath = path.join(path.dirname(datetimepickerJs), '../../');
29+
trees.push(new Funnel(datetimepickerPath, {
30+
destDir: 'eonasdan-bootstrap-datetimepicker',
31+
include: ['build/css/bootstrap-datetimepicker.css', 'src/js/bootstrap-datetimepicker.js']
32+
}));
33+
34+
return mergeTrees(trees);
1535
}
1636
};

package.json

+15-10
Original file line numberDiff line numberDiff line change
@@ -19,23 +19,26 @@
1919
"license": "MIT",
2020
"devDependencies": {
2121
"broccoli-asset-rev": "^2.2.0",
22-
"ember-cli": "1.13.13",
22+
"ember-ajax": "0.7.1",
23+
"ember-cli": "2.3.0",
2324
"ember-cli-app-version": "^1.0.0",
24-
"ember-cli-content-security-policy": "0.4.0",
25-
"ember-cli-dependency-checker": "^1.1.0",
25+
"ember-cli-dependency-checker": "^1.2.0",
2626
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
27-
"ember-cli-ic-ajax": "0.2.4",
2827
"ember-cli-inject-live-reload": "^1.3.1",
29-
"ember-cli-qunit": "^1.0.4",
30-
"ember-cli-moment-shim": "0.6.2",
28+
"ember-cli-qunit": "^1.2.1",
29+
"ember-cli-moment-shim": "1.0.0",
3130
"ember-cli-release": "0.2.8",
32-
"ember-cli-sri": "^1.2.0",
31+
"ember-cli-sri": "^2.0.0",
3332
"ember-cli-uglify": "^1.2.0",
34-
"ember-data": "1.13.15",
33+
"ember-data": "^2.3.0",
34+
"ember-disable-prototype-extensions": "^1.1.0",
3535
"ember-disable-proxy-controllers": "^1.0.1",
3636
"ember-export-application-global": "^1.0.4",
37-
"ember-disable-prototype-extensions": "^1.0.0",
38-
"ember-try": "~0.0.8"
37+
"ember-load-initializers": "^0.5.0",
38+
"ember-resolver": "^2.0.3",
39+
"ember-try": "^0.1.2",
40+
"eonasdan-bootstrap-datetimepicker": "4.17.37",
41+
"loader.js": "^4.0.0"
3942
},
4043
"keywords": [
4144
"ember-addon",
@@ -52,6 +55,8 @@
5255
"datetimepicker"
5356
],
5457
"dependencies": {
58+
"broccoli-funnel": "^1.0.1",
59+
"broccoli-merge-trees": "^1.1.1",
5560
"ember-cli-babel": "^5.1.5",
5661
"ember-cli-htmlbars": "^1.0.1"
5762
},

0 commit comments

Comments
 (0)