@wocker/ws 1.0.2 → 1.0.4

package/lib/utils/index.js

@@ -1,192 +1,33 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-var _buildOptions = require("./buildOptions");
-Object.keys(_buildOptions).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _buildOptions[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _buildOptions[key];
-    }
-  });
-});
-var _demuxOutput = require("./demuxOutput");
-Object.keys(_demuxOutput).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _demuxOutput[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _demuxOutput[key];
-    }
-  });
-});
-var _escapeRegExp = require("./escapeRegExp");
-Object.keys(_escapeRegExp).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _escapeRegExp[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _escapeRegExp[key];
-    }
-  });
-});
-var _exec = require("./exec");
-Object.keys(_exec).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _exec[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _exec[key];
-    }
-  });
-});
-var _fetch = require("./fetch");
-Object.keys(_fetch).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _fetch[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _fetch[key];
-    }
-  });
-});
-var _followProgress = require("./followProgress");
-Object.keys(_followProgress).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _followProgress[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _followProgress[key];
-    }
-  });
-});
-var _formatSizeUnits = require("./format-size-units");
-Object.keys(_formatSizeUnits).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _formatSizeUnits[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _formatSizeUnits[key];
-    }
-  });
-});
-var _getConfig = require("./get-config");
-Object.keys(_getConfig).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _getConfig[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _getConfig[key];
-    }
-  });
-});
-var _getCursorPosition = require("./get-cursor-position");
-Object.keys(_getCursorPosition).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _getCursorPosition[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _getCursorPosition[key];
-    }
-  });
-});
-var _imageBuild = require("./image-build");
-Object.keys(_imageBuild).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _imageBuild[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _imageBuild[key];
-    }
-  });
-});
-var _injectVariables = require("./injectVariables");
-Object.keys(_injectVariables).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _injectVariables[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _injectVariables[key];
-    }
-  });
-});
-var _parseTable = require("./parse-table");
-Object.keys(_parseTable).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _parseTable[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _parseTable[key];
-    }
-  });
-});
-var _setConfig = require("./set-config");
-Object.keys(_setConfig).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _setConfig[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _setConfig[key];
-    }
-  });
-});
-var _spawn = require("./spawn");
-Object.keys(_spawn).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _spawn[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _spawn[key];
-    }
-  });
-});
-var _tty = require("./tty");
-Object.keys(_tty).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _tty[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _tty[key];
-    }
-  });
-});
-var _volumeFormat = require("./volumeFormat");
-Object.keys(_volumeFormat).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _volumeFormat[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _volumeFormat[key];
-    }
-  });
-});
-var _volumeParse = require("./volumeParse");
-Object.keys(_volumeParse).forEach(function (key) {
-  if (key === "default" || key === "__esModule") return;
-  if (key in exports && exports[key] === _volumeParse[key]) return;
-  Object.defineProperty(exports, key, {
-    enumerable: true,
-    get: function () {
-      return _volumeParse[key];
-    }
-  });
-});
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./buildOptions"), exports);
+__exportStar(require("./demuxOutput"), exports);
+__exportStar(require("./escapeRegExp"), exports);
+__exportStar(require("./exec"), exports);
+__exportStar(require("./fetch"), exports);
+__exportStar(require("./followProgress"), exports);
+__exportStar(require("./format-size-units"), exports);
+__exportStar(require("./get-config"), exports);
+__exportStar(require("./get-cursor-position"), exports);
+__exportStar(require("./image-build"), exports);
+__exportStar(require("./injectVariables"), exports);
+__exportStar(require("./parse-table"), exports);
+__exportStar(require("./set-config"), exports);
+__exportStar(require("./spawn"), exports);
+__exportStar(require("./tty"), exports);
+__exportStar(require("./volumeFormat"), exports);
+__exportStar(require("./volumeParse"), exports);

package/lib/utils/injectVariables.js

@@ -1,17 +1,14 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.injectVariables = void 0;
 const injectVariables = (str, data) => {
-  let res = str;
-  Object.keys(data).forEach(key => {
-    const variableName = `\\$\\{${key}\\}`;
-    const variableValue = data[key];
-    const regex = new RegExp(variableName, "g");
-    res = res.replace(regex, variableValue);
-  });
-  return res;
+    let res = str;
+    Object.keys(data).forEach((key) => {
+        const variableName = `\\$\\{${key}\\}`;
+        const variableValue = data[key];
+        const regex = new RegExp(variableName, "g");
+        res = res.replace(regex, variableValue);
+    });
+    return res;
 };
