From 71c46d5253ceb9d1609486abaf1e9bcec8c6fb10 Mon Sep 17 00:00:00 2001 From: Gavin Joyce Date: Wed, 17 Oct 2018 14:38:29 +0100 Subject: [PATCH] upgrade to Ember 3.4 use `Ember.run.backburner.queueNames` instead of `Ember.run.queues` --- ember-model.js | 2 +- package-lock.json | 150 +++++++++--------- package.json | 2 +- packages/ember-model/lib/model.js | 2 +- .../tests/adapter/custom_adapter_test.js | 2 +- 5 files changed, 79 insertions(+), 79 deletions(-) diff --git a/ember-model.js b/ember-model.js index 9404d8a..de4fdc7 100644 --- a/ember-model.js +++ b/ember-model.js @@ -553,7 +553,7 @@ function isDescriptor(value) { return value && typeof value === 'object' && value.isDescriptor; } -Ember.run.queues.push('data'); +Ember.run.backburner.queueNames.push('data'); Ember.Model = Ember.Object.extend(Ember.Evented, { isLoaded: true, diff --git a/package-lock.json b/package-lock.json index 4cd966a..1589dcc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -468,11 +468,11 @@ "requires": { "array-equal": "1.0.0", "blank-object": "1.0.2", - "broccoli-plugin": "1.3.0", + "broccoli-plugin": "1.3.1", "debug": "2.6.9", "fast-ordered-set": "1.0.3", - "fs-tree-diff": "0.5.7", - "heimdalljs": "0.2.5", + "fs-tree-diff": "0.5.9", + "heimdalljs": "0.2.6", "minimatch": "3.0.4", "mkdirp": "0.5.1", "path-posix": "1.0.0", @@ -491,9 +491,9 @@ } }, "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { "fs.realpath": "1.0.0", @@ -519,25 +519,25 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "7.1.3" } } } }, "broccoli-merge-trees": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/broccoli-merge-trees/-/broccoli-merge-trees-2.0.0.tgz", - "integrity": "sha1-EK6kbdXOvMi499WlTwqEpPC7kLk=", + "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", + "broccoli-plugin": "1.3.1", "merge-trees": "1.0.1" } }, "broccoli-plugin": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-1.3.0.tgz", - "integrity": "sha1-vucEqOQtoIy1jlE6qkNu+38O8e4=", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/broccoli-plugin/-/broccoli-plugin-1.3.1.tgz", + "integrity": "sha512-DW8XASZkmorp+q7J4EeDEZz+LoyKLAd2XZULXyD9l4m9/hAKV3vjHmB1kiUshcWAYMgTP1m2i4NnqCE/23h6AQ==", "dev": true, "requires": { "promise-map-series": "0.2.3", @@ -547,9 +547,9 @@ }, "dependencies": { "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { "fs.realpath": "1.0.0", @@ -575,7 +575,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "7.1.3" } } } @@ -743,6 +743,12 @@ "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", "dev": true }, + "coffee-script": { + "version": "1.12.7", + "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz", + "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==", + "dev": true + }, "coffeescript": { "version": "1.10.0", "resolved": "https://registry.npmjs.org/coffeescript/-/coffeescript-1.10.0.tgz", @@ -1158,7 +1164,7 @@ "integrity": "sha1-CxT3vLxZmqEXtf3cgeT9A8S61bc=", "dev": true, "requires": { - "silent-error": "1.1.0" + "silent-error": "1.1.1" } }, "ember-cli-path-utils": { @@ -1179,23 +1185,23 @@ "integrity": "sha1-cVUM44fgIzBl8wswsVEKot++h+8=", "dev": true, "requires": { - "silent-error": "1.1.0" + "silent-error": "1.1.1" } }, "ember-cli-version-checker": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-2.1.0.tgz", - "integrity": "sha512-ssiNyVTp+PphroFum8guHX9py4xU1PCxkRYgb25NxumgjpKTPjhkgTfpRRKXlIQe+/wVMmhf+Uv6w9vSLZKWKQ==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ember-cli-version-checker/-/ember-cli-version-checker-2.1.2.tgz", + "integrity": "sha512-sjkHGr4IGXnO3EUcY21380Xo9Qf6bC8HWH4D62bVnrQop/8uha5XgMQRoAflMCeH6suMrezQL287JUoYc2smEw==", "dev": true, "requires": { - "resolve": "1.7.1", + "resolve": "1.8.1", "semver": "5.5.0" }, "dependencies": { "resolve": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", - "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", + "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "dev": true, "requires": { "path-parse": "1.0.5" @@ -1213,30 +1219,30 @@ } }, "ember-source": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ember-source/-/ember-source-3.0.0.tgz", - "integrity": "sha1-UYEcrpjSzuxTvPuqh20CsrWyFZ8=", + "version": "3.1.0", + "resolved": "http://registry.npmjs.org/ember-source/-/ember-source-3.1.0.tgz", + "integrity": "sha512-ajj7vCpCNJwhZaeIYrjI0SXMxNB6sZuYLOgF2+5PzI2n4G1t+Y95YCu3M8KNN248vdiiQbgHX6Wa7Cf6gC7j/Q==", "dev": true, "requires": { "broccoli-funnel": "2.0.1", - "broccoli-merge-trees": "2.0.0", + "broccoli-merge-trees": "2.0.1", "ember-cli-get-component-path-option": "1.0.0", "ember-cli-is-package-missing": "1.0.0", "ember-cli-normalize-entity-name": "1.0.0", "ember-cli-path-utils": "1.0.0", "ember-cli-string-utils": "1.1.0", "ember-cli-valid-component-name": "1.0.0", - "ember-cli-version-checker": "2.1.0", + "ember-cli-version-checker": "2.1.2", "ember-router-generator": "1.2.3", "inflection": "1.12.0", "jquery": "3.3.1", - "resolve": "1.7.1" + "resolve": "1.8.1" }, "dependencies": { "resolve": { - "version": "1.7.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.7.1.tgz", - "integrity": "sha512-c7rwLofp8g1U+h1KNyHL/jicrKg1Ek4q+Lr33AL65uZTinUZHe30D5HlyN5V9NW0JX1D5dXQ4jqW5l7Sy/kGfw==", + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", + "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", "dev": true, "requires": { "path-parse": "1.0.5" @@ -2053,12 +2059,12 @@ } }, "fs-tree-diff": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/fs-tree-diff/-/fs-tree-diff-0.5.7.tgz", - "integrity": "sha512-dJwDX6NBH7IfdfFjZAdHCZ6fIKc8LwR7kzqUhYRFJuX4g9ctG/7cuqJuwegGQsyLEykp6Z4krq+yIFMQlt7d9Q==", + "version": "0.5.9", + "resolved": "https://registry.npmjs.org/fs-tree-diff/-/fs-tree-diff-0.5.9.tgz", + "integrity": "sha512-872G8ax0kHh01m9n/2KDzgYwouKza0Ad9iFltBpNykvROvf2AGtoOzPJgGx125aolGPER3JuC7uZFrQ7bG1AZw==", "dev": true, "requires": { - "heimdalljs-logger": "0.1.9", + "heimdalljs-logger": "0.1.10", "object-assign": "4.1.1", "path-posix": "1.0.0", "symlink-or-copy": "1.2.0" @@ -3360,7 +3366,7 @@ "dependencies": { "semver": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-1.1.4.tgz", + "resolved": "http://registry.npmjs.org/semver/-/semver-1.1.4.tgz", "integrity": "sha1-LlpOcrqwNHLMl/cnU7RQiRLvVUA=", "dev": true } @@ -3419,12 +3425,6 @@ "integrity": "sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=", "dev": true }, - "coffee-script": { - "version": "1.12.7", - "resolved": "https://registry.npmjs.org/coffee-script/-/coffee-script-1.12.7.tgz", - "integrity": "sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==", - "dev": true - }, "connect": { "version": "2.19.6", "resolved": "https://registry.npmjs.org/connect/-/connect-2.19.6.tgz", @@ -3474,7 +3474,7 @@ }, "debug": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-1.0.2.tgz", + "resolved": "http://registry.npmjs.org/debug/-/debug-1.0.2.tgz", "integrity": "sha1-OElZHBDM5khHbDx8Li40FttZY8Q=", "dev": true, "requires": { @@ -3495,7 +3495,7 @@ }, "ms": { "version": "0.6.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-0.6.2.tgz", + "resolved": "http://registry.npmjs.org/ms/-/ms-0.6.2.tgz", "integrity": "sha1-2JwhJMb9wTU9Zai3e/GqxLGTcIw=", "dev": true }, @@ -3634,9 +3634,9 @@ } }, "heimdalljs": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/heimdalljs/-/heimdalljs-0.2.5.tgz", - "integrity": "sha1-aqVDCO7nk7ZCz/nPlHgURfN3MKw=", + "version": "0.2.6", + "resolved": "https://registry.npmjs.org/heimdalljs/-/heimdalljs-0.2.6.tgz", + "integrity": "sha512-o9bd30+5vLBvBtzCPwwGqpry2+n0Hi6H1+qwt6y+0kwRHGGF8TFIhJPmnuM0xO97zaKrDZMwO/V56fAnn8m/tA==", "dev": true, "requires": { "rsvp": "3.2.1" @@ -3644,20 +3644,20 @@ "dependencies": { "rsvp": { "version": "3.2.1", - "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.2.1.tgz", + "resolved": "http://registry.npmjs.org/rsvp/-/rsvp-3.2.1.tgz", "integrity": "sha1-B8tKXfJa3Z6Cbrxn3Mn9idsn2Eo=", "dev": true } } }, "heimdalljs-logger": { - "version": "0.1.9", - "resolved": "https://registry.npmjs.org/heimdalljs-logger/-/heimdalljs-logger-0.1.9.tgz", - "integrity": "sha1-12raTkW3u294b8nAEKaOsuL68XY=", + "version": "0.1.10", + "resolved": "https://registry.npmjs.org/heimdalljs-logger/-/heimdalljs-logger-0.1.10.tgz", + "integrity": "sha512-pO++cJbhIufVI/fmB/u2Yty3KJD0TqNPecehFae0/eps0hkZ3b4Zc/PezUMOpYuHFQbA7FxHZxa305EhmjLj4g==", "dev": true, "requires": { "debug": "2.6.9", - "heimdalljs": "0.2.5" + "heimdalljs": "0.2.6" }, "dependencies": { "debug": { @@ -4338,17 +4338,17 @@ "dev": true, "requires": { "can-symlink": "1.0.0", - "fs-tree-diff": "0.5.7", - "heimdalljs": "0.2.5", - "heimdalljs-logger": "0.1.9", + "fs-tree-diff": "0.5.9", + "heimdalljs": "0.2.6", + "heimdalljs-logger": "0.1.10", "rimraf": "2.6.2", "symlink-or-copy": "1.2.0" }, "dependencies": { "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { "fs.realpath": "1.0.0", @@ -4374,7 +4374,7 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "7.1.3" } } } @@ -5102,13 +5102,13 @@ "requires": { "mktemp": "0.4.0", "rimraf": "2.6.2", - "underscore.string": "3.3.4" + "underscore.string": "3.3.5" }, "dependencies": { "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", + "version": "7.1.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz", + "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==", "dev": true, "requires": { "fs.realpath": "1.0.0", @@ -5134,13 +5134,13 @@ "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", "dev": true, "requires": { - "glob": "7.1.2" + "glob": "7.1.3" } }, "underscore.string": { - "version": "3.3.4", - "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.4.tgz", - "integrity": "sha1-LCo/n4PmR2L9xF5s6sZRQoZCE9s=", + "version": "3.3.5", + "resolved": "https://registry.npmjs.org/underscore.string/-/underscore.string-3.3.5.tgz", + "integrity": "sha512-g+dpmgn+XBneLmXXo+sGlW5xQEt4ErkS3mgeN2GFbremYeMBSJKr9Wf2KJplQVaiPY/f7FN6atosWYNm9ovrYg==", "dev": true, "requires": { "sprintf-js": "1.0.3", @@ -6041,9 +6041,9 @@ "dev": true }, "silent-error": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/silent-error/-/silent-error-1.1.0.tgz", - "integrity": "sha1-IglwbxyFCp8dENDYQJGLRvJuG8k=", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/silent-error/-/silent-error-1.1.1.tgz", + "integrity": "sha512-n4iEKyNcg4v6/jpb3c0/iyH2G1nzUNl7Gpqtn/mHIJK9S/q/7MCfoO4rwVOoO59qPFIc0hVHvMbiOJ0NdtxKKw==", "dev": true, "requires": { "debug": "2.6.9" diff --git a/package.json b/package.json index f1c351e..7999710 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "author": "no", "license": "MIT", "devDependencies": { - "ember-source": "3.0.0", + "ember-source": "3.4.0", "glob": "~3.2.1", "grunt": "~1.0.1", "grunt-contrib-clean": "~0.4.1", diff --git a/packages/ember-model/lib/model.js b/packages/ember-model/lib/model.js index 1f4bdc4..fcb6250 100644 --- a/packages/ember-model/lib/model.js +++ b/packages/ember-model/lib/model.js @@ -39,7 +39,7 @@ function isDescriptor(value) { return value && typeof value === 'object' && value.isDescriptor; } -Ember.run.queues.push('data'); +Ember.run.backburner.queueNames.push('data'); Ember.Model = Ember.Object.extend(Ember.Evented, { isLoaded: true, diff --git a/packages/ember-model/tests/adapter/custom_adapter_test.js b/packages/ember-model/tests/adapter/custom_adapter_test.js index 3e3641b..bd77877 100644 --- a/packages/ember-model/tests/adapter/custom_adapter_test.js +++ b/packages/ember-model/tests/adapter/custom_adapter_test.js @@ -15,5 +15,5 @@ QUnit.test("throws an error message with class name", function(assert) { assert.throws(function() { Ember.run(CustomModel, CustomModel.find(1)); - }, /Ember.CustomAdapter must implement find/); + }, /must implement find/); }); \ No newline at end of file