fix(core): improve global variable detection (#28679)
Closes #16545 PR Close #28679
This commit is contained in:
parent
553f80ff46
commit
77eee42963
@ -12,14 +12,23 @@ declare var WorkerGlobalScope: any /** TODO #9100 */;
|
|||||||
// We don't want to include the whole node.d.ts this this compilation unit so we'll just fake
|
// We don't want to include the whole node.d.ts this this compilation unit so we'll just fake
|
||||||
// the global "global" var for now.
|
// the global "global" var for now.
|
||||||
declare var global: any /** TODO #9100 */;
|
declare var global: any /** TODO #9100 */;
|
||||||
|
// Not yet available in TypeScript: https://github.com/Microsoft/TypeScript/pull/29332
|
||||||
|
declare var globalThis: any /** TODO #9100 */;
|
||||||
|
|
||||||
|
function getGlobal(): any {
|
||||||
|
const __globalThis = typeof globalThis !== 'undefined' && globalThis;
|
||||||
const __window = typeof window !== 'undefined' && window;
|
const __window = typeof window !== 'undefined' && window;
|
||||||
const __self = typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'undefined' &&
|
const __self = typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'undefined' &&
|
||||||
self instanceof WorkerGlobalScope && self;
|
self instanceof WorkerGlobalScope && self;
|
||||||
const __global = typeof global !== 'undefined' && global;
|
const __global = typeof global !== 'undefined' && global;
|
||||||
|
|
||||||
// Check __global first, because in Node tests both __global and __window may be defined and _global
|
// Always use __globalThis if available, which is the spec-defined global variable across all
|
||||||
// should be __global in that case.
|
// environments, then fallback to __global first, because in Node tests both __global and
|
||||||
const _global: {[name: string]: any} = __global || __window || __self;
|
// __window may be defined and _global should be __global in that case.
|
||||||
|
return __globalThis || __global || __window || __self;
|
||||||
|
}
|
||||||
|
|
||||||
|
const _global = getGlobal();
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Attention: whenever providing a new value, be sure to add an
|
* Attention: whenever providing a new value, be sure to add an
|
||||||
|
@ -143,15 +143,9 @@
|
|||||||
{
|
{
|
||||||
"name": "ViewEncapsulation"
|
"name": "ViewEncapsulation"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "__self"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "__values"
|
"name": "__values"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "__window"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "_currentNamespace"
|
"name": "_currentNamespace"
|
||||||
},
|
},
|
||||||
@ -329,6 +323,9 @@
|
|||||||
{
|
{
|
||||||
"name": "getElementDepthCount"
|
"name": "getElementDepthCount"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "getGlobal"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "getHighestElementOrICUContainer"
|
"name": "getHighestElementOrICUContainer"
|
||||||
},
|
},
|
||||||
|
@ -116,15 +116,9 @@
|
|||||||
{
|
{
|
||||||
"name": "ViewEncapsulation"
|
"name": "ViewEncapsulation"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "__self"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "__values"
|
"name": "__values"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "__window"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "_global"
|
"name": "_global"
|
||||||
},
|
},
|
||||||
@ -239,6 +233,9 @@
|
|||||||
{
|
{
|
||||||
"name": "getDirectiveDef"
|
"name": "getDirectiveDef"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "getGlobal"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "getHighestElementOrICUContainer"
|
"name": "getHighestElementOrICUContainer"
|
||||||
},
|
},
|
||||||
|
@ -278,18 +278,12 @@
|
|||||||
{
|
{
|
||||||
"name": "__read"
|
"name": "__read"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "__self"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "__spread"
|
"name": "__spread"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"name": "__values"
|
"name": "__values"
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"name": "__window"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"name": "_c0"
|
"name": "_c0"
|
||||||
},
|
},
|
||||||
@ -680,6 +674,9 @@
|
|||||||
{
|
{
|
||||||
"name": "getErrorLogger"
|
"name": "getErrorLogger"
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
"name": "getGlobal"
|
||||||
|
},
|
||||||
{
|
{
|
||||||
"name": "getHighestElementOrICUContainer"
|
"name": "getHighestElementOrICUContainer"
|
||||||
},
|
},
|
||||||
|
25
packages/core/test/util/global_spec.ts
Normal file
25
packages/core/test/util/global_spec.ts
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
/**
|
||||||
|
* @license
|
||||||
|
* Copyright Google Inc. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Use of this source code is governed by an MIT-style license that can be
|
||||||
|
* found in the LICENSE file at https://angular.io/license
|
||||||
|
*/
|
||||||
|
|
||||||
|
import {global} from '../../src/util/global';
|
||||||
|
|
||||||
|
// Not yet available in TypeScript: https://github.com/Microsoft/TypeScript/pull/29332
|
||||||
|
declare var globalThis: any /** TODO #9100 */;
|
||||||
|
|
||||||
|
{
|
||||||
|
describe('global', () => {
|
||||||
|
it('should be global this value', () => {
|
||||||
|
const _global = new Function('return this')();
|
||||||
|
expect(global).toBe(_global);
|
||||||
|
});
|
||||||
|
|
||||||
|
if (typeof globalThis !== 'undefined') {
|
||||||
|
it('should use globalThis as global reference', () => { expect(global).toBe(globalThis); });
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user