Merge branch 'i11-项目结构和代码优化（复杂）'

521xueweihan · 521xueweihan · commit 1047b3cf5ef7 · 2022-09-01T21:14:25.000+08:00
diff --git a/Dockerfile b/Dockerfile
@@ -0,0 +1,30 @@
+# Base on offical Node.js Alpine image
+FROM node:alpine
+
+# Set working directory
+WORKDIR /usr/app
+
+# Install PM2 globally
+RUN npm install --global pm2 --registry=https://registry.npm.taobao.org
+
+# Copy package.json and package-lock.json before other files
+# Utilise Docker cache to save re-installing dependencies if unchanged
+COPY ./package*.json ./
+
+# Copy all files
+COPY ./ ./
+
+# Build app
+RUN yarn config set registry https://registry.npm.taobao.org/
+RUN yarn
+RUN yarn build
+
+# Run container as non-root (unprivileged) user
+# The node user is provided in the Node.js Alpine base image
+USER node
+EXPOSE 8888
+
+RUN ls -alh
+
+# Run npm start script with PM2 when container starts
+CMD [ "pm2-runtime", "start", "ecosystem.config.js" ]
diff --git a/ecosystem.config.js b/ecosystem.config.js
@@ -0,0 +1,21 @@
+module.exports = {
+  apps: [
+    {
+      name: 'geese',
+      script: './server.js',
+      instances: 2,
+      max_restarts: 3,
+      env: {
+        NEXT_PUBLIC_ENV: 'production',
+      },
+      watch: true,
+      merge_logs: true,
+      exec_mode: 'cluster',
+      max_memory_restart: '1G',
+      instance_var: 'NODE_APP_INSTANCE',
+      log_date_format: 'YYYY-MM-DD HH:mm:ss:SS',
+      error_file: '/data/logs/geese_error.log',
+      out_file: '/data/logs/geese_out.log',
+    },
+  ],
+};
diff --git a/package.json b/package.json
@@ -6,6 +6,9 @@
     "dev": "NODE_OPTIONS='--inspect' next dev",
     "build": "next build",
     "start": "next start",
+    "server_start": "pm2 start ecosystem.config.js",
+    "server_reload": "pm2 reload ecosystem.config.js",
+    "server_stop": "pm2 stop ecosystem.config.js",
     "lint": "next lint",
     "lint:fix": "eslint src --fix && yarn format",
     "lint:strict": "eslint --max-warnings=0 src",
@@ -26,6 +29,7 @@
     "copy-to-clipboard": "^3.3.2",
     "dayjs": "^1.11.3",
     "eslint-plugin-react": "^7.30.1",
+    "express": "^4.18.1",
     "next": "^12.1.6",
     "rc-image": "^5.7.0",
     "react": "^18.1.0",
diff --git a/public/fonts/inter-var-latin.woff2 b/public/fonts/inter-var-latin.woff2
diff --git a/public/svg/Vercel.svg b/public/svg/Vercel.svg
diff --git a/server.js b/server.js
@@ -0,0 +1,37 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+const next = require('next');
+const dev = process.env.NEXT_PUBLIC_ENV !== 'production';
+const app = next({ dev });
+const handle = app.getRequestHandler();
+
+const { parse } = require('url');
+
+const express = require('express');
+const expressRouter = express.Router();
+const server = express();
+
+const NODE_PORT = 8888;
+
+app.prepare().then(() => {
+  expressRouter.get('*', (req, res) => {
+    // 页面路由
+    const parsedUrl = parse(req.url, true);
+    const { pathname, query } = parsedUrl;
+    console.log('process.env.NEXT_PUBLIC_ENV: ', process.env.NEXT_PUBLIC_ENV);
+    console.log('pathname: ', pathname);
+    return app.render(req, res, pathname, query);
+  });
+  server.use('/', expressRouter);
+
+  server.all('*', (req, res) => {
+    // Be sure to pass `true` as the second argument to `url.parse`.
+    // This tells it to parse the query portion of the URL.
+    const parsedUrl = parse(req.url, true);
+
+    return handle(req, res, parsedUrl);
+  });
+
+  server.listen(NODE_PORT, () =>
+    console.log('App listening on port ' + NODE_PORT)
+  );
+});
diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx
@@ -16,13 +16,13 @@ class MyDocument extends Document {
     return (
       <Html lang='en'>
         <Head>
-          <link
+          {/* <link
             rel='preload'
             href='/fonts/inter-var-latin.woff2'
             as='font'
             type='font/woff2'
             crossOrigin='anonymous'
-          />
+          /> */}
         </Head>
         <body>
           <Main />
diff --git a/src/styles/globals.css b/src/styles/globals.css
@@ -32,7 +32,7 @@
 
 @layer base {
   /* inter var - latin */
-  @font-face {
+  /* @font-face {
     font-family: 'Inter';
     font-style: normal;
     font-weight: 100 900;
@@ -41,7 +41,7 @@
     unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
       U+02DC, U+2000-206F, U+2074, U+20AC, U+2122, U+2191, U+2193, U+2212,
       U+2215, U+FEFF, U+FFFD;
-  }
+  } */
 
   .cursor-newtab {
     cursor: url('/images/new-tab.png') 10 10, pointer;
diff --git a/src/utils/api.ts b/src/utils/api.ts
@@ -8,9 +8,9 @@ const PRODUCTION_API_HOST = 'https://api.hellogithub.com';
 const API_ROOT_PATH = '/v1';
 
 export const API_HOST =
-  process.env.NEXT_PUBLIC_ENV === 'production'
-    ? PRODUCTION_API_HOST
-    : LOCAL_API_HOST;
+  process.env.NEXT_PUBLIC_ENV === 'development'
+    ? LOCAL_API_HOST
+    : PRODUCTION_API_HOST;
 
 /**
  * Generates a url to make an api call to our backend
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -16,7 +16,7 @@ module.exports = {
   theme: {
     extend: {
       fontFamily: {
-        primary: ['Inter', ...fontFamily.sans],
+        primary: [...fontFamily.sans],
       },
       colors: {
         primary: {
diff --git a/vercel.json b/vercel.json
diff --git a/yarn.lock b/yarn.lock
