From e6dcf0d83ea2f96e7ebe514ee67e8f2cacf42632 Mon Sep 17 00:00:00 2001
From: rijkvanzanten <rijkvanzanten@me.com>
Date: Fri, 24 Jul 2020 16:45:42 -0400
Subject: [PATCH] Add Makefile to bundle in app

---
 .gitignore        |  1 +
 Makefile          |  6 ++++++
 package-lock.json |  2 +-
 package.json      | 15 +++++++++++----
 src/app.ts        |  4 ++++
 5 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 Makefile

diff --git a/.gitignore b/.gitignore
index 8122c44a91..a5045a4804 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ uploads
 debug.db
 test
 dist
+tmp
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000000..ee677962f8
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,6 @@
+bundle:
+	npm run build
+	git clone git@github.com:directus/app-next.git tmp-app
+	cd tmp-app && npm install && npm run build
+	cp -r tmp-app/dist dist/admin
+	rm -rf tmp-app
diff --git a/package-lock.json b/package-lock.json
index f16eae8dd2..c08a95797e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "directus",
-  "version": "0.0.1",
+  "version": "0.1.0-preview.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index d677a492a7..98708a26bf 100644
--- a/package.json
+++ b/package.json
@@ -1,8 +1,8 @@
 {
   "name": "directus",
-  "version": "0.0.1",
+  "version": "0.1.0-preview.1",
   "description": "Directus",
-  "main": "dist/server.js",
+  "main": "dist/app.js",
   "bin": {
     "directus": "dist/cli/index.js"
   },
@@ -10,12 +10,19 @@
     "start": "NODE_ENV=production node dist/server.js",
     "build": "rimraf dist && tsc -b && copyfiles \"src/**/*.*\" -e \"src/**/*.ts\" -u 1 dist",
     "dev": "NODE_ENV=development LOG_LEVEL=trace ts-node-dev --files src/server.ts --clear --respawn --watch \"src/**/*.ts\" --transpile-only | pino-colada",
-    "cli": "NODE_ENV=development ts-node --script-mode --transpile-only src/cli/index.ts"
+    "cli": "NODE_ENV=development ts-node --script-mode --transpile-only src/cli/index.ts",
+    "prepublishOnly": "make bundle"
   },
   "repository": {
     "type": "git",
     "url": "git+https://github.com/directus/api-node.git"
   },
+  "files": [
+    "dist",
+    "LICENSE",
+    "README.md",
+    "example.env"
+  ],
   "keywords": [
     "directus",
     "api",
@@ -26,7 +33,7 @@
     "crm"
   ],
   "author": "Rijk van Zanten <rijkvanzanten@me.com>",
-  "license": "GPL-3.0",
+  "license": "GPL-3.0-only",
   "bugs": {
     "url": "https://github.com/directus/api-node/issues"
   },
diff --git a/src/app.ts b/src/app.ts
index d8d325a75d..c09b8ef7f8 100644
--- a/src/app.ts
+++ b/src/app.ts
@@ -4,6 +4,7 @@ dotenv.config();
 import express from 'express';
 import bodyParser from 'body-parser';
 import logger from 'express-pino-logger';
+import path from 'path';
 
 import errorHandler from './middleware/error-handler';
 
@@ -44,6 +45,9 @@ const app = express()
 	})
 
 	// the auth endpoints allow you to login/logout etc. It should ignore the authentication check
+	.use('/admin', express.static(path.join(__dirname, 'admin')))
+	.use('/admin/*', (req, res) => res.sendFile(path.join(__dirname, 'admin/index.html')))
+
 	.use('/auth', authRouter)
 
 	.use(authenticate)