-exports.injectVariables = injectVariables;
+exports.injectVariables = injectVariables;

package/lib/utils/parse-table.js

@@ -1,27 +1,24 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseTable = void 0;
 const parseTable = (string, pos) => {
-  return string.split("\n").filter(line => {
-    return line.split(new RegExp("\\s\\s+")).filter(item => {
-      return item !== "";
-    }).length > 0;
-  }).map((line, index) => {
-    if (index === 0) {
-      return null;
-    }
-    let data = line.split(new RegExp("\\s\\s+"));
-    let row = {};
-    for (let i in data) {
-      let name = pos[i];
-      row[name] = data[i];
-    }
-    return row;
-  }).filter(line => {
-    return !!line;
-  });
+    return string.split("\n").filter((line) => {
+        return line.split(new RegExp("\\s\\s+")).filter((item) => {
+            return item !== "";
+        }).length > 0;
+    }).map((line, index) => {
+        if (index === 0) {
+            return null;
+        }
+        let data = line.split(new RegExp("\\s\\s+"));
+        let row = {};
+        for (let i in data) {
+            let name = pos[i];
+            row[name] = data[i];
+        }
+        return row;
+    }).filter((line) => {
+        return !!line;
+    });
 };
-exports.parseTable = parseTable;
+exports.parseTable = parseTable;

package/lib/utils/set-config.d.ts

@@ -1,2 +1,2 @@
-import { Config } from "src/types";
+import { Config } from "../types";
 export declare const setConfig: (data: Partial<Config>) => Promise<Config>;

package/lib/utils/set-config.js

