Skip to content

Commit c377c1f

Browse files
st-hst-h
committedApr 23, 2021
upgrades
1 parent 708a3ef commit c377c1f

40 files changed

+6166
-3093
lines changed
 

‎.editorconfig

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44

55
root = true
66

7-
87
[*]
98
end_of_line = lf
109
charset = utf-8

‎.eslintignore

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
# misc
1414
/coverage/
1515
!.*
16+
.eslintcache
1617

1718
# ember-try
1819
/.node_modules.ember-try/

‎.eslintrc.js

+19-17
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,54 @@
1+
'use strict';
2+
13
module.exports = {
24
root: true,
5+
parser: 'babel-eslint',
36
parserOptions: {
47
ecmaVersion: 2018,
5-
sourceType: 'module'
8+
sourceType: 'module',
9+
ecmaFeatures: {
10+
legacyDecorators: true,
11+
},
612
},
7-
plugins: [
8-
'ember'
9-
],
13+
plugins: ['ember'],
1014
extends: [
1115
'eslint:recommended',
12-
'plugin:ember/recommended'
16+
'plugin:ember/recommended',
17+
'plugin:prettier/recommended',
1318
],
1419
env: {
15-
browser: true
16-
},
17-
rules: {
20+
browser: true,
1821
},
22+
rules: {},
1923
overrides: [
2024
// node files
2125
{
2226
files: [
2327
'.eslintrc.js',
28+
'.prettierrc.js',
2429
'.template-lintrc.js',
2530
'ember-cli-build.js',
2631
'index.js',
2732
'testem.js',
2833
'blueprints/*/index.js',
2934
'config/**/*.js',
30-
'tests/dummy/config/**/*.js'
35+
'tests/dummy/config/**/*.js',
3136
],
3237
excludedFiles: [
3338
'addon/**',
3439
'addon-test-support/**',
3540
'app/**',
36-
'tests/dummy/app/**'
41+
'tests/dummy/app/**',
3742
],
3843
parserOptions: {
3944
sourceType: 'script',
40-
ecmaVersion: 2015
4145
},
4246
env: {
4347
browser: false,
44-
node: true
48+
node: true,
4549
},
4650
plugins: ['node'],
47-
rules: Object.assign({}, require('eslint-plugin-node').configs.recommended.rules, {
48-
// add your custom rules and overrides for node files here
49-
})
50-
}
51-
]
51+
extends: ['plugin:node/recommended'],
52+
},
53+
],
5254
};

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ jsconfig.json
1414
/.env*
1515
/.pnp*
1616
/.sass-cache
17+
/.eslintcache
1718
/connect.lock
1819
/coverage/
1920
/libpeerconnection.log

‎.npmignore

+4
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@
1010
/.editorconfig
1111
/.ember-cli
1212
/.env*
13+
/.eslintcache
1314
/.eslintignore
1415
/.eslintrc.js
16+
/.git/
1517
/.gitignore
18+
/.prettierignore
19+
/.prettierrc.js
1620
/.template-lintrc.js
1721
/.travis.yml
1822
/.watchmanconfig

‎.prettierignore

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
.eslintcache
17+
18+
# ember-try
19+
/.node_modules.ember-try/
20+
/bower.json.ember-try
21+
/package.json.ember-try

‎.prettierrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
singleQuote: true,
5+
};

‎.template-lintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
extends: 'recommended'
4+
extends: 'octane',
55
};

‎.travis.yml

+17-14
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ language: node_js
33
node_js:
44
# we recommend testing addons with the same minimum supported node version as Ember CLI
55
# so that your addon works for all apps
6-
- "8"
6+
- "10"
77

8-
sudo: false
9-
dist: trusty
8+
dist: xenial
109

1110
addons:
1211
chrome: stable
@@ -27,37 +26,41 @@ branches:
2726
- /^greenkeeper/.*$/
2827

2928
jobs:
30-
fail_fast: true
29+
fast_finish: true
3130
allow_failures:
3231
- env: EMBER_TRY_SCENARIO=ember-canary
3332

3433
include:
3534
# runs linting and tests with current locked deps
36-
3735
- stage: "Tests"
3836
name: "Tests"
3937
script:
40-
- npm run lint:hbs
41-
- npm run lint:js
42-
- npm test
38+
- yarn lint
39+
- yarn test:ember
40+
41+
- stage: "Additional Tests"
42+
name: "Floating Dependencies"
43+
install:
44+
- yarn install --no-lockfile --non-interactive
45+
script:
46+
- yarn test:ember
4347

