Skip to content

Commit eaff12e

Browse files
Merge pull request #8 from NullVoxPopuli/ensure-no-deprecations
Ensure no deprecations
2 parents 7ba31ed + 83165a9 commit eaff12e

File tree

7 files changed

+68
-12
lines changed

7 files changed

+68
-12
lines changed

pnpm-lock.yaml

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

test-app-ember-resources-7/app/app.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
import Application from '@ember/application';
2+
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
23

34
import loadInitializers from 'ember-load-initializers';
45
import Resolver from 'ember-resolver';
56
import config from 'test-app/config/environment';
67

8+
if (macroCondition(isDevelopingApp())) {
9+
importSync('test-app/deprecation-workflow');
10+
}
11+
712
export default class App extends Application {
813
modulePrefix = config.modulePrefix;
914
podModulePrefix = config.podModulePrefix;
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { registerDeprecationHandler } from '@ember/debug';
2+
3+
import config from 'test-app/config/environment';
4+
5+
const SHOULD_THROW = config.environment !== 'production';
6+
const SILENCED_DEPRECATIONS: string[] = [
7+
// Add ids of deprecations you temporarily want to silence here.
8+
];
9+
10+
registerDeprecationHandler((message, options, next) => {
11+
if (!options) {
12+
console.error('Missing options');
13+
throw new Error(message);
14+
}
15+
16+
if (SILENCED_DEPRECATIONS.includes(options.id)) {
17+
return;
18+
} else if (SHOULD_THROW) {
19+
throw new Error(message);
20+
}
21+
22+
next(message, options);
23+
});

test-app-ember-resources-7/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@babel/eslint-parser": "^7.19.1",
4646
"@ember/optional-features": "^2.0.0",
4747
"@ember/string": "^3.0.1",
48-
"@ember/test-helpers": "^3.0.3",
48+
"@ember/test-helpers": "^3.2.1",
4949
"@embroider/compat": "^3.1.5",
5050
"@embroider/core": "^3.1.3",
5151
"@embroider/test-setup": "^3.0.1",

test-app/app/app.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
import Application from '@ember/application';
2+
import { importSync, isDevelopingApp, macroCondition } from '@embroider/macros';
23

34
import loadInitializers from 'ember-load-initializers';
45
import Resolver from 'ember-resolver';
56
import config from 'test-app/config/environment';
67

8+
if (macroCondition(isDevelopingApp())) {
9+
importSync('test-app/deprecation-workflow');
10+
}
11+
712
export default class App extends Application {
813
modulePrefix = config.modulePrefix;
914
podModulePrefix = config.podModulePrefix;
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
import { registerDeprecationHandler } from '@ember/debug';
2+
3+
import config from 'test-app/config/environment';
4+
5+
const SHOULD_THROW = config.environment !== 'production';
6+
const SILENCED_DEPRECATIONS: string[] = [
7+
// Add ids of deprecations you temporarily want to silence here.
8+
];
9+
10+
registerDeprecationHandler((message, options, next) => {
11+
if (!options) {
12+
console.error('Missing options');
13+
throw new Error(message);
14+
}
15+
16+
if (SILENCED_DEPRECATIONS.includes(options.id)) {
17+
return;
18+
} else if (SHOULD_THROW) {
19+
throw new Error(message);
20+
}
21+
22+
next(message, options);
23+
});

test-app/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"@babel/eslint-parser": "^7.19.1",
4646
"@ember/optional-features": "^2.0.0",
4747
"@ember/string": "^3.0.1",
48-
"@ember/test-helpers": "^3.0.3",
48+
"@ember/test-helpers": "^3.2.1",
4949
"@embroider/compat": "^3.1.5",
5050
"@embroider/core": "^3.1.3",
5151
"@embroider/test-setup": "^3.0.1",

0 commit comments

Comments
 (0)