chore(workspaces): yarn workspace (#108)

* chore(workspaces): setup workspaces

* chore(app): rename dir

* chore(config): rename dir

* chore(git): rename git repo

* chore(app): rename package name

* chore(workflows): fix to with workspaces command

* chore(workflows): remove cache job

Author: amotarao

.github/workflows/deploy-app-develop.yml

@@ -5,7 +5,7 @@ on:
     branches:
     - develop
     paths:
-    - packages/yukukuru-app/**
+    - packages/app/**
 
 jobs:
   build:
@@ -20,32 +20,14 @@ jobs:
       with:
         node-version: 10
 
-    - name: Get yarn cache directory path
-      id: yarn-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-
-    - uses: actions/cache@v2
-      id: yarn-cache
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('./packages/yukukuru-app/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-yarn-
-
-    - name: Install dependencies on root
-      run: yarn --frozen-lockfile
-
-    - name: Install dependencies on app
+    - name: Install dependencies
       run: yarn --frozen-lockfile
-      working-directory: ./packages/yukukuru-app
 
-    - name: Run lint on app
-      run: yarn lint
-      working-directory: ./packages/yukukuru-app
+    - name: Run lint
+      run: yarn workspace @yukukuru/app lint
 
-    - name: Run build on app
-      run: yarn build
-      working-directory: ./packages/yukukuru-app
+    - name: Run build
+      run: yarn workspace @yukukuru/app build
       env:
         PUBLIC_URL: ${{ secrets.PUBLIC_URL_DEVELOP }}
         GOOGLE_ANALYTICS: ${{ secrets.GOOGLE_ANALYTICS_DEVELOP }}
@@ -61,7 +43,7 @@ jobs:
       uses: actions/upload-artifact@master
       with:
         name: app-dist
-        path: ./packages/yukukuru-app/out
+        path: ./packages/app/out
 
   deploy:
     name: Deploy app
@@ -84,7 +66,7 @@ jobs:
       uses: actions/download-artifact@master
       with:
         name: app-dist
-        path: ./packages/yukukuru-app/out
+        path: ./packages/app/out
 
     - name: Install to firebase-tools
       run: npm i -g firebase-tools

.github/workflows/deploy-app-production.yml

@@ -5,7 +5,7 @@ on:
     branches:
     - master
     paths:
-    - packages/yukukuru-app/**
+    - packages/app/**
 
 jobs:
   build:
@@ -20,32 +20,14 @@ jobs:
       with:
         node-version: 10
 
-    - name: Get yarn cache directory path
-      id: yarn-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
-
-    - uses: actions/cache@v2
-      id: yarn-cache
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('./packages/yukukuru-app/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-yarn-
-
-    - name: Install dependencies on root
-      run: yarn --frozen-lockfile
-
-    - name: Install dependencies on app
+    - name: Install dependencies
       run: yarn --frozen-lockfile
-      working-directory: ./packages/yukukuru-app
 
-    - name: Run lint on app
-      run: yarn lint
-      working-directory: ./packages/yukukuru-app
+    - name: Run lint
+      run: yarn workspace @yukukuru/app lint
 
-    - name: Run build on app
-      run: yarn build
-      working-directory: ./packages/yukukuru-app
+    - name: Run build
+      run: yarn workspace @yukukuru/app build
       env:
         PUBLIC_URL: ${{ secrets.PUBLIC_URL }}
         GOOGLE_ANALYTICS: ${{ secrets.GOOGLE_ANALYTICS }}
@@ -61,7 +43,7 @@ jobs:
       uses: actions/upload-artifact@master
       with:
         name: app-dist
-        path: ./packages/yukukuru-app/out
+        path: ./packages/app/out
 
   deploy:
     name: Deploy app
@@ -84,7 +66,7 @@ jobs:
       uses: actions/download-artifact@master
       with:
         name: app-dist
-        path: ./packages/yukukuru-app/out
+        path: ./packages/app/out
 
     - name: Install to firebase-tools
       run: npm i -g firebase-tools

.github/workflows/test-functions.yml

@@ -16,29 +16,11 @@ jobs:
       with:
         node-version: '10.x'
 
-    - name: Get yarn cache directory path
-      id: yarn-cache-dir-path
-      run: echo "::set-output name=dir::$(yarn cache dir)"
+    - name: Install dependencies
+      run: yarn --frozen-lockfile
 
-    - uses: actions/cache@v1
-      id: yarn-cache
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('./packages/functions/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-yarn-
-
-    - name: Install dependencies on root
-      run: yarn
-
-    - name: Install dependencies on functions
-      run: yarn
-      working-directory: ./packages/functions
-
-    - name: Run lint on functions
-      run: yarn lint
-      working-directory: ./packages/functions
+    - name: Run lint
+      run: yarn workspace @yukukuru/functions lint
 
-    - name: Run build on functions
-      run: yarn build
-      working-directory: ./packages/functions
+    - name: Run build
+      run: yarn workspace @yukukuru/functions build

.github/workflows/test-types.yml

@@ -16,25 +16,8 @@ jobs:
       with:
         node-version: '10.x'
 
-    - 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
-      with:
-        path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-        key: ${{ runner.os }}-yarn-${{ hashFiles('./packages/types/yarn.lock') }}
-        restore-keys: |
-          ${{ runner.os }}-yarn-
-
-    - name: Install dependencies on root
-      run: yarn --frozen-lockfile
-
-    - name: Install dependencies on types
+    - name: Install dependencies
       run: yarn --frozen-lockfile
-      working-directory: ./packages/types
 
-    - name: Run lint on types
-      run: yarn lint
-      working-directory: ./packages/types
+    - name: Run lint
+      run: yarn workspace @yukukuru/types lint

README.md

@@ -10,7 +10,7 @@
   "hosting": [
     {
       "target": "app",
-      "public": "packages/yukukuru-app/out",
+      "public": "packages/app/out",
       "ignore": [
         "firebase.json",
         "**/.*",

firebase.json

@@ -1,11 +1,13 @@
 {
   "name": "yukukuru",
-  "version": "0.101.0",
   "homepage": "https://yukukuru.app",
   "license": "UNLICENSED",
   "private": true,
-  "repository": "[email protected]:amotarao/yukukuru-app.git",
+  "repository": "[email protected]:amotarao/yukukuru.git",
   "author": "Amon Sawamura <[email protected]>",
+  "workspaces": [
+    "packages/**"
+  ],
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^2.26.0",
     "@typescript-eslint/parser": "^2.26.0",

package.json

@@ -1,5 +1,6 @@
 {
-  "name": "@yukukuru/yukukuru-app",
+  "name": "@yukukuru/app",
+  "version": "0.1.0",
   "homepage": "https://yukukuru.app",
   "license": "UNLICENSED",
   "scripts": {
@@ -29,7 +30,6 @@
     "@types/react-transition-group": "^4.2.4",
     "@typescript-eslint/eslint-plugin": "^2.29.0",
     "@typescript-eslint/parser": "^2.29.0",
-    "@yukukuru/types": "../types",
     "dotenv": "^8.2.0",
     "eslint": "^6.8.0",
     "eslint-config-prettier": "^6.11.0",

packages/yukukuru-app/.env.sample renamed to packages/app/.env.sample

@@ -14,9 +14,9 @@ export const GitHubButton: React.FC<GitHubButtonProps> = ({ size = 'normal' }) =
   return (
     <div css={style.wrapper} data-size={isNormal ? undefined : size}>
       <ReactGitHubButton
-        href="https://github.com/amotarao/yukukuru-app"
+        href="https://github.com/amotarao/yukukuru"
         data-icon="octicon-star"
-        aria-label="Star amotarao/yukukuru-app on GitHub"
+        aria-label="Star amotarao/yukukuru on GitHub"
       >
         Star
       </ReactGitHubButton>

packages/yukukuru-app/.eslintrc.js renamed to packages/app/.eslintrc.js

@@ -1,9 +1,9 @@
 {
   "name": "@yukukuru/functions",
+  "version": "0.1.0",
   "homepage": "https://yukukuru.app",
   "license": "UNLICENSED",
   "scripts": {
-    "preinstall": "if [ -d ../types ]; then npm pack ../types; fi",
     "build": "rm -rf lib/* && tsc",
     "serve": "npm run build && firebase serve --only functions",
     "shell": "npm run build && firebase functions:shell",
@@ -25,7 +25,6 @@
   "devDependencies": {
     "@types/lodash": "^4.14.149",
     "@types/twitter": "^1.7.0",
-    "@yukukuru/types": "file:./yukukuru-types-0.2.8.tgz",
     "eslint": "^6.8.0",
     "typescript": "^3.8.3"
   }