Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): upgrade ember-cli-typescript and ember-cli-babel #315

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions addon/services/resize.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,16 @@ export interface ResizeDefaults {
injectionFactories?: string[];
}

// This is a workaround to define the `resizeServiceDefaults` property on the
// *type* `ResizeService`, while not stomping the property with a default value
// of `void 0`: per the ES spec, a property declared on a class body with no
// value is equivalent to `defineProperty(this, 'propertyName', void 0, ...)`.
// Once this project is upgraded to use TS 3.7+, this can be replace dwith the
// use of `declare resizeServiceDefaults: Partial<ResizeDefaults>` on the class.
interface ResizeService {
resizeServiceDefaults: Partial<ResizeDefaults>;
}

class ResizeService extends Service.extend(Evented, {
debounceTimeout: computed.oneWay('defaultDebounceTimeout'),
heightSensitive: computed.oneWay('defaultHeightSensitive'),
Expand All @@ -28,8 +38,6 @@ class ResizeService extends Service.extend(Evented, {
public _oldWidthDebounced = window.innerWidth;
public _oldHeightDebounced = window.innerHeight;

public resizeServiceDefaults!: Partial<ResizeDefaults>;

public _onResizeHandler?: (this: Window, evt: UIEvent) => void;
public _scheduledDebounce?: ReturnType<typeof debounce>;
constructor() {
Expand Down
19 changes: 10 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@
"@commitlint/travis-cli": "7.2.1",
"@mike-north/js-lib-renovate-config": "1.2.0",
"@mike-north/js-lib-semantic-release-config": "1.0.1",
"@types/ember": "3.0.26",
"@types/ember-qunit": "3.4.5",
"@types/ember__test-helpers": "0.7.7",
"@types/qunit": "2.5.4",
"@types/rsvp": "4.0.2",
"@types/ember": "^3.1.1",
"@types/ember-qunit": "^3.4.7",
"@types/ember__test-helpers": "^0.7.9",
"@types/qunit": "^2.9.0",
"@types/rsvp": "^4.0.3",
"babel-eslint": "10.0.1",
"broccoli-asset-rev": "3.0.0",
"ember-cli": "3.8.0",
Expand All @@ -36,7 +36,7 @@
"ember-cli-inject-live-reload": "2.0.1",
"ember-cli-qunit": "4.4.0",
"ember-cli-tslint": "0.1.4",
"ember-cli-typescript": "1.5.0",
"ember-cli-typescript-blueprints": "^3.0.0",
"ember-cli-uglify": "2.1.0",
"ember-disable-prototype-extensions": "1.1.3",
"ember-disable-proxy-controllers": "1.0.2",
Expand All @@ -54,7 +54,7 @@
"loader.js": "4.7.0",
"qunit-dom": "0.8.4",
"semantic-release": "15.12.4",
"typescript": "3.2.2",
"typescript": "^3.7.5",
"typescript-eslint-parser": "21.0.2"
},
"keywords": [
Expand All @@ -69,8 +69,9 @@
"test": "tests"
},
"dependencies": {
"ember-cli-babel": "^7.1.0",
"ember-cli-htmlbars": "^3.0.0"
"ember-cli-babel": "^7.14.1",
"ember-cli-htmlbars": "^3.0.0",
"ember-cli-typescript": "^3.1.3"
},
"ember-addon": {
"configPath": "tests/dummy/config",
Expand Down
1 change: 0 additions & 1 deletion testem.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ module.exports = {
// --no-sandbox is needed when running Chrome inside a container
process.env.CI ? '--no-sandbox' : null,
'--headless',
'--disable-gpu',
'--disable-dev-shm-usage',
'--disable-software-rasterizer',
'--mute-audio',
Expand Down
6 changes: 3 additions & 3 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"inlineSources": true,
"baseUrl": ".",
"module": "es6",
"experimentalDecorators": true,
"paths": {
"dummy/tests/*": [
"tests/*"
Expand All @@ -42,8 +43,7 @@
"*": [
"types/*"
]
},
"experimentalDecorators": true
}
},
"include": [
"app/**/*",
Expand All @@ -53,4 +53,4 @@
"test-support/**/*",
"addon-test-support/**/*"
]
}
}
Loading