From d0266e7ef0cfadf7381f4f69de59b4ae3aac66fa Mon Sep 17 00:00:00 2001 From: Harald Bamberger Date: Thu, 12 Dec 2024 14:49:15 +0100 Subject: [PATCH] add vuejs3_dev to composer.json and ci javascript config file to switch between vuejs dev and prod version, alter FHC-Footer to use new config --- application/config/javascript.php | 7 +++++++ application/views/templates/FHC-Footer.php | 12 +++++++++++- composer.json | 12 ++++++++++++ composer.lock | 11 ++++++++++- 4 files changed, 40 insertions(+), 2 deletions(-) create mode 100644 application/config/javascript.php diff --git a/application/config/javascript.php b/application/config/javascript.php new file mode 100644 index 000000000..5e9aa270a --- /dev/null +++ b/application/config/javascript.php @@ -0,0 +1,7 @@ +router->directory.$this->router->class; $calledMethod = $this->router->method; + $this->load->config('javascript'); + $use_vuejs_dev_version = $this->config->item('use_vuejs_dev_version'); + // By default set the parameters to null $customJSs = isset($customJSs) ? $customJSs : null; $customJSModules = isset($customJSModules) ? $customJSModules : null; @@ -110,7 +113,14 @@ // Vue 3 JS if ($vue3 === true) { - generateJSsInclude('vendor/vuejs/vuejs3/vue.global.prod.js'); + if($use_vuejs_dev_version && $use_vuejs_dev_version === true) + { + generateJSsInclude('vendor/vuejs/vuejs3_dev/vue.global.js'); + } + else + { + generateJSsInclude('vendor/vuejs/vuejs3/vue.global.prod.js'); + } generateJSsInclude('vendor/vuejs/vuerouter4/vue-router.global.js'); } diff --git a/composer.json b/composer.json index 9e0c0fb7c..216d315d9 100644 --- a/composer.json +++ b/composer.json @@ -326,6 +326,17 @@ } } }, + { + "type": "package", + "package": { + "name": "vuejs/vuejs3_dev", + "version": "3.3.8", + "dist": { + "url": "https://unpkg.com/vue@3.3.8/dist/vue.global.js", + "type": "file" + } + } + }, { "type": "package", "package": { @@ -439,6 +450,7 @@ }, "require-dev": { + "vuejs/vuejs3_dev": "3.3.8", "squizlabs/php_codesniffer": "3.6.*", "phpmd/phpmd": "2.*", "phpmetrics/phpmetrics": "2.*", diff --git a/composer.lock b/composer.lock index 6eb3e0383..27132ecff 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "eedcd2abe226d372ff8d735498eb3b0a", + "content-hash": "01ea35652d88680f8262c5365828eb46", "packages": [ { "name": "afarkas/html5shiv", @@ -4680,6 +4680,15 @@ }, "time": "2019-06-13T22:48:21+00:00" }, + { + "name": "vuejs/vuejs3_dev", + "version": "3.3.8", + "dist": { + "type": "file", + "url": "https://unpkg.com/vue@3.3.8/dist/vue.global.js" + }, + "type": "library" + }, { "name": "webmozart/assert", "version": "1.9.1",