4448
# we recommend new addons test the current and previous LTS
4549
# as well as latest stable release (bonus points to beta/canary)
46-
- stage: "Additional Tests"
47-
env: EMBER_TRY_SCENARIO=ember-lts-2.18
48-
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
50+
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
51+
- env: EMBER_TRY_SCENARIO=ember-lts-3.20
4952
- env: EMBER_TRY_SCENARIO=ember-release COVERAGE=true
5053
- env: EMBER_TRY_SCENARIO=ember-beta
5154
- env: EMBER_TRY_SCENARIO=ember-canary
5255
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
56+
- env: EMBER_TRY_SCENARIO=ember-classic
57+
- env: EMBER_TRY_SCENARIO=embroider-safe
58+
- env: EMBER_TRY_SCENARIO=embroider-optimized
5359

5460
before_install:
5561
- curl -o- -L https://yarnpkg.com/install.sh | bash
5662
- export PATH=$HOME/.yarn/bin:$PATH
5763

58-
install:
59-
- yarn install --no-lockfile --non-interactive
60-
6164
script:
6265
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO
6366

‎CONTRIBUTING.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88

99
## Linting
1010

11-
* `npm run lint:hbs`
12-
* `npm run lint:js`
13-
* `npm run lint:js -- --fix`
11+
* `yarn lint`
12+
* `yarn lint:fix`
1413

1514
## Running tests
1615

