Skip to content

Commit 2be7b7b

Browse files
committed
Auto merge of #1983 - Turbo87:faker, r=Turbo87
Migrate `faker` imports `ember-cli-mirage` v1.0.0 removed its `faker` dependency in favor of importing via `ember-auto-import`. This PR adds an explicit dependency on `faker`, and migrates all the existing import to import from the `'faker'` module directly.
2 parents 2df224d + ae3be09 commit 2be7b7b

File tree

6 files changed

+17
-7
lines changed

6 files changed

+17
-7
lines changed

mirage/factories/category.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Factory, faker } from 'ember-cli-mirage';
1+
import { Factory } from 'ember-cli-mirage';
2+
import faker from 'faker';
23
import { dasherize } from '@ember/string';
34

45
export default Factory.extend({

mirage/factories/crate.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Factory, trait, faker } from 'ember-cli-mirage';
1+
import { Factory, trait } from 'ember-cli-mirage';
2+
import faker from 'faker';
23

34
export default Factory.extend({
45
id(i) {

mirage/factories/version.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
import { Factory, faker } from 'ember-cli-mirage';
1+
import { Factory } from 'ember-cli-mirage';
2+
import faker from 'faker';
23

34
export default Factory.extend({
45
id: i => i,

package-lock.json

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
"eslint-config-prettier": "^6.7.0",
8080
"eslint-plugin-ember": "^7.7.2",
8181
"eslint-plugin-prettier": "^3.1.0",
82+
"faker": "^4.1.0",
8283
"loader.js": "^4.5.1",
8384
"normalize.css": "^7.0.0",
8485
"nyc": "^14.1.1",

tests/helpers/setup-mirage.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import setupMirage from 'ember-cli-mirage/test-support/setup-mirage';
2-
import { faker } from 'ember-cli-mirage';
2+
import faker from 'faker';
33
import timekeeper from 'timekeeper';
44

55
export default function(hooks) {

0 commit comments

Comments
 (0)