Skip to content

Commit 9a1b192

Browse files
committed
Remove environment configuration
1 parent 916ff18 commit 9a1b192

43 files changed

Lines changed: 108 additions & 597 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

lib/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,6 @@ const shim = addonV1Shim(path.join(__dirname, '..'), {
137137
'./dist/dev/packages/@glimmer/destroyable/index.js',
138138
'./dist/dev/packages/@glimmer/encoder/index.js',
139139
'./dist/dev/packages/@glimmer/env/index.js',
140-
'./dist/dev/packages/@glimmer/global-context/index.js',
141140
'./dist/dev/packages/@glimmer/manager/index.js',
142141
'./dist/dev/packages/@glimmer/node/index.js',
143142
'./dist/dev/packages/@glimmer/opcode-compiler/index.js',

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -319,7 +319,6 @@
319319
"@glimmer/destroyable/index.js": "ember-source/@glimmer/destroyable/index.js",
320320
"@glimmer/encoder/index.js": "ember-source/@glimmer/encoder/index.js",
321321
"@glimmer/env/index.js": "ember-source/@glimmer/env/index.js",
322-
"@glimmer/global-context/index.js": "ember-source/@glimmer/global-context/index.js",
323322
"@glimmer/manager/index.js": "ember-source/@glimmer/manager/index.js",
324323
"@glimmer/node/index.js": "ember-source/@glimmer/node/index.js",
325324
"@glimmer/opcode-compiler/index.js": "ember-source/@glimmer/opcode-compiler/index.js",
Lines changed: 8 additions & 111 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,16 @@
11
import { ENV } from '@ember/-internals/environment';
2-
import { get, set, _getProp, _setProp } from '@ember/-internals/metal';
3-
import type { InternalOwner } from '@ember/-internals/owner';
42
import { getDebugName } from '@ember/-internals/utils';
5-
import { constructStyleDeprecationMessage } from '@ember/-internals/views';
6-
import { assert, deprecate, warn } from '@ember/debug';
7-
import type { DeprecationOptions } from '@ember/debug';
83
import { schedule, _backburner } from '@ember/runloop';
4+
import { setDestructionSchedulers } from '@glimmer/destroyable';
95
import { DEBUG } from '@glimmer/env';
10-
import setGlobalContext from '@glimmer/global-context';
116
import type { EnvironmentDelegate } from '@glimmer/runtime';
12-
import { debug } from '@glimmer/validator';
13-
import toIterator from './utils/iterator';
14-
import { isHTMLSafe } from './utils/string';
15-
import toBool from './utils/to-bool';
7+
import { debug, setScheduleRevalidate } from '@glimmer/validator';
168

17-
///////////
18-
19-
// Setup global context
20-
21-
setGlobalContext({
22-
scheduleRevalidate() {
23-
_backburner.ensureInstance();
24-
},
25-
26-
toBool,
27-
toIterator,
28-
29-
getProp: _getProp,
30-
setProp: _setProp,
31-
getPath: get,
32-
setPath: set,
33-
34-
scheduleDestroy(destroyable, destructor) {
35-
schedule('actions', null, destructor, destroyable);
36-
},
37-
38-
scheduleDestroyed(finalizeDestructor) {
39-
schedule('destroy', null, finalizeDestructor);
40-
},
41-
42-
warnIfStyleNotTrusted(value: unknown) {
43-
warn(
44-
constructStyleDeprecationMessage(String(value)),
45-
(() => {
46-
if (value === null || value === undefined || isHTMLSafe(value)) {
47-
return true;
48-
}
49-
return false;
50-
})(),
51-
{ id: 'ember-htmlbars.style-xss-warning' }
52-
);
53-
},
54-
55-
assert(test: unknown, msg: string, options?: { id: string }) {
56-
if (DEBUG) {
57-
let id = options?.id;
58-
59-
let override = VM_ASSERTION_OVERRIDES.filter((o) => o.id === id)[0];
60-
61-
assert(override?.message ?? msg, test);
62-
}
63-
},
64-
65-
deprecate(msg: string, test: unknown, options: { id: string }) {
66-
if (DEBUG) {
67-
let { id } = options;
68-
69-
if (id === 'argument-less-helper-paren-less-invocation') {
70-
throw new Error(
71-
`A resolved helper cannot be passed as a named argument as the syntax is ` +
72-
`ambiguously a pass-by-reference or invocation. Use the ` +
73-
`\`{{helper 'foo-helper}}\` helper to pass by reference or explicitly ` +
74-
`invoke the helper with parens: \`{{(fooHelper)}}\`.`
75-
);
76-
}
77-
78-
let override = VM_DEPRECATION_OVERRIDES.filter((o) => o.id === id)[0];
79-
80-
if (!override) throw new Error(`deprecation override for ${id} not found`);
81-
82-
// allow deprecations to be disabled in the VM_DEPRECATION_OVERRIDES array below
83-
if (!override.disabled) {
84-
deprecate(override.message ?? msg, Boolean(test), override);
85-
}
86-
}
87-
},
88-
});
9+
setScheduleRevalidate(() => _backburner.ensureInstance());
10+
setDestructionSchedulers(
11+
(destroyable, destructor) => schedule('actions', null, destructor, destroyable),
12+
(finalizer) => schedule('destroy', null, finalizer)
13+
);
8914

9015
if (DEBUG) {
9116
debug?.setTrackingTransactionEnv?.({
@@ -99,38 +24,10 @@ if (DEBUG) {
9924
});
10025
}
10126

102-
///////////
103-
104-
// VM Assertion/Deprecation overrides
105-
106-
const VM_DEPRECATION_OVERRIDES: (DeprecationOptions & {
107-
disabled?: boolean;
108-
message?: string;
109-
})[] = [
110-
{
111-
id: 'setting-on-hash',
112-
until: '4.4.0',
113-
for: 'ember-source',
114-
since: {
115-
available: '3.28.0',
116-
enabled: '3.28.0',
117-
},
118-
},
119-
];
120-
121-
const VM_ASSERTION_OVERRIDES: { id: string; message: string }[] = [];
122-
123-
///////////
124-
125-
// Define environment delegate
126-
12727
export class EmberEnvironmentDelegate implements EnvironmentDelegate {
12828
public enableDebugTooling: boolean = ENV._DEBUG_RENDER_TREE;
12929

130-
constructor(
131-
public owner: InternalOwner,
132-
public isInteractive: boolean
133-
) {}
30+
constructor(public isInteractive: boolean) {}
13431

13532
onTransactionCommit(): void {}
13633
}
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
export class EachInWrapper {
2+
constructor(public inner: unknown) {}
3+
}

packages/@ember/-internals/glimmer/lib/helpers/each-in.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import { assert } from '@ember/debug';
88
import type { CapturedArguments } from '@glimmer/interfaces';
99
import { createComputeRef, valueForRef } from '@glimmer/reference';
1010
import { consumeTag } from '@glimmer/validator';
11+
import { EachInWrapper } from './each-in-wrapper';
1112
import { internalHelper } from './internal-helper';
1213

1314
/**
@@ -163,10 +164,6 @@ import { internalHelper } from './internal-helper';
163164
@public
164165
@since 2.1.0
165166
*/
166-
export class EachInWrapper {
167-
constructor(public inner: unknown) {}
168-
}
169-
170167
export default internalHelper(({ positional }: CapturedArguments) => {
171168
const inner = positional[0];
172169
assert('expected at least one positional arg', inner);

packages/@ember/-internals/glimmer/lib/renderer.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -750,7 +750,7 @@ class BaseRenderer {
750750
* But for actual ember apps, you *need* to implement everything
751751
* an app needs (which will actually change and become less over time)
752752
*/
753-
let env = new EmberEnvironmentDelegate(owner as InternalOwner, envOptions.isInteractive);
753+
let env = new EmberEnvironmentDelegate(envOptions.isInteractive);
754754
let options = runtimeOptions({ document }, env, sharedArtifacts, resolver);
755755
let context = new EvaluationContextImpl(
756756
sharedArtifacts,

packages/@ember/-internals/glimmer/lib/utils/iterator.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { isObject } from '@ember/-internals/utils';
55
import type { Nullable } from '@ember/-internals/utility-types';
66
import type { IteratorDelegate } from '@glimmer/reference';
77
import { consumeTag, isTracking, tagFor } from '@glimmer/validator';
8-
import { EachInWrapper } from '../helpers/each-in';
8+
import { EachInWrapper } from '../helpers/each-in-wrapper';
99
import type { NativeArray } from '@ember/array';
1010

1111
export default function toIterator(iterable: unknown): Nullable<IteratorDelegate> {

packages/@ember/-internals/package.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,9 @@
1212
"./error-handling": "./error-handling/index.ts",
1313
"./glimmer": "./glimmer/index.ts",
1414
"./glimmer/lib/components/internal": "./glimmer/lib/components/internal.ts",
15+
"./glimmer/lib/utils/iterator": "./glimmer/lib/utils/iterator.ts",
16+
"./glimmer/lib/utils/string": "./glimmer/lib/utils/string.ts",
17+
"./glimmer/lib/utils/to-bool": "./glimmer/lib/utils/to-bool.ts",
1518
"./meta": "./meta/index.ts",
1619
"./metal": "./metal/index.ts",
1720
"./owner": "./owner/index.ts",
@@ -48,7 +51,6 @@
4851
"@glimmer/component": "workspace:*",
4952
"@glimmer/destroyable": "workspace:*",
5053
"@glimmer/env": "workspace:*",
51-
"@glimmer/global-context": "workspace:*",
5254
"@glimmer/interfaces": "workspace:*",
5355
"@glimmer/manager": "workspace:*",
5456
"@glimmer/node": "workspace:*",

packages/@glimmer-workspace/integration-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414
},
1515
"scripts": {},
1616
"dependencies": {
17+
"@ember/debug": "workspace:*",
1718
"@glimmer-workspace/test-utils": "workspace:*",
1819
"@glimmer/compiler": "workspace:*",
1920
"@glimmer/destroyable": "workspace:*",
20-
"@glimmer/global-context": "workspace:*",
2121
"@glimmer/interfaces": "workspace:*",
2222
"@glimmer/manager": "workspace:*",
2323
"@glimmer/node": "workspace:*",

packages/@glimmer-workspace/integration-tests/test/package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
"@glimmer/constants": "workspace:*",
1111
"@glimmer/debug-util": "workspace:*",
1212
"@glimmer/destroyable": "workspace:*",
13-
"@glimmer/global-context": "workspace:*",
1413
"@glimmer/local-debug-flags": "workspace:*",
1514
"@glimmer/manager": "workspace:*",
1615
"@glimmer/opcode-compiler": "workspace:*",

0 commit comments

Comments
 (0)