qcobjects-cli 2.4.37 → 2.4.40

package/VERSION

@@ -1 +1 @@
-2.4.37
+2.4.40

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "qcobjects-cli",
-  "version": "2.4.37",
+  "version": "2.4.40",
   "description": "qcobjects cli command line tool",
   "main": "src/index.cjs",
   "module": "src/index.mjs",
@@ -24,9 +24,9 @@
   "dependencies": {
     "commander": "^10.0.1",
     "mime": "^2.4.7",
-    "qcobjects": "^2.4.67",
-    "qcobjects-sdk": "^2.4.30",
-    "yaml": "^1.10.2"
+    "qcobjects": "^2.4.68",
+    "yaml": "^2.2.2",
+    "qcobjects-sdk": "^2.4.32"
   },
   "devDependencies": {
     "@types/qcobjects": "github:QCObjects/-types-qcobjects",
@@ -35,7 +35,7 @@
     "@typescript-eslint/parser": "^5.58.0",
     "eslint": "^8.38.0",
     "eslint-config-prettier": "^8.8.0",
-    "eslint-config-qcobjects": "^0.0.26",
+    "eslint-config-qcobjects": "^0.0.27",
     "eslint-config-qcobjects-typescript": "^2.4.5",
     "eslint-config-semistandard": "^17.0.0",
     "eslint-config-standard": "^17.0.0",
@@ -43,13 +43,13 @@
     "eslint-plugin-n": "^15.7.0",
     "eslint-plugin-promise": "^6.1.1",
     "jasmine": "^3.99.0",
-    "qcobjects": "^2.4.67",
-    "qcobjects-sdk": "^2.4.30",
+    "qcobjects": "^2.4.68",
+    "qcobjects-sdk": "^2.4.32",
     "qcobjects-tsconfig": "^2.4.10"
   },
   "peerDependencies": {
-    "qcobjects": "^2.4.67",
-    "qcobjects-sdk": "^2.4.30"
+    "qcobjects": "^2.4.68",
+    "qcobjects-sdk": "^2.4.32"
   },
   "repository": {
     "type": "file",

package/src/backend/com.qcobjects.backend.microservice.static.js

@@ -47,7 +47,7 @@ Package("com.qcobjects.backend.microservice.static", [
 
       const microservice = this;
       const stream = microservice.stream;
-      const fileName = `${process.cwd()}/${microservice.fileName}`;
+      const fileName = (!microservice.fileName.startsWith("/"))?(`${process.cwd()}/${microservice.fileName}`):(microservice.fileName);
 
       const sendFileHTTP2 = function(stream, fileName) {
         // read and send file content in the stream

package/src/org.quickcorp.qcobjects.defaultsettings.js

@@ -132,6 +132,8 @@ try {
   const path = require("path");
   const projectPath = CONFIG.get("projectPath", `${process.cwd()}/`);
   const loadDefaultRoutes = async () => {
+    const sdkPath = path.resolve(findPackageNodePath("qcobjects-sdk"), "qcobjects-sdk");
+    const qcobjectsPath = path.resolve(findPackageNodePath("qcobjects"), "qcobjects");
     let backend = CONFIG.get("backend");
     if (typeof backend === "undefined") {
       backend = {};
@@ -144,7 +146,7 @@ try {
         "description": "Redirection of QCObjects.js",
         "path": "^/QCObjects.js$",
         "microservice": "com.qcobjects.backend.microservice.static",
-        "redirect_to": "./node_modules/qcobjects/QCObjects.js",
+        "redirect_to": path.resolve(qcobjectsPath,"src","QCObjects.js"),
         "responseHeaders": {},
         "cors": {
           "allow_origins": "*"
@@ -155,7 +157,7 @@ try {
         "description": "Redirection of QCObjects SDK",
         "path": "^/js/packages/QCObjects-SDK.js$",
         "microservice": "com.qcobjects.backend.microservice.static",
-        "redirect_to": "./node_modules/qcobjects-sdk/QCObjects-SDK.js",
+        "redirect_to": path.resolve(sdkPath, "src/QCObjects-SDK.js"),
         "responseHeaders": {},
         "cors": {
           "allow_origins": "*"
@@ -166,7 +168,7 @@ try {
         "description": "Redirection of QCObjects SDK",
         "path": "^/qcobjects-sdk/(.*)$",
         "microservice": "com.qcobjects.backend.microservice.static",
-        "redirect_to": "./node_modules/qcobjects-sdk/$1",
+        "redirect_to": path.resolve(sdkPath, "src/$1"),
         "responseHeaders": {},
         "cors": {
           "allow_origins": "*"
@@ -176,7 +178,6 @@ try {
     ]);
     CONFIG.set("backend", backend);
 
-    return;
   };
   await loadDefaultRoutes();
 })().then(() => logger.info("Default routes loaded"));