Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,14 @@ fabric.properties
composer.phar
/vendor/

# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
composer.lock
package-lock.json

/node_modules
package-lock.json

# Vite build outputs (generated by .github/workflows/build-assets.yml)
/public/css/app.css
/public/js/app.js

# ZendStudio project files
.project
Expand Down
34 changes: 4 additions & 30 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,43 +23,17 @@
},
"homepage": "https://github.com/dotkernel/light#readme",
"devDependencies": {
"@rollup/plugin-alias": "^6.0.0",
"@popperjs/core": "^2.11.8",
"autoprefixer": "^10.4.20",
"babel-core": "^7.0.0-bridge.0",
"babel-loader": "^10.0.0",
"babel-preset-env": "^1.7.0",
"bootstrap": "^5.3.3",
"bootstrap-fileinput": "^5.5.4",
"bootstrap-sass": "^3.4.3",
"cross-env": "^10.0.0",
"css-loader": "^7.1.2",
"file-loader": "^6.2.0",
"jquery": "^4.0.0",
"jquery-mousewheel": "^3.1.13",
"mini-css-extract-plugin": "^2.9.1",
"postcss-loader": "^8.1.1",
"lightningcss": "^1.29.3",
"pre-commit": "^2.0.0",
"sass": "^1.86.3",
"sass-loader": "^17.0.0",
"style-loader": "^4.0.0",
"toastr": "^2.1.4",
"ts-loader": "^9.5.1",
"typescript": "^7.0.0",
"vite": "^8.0.0",
"vite-plugin-static-copy": "^4.1.0"
},
"dependencies": {
"@babel/core": "^7.26.9",
"@popperjs/core": "^2.11.8",
"bootstrap-slider": "^11.0.2",
"lightningcss": "^1.29.3",
"npm": "^12.0.0",
"npm-check": "^6.0.1",
"popper.js": "^1.16.1",
"vite-jsconfig-paths": "^2.0.1",
"vite-plugin-bundle-css": "^0.1.1",
"vite-plugin-commonjs": "^0.10.4",
"vite-plugin-css-injected-by-js": "^5.0.0",
"vite-plugin-minify": "^3.0.0"
"vite-plugin-minify": "^3.0.0",
"vite-plugin-static-copy": "^4.1.0"
}
}
2 changes: 1 addition & 1 deletion public/css/app.css

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions public/images/app/favicon/browserconfig.xml

This file was deleted.

Binary file removed public/images/app/favicon/mstile-150x150.png
Binary file not shown.
5 changes: 1 addition & 4 deletions public/js/app.js

Large diffs are not rendered by default.

9 changes: 0 additions & 9 deletions src/App/assets/images/favicon/browserconfig.xml

This file was deleted.

Binary file removed src/App/assets/images/favicon/mstile-150x150.png
Binary file not shown.
4 changes: 0 additions & 4 deletions src/App/assets/js/components/_main.js

This file was deleted.

7 changes: 2 additions & 5 deletions src/App/assets/js/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
// Load jQuery and Bootstrap
// Import our custom CSS
import '../scss/index.scss'
import './components/_main'
import 'bootstrap/dist/js/bootstrap.bundle';
window.$ = window.jQuery = require('jquery');

// Import all of Bootstrap's JS
// Import all of Bootstrap's JS (includes Popper)
import 'bootstrap/dist/js/bootstrap.bundle';
11 changes: 3 additions & 8 deletions src/App/assets/scss/index.scss
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
// Bootstrap
$navbar-height: 60px;
$grid-float-breakpoint: 767px;
$icon-font-path: "../../../../node_modules/bootstrap-sass/assets/fonts/bootstrap/";
@import "../../../../node_modules/bootstrap/scss/bootstrap";
@import "../../../../node_modules/toastr/toastr";
@import "../../../../node_modules/bootstrap-slider/src/sass/bootstrap-slider";
@use "~bootstrap/scss/bootstrap";
// Base
@import "components/general";
@import "components/pages";
@use "components/general";
@use "components/pages";
11 changes: 0 additions & 11 deletions tsconfig.json

This file was deleted.

15 changes: 10 additions & 5 deletions vite.config.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
import {defineConfig} from 'vite';
import { ViteMinifyPlugin } from 'vite-plugin-minify'
import { viteStaticCopy } from 'vite-plugin-static-copy'
import alias from '@rollup/plugin-alias'
import path from 'path'
import commonjs from "vite-plugin-commonjs";
export default defineConfig({
plugins: [
alias(), commonjs(),
viteStaticCopy({
targets: [
{
Expand All @@ -24,9 +21,8 @@ export default defineConfig({
ViteMinifyPlugin({}),
],
emptyOutDir: true,
root: path.resolve(__dirname, 'src'), //'src', // Set the root directory for Vite
root: path.resolve(__dirname, 'src'), // Set the root directory for Vite
build: {
commonjsOptions: { transformMixedEsModules: true }, // Change
outDir: '../public', // Output directory for compiled assets
rollupOptions: {
input: {
Expand All @@ -41,6 +37,15 @@ export default defineConfig({
},
},
optimizeDeps: { force: true, },
css: {
preprocessorOptions: {
scss: {
// Bootstrap 5.3 still uses @import internally; silence
// deprecation warnings coming from node_modules only.
quietDeps: true,
},
},
},
resolve: {
alias: [
{
Expand Down