Skip to content

Commit

Permalink
Merge pull request #198 from emberjs/import-require
Browse files Browse the repository at this point in the history
Import `require` (avoid using global require).
  • Loading branch information
rwjblue authored Mar 4, 2017
2 parents acf848c + b6c70b0 commit 455f9c1
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion lib/ember-test-helpers/build-registry.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* globals global, self, requirejs, require */
/* globals global, self, requirejs */

import require from 'require';
import Ember from 'ember';

function exposeRegistryMethodsWithoutDeprecations(container) {
Expand Down
3 changes: 2 additions & 1 deletion lib/ember-test-helpers/test-module-for-model.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
/* global DS, require, requirejs */ // added here to prevent an import from erroring when ED is not present
/* global DS, requirejs */ // added here to prevent an import from erroring when ED is not present

import require from 'require';
import TestModule from './test-module';
import Ember from 'ember';

Expand Down

0 comments on commit 455f9c1

Please sign in to comment.