chore: packegae.jsonを分離

Author: mikan3rd

.github/workflows/github-actions.yaml

@@ -28,12 +28,16 @@ jobs:
           restore-keys: ${{ runner.os }}-yarn-
 
       - run: yarn install
+        working-directory: ./app
 
-      - run: yarn app:type-check
+      - run: yarn type-check
+        working-directory: ./app
 
-      - run: yarn app:lint
+      - run: yarn lint
+        working-directory: ./app
 
       - run: yarn app:build
+        working-directory: ./app
         env:
           FIREBASE_API_KEY: ${{ secrets.FIREBASE_API_KEY }}
           FIREBASE_AUTH_DOMAIN: ${{ secrets.FIREBASE_AUTH_DOMAIN }}
@@ -71,7 +75,10 @@ jobs:
           restore-keys: ${{ runner.os }}-yarn-
 
       - run: yarn install
+        working-directory: ./functions
 
-      - run: yarn functions:lint
+      - run: yarn lint
+        working-directory: ./functions
 
-      - run: yarn functions:build
+      - run: yarn build
+        working-directory: ./functions

.eslintrc.json app/.eslintrc.json

@@ -2,39 +2,28 @@
   "name": "commitly-next-web",
   "version": "1.0.0",
   "scripts": {
-    "app:dev": "next dev app/",
-    "app:build": "next build app/",
-    "app:start": "next start app/",
-    "app:type-check": "tsc -p app/tsconfig.json --noEmit",
-    "app:lint": "eslint app",
-    "functions:build": "tsc -p functions/tsconfig.json",
-    "functions:serve": "yarn functions:build && firebase emulators:start --only functions",
-    "functions:shell": "yarn functions:build && firebase functions:shell",
-    "functions:start": "yarn shell",
-    "functions:deploy": "firebase deploy --only functions",
-    "functions:logs": "firebase functions:log",
-    "functions:lint": "eslint functions",
+    "dev": "next dev",
+    "build": "next build",
+    "start": "next start",
+    "type-check": "tsc --noEmit",
+    "lint": "eslint .",
     "lint:fix": "yarn lint --fix"
   },
   "dependencies": {
     "@emotion/babel-preset-css-prop": "10.0.27",
     "@emotion/core": "10.0.28",
-    "@google-cloud/pubsub": "2.3.0",
-    "axios": "0.19.2",
     "dayjs": "1.8.31",
     "dotenv": "8.2.0",
     "firebase": "7.17.1",
     "firebase-admin": "8.13.0",
     "firebase-functions": "3.8.0",
     "immer": "7.0.7",
-    "jsonwebtoken": "8.5.1",
     "next": "9.5.1",
     "react": "16.13.1",
     "react-dom": "16.13.1",
     "react-semantic-toasts": "0.6.5",
     "semantic-ui-css": "2.4.1",
-    "semantic-ui-react": "1.1.0",
-    "twitter": "1.7.1"
+    "semantic-ui-react": "1.1.0"
   },
   "devDependencies": {
     "@types/node": "14.0.27",
@@ -54,7 +43,7 @@
     "typescript": "3.9.7"
   },
   "engines": {
-    "node": "12"
+    "node": "12.x"
   },
   "license": "MIT"
 }

Dockerfile app/Dockerfile

@@ -2,10 +2,10 @@ version: "3"
 services:
   app:
     build:
-      context: .
+      context: ./app
     tty: true
     ports:
       - "3000:3000"
     volumes:
-      - .:/app
+      - ./app:/app
       - /app/node_modules

package.json app/package.json

@@ -0,0 +1,41 @@
+{
+  "extends": [
+    "eslint:recommended",
+    "plugin:@typescript-eslint/recommended",
+    "prettier/@typescript-eslint",
+    "plugin:prettier/recommended",
+    "plugin:import/errors",
+    "plugin:import/warnings",
+    "plugin:import/typescript"
+  ],
+  "plugins": ["@typescript-eslint", "prettier"],
+  "env": {
+    "node": true,
+    "browser": true,
+    "jest": true,
+    "es6": true
+  },
+  "rules": {
+    "@typescript-eslint/no-unused-vars": ["warn", { "args": "none" }],
+    "@typescript-eslint/explicit-function-return-type": ["off"],
+    "@typescript-eslint/explicit-module-boundary-types": ["off"],
+    "sort-imports": ["error", { "ignoreDeclarationSort": true }],
+    "import/order": ["error", { "newlines-between": "always" }],
+    "prettier/prettier": [
+      "error",
+      {
+        "semi": true,
+        "printWidth": 120,
+        "trailingComma": "all"
+      }
+    ]
+  },
+  "parser": "@typescript-eslint/parser",
+  "settings": {
+    "react": {
+      "version": "detect"
+    },
+    "import/ignore": ["node_modules", "lib"]
+  },
+  "ignorePatterns": ["node_modules", "lib"]
+}

yarn.lock app/yarn.lock

@@ -0,0 +1,40 @@
+{
+  "name": "functions",
+  "scripts": {
+    "build": "tsc",
+    "serve": "npm run build && firebase emulators:start --only functions",
+    "shell": "npm run build && firebase functions:shell",
+    "start": "npm run shell",
+    "deploy": "firebase deploy --only functions",
+    "logs": "firebase functions:log",
+    "lint": "eslint .",
+    "lint:fix": "yarn lint --fix"
+  },
+  "engines": {
+    "node": "12"
+  },
+  "main": "lib/index.js",
+  "dependencies": {
+    "@google-cloud/pubsub": "1.7.3",
+    "@types/twitter": "1.7.0",
+    "axios": "0.19.2",
+    "dayjs": "1.8.30",
+    "firebase-admin": "8.13.0",
+    "firebase-functions": "3.8.0",
+    "jsonwebtoken": "8.5.1",
+    "twitter": "1.7.1"
+  },
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "3.7.1",
+    "@typescript-eslint/parser": "3.7.1",
+    "eslint": "7.5.0",
+    "eslint-config-prettier": "6.11.0",
+    "eslint-import-resolver-webpack": "0.12.2",
+    "eslint-loader": "4.0.2",
+    "eslint-plugin-import": "2.22.0",
+    "eslint-plugin-prettier": "3.1.4",
+    "prettier": "2.0.5",
+    "typescript": "3.9.7",
+    "firebase-functions-test": "0.2.1"
+  }
+}