From dcc246e1653d435fea37ed41b50cd9dc1136df0c Mon Sep 17 00:00:00 2001
From: Pascal Jufer <pascal-jufer@bluewin.ch>
Date: Tue, 11 Apr 2023 21:25:58 +0200
Subject: [PATCH] Introduce new `directus` wrapper package (#18134)

* Maybe?

* Maybe maybe

* ESM & version update

* Adjust Dockerfile to new wrapper package

* Clean-up api package.json file

* Update directus/package.json

* Update directus/package.json

* Update directus/package.json

* Regen pnpm lock

* Declare engines in new wrapper package

* Use wrapper version in app-settings

---------

Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
---
 Dockerfile                                    |  6 +-
 api/cli.js                                    |  2 -
 api/package.json                              |  9 +--
 app/package.json                              |  1 +
 .../settings/components/navigation.vue        |  2 +-
 directus/cli.js                               |  2 +
 directus/package.json                         | 64 +++++++++++++++++++
 pnpm-lock.yaml                                | 26 +++-----
 pnpm-workspace.yaml                           |  1 +
 9 files changed, 85 insertions(+), 28 deletions(-)
 delete mode 100755 api/cli.js
 create mode 100755 directus/cli.js
 create mode 100644 directus/package.json

diff --git a/Dockerfile b/Dockerfile
index cc8c4b74fe..979932879f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ COPY . .
 RUN pnpm install --recursive --offline --frozen-lockfile
 
 RUN : \
-	&& pnpm --recursive --workspace-concurrency=1 run build \
+	&& npm_config_workspace_concurrency=1 pnpm run build \
 	&& pnpm --filter directus deploy --prod dist \
 	&& cd dist \
 	&& pnpm pack \
@@ -49,6 +49,6 @@ COPY --from=builder --chown=node:node /directus/dist .
 USER node
 
 CMD : \
-	&& node /directus/dist/cli/run.js bootstrap \
-	&& node /directus/dist/cli/run.js start \
+	&& node /directus/cli.js bootstrap \
+	&& node /directus/cli.js start \
 	;
diff --git a/api/cli.js b/api/cli.js
deleted file mode 100755
index c4799493e2..0000000000
--- a/api/cli.js
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env node
-import './dist/cli/run.js';
diff --git a/api/package.json b/api/package.json
index b4a2b1d250..40de1ccad2 100644
--- a/api/package.json
+++ b/api/package.json
@@ -1,5 +1,5 @@
 {
-	"name": "directus",
+	"name": "@directus/api",
 	"version": "9.24.0",
 	"description": "Directus is a real-time API and App dashboard for managing SQL database content",
 	"type": "module",
@@ -53,12 +53,10 @@
 	"exports": {
 		".": "./dist/index.js",
 		"./*": "./dist/*.js",
+		"./cli/run.js": "./dist/cli/run.js",
 		"./package.json": "./package.json"
 	},
 	"main": "dist/index.js",
-	"bin": {
-		"directus": "cli.js"
-	},
 	"files": [
 		"dist",
 		"!**/*.test.js",
@@ -68,7 +66,6 @@
 		"build": "tsc --build && copyfiles \"src/**/*.{yaml,liquid}\" -u 1 dist",
 		"cli": "NODE_ENV=development SERVE_APP=false tsx src/cli/run.ts",
 		"dev": "NODE_ENV=development SERVE_APP=false tsx watch --clear-screen=false src/start.ts",
-		"start": "node cli.js start",
 		"test": "vitest --watch=false"
 	},
 	"dependencies": {
@@ -229,6 +226,6 @@
 		"tedious": "15.1.3"
 	},
 	"engines": {
-		"node": ">=12.20.0"
+		"node": ">=18.0.0"
 	}
 }
diff --git a/app/package.json b/app/package.json
index da9f2713e2..ccedb0b3f8 100644
--- a/app/package.json
+++ b/app/package.json
@@ -95,6 +95,7 @@
 		"date-fns": "2.29.3",
 		"diacritics": "1.3.0",
 		"diff": "5.1.0",
+		"directus": "workspace:*",
 		"dompurify": "3.0.1",
 		"escape-string-regexp": "5.0.0",
 		"file-saver": "2.0.5",
diff --git a/app/src/modules/settings/components/navigation.vue b/app/src/modules/settings/components/navigation.vue
index edc25a6770..e410530df0 100644
--- a/app/src/modules/settings/components/navigation.vue
+++ b/app/src/modules/settings/components/navigation.vue
@@ -28,7 +28,7 @@
 <script lang="ts">
 import { computed, defineComponent } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { version } from '../../../../package.json';
+import { version } from 'directus/package.json';
 
 export default defineComponent({
 	setup() {
diff --git a/directus/cli.js b/directus/cli.js
new file mode 100755
index 0000000000..8a72122f99
--- /dev/null
+++ b/directus/cli.js
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '@directus/api/cli/run.js';
diff --git a/directus/package.json b/directus/package.json
new file mode 100644
index 0000000000..1bebcb9dfa
--- /dev/null
+++ b/directus/package.json
@@ -0,0 +1,64 @@
+{
+	"name": "directus",
+	"version": "9.24.0",
+	"description": "Directus is a real-time API and App dashboard for managing SQL database content",
+	"type": "module",
+	"keywords": [
+		"directus",
+		"realtime",
+		"database",
+		"content",
+		"api",
+		"rest",
+		"graphql",
+		"app",
+		"dashboard",
+		"headless",
+		"cms",
+		"mysql",
+		"postgresql",
+		"cockroachdb",
+		"sqlite",
+		"framework",
+		"vue"
+	],
+	"homepage": "https://directus.io",
+	"bugs": {
+		"url": "https://github.com/directus/directus/issues"
+	},
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/directus/directus.git"
+	},
+	"funding": "https://github.com/directus/directus?sponsor=1",
+	"license": "GPL-3.0-only",
+	"author": {
+		"name": "Monospace Inc",
+		"email": "info@monospace.io",
+		"url": "https://monospace.io"
+	},
+	"maintainers": [
+		{
+			"name": "Rijk van Zanten",
+			"email": "rijkvanzanten@me.com",
+			"url": "https://github.com/rijkvanzanten"
+		},
+		{
+			"name": "Ben Haynes",
+			"email": "ben@rngr.org",
+			"url": "https://github.com/benhaynes"
+		}
+	],
+	"exports": {
+		"./package.json": "./package.json"
+	},
+	"bin": {
+		"directus": "cli.js"
+	},
+	"dependencies": {
+		"@directus/api": "workspace:*"
+	},
+	"engines": {
+		"node": ">=18.0.0"
+	}
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3624b0e6a7..6eb8456693 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -697,6 +697,9 @@ importers:
       diff:
         specifier: 5.1.0
         version: 5.1.0
+      directus:
+        specifier: workspace:*
+        version: link:../directus
       dompurify:
         specifier: 3.0.1
         version: 3.0.1
@@ -809,6 +812,12 @@ importers:
         specifier: 0.5.0
         version: 0.5.0
 
+  directus:
+    dependencies:
+      '@directus/api':
+        specifier: workspace:*
+        version: link:../api
+
   docs:
     dependencies:
       node-fetch:
@@ -5688,7 +5697,7 @@ packages:
       rollup:
         optional: true
     dependencies:
-      '@rollup/pluginutils': 5.0.2
+      '@rollup/pluginutils': 5.0.2(rollup@3.19.1)
       js-yaml: 4.1.0
       tosource: 2.0.0-alpha.3
     dev: true
@@ -5701,20 +5710,6 @@ packages:
       picomatch: 2.3.1
     dev: false
 
-  /@rollup/pluginutils@5.0.2:
-    resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
-    engines: {node: '>=14.0.0'}
-    peerDependencies:
-      rollup: ^1.20.0||^2.0.0||^3.0.0
-    peerDependenciesMeta:
-      rollup:
-        optional: true
-    dependencies:
-      '@types/estree': 1.0.0
-      estree-walker: 2.0.2
-      picomatch: 2.3.1
-    dev: true
-
   /@rollup/pluginutils@5.0.2(rollup@3.19.1):
     resolution: {integrity: sha512-pTd9rIsP92h+B6wWwFbW8RkZv4hiR/xKsqre4SIuAOaOEQRxi0lqLke9k2/7WegC85GgUs9pjmOjCUi3In4vwA==}
     engines: {node: '>=14.0.0'}
@@ -5728,7 +5723,6 @@ packages:
       estree-walker: 2.0.2
       picomatch: 2.3.1
       rollup: 3.19.1
-    dev: false
 
   /@sendgrid/client@6.5.5:
     resolution: {integrity: sha512-Nbfgo94gbWSL8PIgJfuHoifyOJJepvV8NQkkglctAEfb1hyozKhrzE6v1kPG/z4j0RodaTtXD5LJj/t0q/VhLA==}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index e6432fd1ce..94d7432f81 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,4 +1,5 @@
 packages:
+  - directus
   - app
   - api
   - docs