From a84f9dba5d8610bcc7677e73d3c7ffb780eadc33 Mon Sep 17 00:00:00 2001 From: Serge S Date: Thu, 27 Jul 2023 13:24:30 +0300 Subject: [PATCH 1/6] Create node.js.yml --- .github/workflows/node.js.yml | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/workflows/node.js.yml diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml new file mode 100644 index 0000000..eb4d9d5 --- /dev/null +++ b/.github/workflows/node.js.yml @@ -0,0 +1,31 @@ +# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node +# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs + +name: Node.js CI + +on: + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + +jobs: + build: + + runs-on: ubuntu-latest + + strategy: + matrix: + node-version: [14.x, 16.x, 18.x] + # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ + + steps: + - uses: actions/checkout@v3 + - name: Use Node.js ${{ matrix.node-version }} + uses: actions/setup-node@v3 + with: + node-version: ${{ matrix.node-version }} + cache: 'npm' + - run: npm ci + - run: npm run build --if-present + - run: npm test From c79c7c04cca9368f7beea7fda1db9f0be3b0bcee Mon Sep 17 00:00:00 2001 From: Serge S Date: Thu, 27 Jul 2023 13:26:43 +0300 Subject: [PATCH 2/6] Update node.js.yml --- .github/workflows/node.js.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index eb4d9d5..b6af8a7 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -26,6 +26,6 @@ jobs: with: node-version: ${{ matrix.node-version }} cache: 'npm' - - run: npm ci + - run: npm i - run: npm run build --if-present - run: npm test From 80fb6055b1dc28cbe48443498bdabdf3a551e70d Mon Sep 17 00:00:00 2001 From: serg Date: Thu, 27 Jul 2023 13:37:24 +0300 Subject: [PATCH 3/6] remove unneeded imports --- src/App.tsx | 2 +- src/components/templates/Login.tsx | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/App.tsx b/src/App.tsx index 393e65b..37944b3 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -1,4 +1,4 @@ -import React from 'react'; + import './App.css'; import { Login } from '@components/pages'; diff --git a/src/components/templates/Login.tsx b/src/components/templates/Login.tsx index 8ee4665..5ab1227 100644 --- a/src/components/templates/Login.tsx +++ b/src/components/templates/Login.tsx @@ -14,7 +14,6 @@ const Topics = () => { return

Topics

; }; -import React from 'react'; import { Routes, Route } from 'react-router-dom'; const Main = () => { From 4789a8ae8868d1608e56f02a20639565879802c7 Mon Sep 17 00:00:00 2001 From: serge Date: Tue, 15 Aug 2023 14:51:06 +0300 Subject: [PATCH 4/6] test --- src/components/pages/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/pages/index.ts b/src/components/pages/index.ts index 413dee7..e994a61 100644 --- a/src/components/pages/index.ts +++ b/src/components/pages/index.ts @@ -1,2 +1,2 @@ -import { LoginPhone } from './login'; +import { LoginPhone } from './Login'; export { LoginPhone }; From 2ad2184c19ba5b448467be205bf66f3c408a8fe0 Mon Sep 17 00:00:00 2001 From: serge Date: Tue, 15 Aug 2023 14:55:11 +0300 Subject: [PATCH 5/6] fix build --- src/main.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main.tsx b/src/main.tsx index c61725b..d0c72da 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -1,6 +1,4 @@ -import React from 'react'; -import ReactDOM from 'react-dom/client'; -import App from './App.tsx'; +import ReactDOM from 'react-dom/client';import App from './App.tsx'; import './index.css'; import { BrowserRouter } from 'react-router-dom'; import './i18n'; From 27d3633813086071d8c8fc12d49f98014c93d6ea Mon Sep 17 00:00:00 2001 From: serge Date: Sun, 20 Aug 2023 14:29:14 +0300 Subject: [PATCH 6/6] add to eslint ignore to fix build error --- .eslintrc.cjs | 2 ++ src/main.tsx | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 8d459f7..4de77ef 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -59,5 +59,7 @@ module.exports = { plugins: ['react-refresh'], rules: { 'react-refresh/only-export-components': ['warn', { allowConstantExport: true }], + 'react/react-in-jsx-scope': 'off', + 'react/jsx-uses-react': 'off', }, }; diff --git a/src/main.tsx b/src/main.tsx index d0c72da..c61725b 100644 --- a/src/main.tsx +++ b/src/main.tsx @@ -1,4 +1,6 @@ -import ReactDOM from 'react-dom/client';import App from './App.tsx'; +import React from 'react'; +import ReactDOM from 'react-dom/client'; +import App from './App.tsx'; import './index.css'; import { BrowserRouter } from 'react-router-dom'; import './i18n';