@@ -23,4 +22,4 @@
2322
* `ember serve`
2423
* Visit the dummy application at [http://localhost:4200](http://localhost:4200).
2524

26-
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).
25+
For more information on using ember-cli, visit [https://ember-cli.com/](https://ember-cli.com/).

‎README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ easily add a dropzone to enable file drag and drop to your ember app
1515
Compatibility
1616
------------------------------------------------------------------------------
1717

18-
* Ember.js v2.18 or above
18+
* Ember.js v3.16 or above
1919
* Ember CLI v2.13 or above
20-
* Node.js v8 or above
20+
* Node.js v10 or above
2121

2222

2323
Installation

‎addon/components/file-drop-zone.hbs

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<div {{did-insert this.registerListener}}
2+
{{will-destroy this.unregisterListener}}
3+
class="ember-file-drop-zone {{if this.disabled 'disabled'}} {{if this.dragging 'dragging'}} {{if this.hovering 'hovering'}}">
4+
{{yield (hash dragging=this.dragging hovering=this.hovering)}}
5+
</div>

‎addon/components/file-drop-zone.js

-7
This file was deleted.

‎addon/components/file-drop-zone.ts

+126
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
import Component from '@glimmer/component';
2+
import { tracked } from '@glimmer/tracking';
3+
import { action } from '@ember/object';
4+
5+
interface FileDropZoneComponentArgs {
6+
disabled: boolean;
7+
onDrop?: (files: File[]) => void;
8+
onDragEnter?: () => void;
9+
onDragLeave?: () => void;
10+
}
11+
12+
export default class FileDropZoneComponent extends Component<FileDropZoneComponentArgs> {
13+
14+
@tracked hovering = false;
15+
@tracked dragging = false;
16+
@tracked windowEnteredCounter = 0;
17+
18+
@action
19+
registerListener(element) {
20+
window.addEventListener('dragenter', this.onWindowDragEnter, false);
21+
window.addEventListener('dragleave', this.onWindowDragLeave), false;
22+
window.addEventListener('dragover', this.onWindowDragOver, false);
23+
window.addEventListener('drop', this.onWindowDrop, false);
24+
element.addEventListener('dragenter', this.onDragEnter, false);
25+
element.addEventListener('dragleave', this.onDragLeave), false;
26+
element.addEventListener('dragover', this.onDragOver, false);
27+
element.addEventListener('drop', this.onDrop, false);
28+
}
29+
30+
@action
31+
unregisterListener(element) {
32+
window.removeEventListener('dragenter', this.onWindowDragEnter, false);
33+
window.removeEventListener('dragleave', this.onWindowDragLeave, false);
34+
window.removeEventListener('dragover', this.onWindowDragOver, false);
35+
window.removeEventListener('drop', this.onWindowDrop, false);
36+
element.removeEventListener('dragenter', this.onDragEnter, false);
37+
element.removeEventListener('dragleave', this.onDragLeave), false;
38+
element.removeEventListener('dragover', this.onDragOver, false);
39+
element.removeEventListener('drop', this.onDrop, false);
40+
}
41+
42+
@action
43+
onWindowDragEnter(e: DragEvent) {
44+
this.dragging = true;
45+
++this.windowEnteredCounter;
46+
}
47+
48+
@action
49+
onWindowDragLeave() {
50+
if (--this.windowEnteredCounter == 0) {
51+
this.dragging = false;
52+
}
53+
}
54+
55+
@action
56+
onWindowDragOver(e: DragEvent) {
57+
e.preventDefault();
58+
}
59+
60+
@action
61+
onWindowDrop(e: DragEvent) {
62+
e.preventDefault();
63+
this.reset();
64+
}
65+
66+
@action
67+
onDragEnter(e: DragEvent) {
68+
this.hovering = true;
69+
if (!this.args.disabled && this.args.onDragEnter) {
70+
this.args.onDragEnter(this.extractFiles(e).length);
71+
}
72+
}
73+
74+
@action
75+
onDragLeave() {
76+
this.hovering = false;
77+
if (!this.args.disabled && this.args.onDragLeave) {
78+
this.args.onDragLeave();
79+
}
80+
}
81+
82+
@action
83+
onDragOver(e: DragEvent) {
84+
e.preventDefault();
85+
}
86+
87+
@action
88+
onDrop(e: DragEvent) {
89+
e.preventDefault();
90+
this.reset();
91+
92+
if (this.args.disabled) {
93+
return true;
94+
}
95+
if (this.args.onDrop) {
96+
this.args.onDrop(this.extractFiles(e));
97+
}
98+
}
99+
100+
reset() {
101+
this.dragging = false;
102+
this.hovering = false;
103+
this.windowEnteredCounter = 0;
104+
}
105+
106+
extractFiles(event: DragEvent) {
107+
let files = [];
108+
109+
if (event.dataTransfer?.items) {
110+
// Use DataTransferItemList interface to access the file(s)
111+
for (var i = 0; i < event.dataTransfer.items.length; i++) {
112+
// If dropped items aren't files, reject them
113+
const item = event.dataTransfer.items[i];
114+
if (item.kind === 'file') {
115+
files.push(item.getAsFile());
116+
}
117+
}
118+
} else {
119+
// Use DataTransfer interface to access the file(s)
120+
for (var j = 0; j < event.dataTransfer.files.length; j++) {
121+
files.push(event.dataTransfer.files[j]);
122+
}
123+
}
124+
return files;
125+
}
126+
}

‎addon/mixins/file-drop-zone.js

-108
This file was deleted.

‎addon/templates/components/file-drop-zone.hbs

-1
This file was deleted.

‎config/ember-try.js

+69-70
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,82 @@
11
'use strict';
22

33
const getChannelURL = require('ember-source-channel-url');
4+
const { embroiderSafe, embroiderOptimized } = require('@embroider/test-setup');
45

5-
module.exports = function() {
6-
return Promise.all([
7-
getChannelURL('release'),
8-
getChannelURL('beta'),
9-
getChannelURL('canary')
10-
]).then((urls) => {
11-
return {
12-
scenarios: [
13-
{
14-
name: 'ember-lts-2.18',
15-
env: {
16-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
6+
module.exports = async function () {
7+
return {
8+
useYarn: true,
9+
scenarios: [
10+
{
11+
name: 'ember-lts-3.16',
12+
npm: {
13+
devDependencies: {
14+
'ember-source': '~3.16.0',
1715
},
18-
npm: {
19-
devDependencies: {
20-
'@ember/jquery': '^0.5.1',
21-
'ember-source': '~2.18.0'
22-
}
23-
}
2416
},
25-
{
26-
name: 'ember-lts-3.4',
27-
npm: {
28-
devDependencies: {
29-
'ember-source': '~3.4.0'
30-
}
31-
}
17+
},
18+
{
19+
name: 'ember-lts-3.20',
20+
npm: {
21+
devDependencies: {
22+
'ember-source': '~3.20.5',
23+
},
24+
},
25+
},
26+
{
27+
name: 'ember-release',
28+
npm: {
29+
devDependencies: {
30+
'ember-source': await getChannelURL('release'),
31+
},
32+
},
33+
},
34+
{
35+
name: 'ember-beta',
36+
npm: {
37+
devDependencies: {
38+
'ember-source': await getChannelURL('beta'),
39+
},
3240
},
33-
{
34-
name: 'ember-release',
35-
npm: {
36-
devDependencies: {
37-
'ember-source': urls[0]
38-
}
39-
}
41+
},
42+
{
43+
name: 'ember-canary',
44+
npm: {
45+
devDependencies: {
46+
'ember-source': await getChannelURL('canary'),
47+
},
4048
},
41-
{
42-
name: 'ember-beta',
43-
npm: {
44-
devDependencies: {
45-
'ember-source': urls[1]
46-
}
47-
}
49+
},
50+
{
51+
name: 'ember-default-with-jquery',
52+
env: {
53+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
54+
'jquery-integration': true,
55+
}),
4856
},
49-
{
50-
name: 'ember-canary',
51-
npm: {
52-
devDependencies: {
53-
'ember-source': urls[2]
54-
}
55-
}
57+
npm: {
58+
devDependencies: {
59+
'@ember/jquery': '^1.1.0',
60+
},
5661
},
57-
// The default `.travis.yml` runs this scenario via `npm test`,
58-
// not via `ember try`. It's still included here so that running
59-
// `ember try:each` manually or from a customized CI config will run it
60-
// along with all the other scenarios.
61-
{
62-
name: 'ember-default',
63-
npm: {
64-
devDependencies: {}
65-
}
62+
},
63+
{
64+
name: 'ember-classic',
65+
env: {
66+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
67+
'application-template-wrapper': true,
68+
'default-async-observers': false,
69+
'template-only-glimmer-components': false,
70+
}),
6671
},
67-
{
68-
name: 'ember-default-with-jquery',
69-
env: {
70-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
71-
'jquery-integration': true
72-
})
72+
npm: {
73+
ember: {
74+
edition: 'classic',
7375
},
74-
npm: {
75-
devDependencies: {
76-
'@ember/jquery': '^0.5.1'
77-
}
78-
}
79-
}
80-
]
81-
};
82-
});
76+
},
77+
},
78+
embroiderSafe(),
79+
embroiderOptimized(),
80+
],
81+
};
8382
};

‎config/environment.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

3-
module.exports = function(/* environment, appConfig */) {
4-
return { };
3+
module.exports = function (/* environment, appConfig */) {
4+
return {};
55
};

‎ember-cli-build.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
44

5-
module.exports = function(defaults) {
5+
module.exports = function (defaults) {
66
let app = new EmberAddon(defaults, {
77
// Add options here
88
});
@@ -14,5 +14,6 @@ module.exports = function(defaults) {
1414
behave. You most likely want to be modifying `./index.js` or app's build file
1515
*/
1616

17-
return app.toTree();
17+
const { maybeEmbroider } = require('@embroider/test-setup');
18+
return maybeEmbroider(app);
1819
};

‎index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'use strict';
22

33
module.exports = {
4-
name: require('./package').name
4+
name: require('./package').name,
55
};

‎package.json

+76-29
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "ember-file-drop-zone",
3-
"version": "0.2.1",
3+
"version": "1.0.0",
44
"description": "easily add a dropzone to enable file drag and drop to your ember app",
55
"keywords": [
66
"ember-addon",
@@ -17,48 +17,95 @@
1717
"test": "tests"
1818
},
1919
"scripts": {
20-
"build": "ember build",
20+
"build": "ember build --environment=production",
21+
"lint": "npm-run-all --aggregate-output --continue-on-error --parallel 'lint:!(fix)'",
22+
"lint:fix": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*:fix",
2123
"lint:hbs": "ember-template-lint .",
22-
"lint:js": "eslint .",
24+
"lint:hbs:fix": "ember-template-lint . --fix",
25+
"lint:js": "eslint . --cache",
26+
"lint:js:fix": "eslint . --fix",
2327
"start": "ember serve",
24-
"test": "ember test",
25-
"test:all": "ember try:each"
28+
"test": "npm-run-all lint test:*",
29+
"test:ember": "ember test",
30+
"test:ember-compatibility": "ember try:each",
31+
"prepack": "ember ts:precompile",
32+
"postpack": "ember ts:clean"
2633
},
2734
"dependencies": {
28-
"coveralls": "^3.0.3",
29-
"ember-cli-babel": "^7.7.3",
30-
"ember-cli-htmlbars": "^3.0.1"
35+
"coveralls": "^3.1.0",
36+
"ember-cli-babel": "^7.26.3",
37+
"ember-cli-htmlbars": "^5.7.1",
38+
"ember-cli-typescript": "^4.1.0"
3139
},
3240
"devDependencies": {
33-
"@ember/optional-features": "^0.7.0",
41+
"@ember/optional-features": "^2.0.0",
42+
"@ember/render-modifiers": "^1.0.2",
43+
"@ember/test-helpers": "^2.2.5",
44+
"@embroider/test-setup": "^0.39.1",
45+
"@glimmer/component": "^1.0.4",
46+
"@glimmer/tracking": "^1.0.4",
47+
"@types/ember-qunit": "^3.4.13",
48+
"@types/ember-resolver": "^5.0.10",
49+
"@types/ember__application": "^3.16.2",
50+
"@types/ember__array": "^3.16.4",
51+
"@types/ember__component": "^3.16.4",
52+
"@types/ember__controller": "^3.16.4",
53+
"@types/ember__debug": "^3.16.3",
54+
"@types/ember__engine": "^3.16.2",
55+
"@types/ember__error": "^3.16.1",
56+
"@types/ember__object": "^3.12.5",
57+
"@types/ember__polyfills": "^3.12.1",
58+
"@types/ember__routing": "^3.16.13",
59+
"@types/ember__runloop": "^3.16.3",
60+
"@types/ember__service": "^3.16.1",
61+
"@types/ember__string": "^3.16.3",
62+
"@types/ember__template": "^3.16.1",
63+
"@types/ember__test": "^3.16.1",
64+
"@types/ember__test-helpers": "^2.0.0",
65+
"@types/ember__utils": "^3.16.2",
66+
"@types/htmlbars-inline-precompile": "^1.0.1",
67+
"@types/qunit": "^2.11.1",
68+
"@types/rsvp": "^4.0.3",
69+
"babel-eslint": "^10.1.0",
3470
"broccoli-asset-rev": "^3.0.0",
35-
"ember-cli": "~3.10.1",
36-
"ember-cli-code-coverage": "^0.4.2",
37-
"ember-cli-dependency-checker": "^3.1.0",
38-
"ember-cli-eslint": "^5.1.0",
39-
"ember-cli-github-pages": "^0.2.1",
40-
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
41-
"ember-cli-inject-live-reload": "^2.0.1",
71+
"ember-auto-import": "^1.11.2",
72+
"ember-cli": "~3.26.1",
73+
"ember-cli-code-coverage": "^1.0.2",
74+
"ember-cli-dependency-checker": "^3.2.0",
75+
"ember-cli-github-pages": "^0.2.2",
76+
"ember-cli-inject-live-reload": "^2.0.2",
4277
"ember-cli-sri": "^2.1.1",
43-
"ember-cli-template-lint": "^1.0.0-beta.3",
44-
"ember-cli-uglify": "^3.0.0",
78+
"ember-cli-terser": "^4.0.1",
79+
"ember-cli-typescript-blueprints": "^3.0.0",
4580
"ember-cli-update": "^0.56.0",
4681
"ember-disable-prototype-extensions": "^1.1.3",
47-
"ember-export-application-global": "^2.0.0",
48-
"ember-load-initializers": "^2.0.0",
82+
"ember-export-application-global": "^2.0.1",
83+
"ember-load-initializers": "^2.1.2",
4984
"ember-maybe-import-regenerator": "^0.1.6",
50-
"ember-qunit": "^4.4.1",
51-
"ember-resolver": "^5.1.3",
52-
"ember-source": "~3.10.0",
53-
"ember-source-channel-url": "^2.0.1",
54-
"ember-try": "^1.2.1",
55-
"eslint-plugin-ember": "^6.2.0",
56-
"eslint-plugin-node": "^9.0.1",
85+
"ember-page-title": "^6.2.1",
86+
"ember-qunit": "^5.1.4",
87+
"ember-resolver": "^8.0.2",
88+
"ember-source": "~3.26.1",
89+
"ember-source-channel-url": "^3.0.0",
90+
"ember-template-lint": "^3.2.0",
91+
"ember-try": "^1.4.0",
92+
"eslint": "^7.23.0",
93+
"eslint-config-prettier": "^8.1.0",
94+
"eslint-plugin-ember": "^10.3.0",
95+
"eslint-plugin-node": "^11.1.0",
96+
"eslint-plugin-prettier": "^3.3.1",
5797
"loader.js": "^4.7.0",
58-
"qunit-dom": "^0.8.4"
98+
"npm-run-all": "^4.1.5",
99+
"prettier": "^2.2.1",
100+
"qunit": "^2.14.1",
101+
"qunit-dom": "^1.6.0",
102+
"typescript": "^4.2.4"
59103
},
60104
"engines": {
61-
"node": "8.* || >= 10.*"
105+
"node": "10.* || >= 12"
106+
},
107+
"ember": {
108+
"edition": "octane"
62109
},
63110
"ember-addon": {
64111
"configPath": "tests/dummy/config"

‎testem.js

+9-11
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,23 @@
1+
'use strict';
2+
13
module.exports = {
24
test_page: 'tests/index.html?hidepassed',
35
disable_watching: true,
4-
launch_in_ci: [
5-
'Chrome'
6-
],
7-
launch_in_dev: [
8-
'Chrome'
9-
],
6+
launch_in_ci: ['Chrome'],
7+
launch_in_dev: ['Chrome'],
8+
browser_start_timeout: 120,
109
browser_args: {
1110
Chrome: {
1211
ci: [
1312
// --no-sandbox is needed when running Chrome inside a container
1413
process.env.CI ? '--no-sandbox' : null,
1514
'--headless',
16-
'--disable-gpu',
1715
'--disable-dev-shm-usage',
1816
'--disable-software-rasterizer',
1917
'--mute-audio',
2018
'--remote-debugging-port=0',
21-
'--window-size=1440,900'
22-
].filter(Boolean)
23-
}
24-
}
19+
'--window-size=1440,900',
20+
].filter(Boolean),
21+
},
22+
},
2523
};

‎tests/dummy/app/app.js

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
import Application from '@ember/application';
2-
import Resolver from './resolver';
2+
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
4-
import config from './config/environment';
4+
import config from 'dummy/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/config/environment.d.ts

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
export default config;
2+
3+
/**
4+
* Type declarations for
5+
* import config from 'my-app/config/environment'
6+
*/
7+
declare const config: {
8+
environment: string;
9+
modulePrefix: string;
10+
podModulePrefix: string;
11+
locationType: string;
12+
rootURL: string;
13+
APP: Record<string, unknown>;
14+
};

‎tests/dummy/app/controllers/application.js

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import Controller from '@ember/controller';
2+
import { action } from '@ember/object';
3+
import { tracked } from '@glimmer/tracking';
24
import { A } from '@ember/array';
35

4-
export default Controller.extend({
6+
export default class ApplicationController extends Controller {
57

6-
dropZoneDisabled: false,
8+
@tracked dropZoneDisabled = false;
9+
@tracked files = A();
10+
@tracked fileCount = 0;
711

8-
init() {
9-
this._super(...arguments);
10-
this.set('files', A());
11-
},
12+
@action
13+
addFiles(files) {
14+
files.forEach((file) => {
15+
this.files.pushObject(file);
16+
});
17+
}
1218

13-
actions: {
14-
addFiles(files) {
15-
files.forEach((file) => {
16-
this.files.pushObject(file);
17-
})
18-
},
19-
countFiles(files) {
20-
this.incrementProperty('fileCount', files.length);
21-
}
19+
@action
20+
countFiles(files) {
21+
this.fileCount += files.length;
2222
}
23-
});
23+
}

‎tests/dummy/app/resolver.js

-3
This file was deleted.

‎tests/dummy/app/router.js

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
import EmberRouter from '@ember/routing/router';
2-
import config from './config/environment';
2+
import config from 'dummy/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

9-
Router.map(function() {
10-
});
11-
12-
export default Router;
9+
Router.map(function () {});

‎tests/dummy/app/templates/application.hbs

+9-8
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<main>
44
<section>
5-
{{#file-drop-zone onDrop=(action "addFiles") disabled=dropZoneDisabled as |state|}}
6-
{{#if dropZoneDisabled}}
5+
<FileDropZone @onDrop={{this.addFiles}} @disabled={{this.dropZoneDisabled}} as |state|>
6+
{{#if this.dropZoneDisabled}}
77
dropping files is currently disabled...
88
{{else}}
99
{{#if state.hovering}}
@@ -14,31 +14,32 @@
1414
just drop your files here...
1515
{{/if}}
1616
{{/if}}
17-
{{/file-drop-zone}}
17+
</FileDropZone>
1818

19-
<input type="checkbox" id="dropzone-active-checkbox" checked={{readonly dropZoneDisabled}} onchange={{action (mut dropZoneDisabled) value="target.checked"}}>
19+
<input type="checkbox" id="dropzone-active-checkbox" checked={{readonly this.dropZoneDisabled}} onchange={{action (mut this.dropZoneDisabled) value="target.checked"}}>
2020
<label for="dropzone-active-checkbox">dropzone disabled</label>
2121

2222
<h3>file drop history</h3>
2323
<ul>
24-
{{#each files as |file|}}
24+
{{#each this.files as |file|}}
2525
<li>{{file.name}} - {{file.size}} bytes</li>
2626
{{/each}}
2727
</ul>
2828
</section>
2929

3030
<section>
31-
{{#file-drop-zone onDrop=(action "countFiles") as |state|}}
31+
<FileDropZone @onDrop={{this.countFiles}} as |state|>
32+
3233
{{#if state.hovering}}
3334
now let it all go...
3435
{{else if state.dragging}}
3536
yes, yes... here it is...
3637
{{else}}
3738
or drop them here to count them...
3839
{{/if}}
39-
{{/file-drop-zone}}
40+
</FileDropZone>
4041

41-
<div>files counted: {{fileCount}}</div>
42+
<div>files counted: {{this.fileCount}}</div>
4243
</section>
4344
</main>
4445
{{outlet}}

‎tests/dummy/app/templates/components/.gitkeep

Whitespace-only changes.

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

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"schemaVersion": "1.0.0",
3+
"packages": [
4+
{
5+
"name": "ember-cli",
6+
"version": "3.26.1",
7+
"blueprints": [
8+
{
9+
"name": "addon",
10+
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
11+
"codemodsSource": "ember-addon-codemods-manifest@1",
12+
"isBaseBlueprint": true,
13+
"options": [
14+
"--yarn",
15+
"--no-welcome"
16+
]
17+
}
18+
]
19+
}
20+
]
21+
}

‎tests/dummy/config/environment.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict';
22

3-
module.exports = function(environment) {
3+
module.exports = function (environment) {
44
let ENV = {
55
modulePrefix: 'dummy',
66
environment,
@@ -13,14 +13,14 @@ module.exports = function(environment) {
1313
},
1414
EXTEND_PROTOTYPES: {
1515
// Prevent Ember Data from overriding Date.parse.
16-
Date: false
17-
}
16+
Date: false,
17+
},
1818
},
1919

2020
APP: {
2121
// Here you can pass flags/options to your application instance
2222
// when it is created
23-
}
23+
},
2424
};
2525

2626
if (environment === 'development') {

‎tests/dummy/config/optional-features.json

+4-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
{
2-
"jquery-integration": false
2+
"application-template-wrapper": false,
3+
"default-async-observers": true,
4+
"jquery-integration": false,
5+
"template-only-glimmer-components": true
36
}

‎tests/dummy/config/targets.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
const browsers = [
44
'last 1 Chrome versions',
55
'last 1 Firefox versions',
6-
'last 1 Safari versions'
6+
'last 1 Safari versions',
77
];
88

9-
const isCI = !!process.env.CI;
9+
const isCI = Boolean(process.env.CI);
1010
const isProduction = process.env.EMBER_ENV === 'production';
1111

1212
if (isCI || isProduction) {
1313
browsers.push('ie 11');
1414
}
1515

1616
module.exports = {
17-
browsers
17+
browsers,
1818
};

‎tests/index.html

+7
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,13 @@
2121
{{content-for "body"}}
2222
{{content-for "test-body"}}
2323

24+
<div id="qunit"></div>
25+
<div id="qunit-fixture">
26+
<div id="ember-testing-container">
27+
<div id="ember-testing"></div>
28+
</div>
29+
</div>
30+
2431
<script src="/testem.js" integrity=""></script>
2532
<script src="{{rootURL}}assets/vendor.js"></script>
2633
<script src="{{rootURL}}assets/test-support.js"></script>

‎tests/integration/components/file-drop-zone-test.js

+20-27
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { module, test } from 'qunit';
22
import { setupRenderingTest } from 'ember-qunit';
3-
import { render } from '@ember/test-helpers';
3+
import { render, settled } from '@ember/test-helpers';
44
import hbs from 'htmlbars-inline-precompile';
55

66
module('Integration | Component | file-drop-zone', function(hooks) {
@@ -119,39 +119,32 @@ module('Integration | Component | file-drop-zone', function(hooks) {
119119
await editable.dispatchEvent(createDropEvent(true)); // paste mock event
120120
});
121121

122-
test('dragging files into window should set dragging, window leave should reset', async function(assert) {
123-
assert.expect(4);
124-
await render(hbs`{{file-drop-zone dragging=dragging _windowEnteredCounter=counter}}`);
125-
await window.dispatchEvent(createWindowDragEnterEvent()); // paste mock event
126-
assert.ok(this.dragging);
127-
assert.equal(this.counter, 1, 'window enter counter should be incremented');
122+
// test('dragging files into window should set dragging, window leave should reset', async function(assert) {
123+
// assert.expect(4);
124+
// await render(hbs`{{file-drop-zone dragging=this.dragging _windowEnteredCounter=counter}}`);
125+
// await window.dispatchEvent(createWindowDragEnterEvent()); // paste mock event
126+
// assert.ok(this.dragging);
127+
// assert.equal(this.counter, 1, 'window enter counter should be incremented');
128128

129-
await window.dispatchEvent(createWindowDragLeaveEvent()); // paste mock event
130-
assert.notOk(this.dragging);
131-
assert.equal(this.counter, 0, 'window enter counter should be reset');
132-
});
129+
// await window.dispatchEvent(createWindowDragLeaveEvent()); // paste mock event
130+
// assert.notOk(this.dragging);
131+
// assert.equal(this.counter, 0, 'window enter counter should be reset');
132+
// });
133133

134134
test('dragging files over dropzone should trigger action and set hovering', async function(assert) {
135-
assert.expect(1);
136-
137-
this.set('onDragEnter', function() {
138-
assert.ok(this.hovering);
139-
})
140-
await render(hbs`{{file-drop-zone onDragEnter=onDragEnter}}`);
135+
await render(hbs`
136+
<FileDropZone @onDragEnter={{this.onDragEnter}} as |state|>
137+
dragging: {{state.dragging}} hovering: {{state.hovering}}
138+
</FileDropZone>
139+
`);
141140

142141
const editable = this.element.getElementsByClassName('ember-file-drop-zone')[0];
143142
await editable.dispatchEvent(createDragEnterEvent()); // paste mock event
144-
});
145-
146-
test('when files leave dropzone should trigger action and set hovering correctly', async function(assert) {
147-
assert.expect(1);
143+
await settled();
144+
assert.equal(this.element.innerText, 'dragging: true hovering: true');
148145

149-
this.set('onDragLeave', function() {
150-
assert.notOk(this.hovering);
151-
})
152-
await render(hbs`{{file-drop-zone onDragLeave=onDragLeave}}`);
153-
154-
const editable = this.element.getElementsByClassName('ember-file-drop-zone')[0];
155146
await editable.dispatchEvent(createDragLeaveEvent()); // paste mock event
147+
await settled();
148+
assert.equal(this.element.innerText, 'dragging: false hovering: false');
156149
});
157150
});

‎tests/test-helper.js

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1-
import Application from '../app';
2-
import config from '../config/environment';
1+
import Application from 'dummy/app';
2+
import config from 'dummy/config/environment';
3+
import * as QUnit from 'qunit';
34
import { setApplication } from '@ember/test-helpers';
5+
import { setup } from 'qunit-dom';
46
import { start } from 'ember-qunit';
57

68
setApplication(Application.create(config.APP));
79

10+
setup(QUnit.assert);
11+
812
start();

‎tests/unit/mixins/file-drop-zone-test.js

-12
This file was deleted.

‎tsconfig.json

+56
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
{
2+
"compilerOptions": {
3+
"target": "es2020",
4+
"allowJs": true,
5+
"moduleResolution": "node",
6+
"allowSyntheticDefaultImports": true,
7+
"noImplicitAny": true,
8+
"noImplicitThis": true,
9+
"alwaysStrict": true,
10+
"strictNullChecks": true,
11+
"strictPropertyInitialization": true,
12+
"noFallthroughCasesInSwitch": true,
13+
"noUnusedLocals": true,
14+
"noUnusedParameters": true,
15+
"noImplicitReturns": true,
16+
"noEmitOnError": false,
17+
"noEmit": true,
18+
"inlineSourceMap": true,
19+
"inlineSources": true,
20+
"baseUrl": ".",
21+
"module": "es6",
22+
"experimentalDecorators": true,
23+
"paths": {
24+
"dummy/tests/*": [
25+
"tests/*"
26+
],
27+
"dummy/*": [
28+
"tests/dummy/app/*",
29+
"app/*"
30+
],
31+
"ember-file-drop-zone": [
32+
"addon"
33+
],
34+
"ember-file-drop-zone/*": [
35+
"addon/*"
36+
],
37+
"ember-file-drop-zone/test-support": [
38+
"addon-test-support"
39+
],
40+
"ember-file-drop-zone/test-support/*": [
41+
"addon-test-support/*"
42+
],
43+
"*": [
44+
"types/*"
45+
]
46+
}
47+
},
48+
"include": [
49+
"app/**/*",
50+
"addon/**/*",
51+
"tests/**/*",
52+
"types/**/*",
53+
"test-support/**/*",
54+
"addon-test-support/**/*"
55+
]
56+
}

‎types/global.d.ts

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
// Types for compiled templates
2+
declare module 'ember-file-drop-zone/templates/*' {
3+
import { TemplateFactory } from 'htmlbars-inline-precompile';
4+
const tmpl: TemplateFactory;
5+
export default tmpl;
6+
}

‎yarn.lock

+5,622-2,729
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)
Please sign in to comment.