From 5405457952f792b3c8a19fa68cdbef7feff9b7f6 Mon Sep 17 00:00:00 2001
From: Izel Nakri <contact@izelnakri.com>
Date: Sun, 13 Jun 2021 15:58:38 +0200
Subject: [PATCH] restructure files for optimized docker build

---
 .dockerignore |  2 --
 .gitignore    |  1 +
 .npmignore    |  9 ---------
 Dockerfile    | 11 ++++-------
 TODO          | 10 ----------
 package.json  |  8 +-------
 6 files changed, 6 insertions(+), 35 deletions(-)
 delete mode 100644 .dockerignore
 delete mode 100644 .npmignore

diff --git a/.dockerignore b/.dockerignore
deleted file mode 100644
index 793cb00..0000000
--- a/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-/dist
-node_modules
diff --git a/.gitignore b/.gitignore
index e5fe5cf..2eab467 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ node_modules
 /examples/dist
 /examples/.cache
 dist/
+/tmp
diff --git a/.npmignore b/.npmignore
deleted file mode 100644
index a22419b..0000000
--- a/.npmignore
+++ /dev/null
@@ -1,9 +0,0 @@
-.git
-.dockerignore
-README.md
-TODO
-scripts
-examples
-node_modules
-Dockerfile
-dist/test
diff --git a/Dockerfile b/Dockerfile
index 453beb7..7f51f45 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,20 +1,17 @@
-FROM node:15.3.0-alpine
+FROM node:15.3.0
 
 WORKDIR /code/
 
-ADD .babelrc /code/.babelrc
 ADD tsconfig.json /code/tsconfig.json
 ADD package-lock.json /code/package-lock.json
 ADD package.json /code/package.json
 
 RUN npm install
 
-ADD memserver-boilerplate /code/memserver-boilerplate
-ADD vendor /code/vendor/
+ADD packages /code/packages
 ADD scripts /code/scripts
-ADD src /code/src
+ADD test /code/test
 
-RUN npm run npm-link-ember-packages
-RUN node_modules/.bin/tsc
+RUN npm run libs:build && npm install
 
 ENTRYPOINT "/bin/bash"
diff --git a/TODO b/TODO
index 1a7663c..2d402dd 100644
--- a/TODO
+++ b/TODO
@@ -1,16 +1,6 @@
-- move to 4 packages? then its harder to use in project: @memserver/cli @memserver/server @memserver/model @memserver/response
-- move to 2 packages? : @memserver/cli @memserver
-- move to github actions
-- add release-it/auto CHANGELOG
-- remove qs?
-- move @ember/string to emberx/string
 - investigate decorator validations
 - maybe a more in-depth serializer
 
-through embroider create a local ember-packages and wire them to memserver with right module names
-
-maybe remove require.caches for tests
-
 JS needs pipeline operator(|>) and cheap Rust bindings(JS<->Rust) and runtimes need to have ava API as default testing API(test.serial, test etc)
 
 - investigate silent Errors within MemServer.Server handler context
diff --git a/package.json b/package.json
index 17272ce..a74286c 100644
--- a/package.json
+++ b/package.json
@@ -50,35 +50,29 @@
     "ts-node": "^10.0.0"
   },
   "devDependencies": {
-    "@ava/typescript": "^1.1.1",
     "@babel/cli": "^7.14.3",
     "@babel/plugin-proposal-class-properties": "^7.13.0",
     "@babel/plugin-proposal-decorators": "^7.14.2",
     "@babel/plugin-proposal-private-methods": "^7.13.0",
     "@babel/preset-typescript": "^7.13.0",
-    "@rollup/plugin-typescript": "^8.2.1",
     "@types/jquery": "^3.5.5",
     "auto-changelog": "^2.3.0",
-    "ava": "3.15.0",
     "babel-loader": "^8.2.2",
     "babel-plugin-module-extension-resolver": "^1.0.0-rc.2",
     "cors": "^2.8.5",
-    "esbuild": "^0.12.6",
     "express": "^4.17.1",
     "fastboot": "^3.1.2",
     "jquery": "3.6.0",
     "qunitx": "^0.2.1",
     "recursive-lookup": "^1.0.0",
     "release-it": "^14.7.0",
-    "rollup": "^2.50.6",
     "sinon": "^11.1.1",
     "strip-ansi": "^7.0.0",
     "tsconfig-paths-webpack-plugin": "^3.5.1",
     "typescript": "^4.3.2",
     "webpack": "^5.37.0",
     "webpack-cli": "^4.7.0",
-    "webpack-dev-server": "^4.0.0-beta.3",
-    "xmlhttprequest": "^1.8.0"
+    "webpack-dev-server": "^4.0.0-beta.3"
   },
   "ava": {
     "files": [