From 2fbe500893a5efe7f8cb977a0d1938e414241a3b Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Sat, 3 Jun 2023 16:34:57 +0200
Subject: [PATCH] Renamed third party packages directories

---
 .gitignore                      |  4 ++--
 .php-cs-fixer.php               |  2 +-
 .yarnrc                         |  2 +-
 app.php                         |  2 +-
 composer.json                   |  1 +
 helpers/RequirementsChecker.php |  4 ++--
 localization/de.po              |  2 +-
 localization/en.po              |  2 +-
 localization/strings.pot        |  2 +-
 views/layout/default.blade.php  | 20 ++++++++++----------
 10 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/.gitignore b/.gitignore
index 305dfcd..37b1d03 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,3 @@
-/public/node_modules
-/vendor
+/packages
 /.release
+/public/packages
diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
index eb465d8..a604635 100644
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@@ -1,7 +1,7 @@
 <?php
 
 $finder = PhpCsFixer\Finder::create()
-	->exclude(['vendor'])
+	->exclude(['packages'])
 	->ignoreVCSIgnored(true)
 	->files()->name('*.php')
 	->in(__DIR__)
diff --git a/.yarnrc b/.yarnrc
index b258865..65cc233 100644
--- a/.yarnrc
+++ b/.yarnrc
@@ -1,4 +1,4 @@
---modules-folder public/node_modules
+--modules-folder public/packages
 --install.production true
 --install.ignore-scripts true
 --install.ignore-optional true
diff --git a/app.php b/app.php
index ad579a9..0c0d403 100644
--- a/app.php
+++ b/app.php
@@ -20,7 +20,7 @@
 }
 
 // Load composer dependencies
-require_once __DIR__ . '/vendor/autoload.php';
+require_once __DIR__ . '/packages/autoload.php';
 
 // Load config files
 require_once PIKSI_DATAPATH . '/config.php';
diff --git a/composer.json b/composer.json
index 9d71b0c..9a99250 100644
--- a/composer.json
+++ b/composer.json
@@ -20,6 +20,7 @@
 		]
 	},
 	"config": {
+		"vendor-dir": "packages",
 		"platform-check": false
 	}
 }
diff --git a/helpers/RequirementsChecker.php b/helpers/RequirementsChecker.php
index dd4bec0..c692a24 100644
--- a/helpers/RequirementsChecker.php
+++ b/helpers/RequirementsChecker.php
@@ -33,9 +33,9 @@ public function CheckEnvironment()
 			throw new \Exception('/config-dist.php not found - please do not remove this file');
 		}
 
-		if (!file_exists(__DIR__ . '/../vendor/autoload.php'))
+		if (!file_exists(__DIR__ . '/../packages/autoload.php'))
 		{
-			throw new \Exception('/vendor/autoload.php not found - have you run Composer?');
+			throw new \Exception('/packages/autoload.php not found - have you run Composer?');
 		}
 
 		if (!is_writable(PIKSI_DATAPATH))
diff --git a/localization/de.po b/localization/de.po
index 8746907..3a2f149 100644
--- a/localization/de.po
+++ b/localization/de.po
@@ -12,7 +12,7 @@ msgstr "Übersicht"
 msgid "About"
 msgstr "Über"
 
-# Lowercase locale based on the filename in /public/node_modules/moment/locale
+# Lowercase locale based on the filename in /public/packages/moment/locale
 msgid "moment_locale"
 msgstr "de"
 
diff --git a/localization/en.po b/localization/en.po
index 5ce7648..4b5b4ed 100644
--- a/localization/en.po
+++ b/localization/en.po
@@ -12,7 +12,7 @@ msgstr "Overview"
 msgid "About"
 msgstr "About"
 
-# Lowercase locale based on the filename in /public/node_modules/moment/locale
+# Lowercase locale based on the filename in /public/packages/moment/locale
 msgid "moment_locale"
 msgstr "x"
 
diff --git a/localization/strings.pot b/localization/strings.pot
index 3d56490..e316503 100644
--- a/localization/strings.pot
+++ b/localization/strings.pot
@@ -18,7 +18,7 @@ msgstr ""
 msgid "About"
 msgstr ""
 
-# Lowercase locale based on the filename in /public/node_modules/moment/locale
+# Lowercase locale based on the filename in /public/packages/moment/locale
 msgid "moment_locale"
 msgstr ""
 
diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php
index 444363f..d50698b 100644
--- a/views/layout/default.blade.php
+++ b/views/layout/default.blade.php
@@ -18,11 +18,11 @@
 
 	<title>@yield('title') | {{$title}}</title>
 
-	<link href="{{ $U('/node_modules/@fontsource/open-sans/latin.css?v=', true) }}{{ $version }}"
+	<link href="{{ $U('/packages/@fontsource/open-sans/latin.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
-	<link href="{{ $U('/node_modules/bootstrap/dist/css/bootstrap.min.css?v=', true) }}{{ $version }}"
+	<link href="{{ $U('/packages/bootstrap/dist/css/bootstrap.min.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
-	<link href="{{ $U('/node_modules/@fortawesome/fontawesome-free/css/all.min.css?v=', true) }}{{ $version }}"
+	<link href="{{ $U('/packages/@fortawesome/fontawesome-free/css/all.min.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
 	<link href="{{ $U('/piksi.css?v=', true) }}{{ $version }}"
 		rel="stylesheet">
@@ -80,13 +80,13 @@ class="col pt-2">
 		</div>
 	</div>
 
-	<script src="{{ $U('/node_modules/jquery/dist/jquery.min.js?v=', true) }}{{ $version }}"></script>
-	<script src="{{ $U('/node_modules/bootstrap/dist/js/bootstrap.bundle.min.js?v=', true) }}{{ $version }}"></script>
-	<script src="{{ $U('/node_modules/bootbox/dist/bootbox.min.js?v=', true) }}{{ $version }}"></script>
-	<script src="{{ $U('/node_modules/sprintf-js/dist/sprintf.min.js?v=', true) }}{{ $version }}"></script>
-	<script src="{{ $U('/node_modules/gettext-translator/dist/translator.js?v=', true) }}{{ $version }}"></script>
-	<script src="{{ $U('/node_modules/moment/min/moment.min.js?v=', true) }}{{ $version }}"></script>
-	@if(!empty($__t('moment_locale') && $__t('moment_locale') != 'x'))<script src="{{ $U('/node_modules', true) }}/moment/locale/{{ $__t('moment_locale') }}.js?v={{ $version }}"></script>@endif
+	<script src="{{ $U('/packages/jquery/dist/jquery.min.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/packages/bootstrap/dist/js/bootstrap.bundle.min.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/packages/bootbox/dist/bootbox.min.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/packages/sprintf-js/dist/sprintf.min.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/packages/gettext-translator/dist/translator.js?v=', true) }}{{ $version }}"></script>
+	<script src="{{ $U('/packages/moment/min/moment.min.js?v=', true) }}{{ $version }}"></script>
+	@if(!empty($__t('moment_locale') && $__t('moment_locale') != 'x'))<script src="{{ $U('/packages', true) }}/moment/locale/{{ $__t('moment_locale') }}.js?v={{ $version }}"></script>@endif
 	<script src="{{ $U('/extensions.js?v=', true) }}{{ $version }}"></script>
 	<script src="{{ $U('/piksi.js?v=', true) }}{{ $version }}"></script>