create-nocobase-app 0.5.0-alpha.31 → 0.5.0-alpha.35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-nocobase-app",
-  "version": "0.5.0-alpha.31",
+  "version": "0.5.0-alpha.35",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "files": [
@@ -15,6 +15,7 @@
   },
   "license": "MIT",
   "dependencies": {
+    "@nocobase/utils": "^0.5.0-alpha.35",
     "@umijs/utils": "3.5.17",
     "commander": "^8.2.0",
     "execa": "^5.1.1",
@@ -23,5 +24,5 @@
   "bin": {
     "create-nocobase-app": "bin/create-nocobase-app.js"
   },
-  "gitHead": "7a35638eda3a59aa31132d6845fed96738f71b38"
+  "gitHead": "2b81a6af327ee784a6943aff6e028fde3298dec9"
 }

package/templates/AppGenerator/.env.example

@@ -30,7 +30,7 @@ ADMIN_PASSWORD=admin
 # STORAGE (Initialization only)
 
 # local or ali-oss
-STORAGE_TYPE=local
+DEFAULT_STORAGE_TYPE=local
 
 # LOCAL STORAGE
 LOCAL_STORAGE_USE_STATIC_SERVER=true
@@ -42,3 +42,10 @@ ALI_OSS_REGION=oss-cn-beijing
 ALI_OSS_ACCESS_KEY_ID=
 ALI_OSS_ACCESS_KEY_SECRET=
 ALI_OSS_BUCKET=
+
+# AWS
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_S3_REGION=
+AWS_S3_BUCKET=
+AWS_S3_STORAGE_BASE_URL=

package/templates/AppGenerator/.env.tpl

@@ -22,6 +22,18 @@ DB_STORAGE=db.sqlite
 # set to 'on' to enable log
 DB_LOG_SQL=
 
+# API & APP
+
+NOCOBASE_ENV=
+
+# api server access point will be proxied from app(web when `umi dev`)
+API_ORIGIN_DEV=http://localhost:13002
+# api server access point for app(web when build)
+API_ORIGIN=
+
+# api base path endpoint for app(web)
+API_BASE_PATH=/api/
+
 # ADMIN USER (Initialization only)
 
 ADMIN_EMAIL=admin@nocobase.com
@@ -30,7 +42,7 @@ ADMIN_PASSWORD=admin123
 # STORAGE (Initialization only)
 
 # local or ali-oss
-STORAGE_TYPE=local
+DEFAULT_STORAGE_TYPE=local
 
 # LOCAL STORAGE
 LOCAL_STORAGE_USE_STATIC_SERVER=true
@@ -42,3 +54,10 @@ ALI_OSS_REGION=oss-cn-beijing
 ALI_OSS_ACCESS_KEY_ID=
 ALI_OSS_ACCESS_KEY_SECRET=
 ALI_OSS_BUCKET=
+
+# AWS
+AWS_ACCESS_KEY_ID=
+AWS_SECRET_ACCESS_KEY=
+AWS_S3_REGION=
+AWS_S3_BUCKET=
+AWS_S3_STORAGE_BASE_URL=

package/templates/AppGenerator/.umirc.ts

@@ -1,11 +1,14 @@
 import { defineConfig } from 'umi';
 import dotenv from 'dotenv';
 import path from 'path';
+import { getUmiConfig } from '@nocobase/utils';
 
 dotenv.config({
   path: path.resolve(__dirname, './.env'),
 });
 
+const umiConfig = getUmiConfig();
+
 process.env.MFSU_AD = 'none';
 
 export default defineConfig({
@@ -14,15 +17,12 @@ export default defineConfig({
     type: 'none',
   },
   define: {
-    'process.env.API_URL': process.env.API_URL || `/api/`,
-    'process.env.API_PORT': process.env.API_PORT || '13001',
+    ...umiConfig.define,
   },
+  // only proxy when using `umi dev`
+  // if the assets are built, will not proxy
   proxy: {
-    '/api': {
-      target: `http://localhost:${process.env.API_PORT || '13001'}/`,
-      changeOrigin: true,
-      pathRewrite: { '^/api': '/api' },
-    },
+    ...umiConfig.proxy,
   },
   routes: [{ path: '/', exact: false, component: '@/pages/index' }],
   fastRefresh: {},

package/templates/AppGenerator/src/apis/index.ts

@@ -7,7 +7,7 @@ const start = Date.now();
 const api = new Application({
   database: dbConfig[process.env.DB_DIALECT || 'sqlite'],
   resourcer: {
-    prefix: '/api',
+    prefix: process.env.API_BASE_PATH || '/api/',
   },
 });