Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Re-enable deprecations for importing htmlSafe and isHTMLSafe from @ember/string. They have moved to @ember/template. #20341

Merged
merged 1 commit into from
Jan 3, 2023
+13 −19
Merged

Re-enable deprecations for importing htmlSafe and isHTMLSafe from @ember/string. They have moved to @ember/template. #20341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions packages/@ember/string/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,16 +240,14 @@ function deprecateImportFromString(
name: string,
message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
) {
// Disabling this deprecation due to unintended errors in 3.25
// See https://github.com/emberjs/ember.js/issues/19393 fo more information.
deprecate(message, true, {
deprecate(message, false, {
id: 'ember-string.htmlsafe-ishtmlsafe',
for: 'ember-source',
since: {
available: '3.25',
enabled: '3.25',
available: '4.10',
enabled: '4.10',
},
until: '4.0.0',
until: '5.0.0',
url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
});
}
Expand Down
10 changes: 4 additions & 6 deletions packages/ember/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,16 +637,14 @@ const deprecateImportFromString = function (
name: string,
message = `Importing ${name} from '@ember/string' is deprecated. Please import ${name} from '@ember/template' instead.`
) {
// Disabling this deprecation due to unintended errors in 3.25
// See https://github.com/emberjs/ember.js/issues/19393 fo more information.
deprecate(message, true, {
deprecate(message, false, {
id: 'ember-string.htmlsafe-ishtmlsafe',
for: 'ember-source',
since: {
available: '3.25',
enabled: '3.25',
available: '4.10',
enabled: '4.10',
},
until: '4.0.0',
until: '5.0.0',
url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-string-htmlsafe-ishtmlsafe',
});
};
Expand Down
12 changes: 5 additions & 7 deletions packages/ember/tests/reexports_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Ember from '../index';
import require from 'require';
import { FEATURES } from '@ember/canary-features';
import { AbstractTestCase, confirmExport, moduleFor } from 'internal-test-helpers';
import { DEBUG } from '@glimmer/env';
import require from 'require';

moduleFor(
'ember reexports',
Expand All @@ -20,7 +20,7 @@ moduleFor(
});
}

['@skip Ember.String.htmlSafe exports correctly (but deprecated)'](assert) {
['@test Ember.String.htmlSafe exports correctly (but deprecated)'](assert) {
let glimmer = require('@ember/-internals/glimmer');
expectDeprecation(() => {
assert.equal(
Expand All @@ -32,7 +32,7 @@ moduleFor(
assert.notEqual(glimmer.htmlSafe, undefined, 'Ember.String.htmlSafe is not `undefined`');
}

['@skip Ember.String.isHTMLSafe exports correctly (but deprecated)'](assert) {
['@test Ember.String.isHTMLSafe exports correctly (but deprecated)'](assert) {
let glimmer = require('@ember/-internals/glimmer');
expectDeprecation(() => {
assert.equal(
Expand Down Expand Up @@ -260,15 +260,13 @@ let allExports = [
['String.classify', '@ember/string', 'classify'],
['String.dasherize', '@ember/string', 'dasherize'],
['String.decamelize', '@ember/string', 'decamelize'],
['String.htmlSafe', '@ember/-internals/glimmer', 'htmlSafe'],
['String.isHTMLSafe', '@ember/-internals/glimmer', 'isHTMLSafe'],
['String.underscore', '@ember/string', 'underscore'],
['String.w', '@ember/string', 'w'],
['STRINGS', '@ember/string', { get: '_getStrings', set: '_setStrings' }],

// @ember/template
['String.htmlSafe', '@ember/template', 'htmlSafe'],
['String.isHTMLSafe', '@ember/template', 'isHTMLSafe'],
[null, '@ember/template', 'htmlSafe'],
[null, '@ember/template', 'isHTMLSafe'],

// @ember/template-compilation
['HTMLBars.compile', '@ember/template-compilation', 'compileTemplate'],
Expand Down