create-aomex 0.0.33 → 0.0.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-aomex",
-  "version": "0.0.33",
+  "version": "0.0.35",
   "repository": "git@github.com:aomex/create-aomex.git",
   "license": "MIT",
   "type": "module",

package/templates/Dockerfile.integration

@@ -1,10 +1,13 @@
 FROM node:{{nodeVersion}}
 COPY . /codes
 WORKDIR /codes
-RUN sh scripts/build-in-docker.sh
+
 RUN mv .env.integration .env
 
 ENV TZ=Asia/Shanghai
 ENV PORT=3000
 ENV NODE_ENV=integration
+
+RUN sh scripts/build-in-docker.sh
+
 CMD ["node", "--enable-source-maps", "src/web.js"]

package/templates/Dockerfile.production

@@ -1,10 +1,13 @@
 FROM node:{{nodeVersion}}
 COPY . /codes
 WORKDIR /codes
-RUN sh scripts/build-in-docker.sh
+
 RUN mv .env.production .env
 
 ENV TZ=Asia/Shanghai
 ENV PORT=3000
 ENV NODE_ENV=production
+
+RUN sh scripts/build-in-docker.sh
+
 CMD ["node", "--enable-source-maps", "src/web.js"]

package/templates/docker-compose.yml

@@ -1,6 +1,6 @@
 services:
-  db:
-    image: mysql:8.4
+  mysql:
+    image: mysql:8
     environment:
       # 修改后需要同步修改.env里的参数
       MYSQL_DATABASE: '{{projectName}}'
@@ -10,8 +10,17 @@ services:
     ports:
       - 3306:3306
     command: --character-set-server=utf8mb4 --collation-server=utf8mb4_unicode_ci
+  mongo:
+    image: mongo:7
+    environment:
+      MONGO_INITDB_ROOT_USERNAME: root
+      MONGO_INITDB_ROOT_PASSWORD: abcde
+    volumes:
+      - ./volumes/mongo:/data/db
+    ports:
+      - 27017:27017
   redis:
-    image: redis:7.4
+    image: redis:7
     volumes:
       - ./volumes/redis:/data
     ports:

package/templates/package.json

@@ -8,6 +8,8 @@
   },
   "scripts": {
     "start": "node scripts/start.mjs",
+    "cron:stats": "sh scripts/docker-cron-stats.sh",
+    "commit:main": "sh scripts/commit-develop-to-main.sh",
     "deploy:production": "sh scripts/deploy.sh production",
     "deploy:integration": "sh scripts/deploy.sh integration",
     "prepare": "npx husky",

package/templates/scripts/build-in-docker.sh

@@ -3,11 +3,12 @@
 set -ex
 
 corepack enable # package.json => packageManager
-pnpm install
+pnpm install --no-prod
 pnpm exec prisma generate
 pnpm exec tsc
 pnpm exec tsc-alias --resolve-full-paths
 rm -rf src
 mv build/src .
 pnpm install --prod
+pnpm store prune
 rm -rf node_modules/@types node_modules/*/*.d.ts

package/templates/scripts/commit-develop-to-main.sh

@@ -0,0 +1,10 @@
+#!/usr/bin/env sh
+
+set -e
+
+git checkout main
+git fetch
+git reset --hard origin/main
+git rebase origin/develop
+git push
+git switch -

package/templates/scripts/docker-cron-stats.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+
+# exit 130 SIGINT
+{ sudo docker compose exec -it cron /bin/sh -c "npx aomex cron:stats" || :; }

package/templates/scripts/start.mjs

@@ -5,7 +5,7 @@ execSync('docker compose -f docker-compose.yml down', { stdio: 'inherit' });
 
 const docker = spawn('docker compose -f docker-compose.yml up', {
   stdio: ['inherit', 'inherit', 'pipe'],
-  shell: 'zsh',
+  shell: true,
 });
 
 await new Promise((resolve) => {
@@ -19,10 +19,10 @@ await new Promise((resolve) => {
 
 const server = spawn(
   'npx prisma migrate deploy && npx prisma generate && node --import tsx/esm --watch src/web.ts',
-  { stdio: 'inherit', shell: 'zsh' },
+  { stdio: 'inherit', shell: true },
 );
 
-const cron = spawn('npx', ['aomex', 'cron:start'], { stdio: 'inherit', shell: 'zsh' });
+const cron = spawn('npx aomex cron:start', { stdio: 'inherit', shell: true });
 
 // 防止被其它逻辑清除监听
 setTimeout(() => {