AVSDev/sprinkle-organisations
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

De-conflict asset bundles

Browse Source
This commit is contained in:
Craig Williams
2022-03-05 17:22:25 +00:00
parent 5cf22b1715
commit 299a6709cd
10 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
asset-bundles.json
View File

@@ -2,59 +2,61 @@
"bundle": {
"js/admin": {
"scripts": [
"vendor/moment/moment.js",
"userfrosting/js/handlebars-helpers.js",
"vendor/tablesorter/dist/js/jquery.tablesorter.js",
"vendor/tablesorter/dist/js/jquery.tablesorter.widgets.js",
"userfrosting/js/tablesorter/widget-sort2Hash.js",
"vendor/tablesorter/dist/js/widgets/widget-columnSelector.min.js",
"vendor/tablesorter/dist/js/widgets/widget-reflow.min.js",
"vendor/tablesorter/dist/js/widgets/widget-pager.min.js",
"userfrosting/js/query-string.js",
"userfrosting/js/uf-table.js",
"avsdev/js/sidebar.js"
]
"organisations/js/sidebar.js"
],
"options": {
"sprinkle": {
"onCollision": "merge"
}
}
},
"js/pages/organisation": {
"scripts": [
"userfrosting/js/widgets/users.js",
"avsdev/js/widgets/users.js",
"avsdev/js/widgets/organisations.js",
"avsdev/js/widgets/members.js",
"avsdev/js/pages/organisation.js"
"organisations/js/widgets/users.js",
"organisations/js/widgets/organisations.js",
"organisations/js/widgets/members.js",
"organisations/js/pages/organisation.js"
]
},
"js/pages/organisations": {
"scripts": [
"avsdev/js/widgets/organisations.js",
"avsdev/js/pages/organisations.js"
"organisations/js/widgets/organisations.js",
"organisations/js/pages/organisations.js"
]
},
"js/pages/user": {
"scripts": [
"userfrosting/js/widgets/users.js",
"userfrosting/js/pages/user.js",
"avsdev/js/widgets/users.js",
"avsdev/js/pages/user.js"
]
"organisations/js/widgets/users.js",
"organisations/js/pages/user.js"
],
"options": {
"sprinkle": {
"onCollision": "merge"
}
}
},
"js/pages/users": {
"scripts": [
"userfrosting/js/widgets/users.js",
"userfrosting/js/pages/users.js",
"avsdev/js/widgets/users.js",
"avsdev/js/pages/users.js"
]
"organisations/js/widgets/users.js",
"organisations/js/pages/users.js",
"organisations/js/pages/users.js"
],
"options": {
"sprinkle": {
"onCollision": "merge"
}
}
},
"css/admin": {
"styles": [
"font-starcraft/css/font-starcraft.css",
"vendor/tablesorter/dist/css/theme.bootstrap.min.css",
"vendor/tablesorter/dist/css/jquery.tablesorter.pager.min.css",
"userfrosting/css/tablesorter-reflow.css",
"userfrosting/css/tablesorter-custom.css",
"avsdev/css/organisations.css"
]
"organisations/css/organisations.css"
],
"options": {
"sprinkle": {
"onCollision": "merge"
}
}
}
}
}