@@ -1,18 +1,15 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.setConfig = void 0;
-var _env = require("../env");
-var _FS = require("../makes/FS");
-var _getConfig = require("./get-config");
-const setConfig = async data => {
-  const config = {
-    ...(await (0, _getConfig.getConfig)()),
-    ...data
-  };
-  await _FS.FS.writeJSON(_env.MAP_PATH, config);
-  return config;
+const env_1 = require("../env");
+const FS_1 = require("../makes/FS");
+const get_config_1 = require("./get-config");
+const setConfig = async (data) => {
+    const config = {
+        ...await (0, get_config_1.getConfig)(),
+        ...data
+    };
+    await FS_1.FS.writeJSON(env_1.MAP_PATH, config);
+    return config;
 };
-exports.setConfig = setConfig;
+exports.setConfig = setConfig;

package/lib/utils/spawn.js

@@ -1,24 +1,21 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.spawn = void 0;
-var _child_process = require("child_process");
-const spawn = async command => {
-  return new Promise(resolve => {
-    let [prog, ...options] = command.split(/\s+/);
-    let worker = (0, _child_process.spawn)(prog, options);
-    worker.stdout.on("data", data => {
-      console.log(`stdout: ${data}`);
+const child_process_1 = require("child_process");
+const spawn = async (command) => {
+    return new Promise((resolve) => {
+        let [prog, ...options] = command.split(/\s+/);
+        let worker = (0, child_process_1.spawn)(prog, options);
+        worker.stdout.on("data", (data) => {
+            console.log(`stdout: ${data}`);
+        });
+        worker.stderr.on("data", (data) => {
+            console.error(`stderr: ${data}`);
+        });
+        worker.on("close", (code) => {
+            console.log(`child process exited with code ${code}`);
+            resolve(undefined);
+        });
     });
-    worker.stderr.on("data", data => {
-      console.error(`stderr: ${data}`);
-    });
-    worker.on("close", code => {
-      console.log(`child process exited with code ${code}`);
-      resolve(undefined);
-    });
-  });
 };
-exports.spawn = spawn;
+exports.spawn = spawn;

package/lib/utils/tty.js

@@ -1,10 +1,6 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.tty = void 0;
 const tty = () => {
-  //
 };
-exports.tty = tty;
+exports.tty = tty;

package/lib/utils/volumeFormat.js

@@ -1,15 +1,8 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.volumeFormat = void 0;
-const volumeFormat = volume => {
-  const {
-    source,
-    destination,
-    options
-  } = volume;
-  return `${source}:${destination}` + (options ? `:${options}` : "");
+const volumeFormat = (volume) => {
+    const { source, destination, options } = volume;
+    return `${source}:${destination}` + (options ? `:${options}` : "");
 };
-exports.volumeFormat = volumeFormat;
+exports.volumeFormat = volumeFormat;

package/lib/utils/volumeParse.js

@@ -1,16 +1,13 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+Object.defineProperty(exports, "__esModule", { value: true });
 exports.volumeParse = void 0;
-const volumeParse = volume => {
-  const regVolume = /^([^:]+):([^:]+)(?::([^:]+))?$/;
-  const [, source, destination, options] = regVolume.exec(volume);
-  return {
-    source,
-    destination,
-    options
-  };
+const volumeParse = (volume) => {
+    const regVolume = /^([^:]+):([^:]+)(?::([^:]+))?$/;
+    const [, source, destination, options] = regVolume.exec(volume);
+    return {
+        source,
+        destination,
+        options
+    };
 };
-exports.volumeParse = volumeParse;
+exports.volumeParse = volumeParse;

package/package.json

@@ -1,11 +1,9 @@
 {
     "name": "@wocker/ws",
-    "version": "1.0.2",
+    "version": "1.0.4",
     "author": "Kris Papercut <krispcut@gmail.com>",
     "description": "Docker workspace for web projects",
     "license": "MIT",
-    "main": "lib/index.js",
-    "types": "lib/index.d.ts",
     "homepage": "https://kearisp.github.io/wocker",
     "repository": {
         "type": "git",
@@ -14,31 +12,21 @@
     "bugs": {
         "url": "https://github.com/kearisp/wocker-ws/issues"
     },
+    "main": "lib/index.js",
+    "types": "lib/index.d.ts",
     "bin": {
         "ws": "./bin/ws.js"
     },
     "scripts": {
         "prepare": "npm run build",
         "start": "npm run watch",
-        "build": "npm run babel:build && tsc --emitDeclarationOnly",
-        "watch": "npm run babel:watch",
-        "webpack:build": "webpack --mode=development --node-env=development",
-        "webpack:watch": "webpack --watch",
-        "babel:build": "babel src --out-dir lib --extensions .js --extensions .ts",
-        "babel:watch": "npm run babel:build -- --watch",
-        "ts:build": "tsc",
-        "ts:watch": "tsc -w",
-        "test": "jest --colors",
-        "test:cli": "npm run test --workspace @kearisp/cli",
-        "test-watch": "jest --colors --watch",
+        "build": "tsc",
+        "watch": "tsc -w",
         "lint": "eslint \"**/*.{js,jsx,ts,tsx}\""
     },
-    "workspaces": [
-        "packages/*"
-    ],
     "dependencies": {
-        "@kearisp/cli": "^1.0.2",
-        "@wocker/core": "^1.0.2",
+        "@kearisp/cli": "^1.0.6",
+        "@wocker/core": "^1.0.4",
         "@wocker/utils": "^1.0.2",
         "async-mutex": "^0.4.0",
         "axios": "^1.4.0",
@@ -46,45 +34,31 @@
         "child_process": "^1.0.2",
         "cli-table3": "^0.6.2",
         "date-fns": "^2.29.3",
-        "dockerode": "^3.3.5",
+        "dockerode": "^4.0.2",
         "fs": "^0.0.1-security",
         "inquirer": "^7.0.0",
         "md5": "^2.3.0",
         "os": "^0.1.2",
         "path": "^0.12.7",
         "readable-stream": "^4.1.0",
+        "reflect-metadata": "^0.2.1",
         "tty": "^1.0.1"
     },
     "devDependencies": {
-        "@babel/cli": "^7.15.7",
-        "@babel/core": "^7.22.11",
-        "@babel/eslint-parser": "^7.15.8",
-        "@babel/eslint-plugin": "^7.14.5",
-        "@babel/preset-env": "^7.21.5",
-        "@babel/preset-typescript": "^7.21.5",
-        "@types/dockerode": "^3.3.14",
+        "@types/dockerode": "^3.3.23",
         "@types/inquirer": "^7.0.0",
-        "@types/jest": "^28.1.8",
+        "@types/jest": "^29.5.12",
         "@types/lodash": "^4.14.161",
         "@types/md5": "^2.3.2",
         "@types/mute-stream": "^0.0.1",
-        "@types/node": "^18.16.16",
+        "@types/node": "^20.11.16",
         "@types/readable-stream": "^2.3.15",
         "@typescript-eslint/eslint-plugin": "^6.5.0",
         "@typescript-eslint/parser": "^6.5.0",
-        "@webpack-cli/generators": "^3.0.1",
-        "babel-jest": "^28.0.0",
-        "babel-loader": "^8.2.3",
-        "babel-plugin-module-resolver": "^5.0.0",
         "eslint": "^8.48.0",
         "eslint-plugin-import": "^2.28.1",
         "eslint-plugin-node": "^11.1.0",
         "eslint-webpack-plugin": "^3.1.0",
-        "jest": "^29.6.3",
-        "ts-loader": "^9.2.6",
-        "ts-node": "^10.9.1",
-        "typescript": "^5.2.2",
-        "webpack": "^5.60.0",
-        "webpack-cli": "^4.9.1"
+        "typescript": "^5.3.3"
     }
 }

package/presets/bun/Dockerfile

@@ -0,0 +1,11 @@
+FROM ubuntu:latest
+
+RUN apt-get update && \
+    apt-get -y install wget curl unzip
+
+RUN curl -fsSL https://bun.sh/install | bash
+
+ENV BUN_INSTALL="/root/.bun"
+ENV PATH="$BUN_INSTALL/bin:$PATH"
+
+# TODO

package/presets/bun/config.json

@@ -0,0 +1,3 @@
+{
+    "dockerfile": "./Dockerfile"
+}

package/presets/node/Dockerfile

@@ -3,6 +3,9 @@ ARG PACKAGE_MANAGER
 
 FROM node:${NODE_VERSION}
 
+ARG UID=1000
+ARG USER=user
+
 ENV TZ=America/Los_Angeles
 ENV APP_PORT 80
 ENV PORT=$APP_PORT
@@ -26,8 +29,7 @@ WORKDIR /usr/app
 
 EXPOSE 80
 
-#CMD npm install && \
-#    ${NPM_RUN}
+USER $UID
 
 CMD if [ "$PACKAGE_MANAGER" = "npm" ]; then \
         npm install --quiet --no-progress; \

package/presets/php-apache/Dockerfile

@@ -3,9 +3,10 @@ ARG PHP_VERSION
 FROM php:${PHP_VERSION}-apache
 
 ARG UID=1000
-ARG USER=user
+ARG USER=www-data
 
-RUN useradd -G root,www-data -u $UID -d /home/$USER $USER && \
+RUN usermod -u 1000 www-data && \
+#    useradd -G root,www-data -u $UID -d /home/$USER $USER && \
     mkdir -p /home/$USER && \
     touch /home/$USER/.bashrc && \
     chown -R $USER:$USER /home/$USER

package/.github/workflows/publish.yml

@@ -1,31 +0,0 @@
-name: Publish
-
-on:
-    release:
-        types:
-            - published
-
-jobs:
-    publish:
-        runs-on: ubuntu-latest
-        environment: publish
-        steps:
-            - name: Checkout code
-              uses: actions/checkout@v3
-
-            - name: Set up Node.js
-              uses: actions/setup-node@v3
-              with:
-                node-version: '18'
-                registry-url: 'https://registry.npmjs.org'
-
-            - name: Install dependencies
-              run: npm install
-
-            - name: Build
-              run: npm run build
-
-            - name: Publish to NPM
-              env:
-                NODE_AUTH_TOKEN: ${{ secrets.NODE_AUTH_TOKEN }}
-              run: npm publish

package/plugins/mariadb/admin/conf/config.user.inc.php

@@ -1,9 +0,0 @@
-<?php
-/**
- *
- */
-
-$cfg['DefaultLang'] = 'uk';
-$cfg['UploadDir'] = '/etc/phpmyadmin/upload';
-$cfg['SaveDir'] = '/etc/phpmyadmin/save';
-$cfg['DefaultConnectionCollation'] = 'utf8_general_ci';