diff --git a/.eslintrc.json b/.eslintrc.json
index 70012bf817af19ee313237f4c468aca8801605c7..77755ba44e03fe04443084bf1d2859a82b1aa861 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -5,7 +5,7 @@
},
"parser": "@typescript-eslint/parser",
"parserOptions": {
- "project": ["tsconfig.json", "tsconfig.servers.json"],
+ "project": ["tsconfig.json", "tsconfig.commonjs.json"],
"sourceType": "module"
},
"plugins": [
diff --git a/.gitignore b/.gitignore
index d0ab23e573a48452cf041ef47f8ee17a14574a97..e2df4e3ffbb99fead749b5827c2426866f8fcb63 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,7 +5,7 @@ node_modules/
debug.log
npm-debug.log
tsconfig.tsbuildinfo
-tsconfig.servers.tsbuildinfo
+tsconfig.commonjs.tsbuildinfo
*.sublime-workspace
.idea
diff --git a/.npmignore b/.npmignore
index 37565e32b4c975a1f04c29492681bd9d5e5deae4..4783d8bac73667771a618c6bb7089b0bf9af10f7 100644
--- a/.npmignore
+++ b/.npmignore
@@ -1 +1 @@
-tsconfig.servers.buildinfo
\ No newline at end of file
+tsconfig.commonjs.buildinfo
\ No newline at end of file
diff --git a/docs/model-server/readme.md b/docs/model-server/readme.md
index 7d65438c0b4f48a6ac04603b30aa15cdff7ec121..444c97c5cf309b301dbeac85996ba187e0f9f6be 100644
--- a/docs/model-server/readme.md
+++ b/docs/model-server/readme.md
@@ -54,12 +54,12 @@ Sometimes nodejs might run into problems with memory. This is usually resolved b
## Preprocessor
-The preprocessor application allows to add custom data to CIF files and/or convert CIF to BinaryCIF. ``node lib/servers/servers/model/preprocess`` or ``model-server-preprocess`` binary from the NPM package.
+The preprocessor application allows to add custom data to CIF files and/or convert CIF to BinaryCIF. ``node lib/commonjs/servers/model/preprocess`` or ``model-server-preprocess`` binary from the NPM package.
## Local Mode
-The server can be run in local/file based mode using ``node lib/servers/servers/model/query`` (``model-server-query`` binary from the NPM package).
+The server can be run in local/file based mode using ``node lib/commonjs/servers/model/query`` (``model-server-query`` binary from the NPM package).
Custom Properties
=================
diff --git a/docs/volume-server/README.md b/docs/volume-server/README.md
index 01cda2104b3e791336d8b4dcf58231351692b85c..b1894ce09880ae2ac67b54348a7109b961de4f24 100644
--- a/docs/volume-server/README.md
+++ b/docs/volume-server/README.md
@@ -28,7 +28,7 @@ npm run build-tsc
and run the server by
```
-node lib/servers/servers/volume/server
+node lib/commonjs/servers/volume/server
```
## From NPM
@@ -60,11 +60,11 @@ Sometimes nodejs might run into problems with memory. This is usually resolved b
## Preparing the Data
For the server to work, CCP4/MAP (models 0, 1, 2 are supported) input data need to be converted into a custom block format.
-To achieve this, use the ``pack`` application (``node lib/servers/servers/volume/pack`` or ``volume-server-pack`` binary from the NPM package).
+To achieve this, use the ``pack`` application (``node lib/commonjs/servers/volume/pack`` or ``volume-server-pack`` binary from the NPM package).
## Local Mode
-The program ``lib/servers/servers/volume/pack`` (``volume-server-query`` in NPM package) can be used to query the data without running a http server.
+The program ``lib/commonjs/servers/volume/pack`` (``volume-server-query`` in NPM package) can be used to query the data without running a http server.
## Navigating the Source Code
diff --git a/package.json b/package.json
index 72986faaf46071e3088f27ad8e75eed01099c252..75ac9ac1bb7f94d4957fef401e947b5fbeec4c26 100644
--- a/package.json
+++ b/package.json
@@ -16,7 +16,7 @@
"test": "npm run lint && jest",
"build": "npm run build-tsc && npm run build-extra && npm run build-webpack",
"build-viewer": "npm run build-tsc && npm run build-extra && npm run build-webpack-viewer",
- "build-tsc": "tsc --incremental && tsc --build tsconfig.servers.json --incremental",
+ "build-tsc": "concurrently \"tsc --incremental\" \"tsc --build tsconfig.commonjs.json --incremental\"",
"build-extra": "cpx \"src/**/*.{scss,html,ico}\" lib/",
"build-webpack": "webpack --mode production --config ./webpack.config.production.js",
"build-webpack-viewer": "webpack --mode production --config ./webpack.config.viewer.js",
@@ -24,16 +24,16 @@
"watch-viewer": "concurrently -c \"green,gray,gray\" --names \"tsc,ext,wpc\" --kill-others \"npm:watch-tsc\" \"npm:watch-extra\" \"npm:watch-webpack-viewer\"",
"watch-viewer-debug": "concurrently -c \"green,gray,gray\" --names \"tsc,ext,wpc\" --kill-others \"npm:watch-tsc\" \"npm:watch-extra\" \"npm:watch-webpack-viewer-debug\"",
"watch-tsc": "tsc --watch --incremental",
- "watch-servers": "tsc --build tsconfig.servers.json --watch --incremental",
+ "watch-servers": "tsc --build tsconfig.commonjs.json --watch --incremental",
"watch-extra": "cpx \"src/**/*.{scss,html,ico}\" lib/ --watch",
"watch-webpack": "webpack -w --mode development --display minimal",
"watch-webpack-viewer": "webpack -w --mode development --display errors-only --info-verbosity verbose --config ./webpack.config.viewer.js",
"watch-webpack-viewer-debug": "webpack -w --mode development --display errors-only --info-verbosity verbose --config ./webpack.config.viewer.debug.js",
"serve": "http-server -p 1338",
- "model-server": "node lib/servers/servers/model/server.js",
- "model-server-watch": "nodemon --watch lib lib/servers/servers/model/server.js",
- "volume-server-test": "node lib/servers/servers/volume/server.js --idMap em 'test/${id}.mdb' --defaultPort 1336",
- "plugin-state": "node lib/servers/servers/plugin-state/index.js",
+ "model-server": "node lib/commonjs/servers/model/server.js",
+ "model-server-watch": "nodemon --watch lib lib/commonjs/servers/model/server.js",
+ "volume-server-test": "node lib/commonjs/servers/volume/server.js --idMap em 'test/${id}.mdb' --defaultPort 1336",
+ "plugin-state": "node lib/commonjs/servers/plugin-state/index.js",
"preversion": "npm run test",
"version": "npm run build",
"postversion": "git push && git push --tags"
@@ -45,12 +45,12 @@
"bin": {
"cif2bcif": "lib/cli/cif2bcif/index.js",
"cifschema": "lib/cli/cifschema/index.js",
- "model-server": "lib/servers/servers/model/server.js",
- "model-server-query": "lib/servers/servers/model/query.js",
- "model-server-preprocess": "lib/servers/servers/model/preprocess.js",
- "volume-server": "lib/servers/servers/volume/server.js",
- "volume-server-query": "lib/servers/servers/volume/query.js",
- "volume-server-pack": "lib/servers/servers/volume/pack.js"
+ "model-server": "lib/commonjs/servers/model/server.js",
+ "model-server-query": "lib/commonjs/servers/model/query.js",
+ "model-server-preprocess": "lib/commonjs/servers/model/preprocess.js",
+ "volume-server": "lib/commonjs/servers/volume/server.js",
+ "volume-server-query": "lib/commonjs/servers/volume/query.js",
+ "volume-server-pack": "lib/commonjs/servers/volume/pack.js"
},
"nodemonConfig": {
"ignoreRoot": [
diff --git a/tsconfig.servers.json b/tsconfig.commonjs.json
similarity index 85%
rename from tsconfig.servers.json
rename to tsconfig.commonjs.json
index 0a29bd69b8b6e471f0bc766923224a9a61f396e6..50217c4c7808e76479c130e6fa2f5b959015fe08 100644
--- a/tsconfig.servers.json
+++ b/tsconfig.commonjs.json
@@ -17,7 +17,7 @@
"jsx": "react",
"lib": [ "es6", "dom", "esnext.asynciterable", "es2016" ],
"rootDir": "src",
- "outDir": "lib"
+ "outDir": "lib/commonjs"
},
- "include": [ "src/servers/**/*", "src/perf-tests/*", "src/cli/**/*" ]
+ "include": [ "src/**/*" ]
}
\ No newline at end of file