Skip to content

Commit

Permalink
Vendor cleanup, re-enabling transpilation build step
Browse files Browse the repository at this point in the history
  • Loading branch information
Wirewraith committed Nov 9, 2023
1 parent 548acaf commit 5583692
Show file tree
Hide file tree
Showing 33 changed files with 44 additions and 29,367 deletions.
10 changes: 6 additions & 4 deletions browserassets/gulpfile.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import replace from 'gulp-replace'
import htmlmin from 'gulp-htmlmin'
import postcss from 'gulp-postcss'
// import uglify from 'gulp-uglify'
// import babel from 'gulp-babel'
import babel from 'gulp-babel'
import imagemin, { optipng } from 'gulp-imagemin'
import autoprefixer from 'autoprefixer'
import cssnano from 'cssnano'
Expand Down Expand Up @@ -78,12 +78,13 @@ function css(cb) {
function javascript(cb) {
return src(sources.scripts)
.pipe(replace(resourceMacroRegex, `${cdn}/$1?v=${rev}`))
// .pipe(babel({
// presets: ['@babel/env']
// }))
.pipe(babel({
presets: ['@babel/env']
}))
.pipe(uglify({
mangle: true,
compress: true,
ie8: true,
// output: {
// comments: 'all'
// }
Expand All @@ -101,6 +102,7 @@ function images(cb) {

function copy(cb) {
return src([
'vendor/**/*',
'css/fonts/**/*',
'sounds/**/*',
'misc/**/*',
Expand Down
4 changes: 2 additions & 2 deletions browserassets/html/admin/banPanel.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<title>Ban Panel</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<link rel="stylesheet" type="text/css" href="{{resource("css/font-awesome.css")}}">
<link rel="stylesheet" type="text/css" href="{{resource("vendor/css/font-awesome.css")}}">
<link rel="stylesheet" type="text/css" href="{{resource("css/style.css")}}">
<style type="text/css">
body {font-size: 8pt; font-family: Arial; padding-top: 30px;}
Expand Down Expand Up @@ -94,7 +94,7 @@

<a href="" class="switchRemoved" title="Switch the view to show removed bans">Removed Bans View</a>

<script type="text/javascript" src="{{resource("js/jquery.min.js")}}"></script>
<script type="text/javascript" src="{{resource("vendor/js/jquery.min.js")}}"></script>
<script type="text/javascript" src="{{resource("js/errorHandler.js")}}"></script>
<script type="text/javascript" language="JavaScript">
var triggerError = attachErrorHandler('banPanel', true);
Expand Down
6 changes: 3 additions & 3 deletions browserassets/html/browserOutput.html
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
text-rendering: optimizeLegibility;
}
</style>
<link rel="stylesheet" type="text/css" href="{{resource("css/font-awesome.css")}}" />
<link rel="stylesheet" type="text/css" href="{{resource("vendor/css/font-awesome.css")}}" />
<link rel="stylesheet" type="text/css" href="{{resource("css/browserOutput.css")}}" />
<script type="text/javascript" src="{{resource("js/jquery.min.js")}}"></script>
<!-- <script type="text/javascript" src="{{resource("js/array.generics.min.js")}}"></script> -->
<script type="text/javascript" src="{{resource("vendor/js/jquery.min.js")}}"></script>
<!-- <script type="text/javascript" src="{{resource("vendor/js/array.generics.min.js")}}"></script> -->
</head>
<body>
<div id="loading">
Expand Down
2 changes: 1 addition & 1 deletion browserassets/html/pathoComp.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<title>Pathogen Manipulator</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<script src="{{resource("js/jquery.min.js")}}" type="text/javascript"></script>
<script src="{{resource("vendor/js/jquery.min.js")}}" type="text/javascript"></script>
<!--<script src="./json2.min.js" type="text/javascript"></script>-->
<script src="{{resource("js/pathology_display.js")}}" type="text/javascript"></script>
<script src="{{resource("js/pathoui-script.js")}}" type="text/javascript"></script>
Expand Down
8 changes: 4 additions & 4 deletions browserassets/html/tooltip.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@
<title>Tooltip</title>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link rel="stylesheet" type="text/css" href="{{resource("css/font-awesome.css")}}" />
<link rel="stylesheet" type="text/css" href="{{resource("vendor/css/font-awesome.css")}}" />
<link rel="stylesheet" type="text/css" href="{{resource("css/tooltip.css")}}" />
</head>
<body>
<div id="wrap" class="wrap">
<div id="content" class="content"></div>
<a href="#" class="close-tip" style="display: none;"><i class="icon-remove"></i></a>
</div>
<script type="text/javascript" src="{{resource("js/jquery.min.js")}}"></script>
<script type="text/javascript" src="{{resource("js/jquery.waitForImages.js")}}"></script>
<script type="text/javascript" src="{{resource("vendor/js/jquery.min.js")}}"></script>
<script type="text/javascript" src="{{resource("vendor/js/jquery.waitForImages.js")}}"></script>
<script type="text/javascript" src="{{resource("js/errorHandler.js")}}"></script>
<script type="text/javascript" src="{{resource("js/animatePopup.js")}}"></script>
<script type="text/javascript">
Expand All @@ -22,4 +22,4 @@
</script>
<script type="text/javascript" src="{{resource("js/tooltip.js")}}"></script>
</body>
</html>
</html>
Loading

0 comments on commit 5583692

Please sign in to comment.