mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-06-01 12:19:28 +00:00
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
This commit is contained in:
@@ -0,0 +1,7 @@
|
||||
<?php
|
||||
if (! defined('BASEPATH')) exit('No direct script access allowed');
|
||||
|
||||
// use vuejs dev version
|
||||
$config['use_vuejs_dev_version'] = false;
|
||||
// use bundled javascript
|
||||
$config['use_bundled_javascript'] = false;
|
||||
@@ -13,6 +13,9 @@
|
||||
$calledPath = $this->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');
|
||||
}
|
||||
|
||||
|
||||
@@ -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.*",
|
||||
|
||||
Generated
+10
-1
@@ -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",
|
||||
|
||||
Reference in New Issue
Block a user