create-steedos-app 2.2.29 → 2.2.32

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-steedos-app",
-  "version": "2.2.29",
+  "version": "2.2.32",
   "keywords": [
     "steedos"
   ],
@@ -35,5 +35,5 @@
   "resolutions": {
     "**/chalk": "3.0.0"
   },
-  "gitHead": "9ac3291157ee0c04125f824c8ea8ca1da09c9f71"
+  "gitHead": "8a0d14e924e75e55863035617981d75acb0f32bb"
 }

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

@@ -2,4 +2,7 @@
 mkdir -p /workspace/mongodb/data/db
 
 # create .env.local
-cp .env .env.local
+cp .env .env.local
+
+# git config pull.rebase， Gitpod上从分支更新代码，或者更新其他人提交的代码有时会提示执行 git config pull.rebase，下面使用git的默认配置
+git config --global pull.rebase false

package/templates/default/.scripts/tailscale.sh

@@ -0,0 +1,7 @@
+if [ -n "${TAILSCALE_STATE_MYPROJECT}" ]; then
+        sudo -E tailscale up
+      else
+        sudo -E tailscale up --hostname "gitpod-${GITPOD_GIT_USER_NAME// /-}-$(echo ${GITPOD_WORKSPACE_CONTEXT} | jq -r .repository.name)"
+        # store the tailscale state into gitpod user
+        gp env TAILSCALE_STATE_MYPROJECT="$(sudo cat /var/lib/tailscale/tailscaled.state)"
+      fi

package/templates/default/.scripts/tailscaled.sh

@@ -0,0 +1,6 @@
+if [ -n "${TS_STATE_TAILSCALE_EXAMPLE}" ]; then
+        # restore the tailscale state from gitpod user's env vars
+        sudo mkdir -p /var/lib/tailscale
+        echo "${TS_STATE_TAILSCALE_EXAMPLE}" | sudo tee /var/lib/tailscale/tailscaled.state > /dev/null
+      fi
+      sudo tailscaled

package/templates/default/.steedos/_package.json

@@ -4,8 +4,8 @@
     "description": "",
     "author": "",
     "dependencies": {
-        "@steedos-labs/master": "2.1.46",
-        "@steedos-labs/oa": "2.1.46",
+        "@steedos-labs/master": "2.1.61",
+        "@steedos-labs/oa": "2.1.61",
         "@steedos-labs/workflow": "2.1.46"
     }
 }

package/templates/default/.steedos/yarn.lock

@@ -16,3 +16,20 @@
   version "2.1.46"
   resolved "https://registry.npmmirror.com/@steedos-labs/workflow/download/@steedos-labs/workflow-2.1.46.tgz#f123666881d0527ab7f56ab706a60232170ae9b7"
   integrity sha512-M0zzmH2XJNEGFpdBNj7RmLlNCYE0ToYRfrXIuoKycgY2rqieQNVxYqCFl+MTvtVrRgsTAut0NEBDkNc5ikwR/g==
+
+"@steedos/service-plugin-amis@2.2.12":
+  version "2.2.12"
+  resolved "https://registry.yarnpkg.com/@steedos/service-plugin-amis/-/service-plugin-amis-2.2.12.tgz#c7bb705657092c166c2a2d0b7a219f44e51d86aa"
+  integrity sha512-F0lZdn60vKz3tGjA8imBXqtoPgfN+DobwxRjQD2aCug9o+VVeNcpWqbnefILqNz/KGakdXfQeZhyrd2kCnHbRA==
+
+"@steedos/webapp-accounts@^2.2.12":
+  version "2.2.12"
+  resolved "https://registry.yarnpkg.com/@steedos/webapp-accounts/-/webapp-accounts-2.2.12.tgz#eb4e53cadd6d779b4d6101341c19bae12b4839c2"
+  integrity sha512-d1KkChTHafeDn6HD+Eql+ab8nrcjv6Ul0gfesp6dx+Zh6dilHkMyZtn6F8rpcH1tGMIzW8Wv4HPPGcv5yprOeA==
+  dependencies:
+    lodash "^4.17.21"
+
+lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==

