From 67188880a7057644b498fbf21c37bbff3de21afa Mon Sep 17 00:00:00 2001 From: Pavel Mineev Date: Wed, 6 Jan 2021 23:27:34 +0300 Subject: [PATCH] Changes * turn back remark.image * fix readme * remove ts-ignore --- frontend/README.md | 5 ++--- frontend/app/common/__mocks__/constants.ts | 5 ++--- frontend/app/common/__mocks__/settings.ts | 5 ++--- frontend/package.json | 3 +-- frontend/remark.image | Bin 0 -> 9200 bytes 5 files changed, 7 insertions(+), 11 deletions(-) create mode 100644 frontend/remark.image diff --git a/frontend/README.md b/frontend/README.md index 98e81b74..b2df769b 100644 --- a/frontend/README.md +++ b/frontend/README.md @@ -9,7 +9,6 @@ ### CSS Styles -- although styles have `scss` extension, it is actually pack of post-css plugins, so syntax differs, for example in `calc` function. - now we are migrating to css-modules and this is recomended way to stylization. A file with styles should be named like `component.module.css` - old component styles use BEM notation (at least it should): `block__element_modifier`. Also there are `mix` classes: `block_modifier`. - new way to naming CSS selectors is camel-case like `blockElemenModifier` and use `classnames` to combine it @@ -20,12 +19,12 @@ - imports for typescript, javascript files should be without extension: `./index`, not `./index.ts` - if file resides in the same directory or in subdirectory import should be relative: `./types/something` -- otherwise it should start from ``namespace:`common/store`which mapped to`/appcommon/store.ts` in webpack, tsconfig and jest +- otherwise it should be imported by absolute path relative to `src` folder like `common/store` which mapped to `./app/common/store.ts` in webpack, tsconfig and jest ### Testing - project uses `jest` as test harness. -- jest check files that match regex `\.test\.(j|t)s(x?)$`, i.e `comment.test.tsx`, `comment.test.js` +- jest check files that match regex `\.(test|spec)\.ts(x?)$`, i.e `comment.test.tsx`, `comment.spec.ts` - tests are running on push attempt - example tests can be found in `./app/store/user/reducers.test.ts`, `./app/components/auth-panel/auth-panel.test.tsx` diff --git a/frontend/app/common/__mocks__/constants.ts b/frontend/app/common/__mocks__/constants.ts index 44374a0a..d3857d4a 100644 --- a/frontend/app/common/__mocks__/constants.ts +++ b/frontend/app/common/__mocks__/constants.ts @@ -1,7 +1,6 @@ -// @ts-ignore -const mock: typeof import('common/constants') = { +const constantsMock: typeof import('common/constants') = { ...jest.requireActual('common/constants'), BASE_URL: 'https://demo.remark42.com/', }; -module.exports = mock; +module.exports = constantsMock; diff --git a/frontend/app/common/__mocks__/settings.ts b/frontend/app/common/__mocks__/settings.ts index 6b0133c5..2be1bb6e 100644 --- a/frontend/app/common/__mocks__/settings.ts +++ b/frontend/app/common/__mocks__/settings.ts @@ -1,5 +1,4 @@ -// @ts-ignore -const mock: typeof import('common/settings') = { +const settingsMock: typeof import('common/settings') = { ...jest.requireActual('common/settings'), siteId: 'remark', pageTitle: 'remark test', @@ -17,4 +16,4 @@ const mock: typeof import('common/settings') = { }, }; -module.exports = mock; +module.exports = settingsMock; diff --git a/frontend/package.json b/frontend/package.json index 1ec3ba7c..46f87cf6 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,5 +1,4 @@ { - "private": true, "name": "remark42", "version": "0.16.0", "license": "MIT", @@ -18,7 +17,7 @@ "lint:eslint": "eslint --max-warnings=0 '**/*.{ts?(x),js}'", "lint:stylelint": "stylelint 'app/**/*.css' 'templates/**'", "size": "cross-env NODE_ENV=production run-s build check:size", - "prettier": "prettier --write './**/*.{js,ts,tsx,css}'", + "prettier": "prettier --write './**/*.{js,ts,tsx,css,html}'", "translation:extract": "formatjs extract --out-file=./extracted-messages/messages.json '**/!(*.d).ts?(x)'", "translation:generate": "node ./tasks/generateTranslations.js", "translation:check": "node ./tasks/checkTranslations.js" diff --git a/frontend/remark.image b/frontend/remark.image new file mode 100644 index 0000000000000000000000000000000000000000..c6b90daff472faa44bcd33bc3e53f7360fab863d GIT binary patch literal 9200 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 Tm@WVQwMI!!UA9Kr^v(YPf^EAb literal 0 HcmV?d00001