unwrapped 'server' folder to have a simpler structure, consistent with 'dist' one
Massimo Melina committed
Aug 26, 2022 at 16:40 UTC
295604e1a99c1b436168d669da5bb4d13d42881e
43 files changed
+57
-68
package.json
+55
-9
@@ -9,40 +9,40 @@
9
"homepage": "https://rejetto.com/hfs",
10
"license": "GPL-3.0",
11
"author": "Massimo Melina <a@rejetto.com>",
12
- "workspaces": [ "server", "admin", "frontend", "shared", "mui-grid-form" ],
12
+ "workspaces": [ "admin", "frontend", "shared", "mui-grid-form" ],
13
"scripts": {
14
- "watch-server": "cross-env DEV=1 nodemon --ignore tests/ --watch server/src -e ts,tsx --exec ts-node server/src",
14
+ "watch-server": "cross-env DEV=1 nodemon --ignore tests/ --watch src -e ts,tsx --exec ts-node src",
15
"watch-server-proxied": "cross-env FRONTEND_PROXY=3005 ADMIN_PROXY=3006 npm run watch-server",
16
"watch-shared": "cd shared && tsc --watch",
17
"watch-form": "cd mui-grid-form && tsc --watch",
18
"start-frontend": "npm run start --workspace=frontend",
19
"start-admin": "npm run start --workspace=admin",
20
"build-all": "npm audit --omit=dev && rm -rf dist && npm i && npm run build-shared && npm run build-server && npm run build-form && npm run build-frontend && npm run build-admin && echo COMPLETED",
21
- "build-server": "rm -rf dist/src dist/plugins && tsc --target es2018 && cp -v -r package-lock.json server/package.json READ* LICENSE* plugins dist && cd dist && npm ci --omit=dev && npm i -f --omit=dev @node-rs/crc32-win32-x64-msvc && cd .. && node afterbuild",
21
+ "build-server": "rm -rf dist/src dist/plugins && tsc --target es2018 && cp -v -r package-lock.json package.json plugins dist && cd dist && npm ci --omit=dev && npm i -f --omit=dev @node-rs/crc32-win32-x64-msvc && cd .. && node afterbuild",
22
"build-frontend": "npm run build --workspace=frontend",
23
"build-admin": "npm run build --workspace=admin",
24
"build-shared": "npm run build --workspace=shared",
25
"build-form": "npm run build --workspace=mui-grid-form",
26
"server-for-test": "cross-env HFS_CONFIG=tests node dist/src",
27
"test": "mocha -r ts-node/register 'tests/**/*.ts'",
28
- "dist-node": "cd dist && zip hfs-node.zip -r * -x *.zip *.exe hfs-*",
28
+ "dist-node": "cd dist && zip hfs-node.zip -r * -x *.zip *.exe hfs-* *.log logs",
29
"dist-win": "pkg . -C gzip -t node16-win && cd dist && zip hfs-windows.zip hfs.exe -r plugins",
30
"dist-bin": "pkg . -C gzip && cd dist && mv -f hfs-win.exe hfs.exe && zip hfs-windows.zip hfs.exe -r plugins && cp -f hfs-linux hfs && zip hfs-linux.zip hfs -r plugins && cp -f hfs-macos hfs && zip hfs-mac.zip hfs -r plugins && rm hfs",
31
- "dist": "npm run build-all && npm run dist-node && npm run dist-bin"
31
+ "dist": "npm run build-all && npm run dist-bin"
32
},
33
"engines": {
34
"node": ">=16.13.0"
35
},
36
"files": [
37
- "dist/**/*"
37
+ "README*",
38
+ "LICENSE*",
39
+ "dist/**/*",
40
+ "!dist/@(hfs-*|logs|*.@(exe|log|zip))"
41
],
42
"repository": {
43
"type": "git",
44
"url": "https://github.com/rejetto/hfs/"
45
},
43
- "devDependencies": {
44
- "pkg": "^5.7.0"
45
- },
46
"bin": {
47
"hfs": "dist/src/index.js"
48
},
@@ -57,5 +57,51 @@
57
"node16-linux"
58
],
59
"outputPath": "dist"
60
+ },
61
+ "dependencies": {
62
+ "@koa/router": "^10.1.1",
63
+ "@node-rs/crc32": "^1.5.1",
64
+ "basic-auth": "^2.0.1",
65
+ "buffer-crc32": "https://github.com/rejetto/buffer-crc32.git",
66
+ "cidr-tools": "^4.3.0",
67
+ "fast-glob": "^3.2.7",
68
+ "find-process": "^1.4.7",
69
+ "koa": "^2.13.4",
70
+ "koa-compress": "^5.1.0",
71
+ "koa-mount": "^4.0.0",
72
+ "koa-session": "^6.2.0",
73
+ "limiter": "^2.1.0",
74
+ "lodash": "^4.17.21",
75
+ "minimist": "^1.2.6",
76
+ "open": "^8.4.0",
77
+ "tssrp6a": "^3.0.0",
78
+ "yaml": "^2.0.0-10",
79
+ "unzip-stream": "^0.3.1"
80
+ },
81
+ "devDependencies": {
82
+ "@types/archiver": "^5.1.1",
83
+ "@types/basic-auth": "^1.1.3",
84
+ "@types/koa": "^2.13.4",
85
+ "@types/koa__router": "^8.0.11",
86
+ "@types/koa-compress": "^4.0.3",
87
+ "@types/koa-mount": "^4.0.1",
88
+ "@types/koa-session": "^5.10.4",
89
+ "@types/lodash": "^4.14.178",
90
+ "@types/micromatch": "^4.0.2",
91
+ "@types/mime-types": "^2.1.1",
92
+ "@types/minimist": "^1.2.2",
93
+ "@types/mocha": "^9.0.0",
94
+ "@types/node": "^16.11.12",
95
+ "@types/unzipper": "^0.10.5",
96
+ "axios": "^0.24.0",
97
+ "axios-cookiejar-support": "^4.0.1",
98
+ "tough-cookie": "^4.0.0",
99
+ "@types/tough-cookie": "^4.0.2",
100
+ "koa-better-http-proxy": "^0.2.9",
101
+ "mocha": "^9.1.3",
102
+ "nm-prune": "^5.0.0",
103
+ "nodemon": "^2.0.15",
104
+ "pkg": "^5.7.0",
105
+ "ts-node": "^10.4.0"
106
}
107
}
server/package.json
deleted
-57
@@ -1,57 +0,0 @@
1
-{
2
- "name": "@hfs/server",
3
- "engines": {
4
- "node": ">=16.13.0"
5
- },
6
- "files": [
7
- "dist/**/*"
8
- ],
9
- "bin": {
10
- "hfs": "dist/src/index.js"
11
- },
12
- "dependencies": {
13
- "@koa/router": "^10.1.1",
14
- "@node-rs/crc32": "^1.5.1",
15
- "basic-auth": "^2.0.1",
16
- "buffer-crc32": "https://github.com/rejetto/buffer-crc32.git",
17
- "cidr-tools": "^4.3.0",
18
- "fast-glob": "^3.2.7",
19
- "find-process": "^1.4.7",
20
- "koa": "^2.13.4",
21
- "koa-compress": "^5.1.0",
22
- "koa-mount": "^4.0.0",
23
- "koa-session": "^6.2.0",
24
- "limiter": "^2.1.0",
25
- "lodash": "^4.17.21",
26
- "minimist": "^1.2.6",
27
- "open": "^8.4.0",
28
- "tssrp6a": "^3.0.0",
29
- "yaml": "^2.0.0-10",
30
- "unzip-stream": "^0.3.1"
31
- },
32
- "devDependencies": {
33
- "@types/archiver": "^5.1.1",
34
- "@types/basic-auth": "^1.1.3",
35
- "@types/koa": "^2.13.4",
36
- "@types/koa__router": "^8.0.11",
37
- "@types/koa-compress": "^4.0.3",
38
- "@types/koa-mount": "^4.0.1",
39
- "@types/koa-session": "^5.10.4",
40
- "@types/lodash": "^4.14.178",
41
- "@types/micromatch": "^4.0.2",
42
- "@types/mime-types": "^2.1.1",
43
- "@types/minimist": "^1.2.2",
44
- "@types/mocha": "^9.0.0",
45
- "@types/node": "^16.11.12",
46
- "@types/unzipper": "^0.10.5",
47
- "axios": "^0.24.0",
48
- "axios-cookiejar-support": "^4.0.1",
49
- "tough-cookie": "^4.0.0",
50
- "@types/tough-cookie": "^4.0.2",
51
- "koa-better-http-proxy": "^0.2.9",
52
- "mocha": "^9.1.3",
53
- "nm-prune": "^5.0.0",
54
- "nodemon": "^2.0.15",
55
- "ts-node": "^10.4.0"
56
- }
57
-}
src/QuickZipStream.ts
renamed
src/ThrottledStream.ts
renamed
src/adminApis.ts
renamed
src/api.accounts.ts
renamed
src/api.auth.ts
renamed
src/api.file_list.ts
renamed
src/api.helpers.ts
renamed
src/api.monitor.ts
renamed
src/api.plugins.ts
renamed
src/api.vfs.ts
renamed
src/apiMiddleware.ts
renamed
src/block.ts
renamed
src/commands.ts
renamed
src/config.ts
renamed
src/connections.ts
renamed
src/const.ts
renamed
src/crypt.ts
renamed
src/debounceAsync.ts
renamed
src/events.ts
renamed
src/frontEndApis.ts
renamed
src/github.ts
renamed
src/index.ts
renamed
src/listen.ts
renamed
src/log.ts
renamed
src/middlewares.ts
renamed
src/misc.ts
renamed
src/pbkdf2.ts
renamed
src/perm.ts
renamed
src/plugins.ts
renamed
src/serveFile.ts
renamed
src/serveGuiFiles.ts
renamed
+1
-1
@@ -11,7 +11,7 @@ import { join, extname } from 'path'
11
import { getOrSet } from './misc'
12
13
// in case of dev env we have our static files within the 'dist' folder'
14
-const DEV_STATIC = process.env.DEV ? '../dist/' : ''
14
+const DEV_STATIC = process.env.DEV ? 'dist/' : ''
15
16
function serveStatic(uri: string): Koa.Middleware {
17
const folder = uri.slice(2,-1) // we know folder is very similar to uri
src/sse.ts
renamed
src/throttler.ts
renamed
src/update.ts
renamed
src/util-files.ts
renamed
src/util-generators.ts
renamed
src/util-http.ts
renamed
src/vfs.ts
renamed
src/watchLoad.ts
renamed
src/zip.ts
renamed
tsconfig.json
+1
-1
@@ -26,7 +26,7 @@
26
27
/* Modules */
28
"module": "commonjs", /* Specify what module code is generated. */
29
- "rootDir": "server/src", /* Specify the root folder within your source files. */
29
+ "rootDir": "src", /* Specify the root folder within your source files. */
30
// "moduleResolution": "node", /* Specify how TypeScript looks up a file from a given module specifier. */
31
// "baseUrl": "./", /* Specify the base directory to resolve non-relative module names. */
32
// "paths": {}, /* Specify a set of entries that re-map imports to additional lookup locations. */