Skip to content

Commit a4dd069

Browse files
authored
Unsilence ember.globals-resolver deprecation (#1663)
- Ticket: [ENG-4004] ## Purpose Stop tripping the warning for ember.globals-resolver deprecation. ## Summary of Changes 1. Stop using ember-cli-shims, which we don't _seem_ to need anymore. 2. Update the prerender instance initializer test to prevent a future problem when upgrading to 4.0 that wasn't caught by the deprecation. ## Side Effects ember-cli-shims has been removed and re-added before, and I'm not sure why it was re-added. But everything builds, and tests run, so as long as selenium and percy does fine, we're probably okay.
1 parent 2c2a9fa commit a4dd069

File tree

4 files changed

+12
-19
lines changed

4 files changed

+12
-19
lines changed

config/deprecation-workflow.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
self.deprecationWorkflow = self.deprecationWorkflow || {};
22
self.deprecationWorkflow.config = {
33
workflow: [
4-
{ handler: 'silence', matchId: 'ember.globals-resolver' },
54
{ handler: 'silence', matchId: 'ember-inflector.globals' },
65
{ handler: 'silence', matchId: 'ember-metal.get-with-default' },
76
{ handler: 'silence', matchId: 'computed-property.volatile' },

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@
138138
"ember-cli-release": "^1.0.0-beta.2",
139139
"ember-cli-sanitize-html": "^2.0.3",
140140
"ember-cli-sass": "^10.0.0",
141-
"ember-cli-shims": "^1.2.0",
142141
"ember-cli-showdown": "^4.4.4",
143142
"ember-cli-sri": "^2.1.1",
144143
"ember-cli-string-helpers": "^5.0.0",

tests/unit/instance-initializers/prerender-test.ts

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ import Application from '@ember/application';
22
import ApplicationInstance from '@ember/application/instance';
33
import { run } from '@ember/runloop';
44
import Service from '@ember/service';
5+
import config from 'ember-get-config';
6+
import Resolver from 'ember-resolver';
57

68
import { initialize } from 'ember-osf-web/instance-initializers/prerender';
79
import { TestContext } from 'ember-test-helpers';
@@ -19,18 +21,24 @@ interface Context extends TestContext {
1921
instance: ApplicationInstance;
2022
}
2123

24+
const { modulePrefix } = config;
25+
2226
module('Unit | Instance Initializer | prerender', hooks => {
2327
hooks.beforeEach(function(this: Context) {
24-
this.TestApplication = Application.extend();
28+
this.TestApplication = class TestApplication extends Application {
29+
modulePrefix = modulePrefix;
30+
Resolver = Resolver;
31+
};
2532
this.TestApplication.instanceInitializer({
2633
name: 'initializer under test',
2734
initialize,
2835
});
2936

3037
this.application = this.TestApplication.create({ autoboot: false });
31-
this.application.register('service:ready', ReadyStub);
3238

3339
this.instance = this.application.buildInstance();
40+
this.instance.register('service:ready', ReadyStub);
41+
3442
window.prerenderReady = false;
3543
});
3644

@@ -41,9 +49,7 @@ module('Unit | Instance Initializer | prerender', hooks => {
4149

4250
test('it sets prerenderReady', async function(this: Context, assert) {
4351
assert.notOk(window.prerenderReady, 'prerenderReady starts false');
44-
4552
await this.instance.boot();
46-
4753
assert.ok(window.prerenderReady, 'prerenderReady set true');
4854
});
4955
});

yarn.lock

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9279,17 +9279,6 @@ ember-cli-sass@^10.0.0:
92799279
broccoli-sass-source-maps "^4.0.0"
92809280
ember-cli-version-checker "^2.1.0"
92819281

9282-
ember-cli-shims@^1.2.0:
9283-
version "1.2.0"
9284-
resolved "https://registry.yarnpkg.com/ember-cli-shims/-/ember-cli-shims-1.2.0.tgz#0f53aff0aab80b5f29da3a9731bac56169dd941f"
9285-
integrity sha1-D1Ov8Kq4C18p2jqXMbrFYWndlB8=
9286-
dependencies:
9287-
broccoli-file-creator "^1.1.1"
9288-
broccoli-merge-trees "^2.0.0"
9289-
ember-cli-version-checker "^2.0.0"
9290-
ember-rfc176-data "^0.3.1"
9291-
silent-error "^1.0.1"
9292-
92939282
ember-cli-showdown@^4.4.4:
92949283
version "4.5.0"
92959284
resolved "https://registry.yarnpkg.com/ember-cli-showdown/-/ember-cli-showdown-4.5.0.tgz#6ea0d28ced62fd5feb92799bc90d6a4857ceb5a7"
@@ -9488,7 +9477,7 @@ ember-cli-version-checker@^1.0.2:
94889477
dependencies:
94899478
semver "^5.3.0"
94909479

9491-
ember-cli-version-checker@^2.0.0, ember-cli-version-checker@^2.1.0, ember-cli-version-checker@^2.1.2:
9480+
ember-cli-version-checker@^2.1.0, ember-cli-version-checker@^2.1.2:
94929481
version "2.2.0"
94939482
resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3"
94949483
integrity sha512-G+KtYIVlSOWGcNaTFHk76xR4GdzDLzAS4uxZUKdASuFX0KJE43C6DaqL+y3VTpUFLI2FIkAS6HZ4I1YBi+S3hg==
@@ -10345,7 +10334,7 @@ ember-responsive@^3.0.0:
1034510334
dependencies:
1034610335
ember-cli-babel "^7.19.0"
1034710336

10348-
ember-rfc176-data@^0.3.1, ember-rfc176-data@^0.3.12, ember-rfc176-data@^0.3.13, ember-rfc176-data@^0.3.15, ember-rfc176-data@^0.3.17:
10337+
ember-rfc176-data@^0.3.12, ember-rfc176-data@^0.3.13, ember-rfc176-data@^0.3.15, ember-rfc176-data@^0.3.17:
1034910338
version "0.3.17"
1035010339
resolved "https://registry.yarnpkg.com/ember-rfc176-data/-/ember-rfc176-data-0.3.17.tgz#d4fc6c33abd6ef7b3440c107a28e04417b49860a"
1035110340
integrity sha512-EVzTTKqxv9FZbEh6Ktw56YyWRAA0MijKvl7H8C06wVF+8f/cRRz3dXxa4nkwjzyVwx4rzKGuIGq77hxJAQhWWw==

0 commit comments

Comments
 (0)