oipage 1.2.0-alpha.2 → 1.2.0-alpha.4

package/bin/serve.js

@@ -5,7 +5,7 @@ const packageValue = require("../package.json");
 const network = require("./tools/network.js");
 const mineTypes = require("./data/mineTypes.json");
 const resolve404 = require("./tools/resolve404.js");
-const resolveImport = require("./tools/resolveImport.js");
+const resolveImportFactory = require("./tools/resolveImport.js");
 const { formatRawHeaders } = require("./tools/format.js");
 
 // 开发服务器
@@ -42,7 +42,7 @@ module.exports = function (config) {
 
             // 如果文件小于10M，认为不大，直接读取
             if (fileInfo.size < 10 * 1024 * 1024) {
-                let source = resolveImport(basePath, filePath, headers.Accept === "*/*", urlArray[1] === "download")
+                let { source, resolveImport } = resolveImportFactory(basePath, filePath, headers.Accept === "*/*", urlArray[1] === "download")
 
                 // 只处理非下载文件
                 // 过大的也不进行处理
@@ -64,7 +64,7 @@ module.exports = function (config) {
 
                 sendType = "Read";
                 response.writeHead('200', responseHeader);
-                response.write(source);
+                response.write(resolveImport(source));
                 response.end();
             }
 

package/bin/tools/resolveImport.js

@@ -2,9 +2,10 @@ const { readFileSync, existsSync, lstatSync } = require("fs");
 const { join } = require("path");
 
 module.exports = function (basePath, filePath, needResolve, isDownload) {
-    let code = readFileSync(filePath);
+    let source = readFileSync(filePath);
+    let resolveImport = content => content;
 
-    let resolveImport = function (content) {
+    let __resolveImport = function (content) {
         return content.replace(/import [^'"]* from (['"])([^'"]*)['"]/sg, function (_importCode, _, _importUrl) {
             if (/^[./]/.test(_importUrl)) {
                 return _importCode;
@@ -31,6 +32,18 @@ module.exports = function (basePath, filePath, needResolve, isDownload) {
                         }
 
                         if (node_modulesRootPath === basePath) {
+
+                            // 如果命令行根目录是一个项目
+                            let packagePath = join(basePath, "./package.json");
+                            if (existsSync(packagePath) && !lstatSync(packagePath).isDirectory()) {
+                                let bundlePackage = require(packagePath);
+                                if (!/\//.test(_importUrl)) {
+                                    return "/" + bundlePackage.main;
+                                } else {
+                                    return "/"
+                                }
+                            }
+
                             return npmName;
                         } else {
                             node_modulesRootPath = join(node_modulesRootPath, "../");
@@ -44,23 +57,24 @@ module.exports = function (basePath, filePath, needResolve, isDownload) {
 
     // 如果是下载
     if (isDownload) {
-        return code;
+        // todo
     }
 
     // 如果需要解析
     else if (needResolve) {
-        return resolveImport(code + "");
+        source += "";
+        resolveImport = __resolveImport;
     }
 
     // 如果是.html或.htm结尾
     else if (/\.html{0,1}$/.test(filePath)) {
-        return (code + "").replace(/<script type="module">(.*)<\/script>/sg, function (_, _matchCode) {
-            return `<script type="module">${resolveImport(_matchCode)}</script>`;
+        source = (source + "").replace(/<script type="module">(.*)<\/script>/sg, function (_, _matchCode) {
+            return `<script type="module">${__resolveImport(_matchCode)}</script>`;
         });
     }
 
-    // 否则直接返回即可
-    else {
-        return code;
-    }
+    return {
+        source,
+        resolveImport
+    };
 };

package/nodejs/animation/index.js

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

package/nodejs/cmdlog/index.js

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

package/nodejs/disk/index.js

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

package/nodejs/logform/index.js

@@ -1,5 +1,5 @@
 /*!
-* logform of OIPage v1.2.0-alpha.2
+* logform of OIPage v1.2.0-alpha.4
 * 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.2
+* throttle of OIPage v1.2.0-alpha.4
 * git+https://github.com/oi-contrib/OIPage.git
 */
 

package/package.json

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

package/web/animation/index.js

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

package/web/onReady/index.js

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

package/web/style/index.js

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

package/web/throttle/index.js

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