Skip to content

Commit ffb927f

Browse files
authored
Merge branch 'main' into types/random/array/variable-types
2 parents b2f14db + ced5f3d commit ffb927f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+69
-59
lines changed

.prettierrc.cjs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
* @type {import('prettier').Options}
55
*/
66
module.exports = {
7-
plugins: [
8-
/* require.resolve("prettier-plugin-organize-imports") */
9-
],
7+
plugins: [require.resolve('prettier-plugin-organize-imports')],
108
singleQuote: true,
119
overrides: [
1210
{

docs/.vitepress/theme/components/index.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import Playground from './Playground.vue';
21
import Badge from './Badge.vue';
2+
import Playground from './Playground.vue';
33

44
export default {
55
Playground,

docs/.vitepress/theme/index.mjs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import './index.css';
2-
import GlobalComponents from './components';
31
import DefaultTheme from 'vitepress/theme';
2+
import GlobalComponents from './components';
3+
import './index.css';
44

55
export default {
66
...DefaultTheme,

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@
112112
"npm-run-all": "~4.1.5",
113113
"picocolors": "~1.0.0",
114114
"prettier": "2.5.1",
115+
"prettier-plugin-organize-imports": "~2.3.4",
115116
"rimraf": "~3.0.2",
116117
"sanitize-html": "~2.7.0",
117118
"simple-git-hooks": "~2.7.0",

pnpm-lock.yaml

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

scripts/verifyCommit.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
// Invoked on the commit-msg git hook by simple-git-hooks.
55

6-
import colors from 'picocolors';
76
import { readFileSync } from 'fs';
7+
import colors from 'picocolors';
88

99
// get $1 from commit-msg script
1010
const msgPath = process.argv[2];

src/definitions/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ export type {
77
export type { CompanyDefinitions } from './company';
88
export type { DatabaseDefinitions } from './database';
99
export type { DateDefinitions, DateEntryDefinition } from './date';
10-
export type { DefinitionTypes, LocaleDefinition } from './definitions';
1110
export { DEFINITIONS } from './definitions';
11+
export type { DefinitionTypes, LocaleDefinition } from './definitions';
1212
export type {
1313
FinanceCurrencyEntryDefinitions,
1414
FinanceDefinitions,

src/image.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import type { Faker } from '.';
2+
import { LoremPicsum } from './image_providers/lorempicsum';
23
import { Lorempixel } from './image_providers/lorempixel';
34
import { Unsplash } from './image_providers/unsplash';
4-
import { LoremPicsum } from './image_providers/lorempicsum';
55

66
/**
77
* Module to generate placeholder images.

src/internet.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { Faker } from '.';
2-
32
import * as random_ua from './vendor/user-agent';
43

54
/**

src/locale/en_AU.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import en_AU from '../locales/en_AU';
87
import en from '../locales/en';
8+
import en_AU from '../locales/en_AU';
99

1010
const faker = new Faker({
1111
locale: 'en_AU',

src/locale/en_AU_ocker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import en_AU_ocker from '../locales/en_AU_ocker';
87
import en from '../locales/en';
8+
import en_AU_ocker from '../locales/en_AU_ocker';
99

1010
const faker = new Faker({
1111
locale: 'en_AU_ocker',

src/locale/en_BORK.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import en_BORK from '../locales/en_BORK';
87
import en from '../locales/en';
8+
import en_BORK from '../locales/en_BORK';
99

1010
const faker = new Faker({
1111
locale: 'en_BORK',

src/locale/en_CA.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import en_CA from '../locales/en_CA';
87
import en from '../locales/en';
8+
import en_CA from '../locales/en_CA';
99

1010
const faker = new Faker({
1111
locale: 'en_CA',

src/locale/en_GB.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import en_GB from '../locales/en_GB';
87
import en from '../locales/en';
8+
import en_GB from '../locales/en_GB';
99

1010
const faker = new Faker({
1111
locale: 'en_GB',

src/locale/en_GH.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import en_GH from '../locales/en_GH';
87
import en from '../locales/en';
8+
import en_GH from '../locales/en_GH';
99

1010
const faker = new Faker({
1111
locale: 'en_GH',

src/locale/en_IE.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import en_IE from '../locales/en_IE';
87
import en from '../locales/en';
8+
import en_IE from '../locales/en_IE';
99

1010
const faker = new Faker({
1111
locale: 'en_IE',

src/locale/en_IND.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import en_IND from '../locales/en_IND';
87
import en from '../locales/en';
8+
import en_IND from '../locales/en_IND';
99

1010
const faker = new Faker({
1111
locale: 'en_IND',

src/locale/en_NG.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import en_NG from '../locales/en_NG';
87
import en from '../locales/en';
8+
import en_NG from '../locales/en_NG';
99

1010
const faker = new Faker({
1111
locale: 'en_NG',

src/locale/en_US.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import en_US from '../locales/en_US';
87
import en from '../locales/en';
8+
import en_US from '../locales/en_US';
99

1010
const faker = new Faker({
1111
locale: 'en_US',

src/locale/en_ZA.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import en_ZA from '../locales/en_ZA';
87
import en from '../locales/en';
8+
import en_ZA from '../locales/en_ZA';
99

1010
const faker = new Faker({
1111
locale: 'en_ZA',

src/locale/es.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import es from '../locales/es';
87
import en from '../locales/en';
8+
import es from '../locales/es';
99

1010
const faker = new Faker({
1111
locale: 'es',

src/locale/es_MX.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import es_MX from '../locales/es_MX';
87
import en from '../locales/en';
8+
import es_MX from '../locales/es_MX';
99

1010
const faker = new Faker({
1111
locale: 'es_MX',

src/locale/fa.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import fa from '../locales/fa';
87
import en from '../locales/en';
8+
import fa from '../locales/fa';
99

1010
const faker = new Faker({
1111
locale: 'fa',

src/locale/fi.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import fi from '../locales/fi';
87
import en from '../locales/en';
8+
import fi from '../locales/fi';
99

1010
const faker = new Faker({
1111
locale: 'fi',

src/locale/fr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import fr from '../locales/fr';
87
import en from '../locales/en';
8+
import fr from '../locales/fr';
99

1010
const faker = new Faker({
1111
locale: 'fr',

src/locale/fr_BE.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import fr_BE from '../locales/fr_BE';
87
import en from '../locales/en';
8+
import fr_BE from '../locales/fr_BE';
99

1010
const faker = new Faker({
1111
locale: 'fr_BE',

src/locale/fr_CA.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import fr_CA from '../locales/fr_CA';
87
import en from '../locales/en';
8+
import fr_CA from '../locales/fr_CA';
99

1010
const faker = new Faker({
1111
locale: 'fr_CA',

src/locale/fr_CH.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import fr_CH from '../locales/fr_CH';
87
import en from '../locales/en';
8+
import fr_CH from '../locales/fr_CH';
99

1010
const faker = new Faker({
1111
locale: 'fr_CH',

src/locale/ge.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import ge from '../locales/ge';
87
import en from '../locales/en';
8+
import ge from '../locales/ge';
99

1010
const faker = new Faker({
1111
locale: 'ge',

src/locale/he.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import he from '../locales/he';
87
import en from '../locales/en';
8+
import he from '../locales/he';
99

1010
const faker = new Faker({
1111
locale: 'he',

src/locale/hr.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import hr from '../locales/hr';
87
import en from '../locales/en';
8+
import hr from '../locales/hr';
99

1010
const faker = new Faker({
1111
locale: 'hr',

src/locale/hy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import hy from '../locales/hy';
87
import en from '../locales/en';
8+
import hy from '../locales/hy';
99

1010
const faker = new Faker({
1111
locale: 'hy',

src/locale/id_ID.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import id_ID from '../locales/id_ID';
87
import en from '../locales/en';
8+
import id_ID from '../locales/id_ID';
99

1010
const faker = new Faker({
1111
locale: 'id_ID',

src/locale/it.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import it from '../locales/it';
87
import en from '../locales/en';
8+
import it from '../locales/it';
99

1010
const faker = new Faker({
1111
locale: 'it',

src/locale/ja.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import ja from '../locales/ja';
87
import en from '../locales/en';
8+
import ja from '../locales/ja';
99

1010
const faker = new Faker({
1111
locale: 'ja',

src/locale/ko.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import ko from '../locales/ko';
87
import en from '../locales/en';
8+
import ko from '../locales/ko';
99

1010
const faker = new Faker({
1111
locale: 'ko',

src/locale/lv.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import lv from '../locales/lv';
87
import en from '../locales/en';
8+
import lv from '../locales/lv';
99

1010
const faker = new Faker({
1111
locale: 'lv',

src/locale/mk.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*/
55

66
import { Faker } from '../faker';
7-
import mk from '../locales/mk';
87
import en from '../locales/en';
8+
import mk from '../locales/mk';
99

1010
const faker = new Faker({
1111
locale: 'mk',

0 commit comments

Comments
 (0)