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

remove lerna.json and add turbo

Yuki Takei 3 лет назад
Родитель
Сommit
e3402c2967
6 измененных файлов с 13 добавлено и 881 удалено
  1. 3 3
      .devcontainer/Dockerfile
  2. 1 1
      .devcontainer/devcontainer.json
  3. 3 3
      .devcontainer/docker-compose.yml
  4. 0 8
      lerna.json
  5. 2 2
      package.json
  6. 4 864
      yarn.lock

+ 3 - 3
.devcontainer/Dockerfile

@@ -14,9 +14,9 @@ ARG USER_UID=1000
 ARG USER_GID=$USER_UID
 
 RUN mkdir -p /workspace/growi/node_modules
-RUN mkdir -p /workspace/growi/packages/app/node_modules
-RUN mkdir -p /workspace/growi/packages/slackbot-proxy/node_modules
-RUN mkdir -p /workspace/growi/packages/app/.next
+RUN mkdir -p /workspace/growi/apps/app/node_modules
+RUN mkdir -p /workspace/growi/apps/slackbot-proxy/node_modules
+RUN mkdir -p /workspace/growi/apps/app/.next
 
 # [Optional] Update UID/GID if needed
 RUN if [ "$USER_GID" != "1000" ] || [ "$USER_UID" != "1000" ]; then \

+ 1 - 1
.devcontainer/devcontainer.json

@@ -35,7 +35,7 @@
   // "shutdownAction": "none",
 
   // Use 'postCreateCommand' to run commands after the container is created.
-  // "postCreateCommand": "yarn install",
+  "postCreateCommand": "yarn global add turbo && yarn install",
 
   // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root.
   "remoteUser": "node"

+ 3 - 3
.devcontainer/docker-compose.yml

@@ -20,9 +20,9 @@ services:
     volumes:
       - ..:/workspace/growi:delegated
       - node_modules:/workspace/growi/node_modules
-      - node_modules_app:/workspace/growi/packages/app/node_modules
-      - node_modules_slackbot-proxy:/workspace/growi/packages/slackbot-proxy/node_modules
-      - buildcache_app:/workspace/growi/packages/app/.next
+      - node_modules_app:/workspace/growi/apps/app/node_modules
+      - node_modules_slackbot-proxy:/workspace/growi/apps/slackbot-proxy/node_modules
+      - buildcache_app:/workspace/growi/apps/app/.next
       - ../../growi-docker-compose:/workspace/growi-docker-compose:delegated
 
     tty: true

+ 0 - 8
lerna.json

@@ -1,8 +0,0 @@
-{
-  "npmClient": "yarn",
-  "useWorkspaces": true,
-  "version": "6.0.7-RC.0",
-  "packages": [
-    "packages/*"
-  ]
-}

+ 2 - 2
package.json

@@ -22,7 +22,8 @@
   "private": true,
   "workspaces": {
     "packages": [
-      "packages/*"
+      "packages/*",
+      "apps/*"
     ],
     "nohoist": [
       "**/slackbot-proxy/bootstrap"
@@ -74,7 +75,6 @@
     "jest": "^28.1.3",
     "jest-date-mock": "^1.0.8",
     "jest-localstorage-mock": "^2.4.14",
-    "lerna": "^4.0.0",
     "postcss": "^8.4.5",
     "postcss-scss": "^4.0.3",
     "reg-keygen-git-hash-plugin": "^0.11.1",

Разница между файлами не показана из-за своего большого размера
+ 4 - 864
yarn.lock


Некоторые файлы не были показаны из-за большого количества измененных файлов