From 99f3bde306d88f7b884dfc308f42288dbc0e6fc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B4=AE=E7=94=9F?= Date: Thu, 11 Mar 2021 23:14:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E7=9B=AE=E5=BD=95=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/deploy.yml | 6 ++-- README.md => apps/backend/README.md | 1 + apps/backend/malagu.yml | 13 ++++++++ apps/backend/package.json | 30 ++++++++++++++++++ {src => apps/backend/src}/home-controller.ts | 0 {src => apps/backend/src}/module.ts | 2 ++ tsconfig.json => apps/backend/tsconfig.json | 0 {projects => apps}/frontend/.gitignore | 0 {projects => apps}/frontend/README.md | 0 {projects => apps}/frontend/index.html | 0 {projects => apps}/frontend/package.json | 0 .../frontend/public/favicon.ico | Bin {projects => apps}/frontend/src/App.vue | 0 .../frontend/src/assets/logo.png | Bin .../frontend/src/components/HelloWorld.vue | 0 {projects => apps}/frontend/src/main.ts | 0 .../frontend/src/shims-vue.d.ts | 0 {projects => apps}/frontend/tsconfig.json | 0 {projects => apps}/frontend/vite.config.ts | 2 +- {projects => apps}/frontend/yarn.lock | 0 malagu.yml | 6 ---- package.json | 28 ++-------------- 22 files changed, 53 insertions(+), 35 deletions(-) rename README.md => apps/backend/README.md (99%) create mode 100644 apps/backend/malagu.yml create mode 100644 apps/backend/package.json rename {src => apps/backend/src}/home-controller.ts (100%) rename {src => apps/backend/src}/module.ts (78%) rename tsconfig.json => apps/backend/tsconfig.json (100%) rename {projects => apps}/frontend/.gitignore (100%) rename {projects => apps}/frontend/README.md (100%) rename {projects => apps}/frontend/index.html (100%) rename {projects => apps}/frontend/package.json (100%) rename {projects => apps}/frontend/public/favicon.ico (100%) rename {projects => apps}/frontend/src/App.vue (100%) rename {projects => apps}/frontend/src/assets/logo.png (100%) rename {projects => apps}/frontend/src/components/HelloWorld.vue (100%) rename {projects => apps}/frontend/src/main.ts (100%) rename {projects => apps}/frontend/src/shims-vue.d.ts (100%) rename {projects => apps}/frontend/tsconfig.json (100%) rename {projects => apps}/frontend/vite.config.ts (80%) rename {projects => apps}/frontend/yarn.lock (100%) delete mode 100644 malagu.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 3ab5e6a..755d6f4 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -20,6 +20,6 @@ jobs: - if: ${{ github.ref == 'refs/heads/pre' }} env: ${{ secrets }} run: npx malagu deploy -m pre - - if: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/pre' }} - env: ${{ secrets }} - run: npx malagu deploy -m test + # - if: ${{ github.ref != 'refs/heads/master' && github.ref != 'refs/heads/pre' }} + # env: ${{ secrets }} + # run: npx malagu deploy -m test diff --git a/README.md b/apps/backend/README.md similarity index 99% rename from README.md rename to apps/backend/README.md index 8322035..215a857 100644 --- a/README.md +++ b/apps/backend/README.md @@ -32,6 +32,7 @@ $ yarn deploy:prod # 部署到线上环境 ``` +部署到阿里云 cn-qingdao ## 关于 Malagu Framework Malagu 是基于 TypeScript 的 Serverless First、组件化、平台无关的渐进式应用框架。 diff --git a/apps/backend/malagu.yml b/apps/backend/malagu.yml new file mode 100644 index 0000000..deae007 --- /dev/null +++ b/apps/backend/malagu.yml @@ -0,0 +1,13 @@ +targets: + - backend + +malagu: + # serve-static: + # root: .malagu/frontend/dist + + faas-adapter: + customDomain: + name: webfontserverless.shenzilong.cn + service: + name: web_font # 默认值是 malagu + diff --git a/apps/backend/package.json b/apps/backend/package.json new file mode 100644 index 0000000..36a7178 --- /dev/null +++ b/apps/backend/package.json @@ -0,0 +1,30 @@ +{ + "name": "backend", + "keywords": [ + "malagu-component" + ], + "version": "0.0.0", + "license": "MIT", + "files": [ + "lib", + "src" + ], + "dependencies": { + "@malagu/fc-adapter": "latest", + "@malagu/mvc": "latest", + "@malagu/serve-static": "latest" + }, + "devDependencies": { + "@malagu/cli": "latest", + "rimraf": "^2.6.3" + }, + "scripts": { + "clean": "rimraf lib dist .malagu", + "build": "malagu build", + "start": "malagu serve", + "deploy": "malagu deploy -m test", + "deploy:test": "malagu deploy -m test", + "deploy:pre": "malagu deploy -m pre", + "deploy:prod": "malagu deploy -m prod" + } +} \ No newline at end of file diff --git a/src/home-controller.ts b/apps/backend/src/home-controller.ts similarity index 100% rename from src/home-controller.ts rename to apps/backend/src/home-controller.ts diff --git a/src/module.ts b/apps/backend/src/module.ts similarity index 78% rename from src/module.ts rename to apps/backend/src/module.ts index 6f5b752..3db6f3d 100644 --- a/src/module.ts +++ b/apps/backend/src/module.ts @@ -1,3 +1,5 @@ import './home-controller'; import { autoBind } from '@malagu/core'; +console.log("app start"); + export default autoBind(); diff --git a/tsconfig.json b/apps/backend/tsconfig.json similarity index 100% rename from tsconfig.json rename to apps/backend/tsconfig.json diff --git a/projects/frontend/.gitignore b/apps/frontend/.gitignore similarity index 100% rename from projects/frontend/.gitignore rename to apps/frontend/.gitignore diff --git a/projects/frontend/README.md b/apps/frontend/README.md similarity index 100% rename from projects/frontend/README.md rename to apps/frontend/README.md diff --git a/projects/frontend/index.html b/apps/frontend/index.html similarity index 100% rename from projects/frontend/index.html rename to apps/frontend/index.html diff --git a/projects/frontend/package.json b/apps/frontend/package.json similarity index 100% rename from projects/frontend/package.json rename to apps/frontend/package.json diff --git a/projects/frontend/public/favicon.ico b/apps/frontend/public/favicon.ico similarity index 100% rename from projects/frontend/public/favicon.ico rename to apps/frontend/public/favicon.ico diff --git a/projects/frontend/src/App.vue b/apps/frontend/src/App.vue similarity index 100% rename from projects/frontend/src/App.vue rename to apps/frontend/src/App.vue diff --git a/projects/frontend/src/assets/logo.png b/apps/frontend/src/assets/logo.png similarity index 100% rename from projects/frontend/src/assets/logo.png rename to apps/frontend/src/assets/logo.png diff --git a/projects/frontend/src/components/HelloWorld.vue b/apps/frontend/src/components/HelloWorld.vue similarity index 100% rename from projects/frontend/src/components/HelloWorld.vue rename to apps/frontend/src/components/HelloWorld.vue diff --git a/projects/frontend/src/main.ts b/apps/frontend/src/main.ts similarity index 100% rename from projects/frontend/src/main.ts rename to apps/frontend/src/main.ts diff --git a/projects/frontend/src/shims-vue.d.ts b/apps/frontend/src/shims-vue.d.ts similarity index 100% rename from projects/frontend/src/shims-vue.d.ts rename to apps/frontend/src/shims-vue.d.ts diff --git a/projects/frontend/tsconfig.json b/apps/frontend/tsconfig.json similarity index 100% rename from projects/frontend/tsconfig.json rename to apps/frontend/tsconfig.json diff --git a/projects/frontend/vite.config.ts b/apps/frontend/vite.config.ts similarity index 80% rename from projects/frontend/vite.config.ts rename to apps/frontend/vite.config.ts index c4b5894..aef9951 100644 --- a/projects/frontend/vite.config.ts +++ b/apps/frontend/vite.config.ts @@ -5,7 +5,7 @@ import vue from "@vitejs/plugin-vue"; export default defineConfig({ plugins: [vue()], build: { - outDir: "../../.malagu/frontend/dist/", + outDir: "../backend/.malagu/frontend/dist/", emptyOutDir: true, }, }); diff --git a/projects/frontend/yarn.lock b/apps/frontend/yarn.lock similarity index 100% rename from projects/frontend/yarn.lock rename to apps/frontend/yarn.lock diff --git a/malagu.yml b/malagu.yml deleted file mode 100644 index 8cc566d..0000000 --- a/malagu.yml +++ /dev/null @@ -1,6 +0,0 @@ -targets: - - backend - -malagu: - serve-static: - root: .malagu/frontend/dist \ No newline at end of file diff --git a/package.json b/package.json index 4041f17..6e128fb 100644 --- a/package.json +++ b/package.json @@ -1,36 +1,14 @@ { "private": true, "name": "web-font-master", - "keywords": [ - "malagu-component" - ], "workspaces": [ - "projects/*" + "apps/*" ], "version": "0.0.0", "license": "MIT", - "files": [ - "lib", - "src" - ], - "dependencies": { - "@malagu/fc-adapter": "latest", - "@malagu/mvc": "latest", - "@malagu/serve-static": "latest" - }, - "devDependencies": { - "@malagu/cli": "latest", - "rimraf": "^2.6.3" - }, "scripts": { - "clean": "rimraf lib dist .malagu", - "build": "malagu build && yarn 前端build", - "start": "malagu serve", "前端dev": "yarn workspace frontend dev", - "前端build": "yarn workspace frontend build", - "deploy": "malagu deploy -m test", - "deploy:test": "malagu deploy -m test", - "deploy:pre": "malagu deploy -m pre", - "deploy:prod": "malagu deploy -m prod" + "后端dev": "yarn workspace backend start", + "deploy:prod": "yarn workspace frontend build && yarn workspace backend deploy:prod" } } \ No newline at end of file