Skip to content

Commit a51d352

Browse files
authored
Merge pull request #978 from ember-cli/plain-library2
hide global require from webpack
2 parents fd6b87a + a22a537 commit a51d352

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

addon/addon/index.js

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
1-
/* globals requirejs, require */
2-
31
import { dasherize, classify, underscore } from './string';
42
import classFactory from './utils/class-factory';
53

6-
if (typeof requirejs.entries === 'undefined') {
7-
requirejs.entries = requirejs._eak_seen;
4+
if (typeof globalThis.requirejs.entries === 'undefined') {
5+
globalThis.requirejs.entries = globalThis.requirejs._eak_seen;
86
}
97

108
export class ModuleRegistry {
119
constructor(entries) {
12-
this._entries = entries || requirejs.entries;
10+
this._entries = entries || globalThis.requirejs.entries;
1311
}
1412
moduleNames() {
1513
return Object.keys(this._entries);
@@ -18,7 +16,7 @@ export class ModuleRegistry {
1816
return moduleName in this._entries;
1917
}
2018
get(...args) {
21-
return require(...args);
19+
return globalThis.require(...args);
2220
}
2321
}
2422

addon/index.d.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
import { Resolver as ResolverContract } from "@ember/owner";
2-
import EmberObject from "@ember/object";
3-
export default class Resolver extends EmberObject {}
2+
3+
export default class Resolver {
4+
static create(props: Record<string, unknown>): InstanceType<this>;
5+
}
46
export default interface Resolver extends Required<ResolverContract> {
57
pluralizedTypes: Record<string, string>;
68
}

0 commit comments

Comments
 (0)