Merge pull request #92 from funnyzak/refactor/action

Author: funnyzak

.eslintrc.js

@@ -92,7 +92,7 @@ module.exports = {
         'react-hooks/exhaustive-deps': 'warn',
         'react-native/no-unused-styles': 2,
         'react-native/split-platform-components': 2,
-        'react-native/no-inline-styles': 'warn',
+        'react-native/no-inline-styles': 'off',
         'react-native/no-color-literals': 2,
         'react-native/no-raw-text': 0,
         'react-native/no-single-element-style-arrays': 2

.github/workflows/ci.yml

@@ -9,49 +9,52 @@ jobs:
   install-and-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
+      - 
+        uses: actions/checkout@v2
+      - 
+        name: Install dependencies
         run: |
           yarn
+          yarn lint
   build-android:
     needs: install-and-test
     runs-on: ubuntu-latest
     steps: 
-      - uses: actions/checkout@v2
-
-      - name: Use Node.js
+      - 
+        uses: actions/checkout@v2
+      - 
+        name: Use Node.js
         uses: actions/setup-node@v2
         with:
           node-version: "16.16.0"
-
-      - name: Get yarn cache directory path
+      - 
+        name: Get yarn cache directory path
         id: yarn-cache-dir-path
         run: echo "::set-output name=dir::$(yarn cache dir)"
-
       - uses: actions/cache@v1
         id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
         with:
           path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
           key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-yarn-
-
-      - name: Install dependencies
+      - 
+        name: Install dependencies
         run: |
           yarn
-
-      - name: Build Android Release
+      - 
+        name: Build Android Release
         run: |
           cd android && ./gradlew assembleRelease
-
-      - name: Get the version
+      - 
+        name: Get the version
         id: get_version
         run: echo ::set-output name=VERSION::$(echo $GITHUB_REF | cut -d / -f 3)
-
-      - name: Rename Apk Name 
+      - 
+        name: Rename Apk Name 
         run: cp android/app/build/outputs/apk/release/app-release.apk android/app/build/outputs/apk/release/v2hub-${{ steps.get_version.outputs.VERSION }}.apk
-
-      - name: build changelog
+      - 
+        name: build changelog
         id: build_changelog
         if: startsWith(github.ref, 'refs/tags/')
         uses: mikepenz/[email protected]
@@ -60,8 +63,8 @@ jobs:
         with:
           configuration: ".config/changelog_configuration.json"
           ignorePreReleases: "false"
-          
-      - name: Create Release
+      - 
+        name: Create Release
         uses: softprops/action-gh-release@v1
         if: startsWith(github.ref, 'refs/tags/')
         with:
@@ -71,21 +74,18 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.github_token }}
 
-      # - name: Upload Artifact
-      #   uses: actions/upload-artifact@v1
-      #   with:
-      #     name: app-release.apk
-      #     path: android/app/build/outputs/apk/release/
-
-
-  jishida-push:
+  push:
     runs-on: ubuntu-latest
     needs: [build-android]
     if: startsWith(github.ref, 'refs/tags/')
     steps:
-      - name: JiShiDa Push
-        uses: funnyzak/jishida-action@master
+      - 
+        name: V2Hub Release Push
+        uses: funnyzak/pushoo-action@main
         with:
-          key: ${{secrets.JPUSH_KEY}}
-          head: ${{github.repository}}已完成打包发布
-          body: 来自GithubAction：${{github.repository}} 发布已完成，下载地址：https://github.com/funnyzak/react-native-v2ex/releases。
+          platforms: ifttt, bark
+          tokens: ${{ secrets.PUSH_KEY }}
+          content: |
+            # ${{github.repository}} Released
+          options: '{"bark": { "url": "https://github.com/funnyzak" }}'
+          debug: false

.github/workflows/test.yml

