Skip to content

Commit

Permalink
fix: remove ember-decorators
Browse files Browse the repository at this point in the history
  • Loading branch information
@mike-north
mike-north committed Aug 23, 2018
1 parent a237ed9 commit eb3275e
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 114 deletions.
17 changes: 8 additions & 9 deletions addon/services/resize.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { oneWay, readOnly } from '@ember-decorators/object/computed';
import { getWithDefault, set } from '@ember/object';
import { computed, getWithDefault, set } from '@ember/object';
import Evented from '@ember/object/evented';
import { cancel, debounce } from '@ember/runloop';
import Service from '@ember/service';
Expand All @@ -17,20 +16,20 @@ export interface ResizeDefaults {
injectionFactories?: string[];
}

class ResizeService extends Service.extend(Evented) {
class ResizeService extends Service.extend(Evented, {
debounceTimeout: computed.oneWay('defaultDebounceTimeout'),
heightSensitive: computed.oneWay('defaultHeightSensitive'),
screenHeight: computed.readOnly('_oldHeight'),
screenWidth: computed.readOnly('_oldWidth'),
widthSensitive: computed.oneWay('defaultWidthSensitive'),
}) {
public _oldWidth = window.innerWidth;
public _oldHeight = window.innerHeight;
public _oldWidthDebounced = window.innerWidth;
public _oldHeightDebounced = window.innerHeight;

@oneWay('defaultDebounceTimeout') public debounceTimeout!: number;
@oneWay('defaultWidthSensitive') public widthSensitive!: boolean;
@oneWay('defaultHeightSensitive') public heightSensitive!: boolean;

public resizeServiceDefaults!: ResizeDefaults;

@readOnly('_oldWidth') public screenWidth!: number;
@readOnly('_oldHeight') public screenHeight!: number;
public _onResizeHandler?: (this: Window, evt: UIEvent) => void;
public _scheduledDebounce?: ReturnType<typeof debounce>;
constructor() {
Expand Down
4 changes: 1 addition & 3 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
},
"homepage": "https://github.com/mike-north/ember-resize",
"devDependencies": {
"@ember-decorators/babel-transforms": "^2.0.0",
"@mike-north/js-lib-semantic-release-config": "^0.0.0-development",
"@types/ember": "^2.8.32",
"@types/ember-qunit": "^3.0.3",
Expand All @@ -41,7 +40,6 @@
"ember-cli-tslint": "^0.1.4",
"ember-cli-typescript": "^1.4.0",
"ember-cli-uglify": "^2.0.0",
"ember-decorators": "^2.3.1",
"ember-disable-prototype-extensions": "^1.1.2",
"ember-disable-proxy-controllers": "^1.0.1",
"ember-export-application-global": "^2.0.0",
Expand Down Expand Up @@ -84,4 +82,4 @@
"release": {
"extends": "@mike-north/js-lib-semantic-release-config"
}
}
}
107 changes: 5 additions & 102 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,58 +78,6 @@
lodash "^4.2.0"
to-fast-properties "^2.0.0"

"@ember-decorators/babel-transforms@^2.0.0":
version "2.0.2"
resolved "https://registry.yarnpkg.com/@ember-decorators/babel-transforms/-/babel-transforms-2.0.2.tgz#f73b4af32bc9aa2253cc8d2e72b984ab85e432db"
dependencies:
babel-plugin-transform-class-properties "^6.24.1"
babel-plugin-transform-decorators-legacy "^1.3.4"
ember-cli-babel "^6.6.0"
ember-cli-version-checker "^2.1.0"

"@ember-decorators/component@^2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@ember-decorators/component/-/component-2.3.1.tgz#4e692c78f4ce69ba107759e5f8e2ed59c55dc232"
dependencies:
"@ember-decorators/utils" "^2.3.1"
ember-cli-babel "^6.6.0"

"@ember-decorators/controller@^2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@ember-decorators/controller/-/controller-2.3.1.tgz#0b64320b037d413d5a351129fb1269e0b9f955f8"
dependencies:
"@ember-decorators/utils" "^2.3.1"
ember-cli-babel "^6.6.0"

"@ember-decorators/data@^2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@ember-decorators/data/-/data-2.3.1.tgz#a2f28a56f0190217b863846808fbee9ec14c2fd9"
dependencies:
"@ember-decorators/utils" "^2.3.1"
ember-cli-babel "^6.6.0"

"@ember-decorators/object@^2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@ember-decorators/object/-/object-2.3.1.tgz#1886911154a58e1d5e5bd1be883249d05d52c918"
dependencies:
"@ember-decorators/utils" "^2.3.1"
ember-cli-babel "^6.6.0"
ember-compatibility-helpers "^1.0.0"

"@ember-decorators/service@^2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@ember-decorators/service/-/service-2.3.1.tgz#84734f22ba295929ba5d506971535358e9e2a432"
dependencies:
"@ember-decorators/utils" "^2.3.1"
ember-cli-babel "^6.6.0"

"@ember-decorators/utils@^2.3.1":
version "2.3.1"
resolved "https://registry.yarnpkg.com/@ember-decorators/utils/-/utils-2.3.1.tgz#1da06a8f11062b0176dac5b427b27b4eabff3604"
dependencies:
ember-cli-babel "^6.6.0"
ember-compatibility-helpers "^1.0.0"

"@ember/test-helpers@^0.7.18":
version "0.7.25"
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-0.7.25.tgz#b4014c108b40ffaf74f3c4d5918800917541541d"
Expand Down Expand Up @@ -942,7 +890,7 @@ babel-plugin-dead-code-elimination@^1.0.2:
version "1.0.2"
resolved "https://registry.yarnpkg.com/babel-plugin-dead-code-elimination/-/babel-plugin-dead-code-elimination-1.0.2.tgz#5f7c451274dcd7cccdbfbb3e0b85dd28121f0f65"

babel-plugin-debug-macros@^0.1.10, babel-plugin-debug-macros@^0.1.11:
babel-plugin-debug-macros@^0.1.10:
version "0.1.11"
resolved "https://registry.yarnpkg.com/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.1.11.tgz#6c562bf561fccd406ce14ab04f42c218cf956605"
dependencies:
Expand Down Expand Up @@ -1014,14 +962,6 @@ babel-plugin-syntax-async-functions@^6.8.0:
version "6.13.0"
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"

babel-plugin-syntax-class-properties@^6.8.0:
version "6.13.0"
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"

babel-plugin-syntax-decorators@^6.1.18:
version "6.13.0"
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz#312563b4dbde3cc806cee3e416cceeaddd11ac0b"

babel-plugin-syntax-exponentiation-operator@^6.8.0:
version "6.13.0"
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
Expand All @@ -1042,23 +982,6 @@ babel-plugin-transform-async-to-generator@^6.22.0:
babel-plugin-syntax-async-functions "^6.8.0"
babel-runtime "^6.22.0"

babel-plugin-transform-class-properties@^6.24.1:
version "6.24.1"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
dependencies:
babel-helper-function-name "^6.24.1"
babel-plugin-syntax-class-properties "^6.8.0"
babel-runtime "^6.22.0"
babel-template "^6.24.1"

babel-plugin-transform-decorators-legacy@^1.3.4:
version "1.3.5"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-decorators-legacy/-/babel-plugin-transform-decorators-legacy-1.3.5.tgz#0e492dffa0edd70529072887f8aa86d4dd8b40a1"
dependencies:
babel-plugin-syntax-decorators "^6.1.18"
babel-runtime "^6.2.0"
babel-template "^6.3.0"

babel-plugin-transform-es2015-arrow-functions@^6.22.0:
version "6.22.0"
resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"
Expand Down Expand Up @@ -1320,14 +1243,14 @@ babel-register@^6.26.0:
mkdirp "^0.5.1"
source-map-support "^0.4.15"

babel-runtime@^6.18.0, babel-runtime@^6.2.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
babel-runtime@^6.18.0, babel-runtime@^6.22.0, babel-runtime@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
dependencies:
core-js "^2.4.0"
regenerator-runtime "^0.11.0"

babel-template@^6.24.1, babel-template@^6.26.0, babel-template@^6.3.0:
babel-template@^6.24.1, babel-template@^6.26.0:
version "6.26.0"
resolved "https://registry.yarnpkg.com/babel-template/-/babel-template-6.26.0.tgz#de03e2d16396b069f46dd9fff8521fb1a0e35e02"
dependencies:
Expand Down Expand Up @@ -2892,7 +2815,7 @@ ember-cli-babel@^5.0.0, ember-cli-babel@^5.1.3:
ember-cli-version-checker "^1.0.2"
resolve "^1.1.2"

ember-cli-babel@^6.0.0, ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2:
ember-cli-babel@^6.0.0-beta.4, ember-cli-babel@^6.0.0-beta.7, ember-cli-babel@^6.11.0, ember-cli-babel@^6.12.0, ember-cli-babel@^6.6.0, ember-cli-babel@^6.8.1, ember-cli-babel@^6.8.2:
version "6.16.0"
resolved "https://registry.yarnpkg.com/ember-cli-babel/-/ember-cli-babel-6.16.0.tgz#623b4a2764ece72b65f1572fc8aeb5714a450228"
dependencies:
Expand Down Expand Up @@ -3114,7 +3037,7 @@ ember-cli-version-checker@^1.0.2, ember-cli-version-checker@^1.1.6:
dependencies:
semver "^5.3.0"

ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0, ember-cli-version-checker@^2.1.1, ember-cli-version-checker@^2.1.2:
ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0, ember-cli-version-checker@^2.1.2:
version "2.1.2"
resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.1.2.tgz#305ce102390c66e4e0f1432dea9dc5c7c19fed98"
dependencies:
Expand Down Expand Up @@ -3300,26 +3223,6 @@ ember-cli@~3.1.4:
watch-detector "^0.1.0"
yam "^0.0.24"

ember-compatibility-helpers@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/ember-compatibility-helpers/-/ember-compatibility-helpers-1.0.2.tgz#a7eb8969747d063720fe44658af5448589b437ba"
dependencies:
babel-plugin-debug-macros "^0.1.11"
ember-cli-version-checker "^2.1.1"
semver "^5.4.1"

ember-decorators@^2.3.1:
version "2.3.1"
resolved "https://registry.yarnpkg.com/ember-decorators/-/ember-decorators-2.3.1.tgz#aef98f6a3e15666bd414576d07cbfc15d39cfe97"
dependencies:
"@ember-decorators/component" "^2.3.1"
"@ember-decorators/controller" "^2.3.1"
"@ember-decorators/data" "^2.3.1"
"@ember-decorators/object" "^2.3.1"
"@ember-decorators/service" "^2.3.1"
ember-cli-babel "^6.0.0"
semver "^5.5.0"

ember-disable-prototype-extensions@^1.1.2:
version "1.1.3"
resolved "https://registry.yarnpkg.com/ember-disable-prototype-extensions/-/ember-disable-prototype-extensions-1.1.3.tgz#1969135217654b5e278f9fe2d9d4e49b5720329e"
Expand Down

0 comments on commit eb3275e

Please sign in to comment.