Skip to content
This repository was archived by the owner on Jun 2, 2023. It is now read-only.

Commit 8909a3e

Browse files
committed
update(project): editor configs
1 parent 860b5f1 commit 8909a3e

File tree

10 files changed

+6432
-6211
lines changed

10 files changed

+6432
-6211
lines changed

.editorconfig

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# EditorConfig is awesome: https://EditorConfig.org
2+
3+
# top-most EditorConfig file
4+
root = true
5+
6+
# Unix-style newlines with a newline ending every file
7+
[*]
8+
end_of_line = lf
9+
insert_final_newline = true
10+
indent_style = space
11+
indent_size = 2

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.vscode
1+
# .vscode
22
.build
33
static/generated
44
src/assets/styles/generated

.prettierrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"endOfLine": "lf",
33
"semi": true,
44
"singleQuote": true,
5-
"tabWidth": 4,
5+
"tabWidth": 2,
66
"useTabs": true,
77
"trailingComma": "es5",
88
"printWidth": 120,

.vscode/extensions.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"recommendations": ["EditorConfig.EditorConfig", "esbenp.prettier-vscode"]
3+
}

package-lock.json

Lines changed: 6389 additions & 6168 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 & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
"translations:runner": "node scripts/translation-runner.js",
103103
"translations": "npm-run-all -s translations:extract translations:runner",
104104
"generate": "npm-run-all -p fonticons translations",
105-
"format": "prettier --write src/**/*.{js,jsx,ts,tsx}",
105+
"format": "prettier --write 'src/**/*.{ts,tsx}'",
106106
"lint": "eslint 'src/**/*.{ts,tsx}'",
107107
"type-check": "tsc",
108108
"gatsby-clean": "gatsby clean",

src/helpers/__tests__/arrays.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,14 +148,7 @@ describe('helpers/arrays', () => {
148148
it('on object arrays', () => {
149149
let valuesA = [{ att: 'a' }, { att: 'b' }, { att: 'c' }, { att: 'd' }];
150150
let valuesB = [{ att: 'c' }, { att: 'd' }, { att: 'e' }, { att: 'f' }];
151-
let valuesResultExpected = [
152-
{ att: 'a' },
153-
{ att: 'b' },
154-
{ att: 'c' },
155-
{ att: 'd' },
156-
{ att: 'e' },
157-
{ att: 'f' },
158-
];
151+
let valuesResultExpected = [{ att: 'a' }, { att: 'b' }, { att: 'c' }, { att: 'd' }, { att: 'e' }, { att: 'f' }];
159152

160153
let values = Arrays.merge(valuesA, valuesB, 'att');
161154
expect(values).toHaveLength(valuesResultExpected.length);

src/helpers/__tests__/values.ts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,7 @@ describe('helpers/values', () => {
155155
});
156156

157157
it('should get a random value from an object array', () => {
158-
const values: any[] = [
159-
{ att: 'a' },
160-
{ att: 'b' },
161-
{ att: 'c' },
162-
{ att: 'd' },
163-
{ att: 'e' },
164-
{ att: 'f' },
165-
];
158+
const values: any[] = [{ att: 'a' }, { att: 'b' }, { att: 'c' }, { att: 'd' }, { att: 'e' }, { att: 'f' }];
166159
const randomValue = Values.randomValue(values);
167160
expect(randomValue).toBeDefined();
168161
expect(arrayFind(values, randomValue, 'att')).toBeDefined();

src/helpers/arrays.ts

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,12 +65,9 @@ function filterFindValue<T extends TJSValue>(value: T, byObjectProperty?: string
6565
* @return {T[]} values without repetition
6666
*/
6767
function unique<T>(values: T[], byObjectProperty?: string): T[] {
68-
return values.reduce(
69-
(unique, item) => {
70-
return filterIntersection(unique, byObjectProperty)(item) ? unique : [...unique, item];
71-
},
72-
[] as T[]
73-
);
68+
return values.reduce((unique, item) => {
69+
return filterIntersection(unique, byObjectProperty)(item) ? unique : [...unique, item];
70+
}, [] as T[]);
7471
}
7572

7673
/**

src/helpers/language.ts

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -24,30 +24,33 @@ export async function loadLocale(locale?: string): Promise<ILocale> {
2424
let localeData;
2525
switch (locale) {
2626
case 'pt':
27-
messages = (await import(
28-
/* webpackMode: "lazy", webpackChunkName: "language_pt" */ `assets/languages/pt.json`
29-
)).default;
30-
localeData = (await import(
31-
/* webpackMode: "lazy", webpackChunkName: "language_pt" */ `@formatjs/intl-relativetimeformat/dist/locale-data/pt.json`
32-
)).default;
27+
messages = (await import(/* webpackMode: "lazy", webpackChunkName: "language_pt" */ `assets/languages/pt.json`))
28+
.default;
29+
localeData = (
30+
await import(
31+
/* webpackMode: "lazy", webpackChunkName: "language_pt" */ `@formatjs/intl-relativetimeformat/dist/locale-data/pt.json`
32+
)
33+
).default;
3334
return { locale, messages, localeData };
3435
case 'es':
35-
messages = (await import(
36-
/* webpackMode: "lazy", webpackChunkName: "language_es" */ `assets/languages/es.json`
37-
)).default;
38-
localeData = (await import(
39-
/* webpackMode: "lazy", webpackChunkName: "language_es" */ `@formatjs/intl-relativetimeformat/dist/locale-data/es.json`
40-
)).default;
36+
messages = (await import(/* webpackMode: "lazy", webpackChunkName: "language_es" */ `assets/languages/es.json`))
37+
.default;
38+
localeData = (
39+
await import(
40+
/* webpackMode: "lazy", webpackChunkName: "language_es" */ `@formatjs/intl-relativetimeformat/dist/locale-data/es.json`
41+
)
42+
).default;
4143
return { locale, messages, localeData };
4244
case 'en':
4345
default:
4446
locale = 'en';
45-
messages = (await import(
46-
/* webpackMode: "lazy", webpackChunkName: "language_en" */ `assets/languages/en.json`
47-
)).default;
48-
localeData = (await import(
49-
/* webpackMode: "lazy", webpackChunkName: "language_en" */ `@formatjs/intl-relativetimeformat/dist/locale-data/en.json`
50-
)).default;
47+
messages = (await import(/* webpackMode: "lazy", webpackChunkName: "language_en" */ `assets/languages/en.json`))
48+
.default;
49+
localeData = (
50+
await import(
51+
/* webpackMode: "lazy", webpackChunkName: "language_en" */ `@formatjs/intl-relativetimeformat/dist/locale-data/en.json`
52+
)
53+
).default;
5154
return { locale, messages, localeData };
5255
}
5356
}

0 commit comments

Comments
 (0)