create-steedos-app 2.1.68 → 2.1.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-app",
-  "version": "2.1.68",
+  "version": "2.1.74",
   "keywords": [
     "steedos"
   ],
@@ -32,5 +32,8 @@
     "cpy": "7.3.0",
     "fs-extra": "8.1.0"
   },
-  "gitHead": "08258fa4543a8cf425156f057c6016ca3c1deaf9"
+  "resolutions": {
+    "**/chalk": "3.0.0"
+  },
+  "gitHead": "ee62091811d4fcf0e63575e9f813befe124ea66f"
 }

package/templates/default/.scripts/flush_cacher_db.js

@@ -0,0 +1,7 @@
+const Redis = require("ioredis");
+require('dotenv-flow').config(process.cwd());
+const redis = new Redis(process.env.CACHER);
+redis.flushdb(() => {
+    console.log(`flushdb: ${process.env.CACHER}`);
+    process.exit(0)
+});

package/templates/default/.scripts/setup.sh

@@ -0,0 +1,13 @@
+# create mongodb data directory
+mkdir -p /workspace/mongodb/data/db
+
+# create .env.local
+cp .env .env.local
+
+# replace ROOT_URL
+root_replacement="ROOT_URL=$(gp url 5000)"
+sed -i "/^ROOT_URL=*/c$root_replacement" .env.local
+
+# replace METADATA_SERVER
+meta_replacement="METADATA_SERVER=$(gp url 5000)"
+sed -i "/^METADATA_SERVER=*/c$meta_replacement" .env.local

package/templates/default/Dockerfile

@@ -3,6 +3,7 @@ FROM node:12.22.7
 WORKDIR /app
 
 ADD .steedos ./.steedos/
+ADD .scripts ./.scripts/
 ADD services ./services/
 ADD steedos-app ./steedos-app/
 # ADD steedos-packages ./steedos-packages/
@@ -10,11 +11,11 @@ ADD package.json .
 ADD moleculer.config.js .
 ADD steedos-config.yml ./steedos-config.yml
 
-RUN npm config set registry http://registry.npm.taobao.org/
-RUN yarn config set registry http://registry.npm.taobao.org/
+# RUN npm config set registry http://registry.npm.taobao.org/
+# RUN yarn config set registry http://registry.npm.taobao.org/
 
 RUN yarn
 
 ENV NODE_ENV=production
 
-CMD ["yarn", "start"]
+CMD ["yarn", "start"]

package/templates/default/_package.json

@@ -8,7 +8,8 @@
     "node": ">=12"
   },
   "scripts": {
-    "start": "moleculer-runner services",
+    "start": "yarn flushCacherDB && moleculer-runner services",
+    "flushCacherDB": "node .scripts/flush_cacher_db.js",
     "start:steedos": "cross-env NODEID=STEEDOS-SERVER moleculer-runner services/steedos-server",
     "start:app": "cross-env NODEID=STEEDOS-APP moleculer-runner --repl services/steedos-app",
     "console": "cross-env NODEID=STEEDOS-CONSOLE moleculer connect --config ./moleculer.config.js",
@@ -39,6 +40,7 @@
   "homepage": "https://www.steedos.com",
   "resolutions": {
     "typeorm": "0.2.28",
+    "**/chalk": "3.0.0",
     "**/lodash": "^4.17.15",
     "**/handlebars": "^4.3.0",
     "**/debug": "^3.1.0",

package/templates/default/gitpod.yml

@@ -1,4 +1,4 @@
-image: steedos/gitpod-workspace-base:latest
+image: ecr.aws.steedos.cn/dockerhub/steedos/gitpod-workspace-base:latest
 
 # List the ports you want to expose and what to do when they are served. See https://www.gitpod.io/docs/config-ports/
 ports:
@@ -17,15 +17,19 @@ ports:
     visibility: public
 # List the start up tasks. You can start them in parallel in multiple terminals. See https://www.gitpod.io/docs/config-start-tasks/
 tasks:
-  - init: sh ./.scripts/setup.sh
+  - name: MongoDB
+    init: sh ./.scripts/setup.sh
     command: |
       mongod --replSet rs0 --dbpath /workspace/mongodb/data/db
   - command: |
       gp await-port 27017
       mongo steedos --eval "rs.initiate()"
-  - command: |
+      exit
+  - name: Redis
+    command: |
       redis-server --save "" --appendonly no --client-output-buffer-limit replica 0 0 0 --client-output-buffer-limit pubsub 0 0 0 --client-output-buffer-limit slave 0 0 0
-  - init: |
+  - name: Steedos
+    init: |
       yarn install
     command: |
       gp await-port 27017
@@ -38,3 +42,4 @@ vscode:
     - redhat.vscode-yaml
     - steedos.steedosdx-vscode
     - steedos.steedosdx-vscode-core
+    - ms-ceintl.vscode-language-pack-zh-hans