Explorar o código

update build settings for server

Yuki Takei %!s(int64=4) %!d(string=hai) anos
pai
achega
756d2bca55

+ 2 - 10
packages/app/.gitignore

@@ -2,16 +2,13 @@
 /.next/
 /out/
 
-# production
-/build
-
 # dist
-/packages/**/dist/
-/report/
+/dist/
 /public/static/js
 /public/static/styles
 /public/uploads
 /tmp/
+*.d.ts
 
 # dist (for GROWI v4.x and below)
 /public/*.chunk.js
@@ -21,8 +18,3 @@
 /public/dll
 /public/js
 /public/styles
-/src/*/__build__/
-/__build__/**
-/src/*/dist/
-/.awcache
-/compiled/

+ 8 - 5
packages/app/package.json

@@ -3,16 +3,19 @@
   "version": "4.3.3-RC",
   "license": "MIT",
   "scripts": {
-    "build": "env-cmd -f config/env.prod.js webpack --config config/webpack.prod.js --profile --bail",
+    "start": "yarn build && yarn server",
+    "start:ci": "yarn build && yarn server --ci",
+    "build": "run-p build:*",
+    "build:client": "env-cmd -f config/env.prod.js webpack --config config/webpack.prod.js --profile --bail",
+    "build:server": "env-cmd -f config/env.prod.js tsc -p tsconfig.build.server.json && tsc-alias -p tsconfig.build.server.json",
+    "prebuild": "run-p prebuild:*",
     "prebuild:plugin": "yarn ts-node bin/generate-plugin-definitions-source.ts",
     "prebuild:dl-resources": "yarn ts-node bin/download-cdn-resources.ts",
-    "prebuild": "run-p prebuild:*",
-    "server:ci": "yarn server --ci",
-    "server": "env-cmd -f config/env.prod.js node --expose_gc src/server/app.js",
+    "server": "env-cmd -f config/env.prod.js node --expose_gc dist/server/app.js",
+    "dev": "run-p dev:client dev:server",
     "dev:client": "env-cmd -f config/env.dev.js webpack --config config/webpack.dev.js --progress --watch",
     "dev:server": "env-cmd -f config/env.dev.js yarn ts-node-dev src/server/app.ts --expose_gc --inspect",
     "dev:ci": "env-cmd -f config/env.dev.js webpack --config config/webpack.dev.js && env-cmd -f config/env.dev.js yarn ts-node src/server/app.ts --ci",
-    "dev": "run-p dev:client dev:server",
     "predev:client": "yarn prebuild",
     "test:lint:js": "eslint --quiet \"**/*.{js,jsx,ts,tsx}\"",
     "test:lint:styles": "stylelint src/**/*.scss",

+ 1 - 1
packages/app/src/server/routes/apiv3/staffs.js

@@ -9,7 +9,7 @@ const axios = require('axios');
 const router = express.Router();
 const { isAfter, addHours } = require('date-fns');
 
-const contributors = require('../../../../resource/Contributor');
+const contributors = require('^/resource/Contributor');
 
 let expiredAt;
 const contributorsCache = contributors;

+ 0 - 0
packages/app/tsconfig.build.json → packages/app/tsconfig.build.client.json


+ 30 - 0
packages/app/tsconfig.build.server.json

@@ -0,0 +1,30 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "rootDir": "./src",
+    "outDir": "dist",
+    "declaration": true,
+    "noResolve": false,
+    "preserveConstEnums": true,
+    "sourceMap": true,
+    "noEmit": false,
+    "inlineSources": true,
+    "baseUrl": "./src",
+    "paths": {
+      "~/*": ["./*"],
+      "debug": ["./server/utils/logger/alias-for-debug"]
+    }
+  },
+  "include": [
+    "src/**/*"
+  ],
+  "exclude": [
+    "src/client",
+    "src/components",
+    "src/linter-checker",
+    "src/migrations",
+    "src/styles",
+    "src/styles-hackmd",
+    "src/test"
+  ]
+}