@@ -0,0 +1,39 @@
+name: test
+
+on:
+  push:
+    branches: [ dev, main ]
+  pull_request:
+    branches: [ dev, main ]
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [16.x]
+    steps:
+      -
+        name: Checkout
+        uses: actions/checkout@v3
+      -
+        name: Use Node.js
+        uses: actions/setup-node@v2
+        with:
+          node-version: ${{ matrix.node-version }}
+      - 
+        name: Get yarn cache directory path
+        id: yarn-cache-dir-path
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+      - 
+        uses: actions/cache@v1
+        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
+        with:
+          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+      - 
+        name: Lint
+        run: |
+          yarn
+          yarn lint

.vscode/settings.json

@@ -11,5 +11,5 @@
       "source.fixAll.spotlessGradle": true
     }
   },
-  "java.configuration.updateBuildConfiguration": "interactive"
+  "java.configuration.updateBuildConfiguration": "automatic"
 }

android/app/build.gradle

@@ -138,7 +138,7 @@ android {
         applicationId "github.funnyzak.v2ex"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 32
+        versionCode 33
         versionName "0.7.1"
         buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
 

metro.config.js

@@ -10,8 +10,8 @@ module.exports = {
     getTransformOptions: async () => ({
       transform: {
         experimentalImportSupport: false,
-        inlineRequires: true,
-      },
-    }),
-  },
-};
+        inlineRequires: true
+      }
+    })
+  }
+}

package.json

@@ -11,7 +11,11 @@
     "start": "react-native start",
     "test": "jest",
     "pod": "pod-install",
-    "lint": "eslint . --ext .js,.jsx,.ts,.tsx",
+    "lint:code": "eslint --max-warnings 100 . --ext .js,.jsx,.ts,.tsx",
+    "lint:style": "prettier --check '**/*.{ts,js,jsx,tsx}'",
+    "lint:style:fix": "prettier --write '**/*.{ts,js,jsx,tsx}'",
+    "lint": "yarn lint:code && yarn lint:style",
+    "lint:fix": "yarn lint:style:fix && yarn lint:code --fix",
     "prepare": "if [[ $NODE_ENV != \"production\" ]]; then husky install; fi && patch-package",
     "upgrade": "react-native upgrade",
     "check-dependencies": "rnx-dep-check",
@@ -28,6 +32,8 @@
   "keywords": [
     "react",
     "react-native",
+    "v2ex",
+    "react-native-v2ex",
     "javascript",
     "js",
     "redux",
@@ -136,4 +142,4 @@
     "*.{js,jsx,ts,tsx}": "eslint --cache --fix",
     "*.{js,tx,tsx,sass,less,css,md}": "prettier --write"
   }
-}
+}

src/components/index.ts

@@ -1,8 +1,8 @@
-export { default as Header } from './header'
-export { default as LoadingModal } from './loading-modal'
-export { default as loading } from './loading'
-export * from './atoms'
-export * from './common'
-export { default as Avatar } from './avatar'
-
-export * from './toast'
+export { default as Header } from './header'
+export { default as LoadingModal } from './loading-modal'
+export { default as loading } from './loading'
+export * from './atoms'
+export * from './common'
+export { default as Avatar } from './avatar'
+
+export * from './toast'

src/reducers/NotificationReducer.ts

@@ -1,4 +1,11 @@
-import { APP_NOTIFICATION_PULL, APP_LOGOUT, APP_NOTIFICATION_LATEST, APP_NOTIFICATION_REMOVE, Action, IState } from '../types'
+import {
+  APP_NOTIFICATION_PULL,
+  APP_LOGOUT,
+  APP_NOTIFICATION_LATEST,
+  APP_NOTIFICATION_REMOVE,
+  Action,
+  IState
+} from '../types'
 
 const INITIAL_STATE: IState.NotificationState = {
   refreshing: false,

src/screens/components/notification/NotificationList.tsx

@@ -61,7 +61,7 @@ const NotificationList: React.FC<NotificationListProps> = ({ containerStyle }: N
         })
     },
     [showMessage, page, logined]
-  ) // eslint-disable-line react-hooks/exhaustive-deps
+  )
 
   const onRefresh = useCallback(() => {
     setPage(1)