diff --git a/lib/overrides.js b/lib/overrides.js index d8d9f4209a6..006d9cc1da6 100644 --- a/lib/overrides.js +++ b/lib/overrides.js @@ -325,8 +325,6 @@ module.exports = class Overrides { toModule() { return ` - export let onEmberGlobalAccess; - ${this.toJS()}; `; } @@ -347,20 +345,6 @@ module.exports = class Overrides { } ${this.onDotAcces} - - onEmberGlobalAccess = ${this.onEmberGlobalAccess}; - - if (!${this.showAllEmberGlobalDeprecations}) { - onEmberGlobalAccess = once(onEmberGlobalAccess); - } - `; - } - - get onEmberGlobalAccess() { - return ` - function onEmberGlobalAccess() { - return ${JSON.stringify(this.globalMessage)}; - } `; } }; diff --git a/packages/@ember/-internals/bootstrap/index.ts b/packages/@ember/-internals/bootstrap/index.ts index 022ef158407..818e29cc74a 100644 --- a/packages/@ember/-internals/bootstrap/index.ts +++ b/packages/@ember/-internals/bootstrap/index.ts @@ -1,64 +1,10 @@ -import { context } from '@ember/-internals/environment'; -import { onEmberGlobalAccess } from '@ember/-internals/overrides'; -import { deprecate } from '@ember/debug'; -import { DEBUG } from '@glimmer/env'; import require from 'require'; (function bootstrap() { - let Ember: unknown; - - let get = () => { - if (!Ember) { - // tslint:disable-next-line: no-require-imports - Ember = require('ember').default; - } - - return Ember; - }; - - if (DEBUG) { - let defaultHandler = () => { - return 'Usage of the Ember Global is deprecated. You should import the Ember module or the specific API instead.'; - }; - - let handler = onEmberGlobalAccess || defaultHandler; - let _get = get; - - get = () => { - let message = handler(); - - if (message !== null) { - deprecate(message, false, { - id: 'ember-global', - until: '4.0.0', - url: 'https://deprecations.emberjs.com/v3.x/#toc_ember-global', - for: 'ember-source', - since: { - enabled: '3.27.0', - }, - }); - } - - return _get(); - }; - } - - function defineEmber(key: string) { - Object.defineProperty(context.exports, key, { - enumerable: true, - configurable: true, - get, - }); - } - - // Bootstrap the global - defineEmber('Ember'); - defineEmber('Em'); - // Bootstrap Node module // eslint-disable-next-line no-undef if (typeof module === 'object' && typeof module.require === 'function') { // tslint:disable-next-line: no-require-imports - module.exports = Ember = require('ember').default; + module.exports = require('ember').default; } })(); diff --git a/packages/@ember/-internals/overrides/index.d.ts b/packages/@ember/-internals/overrides/index.d.ts deleted file mode 100644 index c913783fb1d..00000000000 --- a/packages/@ember/-internals/overrides/index.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -type Callback = (...args: TArgs) => TReturn; - -/** - * Returns a deprecation message or null to skip the deprecation. - */ -type Handler = Callback; -type GlobalAccessHandler = Handler<[]>; - -export let onEmberGlobalAccess: GlobalAccessHandler | undefined; diff --git a/tests/node/fastboot-sandbox-test.js b/tests/node/fastboot-sandbox-test.js index ea9affbe53e..72427206550 100644 --- a/tests/node/fastboot-sandbox-test.js +++ b/tests/node/fastboot-sandbox-test.js @@ -43,7 +43,7 @@ function buildSandboxContext(precompile) { URL, // Convince jQuery not to assume it's in a browser - module: { exports: {} }, + module: { exports: {}, require() {} }, }; // Set the global as `window` @@ -69,6 +69,8 @@ var EmberENV = { emberScript.runInContext(context); let applicationSource = ` +let Ember = module.exports; + class Router extends Ember.Router {} Router.map(function() { this.route('a'); diff --git a/tests/node/overrides-test.js b/tests/node/overrides-test.js index 07dc930c30b..ab6f98e31c8 100644 --- a/tests/node/overrides-test.js +++ b/tests/node/overrides-test.js @@ -125,20 +125,6 @@ function infoForApp({ // }; // } -function evalJS(overrides) { - return eval(` - (function () { - let onEmberGlobalAccess; - - ${overrides.toJS()} - - return { - onEmberGlobalAccess: onEmberGlobalAccess, - }; - })() - `); -} - QUnit.module('Overrides', function () { QUnit.module('.addonsInfoFor', function () { // app @@ -593,39 +579,6 @@ QUnit.module('Overrides', function () { assert.strictEqual(overrides.hasActionableSuggestions, true, 'hasActionableSuggestions'); assert.strictEqual(overrides.hasCompatibleAddons, false, 'hasCompatibleAddons'); assert.strictEqual(overrides.hasDormantAddons, false, 'hasDormantAddons'); - assert.strictEqual( - overrides.showAllEmberGlobalDeprecations, - false, - 'showAllEmberGlobalDeprecations' - ); - assert.deepEqual(overrides.suggestions, [ - 'Upgrade your `devDependencies` on `ember-cli-babel` to `^7.26.6`.', - ]); - assert.equal( - overrides.outdated.length, - 1 /* number of different old babel versions */, - 'outdated.length' - ); - assert.ok( - overrides.buildTimeWarning.startsWith( - '[DEPRECATION] Usage of the Ember Global is deprecated.' - ), - 'overrides.buildTimeWarning' - ); - assert.ok( - overrides.globalMessage.startsWith('Usage of the Ember Global is deprecated.'), - 'overrides.globalMessage' - ); - - let { onEmberGlobalAccess } = evalJS(overrides); - - assert.equal( - onEmberGlobalAccess(), - overrides.globalMessage, - 'onEmberGlobalAccess() (first call)' - ); - - assert.strictEqual(onEmberGlobalAccess(), null, 'onEmberGlobalAccess() (second call)'); }); // let project, env;