Skip to content

Commit 12494f3

Browse files
committed
Use global jQuery.
Update `ember-cli` and dependencies.
1 parent a937b6c commit 12494f3

File tree

10 files changed

+1443
-1244
lines changed

10 files changed

+1443
-1244
lines changed

.eslintrc.js

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
module.exports = {
22
root: true,
3+
parser: 'babel-eslint',
34
parserOptions: {
4-
ecmaVersion: 2017,
5-
sourceType: 'module'
5+
ecmaVersion: 2018,
6+
sourceType: 'module',
7+
ecmaFeatures: {
8+
legacyDecorators: true
9+
}
610
},
711
plugins: [
812
'ember'
@@ -15,6 +19,7 @@ module.exports = {
1519
browser: true
1620
},
1721
rules: {
22+
'ember/no-jquery': 'error'
1823
},
1924
overrides: [
2025
// node files

.npmignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,11 @@
88
# misc
99
/.bowerrc
1010
/.editorconfig
11-
/.ember-cli
11+
/.ember-cli.js
1212
/.env*
1313
/.eslintignore
1414
/.eslintrc.js
15+
/.git/
1516
/.gitignore
1617
/.template-lintrc.js
1718
/.travis.yml

addon/components/bs-datetimepicker.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
import $ from 'jquery';
21
import Component from '@ember/component';
32
import { computed } from '@ember/object';
43
import layout from '../templates/components/bs-datetimepicker';
54
import DynamicAttributeBindings from '../-private/dynamic-attribute-bindings';
65

7-
const {
8-
defaults
9-
} = $.fn.datetimepicker;
6+
const { $ } = window;
7+
const { defaults } = $.fn.datetimepicker;
108

119
export default Component.extend(DynamicAttributeBindings, {
1210
attributeBindings: null,
@@ -41,7 +39,7 @@ export default Component.extend(DynamicAttributeBindings, {
4139
up: this.getWithDefault('config.icons.up', defaults.icons.up)
4240
};
4341

44-
$(this.element).datetimepicker({
42+
window.$(this.element).datetimepicker({
4543
allowInputToggle: this.getWithDefault('allowInputToggle', defaults.allowInputToggle),
4644
calendarWeeks: this.getWithDefault('calendarWeeks', defaults.calendarWeeks),
4745
date: this.getWithDefault('date', null),
@@ -117,7 +115,7 @@ export default Component.extend(DynamicAttributeBindings, {
117115
},
118116

119117
picker() {
120-
return $(this.element).data('DateTimePicker');
118+
return window.$(this.element).data('DateTimePicker');
121119
},
122120

123121
updateDate() {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
return this.addPackagesToProject([
99
{ name: 'ember-cli-moment-shim', target: '3.7.1' },
1010
{ name: 'moment', target: '^2.24.0' },
11-
{ name: 'moment-timezone', target: '^0.5.26' }
11+
{ name: 'moment-timezone', target: '^0.5.27' }
1212
]);
1313
}
1414
};

config/ember-try.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ const getChannelURL = require('ember-source-channel-url');
44

55
module.exports = async function() {
66
return {
7+
useYarn: true,
78
scenarios: [
89
{
910
name: 'ember-lts-3.4',
@@ -45,7 +46,7 @@ module.exports = async function() {
4546
}
4647
}
4748
},
48-
// The default `.travis.yml` runs this scenario via `npm test`,
49+
// The default `.travis.yml` runs this scenario via `yarn test`,
4950
// not via `ember try`. It's still included here so that running
5051
// `ember try:each` manually or from a customized CI config will run it
5152
// along with all the other scenarios.

package.json

+16-17
Original file line numberDiff line numberDiff line change
@@ -33,36 +33,35 @@
3333
},
3434
"dependencies": {
3535
"btecu-eonasdan-bootstrap-datetimepicker": "4.17.50",
36-
"ember-cli-babel": "^7.8.0",
37-
"ember-cli-htmlbars": "^3.1.0"
36+
"ember-cli-babel": "^7.13.0",
37+
"ember-cli-htmlbars": "^4.0.8"
3838
},
3939
"devDependencies": {
40-
"@ember/jquery": "^0.6.1",
41-
"@ember/optional-features": "^0.7.0",
40+
"@ember/jquery": "^1.1.0",
41+
"@ember/optional-features": "^1.1.0",
4242
"broccoli-asset-rev": "^3.0.0",
43-
"ember-cli": "~3.11.0",
43+
"ember-cli": "~3.14.0",
4444
"ember-cli-dependency-checker": "^3.2.0",
4545
"ember-cli-eslint": "^5.1.0",
46-
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
47-
"ember-cli-inject-live-reload": "^1.8.2",
46+
"ember-cli-inject-live-reload": "^2.0.2",
4847
"ember-cli-moment-shim": "3.7.1",
4948
"ember-cli-sri": "^2.1.1",
5049
"ember-cli-template-lint": "^1.0.0-beta.3",
5150
"ember-disable-prototype-extensions": "^1.1.3",
52-
"ember-export-application-global": "^2.0.0",
53-
"ember-load-initializers": "^2.0.0",
51+
"ember-export-application-global": "^2.0.1",
52+
"ember-load-initializers": "^2.1.1",
5453
"ember-maybe-import-regenerator": "^0.1.6",
55-
"ember-qunit": "4.4.1",
56-
"ember-resolver": "^5.1.3",
57-
"ember-source": "~3.11.1",
54+
"ember-qunit": "4.6.0",
55+
"ember-resolver": "^6.0.0",
56+
"ember-source": "~3.14.3",
5857
"ember-source-channel-url": "^2.0.1",
59-
"ember-try": "^1.2.1",
60-
"eslint-plugin-ember": "^6.7.1",
61-
"eslint-plugin-node": "^9.1.0",
58+
"ember-try": "^1.3.0",
59+
"eslint-plugin-ember": "^7.7.1",
60+
"eslint-plugin-node": "^10.0.0",
6261
"loader.js": "^4.7.0",
6362
"moment": "^2.24.0",
64-
"moment-timezone": "^0.5.26",
65-
"qunit-dom": "^0.9.0"
63+
"moment-timezone": "^0.5.27",
64+
"qunit-dom": "^0.9.2"
6665
},
6766
"engines": {
6867
"node": "8.* || 10.* || 12.*"

testem.js

-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ module.exports = {
1313
// --no-sandbox is needed when running Chrome inside a container
1414
process.env.CI ? '--no-sandbox' : null,
1515
'--headless',
16-
'--disable-gpu',
1716
'--disable-dev-shm-usage',
1817
'--disable-software-rasterizer',
1918
'--mute-audio',

tests/dummy/app/app.js

+5-7
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,10 @@ import Resolver from './resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

6-
const App = Application.extend({
7-
modulePrefix: config.modulePrefix,
8-
podModulePrefix: config.podModulePrefix,
9-
Resolver
10-
});
6+
export default class App extends Application {
7+
modulePrefix = config.modulePrefix;
8+
podModulePrefix = config.podModulePrefix;
9+
Resolver = Resolver;
10+
}
1111

1212
loadInitializers(App, config.modulePrefix);
13-
14-
export default App;

tests/dummy/app/router.js

+4-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
import EmberRouter from '@ember/routing/router';
22
import config from './config/environment';
33

4-
const Router = EmberRouter.extend({
5-
location: config.locationType,
6-
rootURL: config.rootURL
7-
});
4+
export default class Router extends EmberRouter {
5+
location = config.locationType;
6+
rootURL = config.rootURL;
7+
}
88

99
Router.map(function() {
1010
});
11-
12-
export default Router;

0 commit comments

Comments
 (0)