oipage 1.2.0-alpha.0 → 1.2.0-alpha.2

package/README.md

@@ -45,7 +45,7 @@ npm install -g oipage
 npm install oipage --save
 ```
 
-全局安装后，就可以直接作为命令行使用了。你可以打印帮助查看：
+安装后，就可以直接作为命令行使用了。你可以打印帮助查看：
 
 ```shell
 oipage-cli

package/bin/run

@@ -19,8 +19,13 @@ if (process.argv[2] === "serve") {
     });
 
     let config = {
-        port: 8080,
-        baseUrl: "./"
+        devServer: {
+            port: 8080,
+            baseUrl: "./",
+        },
+        module: {
+            rules: []
+        }
     };
 
     // 如果设置了配置文件
@@ -28,15 +33,15 @@ if (process.argv[2] === "serve") {
         let configPath = join(process.cwd(), argvObj["--config"][0] || "./oipage.config.js");
         if (existsSync(configPath) && !lstatSync(configPath).isDirectory()) {
             let configValue = require(configPath);
-            mergeOption(config, configValue.devServer);
+            mergeOption(config, configValue);
         } else {
             console.log("\x1b[0m\x1b[31m" + configPath + "\x1b[0m");
             throw new Error("OIPage: The configuration file does not exist or is not a file.");
         }
     }
 
-    if ((argvObj["--port"] || [])[0]) config.port = (argvObj["--port"] || [])[0];
-    if ((argvObj["--baseUrl"] || [])[0]) config.baseUrl = (argvObj["--baseUrl"] || [])[0];
+    if ((argvObj["--port"] || [])[0]) config.devServer.port = (argvObj["--port"] || [])[0];
+    if ((argvObj["--baseUrl"] || [])[0]) config.devServer.baseUrl = (argvObj["--baseUrl"] || [])[0];
 
     require("./serve.js")(config);
 }

package/bin/serve.js

@@ -12,14 +12,15 @@ const { formatRawHeaders } = require("./tools/format.js");
 module.exports = function (config) {
     let startTime = new Date().valueOf();
 
-    const port = config.port; // 端口号
-    const basePath = (/^\./.test(config.baseUrl)) ? join(process.cwd(), config.baseUrl) : config.baseUrl; // 服务器根路径
+    const port = config.devServer.port; // 端口号
+    const basePath = (/^\./.test(config.devServer.baseUrl)) ? join(process.cwd(), config.devServer.baseUrl) : config.devServer.baseUrl; // 服务器根路径
 
     let Server = createServer(function (request, response) {
         let headers = formatRawHeaders(request.rawHeaders);
         let url = decodeURIComponent(request.url);
 
-        url = url.split("?")[0];
+        let urlArray = url.split("?");
+        url = urlArray[0];
 
         // 请求的文件路径
         let filePath = join(basePath, url == "/" ? "index.html" : url.replace(/^\//, ""));
@@ -41,9 +42,29 @@ module.exports = function (config) {
 
             // 如果文件小于10M，认为不大，直接读取
             if (fileInfo.size < 10 * 1024 * 1024) {
+                let source = resolveImport(basePath, filePath, headers.Accept === "*/*", urlArray[1] === "download")
+
+                // 只处理非下载文件
+                // 过大的也不进行处理
+                if (urlArray[1] !== "download") {
+                    for (let i = 0; i < config.module.rules.length; i++) {
+                        if (config.module.rules[i].test.test(filePath)) {
+                            source = config.module.rules[i].use.call({
+                                root: basePath, // 服务器根路径
+                                path: filePath.replace(basePath, ""), // 文件相对路径
+                                entry: headers.Accept !== "*/*", // 是否是浏览器地址栏直接访问
+                                setFileType(fileType) { // 设置文件类型
+                                    responseHeader['Content-type'] = fileType + ";charset=utf-8";
+                                }
+                            }, source);
+                            break;
+                        }
+                    }
+                }
+
                 sendType = "Read";
                 response.writeHead('200', responseHeader);
-                response.write(resolveImport(basePath, filePath, headers.Accept === "*/*"));
+                response.write(source);
                 response.end();
             }
 

package/bin/tools/resolve404.js

@@ -72,7 +72,7 @@ module.exports = function (filePath, url) {
         </th>
             <th>
                 <a href='./${subItems[i]}' class="btn">访问</a>
-                <a href='./${subItems[i]}' class="btn" download='${subItems[i]}'>下载</a>
+                <a href='./${subItems[i]}?download' class="btn" download='${subItems[i]}'>下载</a>
             </th>
         </tr>`;
         }

package/bin/tools/resolveImport.js

@@ -1,7 +1,7 @@
 const { readFileSync, existsSync, lstatSync } = require("fs");
 const { join } = require("path");
 
-module.exports = function (basePath, filePath, needResolve) {
+module.exports = function (basePath, filePath, needResolve, isDownload) {
     let code = readFileSync(filePath);
 
     let resolveImport = function (content) {
@@ -42,8 +42,13 @@ module.exports = function (basePath, filePath, needResolve) {
         });
     };
 
+    // 如果是下载
+    if (isDownload) {
+        return code;
+    }
+
     // 如果需要解析
-    if (needResolve) {
+    else if (needResolve) {
         return resolveImport(code + "");
     }
 

package/nodejs/animation/index.js

@@ -1,5 +1,5 @@
 /*!
-* animation of OIPage v1.2.0-alpha.0
+* animation of OIPage v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/cmdlog/index.js

@@ -1,5 +1,5 @@
 /*!
-* cmdlog of OIPage v1.2.0-alpha.0
+* cmdlog of OIPage v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/disk/index.js

@@ -1,5 +1,5 @@
 /*!
-* disk of OIPage v1.2.0-alpha.0
+* disk of OIPage v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/nodejs/logform/index.js

@@ -1,5 +1,5 @@
 /*!
-* logform of OIPage v1.2.0-alpha.0
+* logform of OIPage v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/OIPage.git
 */
 const {linelog} = require("../cmdlog/index.js");

package/nodejs/throttle/index.js

@@ -1,5 +1,5 @@
 /*!
-* throttle of OIPage v1.2.0-alpha.0
+* throttle of OIPage v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "oipage",
-  "version": "1.2.0-alpha.0",
+  "version": "1.2.0-alpha.2",
   "description": "前端网页或应用快速开发助手，包括开发服务器、辅助命令、实用API等",
   "sideEffects": false,
   "scripts": {

package/web/animation/index.js

@@ -1,5 +1,5 @@
 /*!
-* animation of OIPage v1.2.0-alpha.0
+* animation of OIPage v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/onReady/index.js

@@ -1,5 +1,5 @@
 /*!
-* onReady of OIPage v1.2.0-alpha.0
+* onReady of OIPage v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/style/index.js

@@ -1,5 +1,5 @@
 /*!
-* style of OIPage v1.2.0-alpha.0
+* style of OIPage v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/web/throttle/index.js

@@ -1,5 +1,5 @@
 /*!
-* throttle of OIPage v1.2.0-alpha.0
+* throttle of OIPage v1.2.0-alpha.2
 * git+https://github.com/oi-contrib/OIPage.git
 */