@n1k1t/mock-server 0.1.50 → 0.1.52

package/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@n1k1t/mock-server",
-    "version": "0.1.50",
+    "version": "0.1.52",
     "description": "Powerful util to setup mocks over HTTP APIs",
     "main": "lib/src/index.js",
     "types": "lib/src/index.d.ts",
@@ -10,7 +10,7 @@
     "scripts": {
         "test": "NODE_ENV=test TZ=UTC npx jest",
         "start": "node lib/src/index",
-        "start:dev": "npx webpack watch --mode development",
+        "start:dev": "npx concurrently --names webpack,server -c gray,cyan \"npx webpack watch --mode development\" \"npx ts-node test\"",
         "gui:build": "npx webpack --mode production",
         "gui:build:check": "npx tsc --noEmit --project src/gui/app/tsconfig.json",
         "server:build": "rm -rf lib && npx tsc",
@@ -88,14 +88,15 @@
         "@types/webpack-livereload-plugin": "2.3.6",
         "@types/ws": "8.5.13",
         "chart.js": "4.4.8",
+        "concurrently": "9.1.2",
         "css-loader": "7.1.2",
         "fnv1a": "1.1.1",
         "husky": "9.1.7",
         "jest": "29.7.0",
         "jest-extended": "4.0.2",
+        "mini-css-extract-plugin": "2.9.2",
         "sass": "1.86.0",
         "sass-loader": "16.0.5",
-        "style-loader": "4.0.0",
         "ts-jest": "29.1.1",
         "ts-loader": "9.5.2",
         "ts-node": "10.9.2",

package/lib/webpack.config.d.ts

@@ -1,5 +1,4 @@
-import { Configuration } from 'webpack';
-import { TFunction } from './src/types';
-declare const _default: TFunction<Configuration[], [object, Pick<Configuration, "mode">]>;
+import type { Configuration } from 'webpack';
+declare const _default: Configuration[];
 export default _default;
 //# sourceMappingURL=webpack.config.d.ts.map

package/lib/webpack.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.config.d.ts","sourceRoot":"","sources":["../webpack.config.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;;AASxC,wBAgFG"}
+{"version":3,"file":"webpack.config.d.ts","sourceRoot":"","sources":["../webpack.config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;;AAe7C,wBAsFG"}

package/lib/webpack.config.js

@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+const mini_css_extract_plugin_1 = __importDefault(require("mini-css-extract-plugin"));
 const webpack_livereload_plugin_1 = __importDefault(require("webpack-livereload-plugin"));
 const path_1 = __importDefault(require("path"));
 const promises_1 = __importDefault(require("fs/promises"));
@@ -12,72 +13,77 @@ class LiveReloadWebpackPlugin extends webpack_livereload_plugin_1.default {
         return super.apply(compiler);
     }
 }
-exports.default = (0, utils_1.cast)((env, options) => {
-    if (options.mode === 'development') {
-        require('./test');
-    }
-    return [
-        {
-            name: 'app',
-            entry: path_1.default.join(__dirname, 'src', 'gui', 'app', 'main.ts'),
-            output: {
-                filename: 'app.js',
-                path: path_1.default.join(__dirname, 'public', 'scripts'),
-            },
-            module: {
-                rules: [{
-                        test: /\.ts$/i,
-                        loader: 'ts-loader',
-                        options: {
-                            configFile: path_1.default.join(__dirname, 'src', 'gui', 'app', 'tsconfig.json'),
-                        },
-                    }],
-            },
-            resolve: {
-                extensions: ['.js', '.ts', '.json', '.hbs'],
-                fallback: {
-                    fs: false,
-                },
-            },
-            plugins: [new LiveReloadWebpackPlugin()],
+exports.default = (0, utils_1.cast)([
+    {
+        name: 'app',
+        entry: path_1.default.join(__dirname, 'src', 'gui', 'app', 'main.ts'),
+        output: {
+            filename: 'main.js',
+            path: path_1.default.join(__dirname, 'public', 'scripts'),
         },
-        {
-            name: 'styles',
-            entry: path_1.default.join(__dirname, 'src', 'gui', 'styles', 'main.scss'),
-            output: {
-                filename: 'styles.js',
-                path: path_1.default.join(__dirname, 'public', 'scripts'),
+        module: {
+            rules: [{
+                    test: /\.ts$/i,
+                    loader: 'ts-loader',
+                    options: {
+                        configFile: path_1.default.join(__dirname, 'src', 'gui', 'app', 'tsconfig.json'),
+                    },
+                }],
+        },
+        resolve: {
+            extensions: ['.js', '.ts', '.json', '.hbs'],
+            fallback: {
+                fs: false,
             },
-            module: {
-                rules: [{
-                        test: /\.(sa|sc|c)ss$/i,
-                        use: [
-                            'style-loader',
-                            'css-loader',
-                            {
-                                loader: 'sass-loader',
-                                options: {
-                                    additionalData: async (content, additional) => {
-                                        const lines = content.toString().split('\n');
-                                        const imports = lines
-                                            .map((line, index) => [line, index])
-                                            .filter(([line]) => line.includes('@import') && line.includes('*'))
-                                            .map(([line, index]) => [line.trim().replace(/\@import\s'|';/g, ''), index]);
-                                        for (const [minimatch, index] of imports.reverse()) {
-                                            lines.splice(index, 1);
-                                            for await (const target of promises_1.default.glob(path_1.default.resolve(additional.context, minimatch))) {
-                                                lines.push(`@import '${target}';`);
-                                            }
+        },
+        plugins: [new LiveReloadWebpackPlugin()],
+    },
+    {
+        name: 'styles',
+        entry: path_1.default.join(__dirname, 'src', 'gui', 'styles', 'main.scss'),
+        output: {
+            path: path_1.default.join(__dirname, 'public', 'styles'),
+        },
+        module: {
+            rules: [{
+                    test: /\.(sa|sc|c)ss$/i,
+                    use: [
+                        mini_css_extract_plugin_1.default.loader,
+                        'css-loader',
+                        {
+                            loader: 'sass-loader',
+                            options: {
+                                additionalData: async (content, additional) => {
+                                    const lines = content.toString().split('\n');
+                                    const imports = lines
+                                        .map((line, index) => [line, index])
+                                        .filter(([line]) => line.includes('@import') && line.includes('*'))
+                                        .map(([line, index]) => [line.trim().replace(/\@import\s'|';/g, ''), index]);
+                                    for (const [minimatch, index] of imports.reverse()) {
+                                        lines.splice(index, 1);
+                                        for await (const target of promises_1.default.glob(path_1.default.resolve(additional.context, minimatch))) {
+                                            lines.push(`@import '${target}';`);
                                         }
-                                        return lines.join('\n');
-                                    },
+                                    }
+                                    return lines.join('\n');
                                 },
                             },
-                        ],
-                    }],
+                        },
+                    ],
+                }],
+        },
+        plugins: [
+            {
+                apply(compiler) {
+                    compiler.hooks.shouldEmit.tap('Remove styles from output', (compilation) => compilation
+                        .getAssets()
+                        .filter((asset) => asset.name.includes('.js'))
+                        .forEach((asset) => compilation.deleteAsset(asset.name)));
+                },
             },
-            plugins: [new LiveReloadWebpackPlugin()],
-        }
-    ];
-});
+            new mini_css_extract_plugin_1.default({ filename: "[name].css", }),
+            new LiveReloadWebpackPlugin(),
+        ],
+    },
+]);
 //# sourceMappingURL=webpack.config.js.map

package/lib/webpack.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"webpack.config.js","sourceRoot":"","sources":["../webpack.config.ts"],"names":[],"mappings":";;;;;AAAA,0FAAyD;AACzD,gDAAwB;AACxB,2DAA6B;AAK7B,uCAAmC;AAEnC,MAAM,uBAAwB,SAAQ,mCAAgB;IACpD,KAAK,CAAC,QAAa;QACjB,OAAO,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;CACF;AAED,kBAAe,IAAA,YAAI,EAAoE,CAAC,GAAG,EAAE,OAAO,EAAE,EAAE;IACtG,IAAI,OAAO,CAAC,IAAI,KAAK,aAAa,EAAE,CAAC;QACnC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACpB,CAAC;IAED,OAAO;QACL;YACE,IAAI,EAAE,KAAK;YAEX,KAAK,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC;YAC3D,MAAM,EAAE;gBACN,QAAQ,EAAE,QAAQ;gBAClB,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC;aAChD;YAED,MAAM,EAAE;gBACN,KAAK,EAAE,CAAC;wBACN,IAAI,EAAE,QAAQ;wBACd,MAAM,EAAE,WAAW;wBAEnB,OAAO,EAAE;4BACP,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,CAAC;yBACvE;qBACF,CAAC;aACH;YAED,OAAO,EAAE;gBACP,UAAU,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC;gBAE3C,QAAQ,EAAE;oBACR,EAAE,EAAE,KAAK;iBACV;aACF;YAED,OAAO,EAAE,CAAC,IAAI,uBAAuB,EAAE,CAAC;SACzC;QACD;YACE,IAAI,EAAE,QAAQ;YAEd,KAAK,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC;YAChE,MAAM,EAAE;gBACN,QAAQ,EAAE,WAAW;gBACrB,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC;aAChD;YAED,MAAM,EAAE;gBACN,KAAK,EAAE,CAAC;wBACN,IAAI,EAAE,iBAAiB;wBACvB,GAAG,EAAE;4BACH,cAAc;4BACd,YAAY;4BACZ;gCACE,MAAM,EAAE,aAAa;gCACrB,OAAO,EAAE;oCACP,cAAc,EAAE,KAAK,EAAE,OAAe,EAAE,UAA+B,EAAE,EAAE;wCACzE,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;wCAC7C,MAAM,OAAO,GAAG,KAAK;6CAClB,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;6CAC1C,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;6CAClE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;wCAEtF,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;4CACnD,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;4CAEvB,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,kBAAE,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;gDAChF,KAAK,CAAC,IAAI,CAAC,YAAY,MAAM,IAAI,CAAC,CAAC;4CACrC,CAAC;wCACH,CAAC;wCAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oCAC1B,CAAC;iCACF;6BACF;yBACF;qBACF,CAAC;aACH;YAED,OAAO,EAAE,CAAC,IAAI,uBAAuB,EAAE,CAAC;SACzC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"webpack.config.js","sourceRoot":"","sources":["../webpack.config.ts"],"names":[],"mappings":";;;;;AAEA,sFAA2D;AAC3D,0FAAyD;AACzD,gDAAwB;AACxB,2DAA6B;AAE7B,uCAAmC;AAEnC,MAAM,uBAAwB,SAAQ,mCAAgB;IACpD,KAAK,CAAC,QAAa;QACjB,OAAO,KAAK,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC/B,CAAC;CACF;AAED,kBAAe,IAAA,YAAI,EAAkB;IACnC;QACE,IAAI,EAAE,KAAK;QAEX,KAAK,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,CAAC;QAC3D,MAAM,EAAE;YACN,QAAQ,EAAE,SAAS;YACnB,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,SAAS,CAAC;SAChD;QAED,MAAM,EAAE;YACN,KAAK,EAAE,CAAC;oBACN,IAAI,EAAE,QAAQ;oBACd,MAAM,EAAE,WAAW;oBAEnB,OAAO,EAAE;wBACP,UAAU,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,eAAe,CAAC;qBACvE;iBACF,CAAC;SACH;QAED,OAAO,EAAE;YACP,UAAU,EAAE,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,CAAC;YAE3C,QAAQ,EAAE;gBACR,EAAE,EAAE,KAAK;aACV;SACF;QAED,OAAO,EAAE,CAAC,IAAI,uBAAuB,EAAE,CAAC;KACzC;IACD;QACE,IAAI,EAAE,QAAQ;QAEd,KAAK,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC;QAChE,MAAM,EAAE;YACN,IAAI,EAAE,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,EAAE,QAAQ,CAAC;SAC/C;QAED,MAAM,EAAE;YACN,KAAK,EAAE,CAAC;oBACN,IAAI,EAAE,iBAAiB;oBACvB,GAAG,EAAE;wBACH,iCAAoB,CAAC,MAAM;wBAC3B,YAAY;wBACZ;4BACE,MAAM,EAAE,aAAa;4BACrB,OAAO,EAAE;gCACP,cAAc,EAAE,KAAK,EAAE,OAAe,EAAE,UAA+B,EAAE,EAAE;oCACzE,MAAM,KAAK,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oCAC7C,MAAM,OAAO,GAAG,KAAK;yCAClB,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;yCAC1C,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;yCAClE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,EAAE,CAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,iBAAiB,EAAE,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;oCAEtF,KAAK,MAAM,CAAC,SAAS,EAAE,KAAK,CAAC,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC;wCACnD,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;wCAEvB,IAAI,KAAK,EAAE,MAAM,MAAM,IAAI,kBAAE,CAAC,IAAI,CAAC,cAAI,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC,EAAE,CAAC;4CAChF,KAAK,CAAC,IAAI,CAAC,YAAY,MAAM,IAAI,CAAC,CAAC;wCACrC,CAAC;oCACH,CAAC;oCAED,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gCAC1B,CAAC;6BACF;yBACF;qBACF;iBACF,CAAC;SACH;QAED,OAAO,EAAE;YACP;gBACE,KAAK,CAAC,QAAQ;oBACZ,QAAQ,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,2BAA2B,EAAE,CAAC,WAAW,EAAE,EAAE,CACzE,WAAW;yBACR,SAAS,EAAE;yBACX,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;yBAC7C,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAC3D,CAAA;gBACH,CAAC;aACF;YACD,IAAI,iCAAoB,CAAC,EAAE,QAAQ,EAAE,YAAY,GAAG,CAAC;YACrD,IAAI,uBAAuB,EAAE;SAC9B;KACF;CACF,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@n1k1t/mock-server",
-  "version": "0.1.50",
+  "version": "0.1.52",
   "description": "Powerful util to setup mocks over HTTP APIs",
   "main": "lib/src/index.js",
   "types": "lib/src/index.d.ts",
@@ -10,7 +10,7 @@
   "scripts": {
     "test": "NODE_ENV=test TZ=UTC npx jest",
     "start": "node lib/src/index",
-    "start:dev": "npx webpack watch --mode development",
+    "start:dev": "npx concurrently --names webpack,server -c gray,cyan \"npx webpack watch --mode development\" \"npx ts-node test\"",
     "gui:build": "npx webpack --mode production",
     "gui:build:check": "npx tsc --noEmit --project src/gui/app/tsconfig.json",
     "server:build": "rm -rf lib && npx tsc",
@@ -88,14 +88,15 @@
     "@types/webpack-livereload-plugin": "2.3.6",
     "@types/ws": "8.5.13",
     "chart.js": "4.4.8",
+    "concurrently": "9.1.2",
     "css-loader": "7.1.2",
     "fnv1a": "1.1.1",
     "husky": "9.1.7",
     "jest": "29.7.0",
     "jest-extended": "4.0.2",
+    "mini-css-extract-plugin": "2.9.2",
     "sass": "1.86.0",
     "sass-loader": "16.0.5",
-    "style-loader": "4.0.0",
     "ts-jest": "29.1.1",
     "ts-loader": "9.5.2",
     "ts-node": "10.9.2",

package/public/index.html

@@ -5,12 +5,12 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
   <title>Mock server</title>
+  <link type="image/png" sizes="120x120" rel="icon" href="images/favicon.png">
 
+  <link rel="stylesheet" href="styles/main.css">
   <link rel="stylesheet" href="styles/fa-all.css">
-  <link type="image/png" sizes="120x120" rel="icon" href="images/favicon.png">
 </head>
 <body>
-  <script src="scripts/styles.js"></script>
-  <script src="scripts/app.js"></script>
+  <script src="scripts/main.js"></script>
 </body>
 </html>