From 1cc955f9978da731d623782e04112a791d485330 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Thu, 15 Apr 2021 17:41:35 +0200
Subject: [PATCH] plugins dir

---
 .gitignore                              | 2 ++
 app/package.json                        | 2 +-
 package.json                            | 4 ++--
 packages/api/src/utility/directories.js | 6 +++++-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4d347afbf..718d20748 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,10 @@ build
 dist
 
 app/packages/web/public
+app/packages/plugins
 docker/public
 docker/bundle.js
+docker/plugins
 
 # misc
 .DS_Store
diff --git a/app/package.json b/app/package.json
index 03e1965f3..f55fa61ef 100644
--- a/app/package.json
+++ b/app/package.json
@@ -71,7 +71,7 @@
     "build": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn dist",
     "build:local": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn predist",
     "postinstall": "electron-builder install-app-deps",
-    "predist": "copyfiles ../packages/api/dist/* packages && copyfiles \"../packages/web/public/*\" packages && copyfiles \"../packages/web/public/**/*\" packages && copyup \"../plugins/dist/**\" packages"
+    "predist": "copyfiles ../packages/api/dist/* packages && copyfiles \"../packages/web/public/*\" packages && copyfiles \"../packages/web/public/**/*\" packages && copyfiles --up 3 \"../plugins/dist/**/*\" packages/plugins"
   },
   "main": "src/electron.js",
   "devDependencies": {
diff --git a/package.json b/package.json
index c23d077b0..70c3ee0fa 100644
--- a/package.json
+++ b/package.json
@@ -33,8 +33,8 @@
     "fillNativeModules": "node fillNativeModules",
     "fillNativeModulesElectron": "node fillNativeModules --eletron",
     "prettier": "prettier --write packages/api/src && prettier --write packages/datalib/src && prettier --write packages/filterparser/src && prettier --write packages/sqltree/src && prettier --write packages/tools/src && prettier --write packages/types && prettier --write packages/web/src && prettier --write app/src",
-    "copy:docker:build": "copyfiles packages/api/dist/* docker -f && copyfiles packages/web/public/* docker -u 2 && copyfiles \"packages/web/public/**/*\" docker -u 2",
-    "prepare:docker": "yarn build:web:docker && yarn build:api && yarn copy:docker:build",
+    "copy:docker:build": "copyfiles packages/api/dist/* docker -f && copyfiles packages/web/public/* docker -u 2 && copyfiles \"packages/web/public/**/*\" docker -u 2 && copyfiles \"plugins/dist/**/*\" docker/plugins -u 2",
+    "prepare:docker": "yarn plugins:copydist && yarn build:web:docker && yarn build:api && yarn copy:docker:build",
     "prepare": "yarn build:lib",
     "start": "concurrently --kill-others-on-fail \"yarn start:api\" \"yarn start:web\"",
     "lib": "concurrently --kill-others-on-fail \"yarn start:sqltree\" \"yarn start:filterparser\" \"yarn start:datalib\" \"yarn start:tools\" \"yarn build:plugins:frontend:watch\"",
diff --git a/packages/api/src/utility/directories.js b/packages/api/src/utility/directories.js
index 0d5540fe1..2bb6d9b5f 100644
--- a/packages/api/src/utility/directories.js
+++ b/packages/api/src/utility/directories.js
@@ -3,6 +3,7 @@ const path = require('path');
 const fs = require('fs');
 const cleanDirectory = require('./cleanDirectory');
 const _isRunOnSource = require('./_isRunOnSource');
+const platformInfo = require('./platformInfo');
 
 const createDirectories = {};
 const ensureDirectory = (dir, clean) => {
@@ -44,7 +45,10 @@ function packagedPluginsDir() {
   if (_isRunOnSource()) {
     return path.resolve(__dirname, '../../../../plugins');
   }
-  return path.resolve(__dirname, '../../plugins/dist');
+  if (platformInfo.isDocker) {
+    return path.resolve(__dirname, 'plugins');
+  }
+  return path.resolve(__dirname, '../../plugins');
 }
 
 module.exports = {