Pre-Script-Break

executor.config.js

@@ -0,0 +1,6 @@
+export default {
+  command: (args)=>{},
+  url: process.env.QUALITEER_URL,
+  jobId: (args)=>{},
+  auth: (args)=>{},
+}

package-lock.json

@@ -18,6 +18,7 @@
         "path": "^0.12.7",
         "pg-promise": "^10.11.1",
         "postgres-migrations": "^5.3.0",
+        "rabbiteer": "gitlab:Dunemask/rabbiteer",
         "react-router-dom": "^6.3.0",
         "socket.io": "^4.4.1",
         "socket.io-client": "^4.4.1",
@@ -4547,7 +4548,7 @@
     },
     "node_modules/rabbiteer": {
       "version": "1.0.0",
-      "resolved": "git+ssh://git@gitlab.com/Dunemask/rabbiteer.git#6bb6cc26ca7ea7f4eb934529305ebb8ae0b26369",
+      "resolved": "git+ssh://git@gitlab.com/Dunemask/rabbiteer.git#7e341191029758fcae0a5e3e7ba3e4c217bd3788",
       "license": "LGPL-2.1-only",
       "optional": true,
       "dependencies": {
@@ -9187,8 +9188,8 @@
       "dev": true
     },
     "rabbiteer": {
-      "version": "git+ssh://git@gitlab.com/Dunemask/rabbiteer.git#6bb6cc26ca7ea7f4eb934529305ebb8ae0b26369",
+      "version": "git+ssh://git@gitlab.com/Dunemask/rabbiteer.git#7e341191029758fcae0a5e3e7ba3e4c217bd3788",
-      "from": "rabbiteer@gitlab:Dunemask/rabbiteer",
+      "from": "rabbiteer@git+https://gitlab.com/Dunemask/rabbiteer.git",
       "optional": true,
       "requires": {
         "amqplib": "^0.8.0"

package.json

@@ -14,11 +14,9 @@
     "qualiteer": "./dist/app.js"
   },
   "scripts": {
-    "build:all": "npm run build:react && npm run export:executor",
+    "build:all": "npm run build:react && npm run build:executor",
-    "build:bin:executor": "caxa -m \"Unpacking, please wait...\" -i dist/bundles/ -o bin/executor -- \"{{caxa}}/node_modules/.bin/node\" \"{{caxa}}/qualiteer-executor.js\"",
+    "build:executor": "node lib/jobs/executor/executor-bundler.js",
     "build:react": "vite build",
-    "export:executor": "npm run pack:executor && npm run build:bin:executor",
-    "pack:executor": "rollup -c",
     "start": "node dist/app.js",
     "start:dev": "nodemon dist/app.js",
     "start:dev:replit": "npm run start:dev & npm run start:react:replit",
@@ -63,16 +61,16 @@
     "@rollup/plugin-commonjs": "^22.0.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@rollup/plugin-replace": "^4.0.0",
+    "@vitejs/plugin-react": "1.1.1",
     "axios": "^0.27.2",
     "caxa": "^2.1.0",
     "nodemon": "^2.0.15",
     "react": "^18.1.0",
     "react-dom": "^18.1.0",
-    "@vitejs/plugin-react": "1.1.1",
-    "vite": "2.7.0",
     "readline-sync": "^1.4.10",
     "rollup": "^2.72.0",
-    "rollup-plugin-terser": "^7.0.2"
+    "rollup-plugin-terser": "^7.0.2",
+    "vite": "2.7.0"
   },
   "optionalDependencies": {
     "rabbiteer": "gitlab:Dunemask/rabbiteer"

rollup.config.js

@@ -1,12 +0,0 @@
-import { nodeResolve } from "@rollup/plugin-node-resolve";
-import commonjs from "@rollup/plugin-commonjs";
-import { terser } from "rollup-plugin-terser";
-
-export default {
-  input: "lib/jobs/job-executor.js",
-  output: {
-    file: "dist/bundles/qualiteer-executor.js",
-    format: "cjs",
-  },
-  plugins: [nodeResolve(), commonjs(), terser()],
-};