Commit 95bc791

author

Lionel Bijaoui

committed

Merge branch 'lb_separate_bundle'. Fix some unit test and change webpack config.

2 parents 8534015 + cc80dd6 commit 95bc791Copy full SHA for 95bc791

File tree

-7

lines changed

-7

lines changed

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import Fakerator from "fakerator";`
`2`		`-import moment from "moment";`
	`2`	`+import fecha from "fecha";`
`3`	`3`
`4`	`4`	`let fakerator = new Fakerator();`
`5`	`5`
`@@ -26,8 +26,8 @@ module.exports = {`
`26`	`26`	`user.bio = fakerator.lorem.paragraph();`
`27`	`27`	`let dob = fakerator.date.past(40, "1998年01月01日");`
`28`	`28`	`user.dob = dob.valueOf();`
`29`		`- user.time = moment().format("hh:mm:ss");`
`30`		`- user.age = moment().year() - moment(dob).year();`
	`29`	`+ user.time = fecha.format(newDate(),"hh:mm:ss");`
	`30`	`+ user.age = fecha.format(newDate().getFullYear() - dob,"YY");`
`31`	`31`	`user.rank = fakerator.random.number(1, 10);`
`32`	`32`	`user.role = fakerator.random.arrayElement(roles).id;`
`33`	`33`	`//user.mobile = fakerator.phone.phoneNumber();`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import moment from "moment";`
	`1`	`+import fecha from "fecha";`
`2`	`2`
`3`	`3`	`import {`
`4`	`4`	`validators`
`@@ -352,7 +352,7 @@ module.exports = {`
`352`	`352`	`label: "Created (label field)",`
`353`	`353`	`model: "created",`
`354`	`354`	`get(model) {`
`355`		`- return model && model.created ? moment(model.created).format("LLL") : "-";`
	`355`	`+ // return model && model.created ? fecha.format(model.created,"MMMM D YYYY H") : "-";`
`356`	`356`	`},`
`357`	`357`	`styleClasses: "half-width"`
`358`	`358`	`}, {`
`@@ -535,8 +535,8 @@ module.exports = {`
`535`	`535`	`model: "dob",`
`536`	`536`	`required: true,`
`537`	`537`	`placeholder: "User's birth of date",`
`538`		`- min: moment("1900-01-01").toDate(),`
`539`		`- max: moment("2018-01-01").toDate(),`
	`538`	`+ min: fecha.parse("1900-01-01","YYYY-MM-DD"),`
	`539`	`+ max: fecha.parse("2018-01-01","YYYY-MM-DD"),`
`540`	`540`	`validator: [`
`541`	`541`	`validators.date`
`542`	`542`	`],`

Comments

(0)