Просмотр исходного кода

replace packages/slackbot-proxy -> apps/slackbot-proxy

Yuki Takei 3 лет назад
Родитель
Сommit
611d93ee2f

+ 4 - 4
.github/workflows/ci-slackbot-proxy.yml

@@ -11,8 +11,8 @@ on:
       - .eslint*
       - tsconfig.base.json
       - yarn.lock
-      - packages/slackbot-proxy/**
-      - '!packages/slackbot-proxy/docker/**'
+      - apps/slackbot-proxy/**
+      - '!apps/slackbot-proxy/docker/**'
       - packages/slack/**
 
 concurrency:
@@ -115,7 +115,7 @@ jobs:
         npx lerna bootstrap -- --frozen-lockfile
 
     - name: yarn dev:ci
-      working-directory: ./packages/slackbot-proxy
+      working-directory: ./apps/slackbot-proxy
       run: |
         cp config/ci/.env.local.for-ci .env.development.local
         yarn dev:ci
@@ -189,7 +189,7 @@ jobs:
         echo -n "npm " && npm -v
         yarn list --production --depth=0
     - name: yarn start:prod:ci
-      working-directory: ./packages/slackbot-proxy
+      working-directory: ./apps/slackbot-proxy
       run: |
         cp config/ci/.env.local.for-ci .env.production.local
         yarn start:prod:ci

+ 4 - 4
.github/workflows/release-slackbot-proxy.yml

@@ -20,7 +20,7 @@ jobs:
       uses: myrotvorets/info-from-package-json-action@1.2.0
       id: package-json
       with:
-        workingDir: packages/slackbot-proxy
+        workingDir: apps/slackbot-proxy
 
     - name: Docker meta
       id: meta
@@ -61,7 +61,7 @@ jobs:
       uses: docker/build-push-action@v4
       with:
         context: .
-        file: ./packages/slackbot-proxy/docker/Dockerfile
+        file: ./apps/slackbot-proxy/docker/Dockerfile
         platforms: linux/amd64
         push: true
         builder: ${{ steps.buildx.outputs.name }}
@@ -87,7 +87,7 @@ jobs:
         username: wsmoogle
         password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }}
         repository: weseek/growi-slackbot-proxy
-        readme-filepath: ./packages/slackbot-proxy/docker/README.md
+        readme-filepath: ./apps/slackbot-proxy/docker/README.md
 
 
   create-pr-for-next-rc:
@@ -118,7 +118,7 @@ jobs:
       uses: myrotvorets/info-from-package-json-action@1.2.0
       id: package-json
       with:
-        workingDir: packages/slackbot-proxy
+        workingDir: apps/slackbot-proxy
 
     - name: Commit
       uses: github-actions-x/commit@v2.9

+ 2 - 2
.github/workflows/reusable-app-prod.yml

@@ -51,7 +51,7 @@ jobs:
 
     - name: Remove unnecessary packages
       run: |
-        rm -rf packages/slackbot-proxy
+        rm -rf apps/slackbot-proxy
         rm -f "node_modules/@growi/slackbot-proxy"
 
     - name: Build
@@ -148,7 +148,7 @@ jobs:
 
     - name: Remove unnecessary packages
       run: |
-        rm -rf packages/slackbot-proxy
+        rm -rf apps/slackbot-proxy
         rm -f "node_modules/@growi/slackbot-proxy"
 
     - name: lerna bootstrap --production

+ 1 - 1
apps/app/docker/Dockerfile

@@ -55,7 +55,7 @@ RUN tar -cf node_modules.tar \
 FROM deps-resolver AS deps-resolver-prod
 
 # remove unnecessary packages
-RUN rm -rf packages/slackbot-proxy
+RUN rm -rf apps/slackbot-proxy
 
 RUN npx -y lerna bootstrap -- --production
 # make artifacts

+ 6 - 6
apps/slackbot-proxy/docker/Dockerfile

@@ -47,7 +47,7 @@ ENV optDir /opt
 WORKDIR ${optDir}
 COPY ["package.json", "yarn.lock", "lerna.json", "./"]
 COPY ./packages/slack/package.json ./packages/slack/package.json
-COPY ./packages/slackbot-proxy/package.json ./packages/slackbot-proxy/package.json
+COPY ./apps/slackbot-proxy/package.json ./apps/slackbot-proxy/package.json
 
 RUN npx -y lerna bootstrap -- --production
 # make artifacts
@@ -77,7 +77,7 @@ RUN rm node_modules.tar
 COPY ["package.json", "lerna.json", "tsconfig.base.json", "./"]
 # copy all related packages
 COPY packages/slack packages/slack
-COPY packages/slackbot-proxy packages/slackbot-proxy
+COPY apps/slackbot-proxy apps/slackbot-proxy
 
 # build
 RUN yarn lerna run build
@@ -86,9 +86,9 @@ RUN yarn lerna run build
 RUN tar -cf packages.tar \
   packages/slack/package.json \
   packages/slack/dist \
-  packages/slackbot-proxy/package.json \
-  packages/slackbot-proxy/.env \
-  packages/slackbot-proxy/dist
+  apps/slackbot-proxy/package.json \
+  apps/slackbot-proxy/.env \
+  apps/slackbot-proxy/dist
 
 
 
@@ -117,7 +117,7 @@ RUN tar -xf dependencies.tar
 RUN tar -xf packages.tar
 RUN rm dependencies.tar packages.tar
 
-WORKDIR ${appDir}/packages/slackbot-proxy
+WORKDIR ${appDir}/apps/slackbot-proxy
 
 EXPOSE 8080
 

+ 1 - 1
apps/slackbot-proxy/docker/README.md

@@ -8,7 +8,7 @@ GROWI Slackbot Proxy Server Official docker image
 Supported tags and respective Dockerfile links
 ------------------------------------------------
 
-* [`1.0.0`, `latest` (Dockerfile)](https://github.com/weseek/growi/blob/master/packages/slackbot-proxy/docker/Dockerfile)
+* [`1.0.0`, `latest` (Dockerfile)](https://github.com/weseek/growi/blob/master/apps/slackbot-proxy/docker/Dockerfile)
 
 
 What is GROWI Slackbot Proxy Server?

+ 1 - 1
package.json

@@ -40,7 +40,7 @@
     "bump-versions:preminor": "node ./bin/github-actions/bump-versions -i preminor",
     "bump-versions:patch": "node ./bin/github-actions/bump-versions -i patch",
     "bump-versions:rc": "node ./bin/github-actions/bump-versions -i prerelease",
-    "bump-versions:slackbot-proxy": "node ./bin/github-actions/bump-versions -i prerelease -d packages/slackbot-proxy --preid slackbot-proxy --update-dependencies false"
+    "bump-versions:slackbot-proxy": "node ./bin/github-actions/bump-versions -i prerelease -d apps/slackbot-proxy --preid slackbot-proxy --update-dependencies false"
   },
   "dependencies": {
     "cross-env": "^7.0.0",