feat(scripts&webconsole): 需求，webconsole打开支持不带后缀的页面url

fix #83
jdf2e · Jan 19, 2021 · d2d510e · d2d510e
1 parent a9a008b
commit d2d510e
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 8 deletions.
diff --git a/packages/rocketact-scripts/package.json b/packages/rocketact-scripts/package.json
@@ -1,6 +1,6 @@
 {
   "name": "rocketact-scripts",
-  "version": "1.10.4",
+  "version": "1.10.5",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -60,7 +60,7 @@
     "postcss-loader": "^3.0.0",
     "progress-bar-webpack-plugin": "^1.11.0",
     "rocketact-dev-utils": "^1.1.4",
-    "rocketact-web-console": "^1.1.8",
+    "rocketact-web-console": "^1.1.11",
     "sass-loader": "^7.1.0",
     "semver": "^6.0.0",
     "style-loader": "^0.23.1",

diff --git a/packages/rocketact-scripts/src/commands/start.ts b/packages/rocketact-scripts/src/commands/start.ts
@@ -1,4 +1,3 @@
-import path from "path";
 import fs from "fs";
 import webpack from "webpack";
 import WebpackDevServer from "webpack-dev-server";
@@ -13,6 +12,8 @@ import {
   warningBlock,
   warning,
   resolveToAppRoot,
+  getValidEntries,
+  appRoot
 } from "rocketact-dev-utils";
 
 import CoreAPI from "../CoreAPI";
@@ -27,14 +28,22 @@ export default (api: CoreAPI) => {
       process.env.NODE_ENV = "development";
       process.env.PUBLIC_URL = "";
 
+      const validEntries = getValidEntries(appRoot());
+      const validEntryRewrites = Object.keys(validEntries).map(item => {
+        return {
+          from: new RegExp(`${item}`),
+          to: `/${item}.html`
+        }
+      });
+
       return new Promise((resolve, reject) => {
         const webpackConfig = api.resolveWebpackConfig();
         const devServerOptions: WebpackDevServer.Configuration = {
           disableHostCheck: true,
           overlay: true,
           hot: true,
           host: "127.0.0.1",
-          https: process.env.HTTPS ? true : false,
+          https: !!process.env.HTTPS,
           publicPath: "/",
           contentBase:
             fs.existsSync(publicDir) &&
@@ -49,6 +58,7 @@ export default (api: CoreAPI) => {
           },
           historyApiFallback: {
             rewrites: [
+              ...validEntryRewrites,
               {
                 from: /^(\/[^/]*\.html)\/.*$/,
                 to: (context) => context.match[1],

diff --git a/packages/rocketact-web-console/package.json b/packages/rocketact-web-console/package.json
@@ -1,13 +1,13 @@
 {
   "name": "rocketact-web-console",
-  "version": "1.1.10",
+  "version": "1.1.11",
   "description": "Rocketact Web Console",
   "main": "index.js",
   "keywords": [
     "rocketact"
   ],
   "scripts": {
-    "build": "tsc --project tsconfig-server.json; webpack",
+    "build": "tsc --project tsconfig-server.json & webpack",
     "watch": "tsc --project tsconfig-server.json --watch & webpack --watch",
     "watch:client": "webpack --watch",
     "watch:server": "tsc --project tsconfig-server.json --watch",

diff --git a/packages/rocketact-web-console/src/client/routes/pages.tsx b/packages/rocketact-web-console/src/client/routes/pages.tsx
@@ -2,7 +2,7 @@ import React from "react";
 
 import * as API from "../api";
 
-import { Table } from "antd";
+import { Table, Tooltip } from "antd";
 
 interface IPage {
   name: string;
@@ -31,7 +31,16 @@ class Pages extends React.PureComponent<{}, IPagesState> {
       {
         title: "Name",
         dataIndex: "name",
-        key: "name"
+        key: "name",
+        render: (text: any, record: IPage) => (
+          <span>
+            <Tooltip title={"Open with url without *.html as a suffix"}>
+              <a href={`/${record.name}`} target="_blank">
+                {record.name}
+              </a>
+            </Tooltip>
+          </span>
+        )
       },
       {
         title: "Title",