From 96eb30eb7541a010ea803d1188de925df7af64e2 Mon Sep 17 00:00:00 2001 From: Sivasubramanyam A Date: Sun, 27 Oct 2019 01:38:03 +0530 Subject: [PATCH] Update ember-source to alpha version to get liquid-fire working --- app/components/clock.hbs | 6 +- app/components/clock.js | 9 +- app/controllers/application.js | 1 + app/styles/app.css | 11 +- app/templates/application.hbs | 38 ++- app/transitions.js | 14 +- config/optional-features.json | 2 +- package-lock.json | 594 ++------------------------------- package.json | 6 +- 9 files changed, 83 insertions(+), 598 deletions(-) diff --git a/app/components/clock.hbs b/app/components/clock.hbs index bb9107f..aa61fdc 100644 --- a/app/components/clock.hbs +++ b/app/components/clock.hbs @@ -8,5 +8,9 @@ flex-1 "> -

{{this.formattedTime}}

+

+

+ {{liquid-bind this.formattedMinutes}}:{{liquid-bind this.formattedSeconds}} +
+

diff --git a/app/components/clock.js b/app/components/clock.js index a9e039c..fec2c25 100644 --- a/app/components/clock.js +++ b/app/components/clock.js @@ -4,10 +4,13 @@ import { inject as service } from '@ember/service'; export default class ClockComponent extends Component { @service presentation; - get formattedTime() { + get formattedMinutes() { let minutes = Math.floor(this.presentation.elapsedTime / 60000).toString() || '0'; - let seconds = ((this.presentation.elapsedTime % 60000) / 1000).toFixed(0).toString() || '0'; + return minutes.padStart(2, '0'); + } - return `${minutes.padStart(2, '0')}:${seconds.padStart(2, '0')}`; + get formattedSeconds() { + let seconds = ((this.presentation.elapsedTime % 60000) / 1000).toFixed(0).toString() || '0'; + return seconds.padStart(2, '0'); } } diff --git a/app/controllers/application.js b/app/controllers/application.js index c9d2d0a..04f89d0 100644 --- a/app/controllers/application.js +++ b/app/controllers/application.js @@ -16,6 +16,7 @@ export default class ApplicationController extends Controller { @tracked speaker; @tracked slide; + @tracked transitionDirection = 'crossFade'; init() { super.init(...arguments); diff --git a/app/styles/app.css b/app/styles/app.css index 9875629..68c0520 100644 --- a/app/styles/app.css +++ b/app/styles/app.css @@ -29,7 +29,16 @@ flex-1 flex-col items-center - justify-center; + justify-center + min-h-screen; +} + +.transitions-container { + @apply w-full min-h-full; +} + +.transitions-container > .liquid-child { + display: flex; } .pagination { diff --git a/app/templates/application.hbs b/app/templates/application.hbs index 59f59d3..9d3b9a7 100644 --- a/app/templates/application.hbs +++ b/app/templates/application.hbs @@ -1,26 +1,28 @@ {{#let (concat "slides/slide-" this.slide) as |Slide|}} - - {{#if this.speaker}} - {{#unless this.presentation.hasStarted}} -
- -
- {{/unless}} + {{#liquid-bind Slide use=this.transitionDirection class="transitions-container" as |Slide|}} + + {{#if this.speaker}} + {{#unless this.presentation.hasStarted}} +
+ +
+ {{/unless}} - - - {{/if}} - + + + {{/if}} + + {{/liquid-bind}} {{/let}} {{#unless this.speaker}} {{/unless}} -{{outlet}} +{{liquid-outlet}} diff --git a/app/transitions.js b/app/transitions.js index afde6f8..0959c99 100644 --- a/app/transitions.js +++ b/app/transitions.js @@ -1,8 +1,6 @@ -// doesn't work in octane even with jquery enabled -// export default function(){ -// this.transition( -// this.toRoute(function(routeName){ return true }), -// this.use('toLeft'), -// this.reverse('toRight') -// ); -// } +export default function() { + this.transition( + this.childOf('#liquid-timer'), + this.use('toUp') + ); +} diff --git a/config/optional-features.json b/config/optional-features.json index 77a734e..062be1d 100644 --- a/config/optional-features.json +++ b/config/optional-features.json @@ -1,5 +1,5 @@ { "application-template-wrapper": false, - "jquery-integration": false, + "jquery-integration": true, "template-only-glimmer-components": true } diff --git a/package-lock.json b/package-lock.json index c851c80..f0144e1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -934,300 +934,60 @@ } } }, - "@ember-data/-build-infra": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/@ember-data/-build-infra/-/-build-infra-3.13.1.tgz", - "integrity": "sha512-bDvnQVPAaQf2UuRsU/6ha444hwdUsUeV5vNsc7U2i6ffzSYiF9y8yQhOoW0JgTUwz0mnASRscOO6QKEUJOTkKA==", - "dev": true, - "requires": { - "@babel/plugin-transform-block-scoping": "^7.5.5", - "@ember/edition-utils": "^1.1.1", - "babel-plugin-debug-macros": "^0.3.2", - "babel-plugin-feature-flags": "^0.3.1", - "babel-plugin-filter-imports": "^3.0.0", - "babel6-plugin-strip-class-callcheck": "^6.0.0", - "broccoli-debug": "^0.6.5", - "broccoli-file-creator": "^2.1.1", - "broccoli-funnel": "^2.0.2", - "broccoli-merge-trees": "^3.0.2", - "broccoli-rollup": "^4.1.1", - "calculate-cache-key-for-tree": "^2.0.0", - "chalk": "^2.4.1", - "ember-cli-path-utils": "^1.0.0", - "ember-cli-string-utils": "^1.1.0", - "ember-cli-version-checker": "^3.1.2", - "esm": "^3.2.25", - "git-repo-info": "^2.0.0", - "glob": "^7.1.4", - "npm-git-info": "^1.0.3", - "rimraf": "^2.6.2", - "rsvp": "^4.8.5", - "silent-error": "^1.1.1" - }, - "dependencies": { - "rsvp": { - "version": "4.8.5", - "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", - "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==", - "dev": true - } - } - }, - "@ember-data/adapter": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/@ember-data/adapter/-/adapter-3.13.1.tgz", - "integrity": "sha512-IpdebSh8B4HlLwkpmpOJUE63U0Q0itI3StsGzZ5i/DIKD6WsMFdux7v8fxRqkW4ZwQDjQdEAtNUUWRILQcWDFw==", - "dev": true, - "requires": { - "@ember-data/-build-infra": "3.13.1", - "@ember/edition-utils": "^1.1.1", - "ember-cli-babel": "^7.8.0", - "ember-cli-test-info": "^1.0.0", - "ember-cli-typescript": "^2.0.2" - } - }, - "@ember-data/canary-features": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/@ember-data/canary-features/-/canary-features-3.13.1.tgz", - "integrity": "sha512-zfLpzcTxux5UPA/E0snGJqbM3yPtcQgWcen45Rcj9AcQNsnYiw/r9HV0uTHzRzeyH7lDMplyvLdQedvyk8K88w==", - "dev": true, - "requires": { - "ember-cli-babel": "^7.8.0" - } - }, - "@ember-data/model": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/@ember-data/model/-/model-3.13.1.tgz", - "integrity": "sha512-lm6AWuBSNp6zMPIjJGN6Dh7u4DJDd8ejOPaS3Cv7r7pgR1ROxRmrjMcgxFdqMY51a/MREj0BfTMWSHKsftcCYA==", - "dev": true, - "requires": { - "@ember-data/-build-infra": "3.13.1", - "@ember-data/store": "3.13.1", - "@ember/edition-utils": "^1.1.1", - "ember-cli-babel": "^7.8.0", - "ember-cli-string-utils": "^1.1.0", - "ember-cli-test-info": "^1.0.0", - "ember-cli-typescript": "^2.0.2", - "ember-compatibility-helpers": "^1.2.0", - "inflection": "1.12.0" - } - }, "@ember-data/rfc395-data": { "version": "0.0.4", "resolved": "https://registry.npmjs.org/@ember-data/rfc395-data/-/rfc395-data-0.0.4.tgz", "integrity": "sha512-tGRdvgC9/QMQSuSuJV45xoyhI0Pzjm7A9o/MVVA3HakXIImJbbzx/k/6dO9CUEQXIyS2y0fW6C1XaYOG7rY0FQ==", "dev": true }, - "@ember-data/serializer": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/@ember-data/serializer/-/serializer-3.13.1.tgz", - "integrity": "sha512-DhTtsvED0KSLy21zBw5NVnSnaJgLEv5vvLUPN1JQyY47Q+auQXi2JXzgTV8mYdTl4Xbe6GYygC0jyPUA4rM8IA==", - "dev": true, - "requires": { - "@ember-data/-build-infra": "3.13.1", - "@ember-data/store": "3.13.1", - "ember-cli-babel": "^7.8.0", - "ember-cli-test-info": "^1.0.0", - "ember-cli-typescript": "^2.0.2" - } - }, - "@ember-data/store": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/@ember-data/store/-/store-3.13.1.tgz", - "integrity": "sha512-7Inhnl3J6yFYE6autfOUPyrNJ63S28OXUM3k4O0pOlvWQbsEPNoELMNPUvjatxRB608qg5Yloh/kVxbdZsM/4w==", - "dev": true, - "requires": { - "@ember-data/-build-infra": "3.13.1", - "@ember-data/adapter": "3.13.1", - "@ember-data/canary-features": "3.13.1", - "ember-cli-babel": "^7.8.0", - "ember-cli-path-utils": "^1.0.0", - "ember-cli-typescript": "^2.0.2", - "heimdalljs": "^0.3.0" - }, - "dependencies": { - "heimdalljs": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/heimdalljs/-/heimdalljs-0.3.3.tgz", - "integrity": "sha1-6S0sb3f9RtW/ULYQ0orTF1UFTQs=", - "dev": true, - "requires": { - "rsvp": "~3.2.1" - } - }, - "rsvp": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.2.1.tgz", - "integrity": "sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=", - "dev": true - } - } - }, "@ember/edition-utils": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@ember/edition-utils/-/edition-utils-1.1.1.tgz", "integrity": "sha512-GEhri78jdQp/xxPpM6z08KlB0wrHfnfrJ9dmQk7JeQ4XCiMzXsJci7yooQgg/IcTKCM/PxE/IkGCQAo80adMkw==", "dev": true }, + "@ember/jquery": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@ember/jquery/-/jquery-1.1.0.tgz", + "integrity": "sha512-zePT3LiK4/2bS4xafrbOlwoLJrDFseOZ95OOuVDyswv8RjFL+9lar+uxX6+jxRb0w900BcQSWP/4nuFSK6HXXw==", + "dev": true, + "requires": { + "broccoli-funnel": "^2.0.2", + "broccoli-merge-trees": "^3.0.2", + "ember-cli-babel": "^7.11.1", + "ember-cli-version-checker": "^3.1.3", + "jquery": "^3.4.1", + "resolve": "^1.11.1" + } + }, "@ember/optional-features": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@ember/optional-features/-/optional-features-1.0.0.tgz", - "integrity": "sha512-nPWqiyjkbSLaNd1kA1Y0BYAx+0IzuxdBfOkQyEwNaaB6xvgGpQMiQF/Au5UBlV/S3GEpuL2kFRQj48XMiTBY+w==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@ember/optional-features/-/optional-features-1.1.0.tgz", + "integrity": "sha512-ST3+gIRH2WtgGcOtf42uM9WaXBY4dj4//zoTYV6GPe8cp0XdJEU63oMo9SbE6+0Efp8lvk96LsX+DVDDZy9Rmw==", "dev": true, "requires": { "chalk": "^2.4.2", "co": "^4.6.0", "ember-cli-version-checker": "^3.1.3", - "glob": "^7.1.4", + "glob": "^7.1.5", "inquirer": "^6.5.1", "mkdirp": "^0.5.1", "silent-error": "^1.1.1", "util.promisify": "^1.0.0" - } - }, - "@ember/ordered-set": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/@ember/ordered-set/-/ordered-set-2.0.3.tgz", - "integrity": "sha512-F4yfVk6WMc4AUHxeZsC3CaKyTvO0qSZJy7WWHCFTlVDQw6vubn+FvnGdhzpN1F00EiXMI4Tv1tJdSquHcCnYrA==", - "dev": true, - "requires": { - "ember-cli-babel": "^6.16.0", - "ember-compatibility-helpers": "^1.1.1" }, "dependencies": { - "amd-name-resolver": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/amd-name-resolver/-/amd-name-resolver-1.2.0.tgz", - "integrity": "sha512-hlSTWGS1t6/xq5YCed7YALg7tKZL3rkl7UwEZ/eCIkn8JxmM6fU6Qs/1hwtjQqfuYxlffuUcgYEm0f5xP4YKaA==", - "dev": true, - "requires": { - "ensure-posix-path": "^1.0.1" - } - }, - "babel-plugin-debug-macros": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz", - "integrity": "sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==", - "dev": true, - "requires": { - "semver": "^5.3.0" - } - }, - "broccoli-babel-transpiler": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.5.1.tgz", - "integrity": "sha512-w6GcnkxvHcNCte5FcLGEG1hUdQvlfvSN/6PtGWU/otg69Ugk8rUk51h41R0Ugoc+TNxyeFG1opRt2RlA87XzNw==", - "dev": true, - "requires": { - "babel-core": "^6.26.0", - "broccoli-funnel": "^2.0.1", - "broccoli-merge-trees": "^2.0.0", - "broccoli-persistent-filter": "^1.4.3", - "clone": "^2.0.0", - "hash-for-dep": "^1.2.3", - "heimdalljs-logger": "^0.1.7", - "json-stable-stringify": "^1.0.0", - "rsvp": "^4.8.2", - "workerpool": "^2.3.0" - } - }, - "broccoli-merge-trees": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-2.0.1.tgz", - "integrity": "sha512-WjaexJ+I8BxP5V5RNn6um/qDRSmKoiBC/QkRi79FT9ClHfldxRyCDs9mcV7mmoaPlsshmmPaUz5jdtcKA6DClQ==", - "dev": true, - "requires": { - "broccoli-plugin": "^1.3.0", - "merge-trees": "^1.0.1" - } - }, - "broccoli-persistent-filter": { - "version": "1.4.6", - "resolved": "https://registry.npmjs.org/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.6.tgz", - "integrity": "sha512-0RejLwoC95kv4kta8KAa+FmECJCK78Qgm8SRDEK7YyU0N9Cx6KpY3UCDy9WELl3mCXLN8TokNxc7/hp3lL4lfw==", - "dev": true, - "requires": { - "async-disk-cache": "^1.2.1", - "async-promise-queue": "^1.0.3", - "broccoli-plugin": "^1.0.0", - "fs-tree-diff": "^0.5.2", - "hash-for-dep": "^1.0.2", - "heimdalljs": "^0.2.1", - "heimdalljs-logger": "^0.1.7", - "mkdirp": "^0.5.1", - "promise-map-series": "^0.2.1", - "rimraf": "^2.6.1", - "rsvp": "^3.0.18", - "symlink-or-copy": "^1.0.1", - "walk-sync": "^0.3.1" - }, - "dependencies": { - "rsvp": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz", - "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==", - "dev": true - } - } - }, - "ember-cli-babel": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz", - "integrity": "sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==", - "dev": true, - "requires": { - "amd-name-resolver": "1.2.0", - "babel-plugin-debug-macros": "^0.2.0-beta.6", - "babel-plugin-ember-modules-api-polyfill": "^2.6.0", - "babel-plugin-transform-es2015-modules-amd": "^6.24.0", - "babel-polyfill": "^6.26.0", - "babel-preset-env": "^1.7.0", - "broccoli-babel-transpiler": "^6.5.0", - "broccoli-debug": "^0.6.4", - "broccoli-funnel": "^2.0.0", - "broccoli-source": "^1.1.0", - "clone": "^2.0.0", - "ember-cli-version-checker": "^2.1.2", - "semver": "^5.5.0" - } - }, - "ember-cli-version-checker": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz", - "integrity": "sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==", - "dev": true, - "requires": { - "resolve": "^1.3.3", - "semver": "^5.3.0" - } - }, - "merge-trees": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-trees/-/merge-trees-1.0.1.tgz", - "integrity": "sha1-zL5nRWl4f53vF/1G5lJfVwC70j4=", - "dev": true, - "requires": { - "can-symlink": "^1.0.0", - "fs-tree-diff": "^0.5.4", - "heimdalljs": "^0.2.1", - "heimdalljs-logger": "^0.1.7", - "rimraf": "^2.4.3", - "symlink-or-copy": "^1.0.0" - } - }, - "rsvp": { - "version": "4.8.5", - "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", - "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==", - "dev": true - }, - "workerpool": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-2.3.3.tgz", - "integrity": "sha512-L1ovlYHp6UObYqElXXpbd214GgbEKDED0d3sj7pRdFXjNkb2+un/AUcCkceHizO0IVI6SOGGncrcjozruCkRgA==", + "glob": { + "version": "7.1.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.5.tgz", + "integrity": "sha512-J9dlskqUXK1OeTOYBEn5s8aMukWMwWfs+rPTn/jn50Ux4MNXVhubL1wu/j2t+H4NVI+cXEcCaYellqaPVGXNqQ==", "dev": true, "requires": { - "object-assign": "4.1.1" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" } } } @@ -1590,18 +1350,6 @@ "integrity": "sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==", "dev": true }, - "@types/broccoli-plugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@types/broccoli-plugin/-/broccoli-plugin-1.3.0.tgz", - "integrity": "sha512-SLk4/hFc2kGvgwNFrpn2O1juxFOllcHAywvlo7VwxfExLzoz1GGJ0oIZCwj5fwSpvHw4AWpZjJ1fUvb62PDayQ==", - "dev": true - }, - "@types/estree": { - "version": "0.0.39", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", - "integrity": "sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==", - "dev": true - }, "@types/events": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/@types/events/-/events-3.0.0.tgz", @@ -2628,12 +2376,6 @@ "ember-rfc176-data": "^0.3.12" } }, - "babel-plugin-feature-flags": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/babel-plugin-feature-flags/-/babel-plugin-feature-flags-0.3.1.tgz", - "integrity": "sha1-nIJ8+aTrmhn3JcyyOehcqwIDb8E=", - "dev": true - }, "babel-plugin-filter-imports": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/babel-plugin-filter-imports/-/babel-plugin-filter-imports-3.0.0.tgz", @@ -3169,12 +2911,6 @@ } } }, - "babel6-plugin-strip-class-callcheck": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/babel6-plugin-strip-class-callcheck/-/babel6-plugin-strip-class-callcheck-6.0.0.tgz", - "integrity": "sha1-3oQcGr6705943gr/ssmlLuIo/d8=", - "dev": true - }, "babylon": { "version": "6.18.0", "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", @@ -4056,61 +3792,6 @@ "postcss": "^7.0.0" } }, - "broccoli-rollup": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/broccoli-rollup/-/broccoli-rollup-4.1.1.tgz", - "integrity": "sha512-hkp0dB5chiemi32t6hLe5bJvxuTOm1TU+SryFlZIs95KT9+94uj0C8w6k6CsZ2HuIdIZg6D252t4gwOlcTXrpA==", - "dev": true, - "requires": { - "@types/broccoli-plugin": "^1.3.0", - "broccoli-plugin": "^2.0.0", - "fs-tree-diff": "^2.0.1", - "heimdalljs": "^0.2.6", - "node-modules-path": "^1.0.1", - "rollup": "^1.12.0", - "rollup-pluginutils": "^2.8.1", - "symlink-or-copy": "^1.2.0", - "walk-sync": "^1.1.3" - }, - "dependencies": { - "broccoli-plugin": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-2.1.0.tgz", - "integrity": "sha512-ElE4caljW4slapyEhSD9jU9Uayc8SoSABWdmY9SqbV8DHNxU6xg1jJsPcMm+cXOvggR3+G+OXAYQeFjWVnznaw==", - "dev": true, - "requires": { - "promise-map-series": "^0.2.1", - "quick-temp": "^0.1.3", - "rimraf": "^2.3.4", - "symlink-or-copy": "^1.1.8" - } - }, - "fs-tree-diff": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fs-tree-diff/-/fs-tree-diff-2.0.1.tgz", - "integrity": "sha512-x+CfAZ/lJHQqwlD64pYM5QxWjzWhSjroaVsr8PW831zOApL55qPibed0c+xebaLWVr2BnHFoHdrwOv8pzt8R5A==", - "dev": true, - "requires": { - "@types/symlink-or-copy": "^1.2.0", - "heimdalljs-logger": "^0.1.7", - "object-assign": "^4.1.0", - "path-posix": "^1.0.0", - "symlink-or-copy": "^1.1.8" - } - }, - "walk-sync": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/walk-sync/-/walk-sync-1.1.4.tgz", - "integrity": "sha512-nowc9thB/Jg0KW4TgxoRjLLYRPvl3DB/98S89r4ZcJqq2B0alNcKDh6pzLkBSkPMzRSMsJghJHQi79qw0YWEkA==", - "dev": true, - "requires": { - "@types/minimatch": "^3.0.3", - "ensure-posix-path": "^1.1.0", - "matcher-collection": "^1.1.1" - } - } - } - }, "broccoli-slow-trees": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/broccoli-slow-trees/-/broccoli-slow-trees-3.0.1.tgz", @@ -7326,15 +7007,6 @@ "integrity": "sha1-ObZ3/CgF9VFzc1N2/O8njqpEUqE=", "dev": true }, - "ember-cli-test-info": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/ember-cli-test-info/-/ember-cli-test-info-1.0.0.tgz", - "integrity": "sha1-7U6WDySel1I8+JHkrtIHLOhFd7Q=", - "dev": true, - "requires": { - "ember-cli-string-utils": "^1.0.0" - } - }, "ember-cli-test-loader": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/ember-cli-test-loader/-/ember-cli-test-loader-2.2.0.tgz", @@ -7638,24 +7310,6 @@ } } }, - "ember-data": { - "version": "3.13.1", - "resolved": "https://registry.npmjs.org/ember-data/-/ember-data-3.13.1.tgz", - "integrity": "sha512-1mxmnvwWXjqfjGXwukHhArJvH829pEdWXiOnZXIDLC2K1PfFHkXxBjONlssGRBPI2rS4Oaa2M6/47uAyZ4mkEA==", - "dev": true, - "requires": { - "@ember-data/-build-infra": "3.13.1", - "@ember-data/adapter": "3.13.1", - "@ember-data/model": "3.13.1", - "@ember-data/serializer": "3.13.1", - "@ember-data/store": "3.13.1", - "@ember/ordered-set": "^2.0.3", - "@glimmer/env": "^0.1.7", - "ember-cli-babel": "^7.8.0", - "ember-cli-typescript": "^2.0.2", - "ember-inflector": "^3.0.1" - } - }, "ember-export-application-global": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/ember-export-application-global/-/ember-export-application-global-2.0.0.tgz", @@ -7883,152 +7537,6 @@ } } }, - "ember-inflector": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ember-inflector/-/ember-inflector-3.0.1.tgz", - "integrity": "sha512-fngrwMsnhkBt51KZgwNwQYxgURwV4lxtoHdjxf7RueGZ5zM7frJLevhHw7pbQNGqXZ3N+MRkhfNOLkdDK9kFdA==", - "dev": true, - "requires": { - "ember-cli-babel": "^6.6.0" - }, - "dependencies": { - "amd-name-resolver": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/amd-name-resolver/-/amd-name-resolver-1.2.0.tgz", - "integrity": "sha512-hlSTWGS1t6/xq5YCed7YALg7tKZL3rkl7UwEZ/eCIkn8JxmM6fU6Qs/1hwtjQqfuYxlffuUcgYEm0f5xP4YKaA==", - "dev": true, - "requires": { - "ensure-posix-path": "^1.0.1" - } - }, - "babel-plugin-debug-macros": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/babel-plugin-debug-macros/-/babel-plugin-debug-macros-0.2.0.tgz", - "integrity": "sha512-Wpmw4TbhR3Eq2t3W51eBAQSdKlr+uAyF0GI4GtPfMCD12Y4cIdpKC9l0RjNTH/P9isFypSqqewMPm7//fnZlNA==", - "dev": true, - "requires": { - "semver": "^5.3.0" - } - }, - "broccoli-babel-transpiler": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/broccoli-babel-transpiler/-/broccoli-babel-transpiler-6.5.1.tgz", - "integrity": "sha512-w6GcnkxvHcNCte5FcLGEG1hUdQvlfvSN/6PtGWU/otg69Ugk8rUk51h41R0Ugoc+TNxyeFG1opRt2RlA87XzNw==", - "dev": true, - "requires": { - "babel-core": "^6.26.0", - "broccoli-funnel": "^2.0.1", - "broccoli-merge-trees": "^2.0.0", - "broccoli-persistent-filter": "^1.4.3", - "clone": "^2.0.0", - "hash-for-dep": "^1.2.3", - "heimdalljs-logger": "^0.1.7", - "json-stable-stringify": "^1.0.0", - "rsvp": "^4.8.2", - "workerpool": "^2.3.0" - } - }, - "broccoli-merge-trees": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-2.0.1.tgz", - "integrity": "sha512-WjaexJ+I8BxP5V5RNn6um/qDRSmKoiBC/QkRi79FT9ClHfldxRyCDs9mcV7mmoaPlsshmmPaUz5jdtcKA6DClQ==", - "dev": true, - "requires": { - "broccoli-plugin": "^1.3.0", - "merge-trees": "^1.0.1" - } - }, - "broccoli-persistent-filter": { - "version": "1.4.6", - "resolved": "https://registry.npmjs.org/broccoli-persistent-filter/-/broccoli-persistent-filter-1.4.6.tgz", - "integrity": "sha512-0RejLwoC95kv4kta8KAa+FmECJCK78Qgm8SRDEK7YyU0N9Cx6KpY3UCDy9WELl3mCXLN8TokNxc7/hp3lL4lfw==", - "dev": true, - "requires": { - "async-disk-cache": "^1.2.1", - "async-promise-queue": "^1.0.3", - "broccoli-plugin": "^1.0.0", - "fs-tree-diff": "^0.5.2", - "hash-for-dep": "^1.0.2", - "heimdalljs": "^0.2.1", - "heimdalljs-logger": "^0.1.7", - "mkdirp": "^0.5.1", - "promise-map-series": "^0.2.1", - "rimraf": "^2.6.1", - "rsvp": "^3.0.18", - "symlink-or-copy": "^1.0.1", - "walk-sync": "^0.3.1" - }, - "dependencies": { - "rsvp": { - "version": "3.6.2", - "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz", - "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==", - "dev": true - } - } - }, - "ember-cli-babel": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/ember-cli-babel/-/ember-cli-babel-6.18.0.tgz", - "integrity": "sha512-7ceC8joNYxY2wES16iIBlbPSxwKDBhYwC8drU3ZEvuPDMwVv1KzxCNu1fvxyFEBWhwaRNTUxSCsEVoTd9nosGA==", - "dev": true, - "requires": { - "amd-name-resolver": "1.2.0", - "babel-plugin-debug-macros": "^0.2.0-beta.6", - "babel-plugin-ember-modules-api-polyfill": "^2.6.0", - "babel-plugin-transform-es2015-modules-amd": "^6.24.0", - "babel-polyfill": "^6.26.0", - "babel-preset-env": "^1.7.0", - "broccoli-babel-transpiler": "^6.5.0", - "broccoli-debug": "^0.6.4", - "broccoli-funnel": "^2.0.0", - "broccoli-source": "^1.1.0", - "clone": "^2.0.0", - "ember-cli-version-checker": "^2.1.2", - "semver": "^5.5.0" - } - }, - "ember-cli-version-checker": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz", - "integrity": "sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==", - "dev": true, - "requires": { - "resolve": "^1.3.3", - "semver": "^5.3.0" - } - }, - "merge-trees": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-trees/-/merge-trees-1.0.1.tgz", - "integrity": "sha1-zL5nRWl4f53vF/1G5lJfVwC70j4=", - "dev": true, - "requires": { - "can-symlink": "^1.0.0", - "fs-tree-diff": "^0.5.4", - "heimdalljs": "^0.2.1", - "heimdalljs-logger": "^0.1.7", - "rimraf": "^2.4.3", - "symlink-or-copy": "^1.0.0" - } - }, - "rsvp": { - "version": "4.8.5", - "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", - "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==", - "dev": true - }, - "workerpool": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-2.3.3.tgz", - "integrity": "sha512-L1ovlYHp6UObYqElXXpbd214GgbEKDED0d3sj7pRdFXjNkb2+un/AUcCkceHizO0IVI6SOGGncrcjozruCkRgA==", - "dev": true, - "requires": { - "object-assign": "4.1.1" - } - } - } - }, "ember-load-initializers": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/ember-load-initializers/-/ember-load-initializers-2.1.0.tgz", @@ -8526,12 +8034,12 @@ } }, "ember-source": { - "version": "https://s3.amazonaws.com/builds.emberjs.com/beta/shas/145ab13849706ed2d2d4225e5dbed37e5bc178bd.tgz", - "integrity": "sha512-oTJh63r2DN9030Nz/68ZWC6RIS9ezpZjsHsNDrIQinqPeF79go+UIS+thCN2GHrs7t99+Z8sp2O20DVGSJTTuw==", + "version": "https://s3.amazonaws.com/builds.emberjs.com/alpha/shas/5272846d417410360f3d4f5abb1aa0f9f4e19ea8.tgz", + "integrity": "sha512-9t7t/+tKo8EuzciqzYGFoI26YG6AS+YV90X1vigdc3TdBJO3kVBpVkZAdgJMtjCQ3H1ZGBxGCLFq+azmRmHkIA==", "dev": true, "requires": { "@babel/helper-module-imports": "^7.0.0", - "@babel/plugin-transform-block-scoping": "^7.6.0", + "@babel/plugin-transform-block-scoping": "^7.6.2", "@babel/plugin-transform-object-assign": "^7.2.0", "@ember/edition-utils": "^1.1.1", "babel-plugin-debug-macros": "^0.3.3", @@ -9390,12 +8898,6 @@ "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "dev": true }, - "estree-walker": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz", - "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==", - "dev": true - }, "esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -13372,12 +12874,6 @@ "integrity": "sha512-qizSNPO93t1YUuUhP22btGOo3chcvDFqFaj2TRybP0DMxkHOCTYwp3n34fel4a31ORXy4m1Xq0Gyqpb5m33qIg==", "dev": true }, - "npm-git-info": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/npm-git-info/-/npm-git-info-1.0.3.tgz", - "integrity": "sha1-qTPELsMh6A02RuDW6ESv6UYw4dU=", - "dev": true - }, "npm-package-arg": { "version": "6.1.1", "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-6.1.1.tgz", @@ -15156,34 +14652,6 @@ "inherits": "^2.0.1" } }, - "rollup": { - "version": "1.24.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.24.0.tgz", - "integrity": "sha512-PiFETY/rPwodQ8TTC52Nz2DSCYUATznGh/ChnxActCr8rV5FIk3afBUb3uxNritQW/Jpbdn3kq1Rwh1HHYMwdQ==", - "dev": true, - "requires": { - "@types/estree": "*", - "@types/node": "*", - "acorn": "^7.1.0" - }, - "dependencies": { - "acorn": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz", - "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==", - "dev": true - } - } - }, - "rollup-pluginutils": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz", - "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==", - "dev": true, - "requires": { - "estree-walker": "^0.6.1" - } - }, "rsvp": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz", diff --git a/package.json b/package.json index 620aab7..12bb861 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,8 @@ }, "devDependencies": { "@ember/edition-utils": "^1.1.1", - "@ember/optional-features": "^1.0.0", + "@ember/jquery": "^1.1.0", + "@ember/optional-features": "^1.1.0", "@ember/render-modifiers": "^1.0.2", "@fullhuman/postcss-purgecss": "^1.3.0", "@glimmer/component": "^0.14.0-alpha.12", @@ -37,14 +38,13 @@ "ember-cli-sri": "^2.1.1", "ember-cli-uglify": "^3.0.0", "ember-code-snippet": "^3.0.0", - "ember-data": "~3.13.0", "ember-export-application-global": "^2.0.0", "ember-load-initializers": "^2.0.0", "ember-maybe-import-regenerator": "^0.1.6", "ember-prism": "^0.5.0", "ember-qunit": "^4.4.1", "ember-resolver": "^5.1.3", - "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/beta/shas/145ab13849706ed2d2d4225e5dbed37e5bc178bd.tgz", + "ember-source": "https://s3.amazonaws.com/builds.emberjs.com/alpha/shas/5272846d417410360f3d4f5abb1aa0f9f4e19ea8.tgz", "ember-svg-jar": "^2.2.3", "ember-template-lint": "^1.5.0", "ember-truth-helpers": "^2.1.0",