Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move to ember-cli@5.7 #587

Merged
merged 2 commits into from Mar 11, 2024
Merged

Move to ember-cli@5.7 #587

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29c6f46
Move to ember-cli@5.7
onechiporenko Mar 11, 2024
89baa70
Update faker
onechiporenko Mar 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 14 additions & 14 deletions package.json
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@
"nodetest": "mocha node-tests --recursive"
},
"dependencies": {
"@babel/core": "^7.23.7",
"@babel/core": "^7.24.0",
"@embroider/macros": "^1.8.0",
"@embroider/util": "^1.12.0",
"chalk": "^4.1.1",
Expand All @@ -62,14 +62,14 @@
"tracked-built-ins": "^3.1.0"
},
"devDependencies": {
"@babel/eslint-parser": "^7.23.3",
"@babel/plugin-proposal-decorators": "^7.23.7",
"@ember/optional-features": "^2.0.0",
"@babel/eslint-parser": "^7.23.10",
"@babel/plugin-proposal-decorators": "^7.24.0",
"@ember/optional-features": "^2.1.0",
"@ember/render-modifiers": "^2.0.4",
"@ember/string": "^3.1.1",
"@ember/test-helpers": "^3.2.1",
"@ember/test-helpers": "^3.3.0",
"@embroider/test-setup": "^3.0.3",
"@faker-js/faker": "6.3.1",
"@faker-js/faker": "^8.4.1",
"@fortawesome/ember-fontawesome": "^2.0.0",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@glimmer/component": "^1.1.2",
Expand Down Expand Up @@ -114,7 +114,7 @@
"concurrently": "^8.2.2",
"coveralls": "^3.0.9",
"ember-a11y-testing": "^6.1.0",
"ember-cli": "~5.6.0",
"ember-cli": "~5.7.0",
"ember-cli-blueprint-test-helpers": "^0.19.2",
"ember-cli-clean-css": "^3.0.0",
"ember-cli-code-coverage": "^1.0.3",
Expand All @@ -131,27 +131,27 @@
"ember-load-initializers": "^2.1.2",
"ember-maybe-import-regenerator": "^0.1.6",
"ember-models-table-floating-filter": "1.5.0",
"ember-page-title": "^8.2.0",
"ember-page-title": "^8.2.2",
"ember-prism": "^0.13.0",
"ember-qunit": "^8.0.2",
"ember-resolver": "^11.0.1",
"ember-source": "~5.6.0",
"ember-source": "~5.7.0",
"ember-source-channel-url": "^3.0.0",
"ember-template-lint": "^5.13.0",
"ember-try": "^3.0.0",
"ember-welcome-page": "^7.0.2",
"eslint": "^8.56.0",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-ember": "^11.12.0",
"eslint-plugin-n": "^16.6.2",
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-qunit": "^8.0.1",
"eslint-plugin-qunit": "^8.1.1",
"lcov-result-merger": "^3.1.0",
"loader.js": "^4.7.0",
"miragejs": "^0.1.43",
"mocha": "^10.0.0",
"prettier": "^3.2.4",
"qunit": "^2.20.0",
"prettier": "^3.2.5",
"qunit": "^2.20.1",
"qunit-dom": "^2.0.0",
"sass": "^1.58.3",
"stylelint": "^15.11.0",
Expand All @@ -160,7 +160,7 @@
"typedoc": "0.25.7",
"typedoc-plugin-rename-defaults": "0.7.0",
"typescript": "^5.0.4",
"webpack": "^5.89.0"
"webpack": "^5.90.3"
},
"peerDependencies": {
"ember-source": ">= 4.0.0"
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/config/ember-cli-update.json
View file
Open in desktop
Expand Up @@ -3,7 +3,7 @@
"packages": [
{
"name": "ember-cli",
"version": "5.6.0",
"version": "5.7.0",
"blueprints": [
{
"name": "addon",
Expand Down
2 changes: 1 addition & 1 deletion tests/dummy/mirage/factories/comment.js
View file
Open in desktop
@@ -1,5 +1,5 @@
import { Factory } from 'miragejs';
import faker from '@faker-js/faker';
import { faker } from '@faker-js/faker';

const { date, lorem } = faker;

Expand Down
16 changes: 8 additions & 8 deletions tests/dummy/mirage/factories/user.js
View file
Open in desktop
@@ -1,33 +1,33 @@
import { Factory } from 'miragejs';
import faker from '@faker-js/faker';
import { faker } from '@faker-js/faker';
const getRandomInt = (min, max) =>
Math.floor(Math.random() * (max - min + 1)) + min;
const { name, random, address, datatype } = faker;
const { person, helpers, location, number } = faker;

export default Factory.extend({
index(i) {
return i + 1;
},

'first-name'(i) {
return `${name.firstName()}_${i + 1}`;
return `${person.firstName()}_${i + 1}`;
},

'last-name'(i) {
return `${name.lastName()}_${i + 1}`;
return `${person.lastName()}_${i + 1}`;
},

age() {
return 11 + datatype.number(42);
return 11 + number.int(42);
},

city() {
return address.city();
return location.city();
},

country() {
return random.arrayElement(
faker.definitions.address.country.filter((c) => c[0] === 'B'),
return helpers.arrayElement(
faker.definitions.location.country.filter((c) => c[0] === 'B'),
);
},

Expand Down
14 changes: 7 additions & 7 deletions tests/helpers/f.js
View file
Open in desktop
@@ -1,9 +1,9 @@
import faker from '@faker-js/faker';
import { faker } from '@faker-js/faker';

const firstNames = faker.definitions.name.first_name.slice(0, 10).sort();
const lastNames = faker.definitions.name.last_name.slice(0, 10).sort();
const firstNames = faker.definitions.person.first_name.slice(0, 10).sort();
const lastNames = faker.definitions.person.last_name.slice(0, 10).sort();

const { random, datatype } = faker;
const { helpers, number } = faker;

// from http://stackoverflow.com/questions/14766951/convert-digits-into-words-with-javascript
function numberToWord(n) {
Expand Down Expand Up @@ -107,9 +107,9 @@ function generateContent(length) {
indexWithHtml: `<i>${i}</i>`,
someWord: numberToWord(i),
id: i,
firstName: random.arrayElement(firstNames.slice(0, -2)),
lastName: random.arrayElement(lastNames.slice(0, -2)),
age: 11 + datatype.number(42),
firstName: helpers.arrayElement(firstNames.slice(0, -2)),
lastName: helpers.arrayElement(lastNames.slice(0, -2)),
age: 11 + number.int(42),
rand: !!(i % 2),
});
}
Expand Down