package/templates/default/README.md

@@ -13,16 +13,16 @@
 
 - **激活华炎魔方**：请参考该 [文档](https://www.steedos.cn/docs/deploy/deploy-activate)，注册华炎魔方门户账户，并准备好后续运行项目时激活华炎魔方依赖的两个环境变量。
 
-- **注册GitPod账户**：如果没有 [Github](https://github.com/) 账户和 [GitPod](https://gitpod.io/) 账户，请分别注册并使用浏览器登录它们。
+- **注册GitPod账户**：如果没有 [Gitlab](https://gitlab.steedos.cn/) 账户，请注册并使用浏览器登录它们。
 
 - **Fork项目**：请Fork本项目到本地，后续我们使用GitPod在线开发Fork后的项目的话就可以把开发后的代码提交到Git仓库。
 也可以执行以下命令来创建一个新项目，然后把该项目提交到Git仓库，而不是Fork本项目来创建自己的魔方项目。```npx create-steedos-app my-app```
 
 ## 运行项目
 
-只要在浏览器中输入地址 `https://gitpod.io/#{之前Fork下来的Git仓库地址}`即可使用 Gitpod 启动远程开发环境，远程开发环境已经安装并初始化好必须的组件，包括 nodejs, mongodb, redis, vscode 等。
+只要在浏览器中输入地址 `https://vscode.steedos.cn/#{之前Fork下来的Git仓库地址}`即可使用 Gitpod 启动远程开发环境，远程开发环境已经安装并初始化好必须的组件，包括 nodejs, mongodb, redis, vscode 等。
 
-比如访问地址 <https://gitpod.io/#https://github.com/steedos/steedos-project-template> 即可在线运行该Git仓库项目，可以把`#`号后面的Git仓库地址换成您希望运行的任何华炎魔方项目的Git仓库地址。
+比如访问地址 <https://vscode.steedos.cn/#https://github.com/steedos/steedos-project-template> 即可在线运行该Git仓库项目，可以把`#`号后面的Git仓库地址换成您希望运行的任何华炎魔方项目的Git仓库地址。
 
 在浏览器中打开项目后，会自动执行`yarn`指令安装项目依赖项，并自动执行`yarn start`指令运行项目。
 

package/templates/default/gitpod.yml

@@ -1,4 +1,4 @@
-image: ecr.aws.steedos.cn/dockerhub/steedos/gitpod-workspace-base:2.1
+image: ecr.aws.steedos.cn/dockerhub/steedos/gitpod-workspace-base:2.1.1
 
 # List the ports you want to expose and what to do when they are served. See https://www.gitpod.io/docs/config-ports/
 ports:
@@ -20,14 +20,14 @@ tasks:
   - name: MongoDB
     init: sh ./.scripts/setup.sh
     command: |
-      mongod --replSet rs0 --dbpath /workspace/mongodb/data/db
+      mongod --replSet rs0 --bind_ip_all --dbpath /workspace/mongodb/data/db
   - command: |
       gp await-port 27017
-      mongo steedos --eval "rs.initiate()"
+      mongo steedos --eval "rs.initiate();conf = rs.conf();conf.members[0].host=\"127.0.0.1\";rs.reconfig(conf, {force:true});"
       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
+      redis-server --protected-mode no --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
   - name: Steedos
     init: |
       yarn install
@@ -44,4 +44,4 @@ vscode:
     - steedos.steedosdx-vscode
     - steedos.steedosdx-vscode-core
     - ms-ceintl.vscode-language-pack-zh-hans
-    - mongodb.mongodb-vscode
+    - mongodb.mongodb-vscode

package/templates/default/services/sidecar-server.service.js

@@ -0,0 +1,7 @@
+const SidecarService = require("@steedos/service-sidecar");
+
+module.exports = {
+  name: "$sidecar",
+  namespace: "steedos",
+  mixins: [SidecarService],
+}