Replaced grunt with esbuild

esbuild + shell scripts are much simpler and faster. Also added self-signed certs for https in nginx
stupid-genius · Nov 7, 2023 · b35d232 · b35d232
1 parent 89f0104
commit b35d232
Show file tree

Hide file tree

Showing 20 changed files with 4,801 additions and 18,992 deletions.
diff --git a/.bowerrc b/.bowerrc
diff --git a/.env b/.env
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 *.swp
 .tmp
+.idea
 node_modules
-bower_components
-build
 dist
+package
+*.log.gz
diff --git a/Gruntfile.js b/Gruntfile.js
diff --git a/README.md b/README.md
@@ -8,17 +8,10 @@ I decided to put together my own starting point for simple, usually disposable,
 
 Uses:
  - BrowserSync
- - Grunt
- - Node
+ - EJS
+ - esbuild
  - Express
- - ejs
+ - Mocha
  - Morgan
+ - Node
  - Winston
- - Mocha
-
-Additional in 1.1.0:
- - Bower
- - Wiredep
- - Usemin
- - Dockerfile
- - dist package
diff --git a/app/public/images/favicon.ico → app/public/favicon.ico b/app/public/images/favicon.ico → app/public/favicon.ico
diff --git a/app/public/index.html b/app/public/index.html
@@ -3,23 +3,8 @@
 	<head>
 		<meta charset="UTF-8">
 		<title>SPA Template</title>
-
-		<!-- build:css(app/public) styles/vendor.css -->
-		<!-- bower:css -->
-		<!-- endbower -->
-		<!-- endbuild -->
-		<!-- build:css(app/public) styles/main.css -->
 		<link rel="stylesheet" href="styles/main.css" />
-		<!-- endbuild -->
-
-
-		<!-- build:js(app/public) scripts/vendor.js -->
-		<!-- bower:js -->
-		<!-- endbower -->
-		<!-- endbuild -->
-		<!-- build:js(app/public) scripts/index.js -->
 		<script src="scripts/index.js"></script>
-		<!-- endbuild -->
 	</head>
 	<body>
 		<section id="header">

diff --git a/app/src/index.js b/app/src/index.js
@@ -16,7 +16,7 @@ app.set('view engine', 'ejs');
 
 app.use(morgan('common'));
 /* eslint-disable-next-line no-undef */
-app.use(servefavicon(path.join(__dirname, '../public/images/favicon.ico')));
+app.use(servefavicon(path.join(__dirname, '../public/favicon.ico')));
 app.use(require('./routes'));
 /* eslint-disable-next-line no-undef */
 app.use(express.static(path.join(__dirname, '../public')));

diff --git a/app/views/bundle.ejs b/app/views/bundle.ejs
@@ -1,16 +1,3 @@
-		<!-- build:css(app/public) styles/vendor.css -->
-		<!-- bower:css -->
-		<!-- endbower -->
-		<!-- endbuild -->
-		<!-- build:css(app/public) styles/main.css -->
 		<link rel="stylesheet" href="styles/main.css" />
-		<!-- endbuild -->
 
-		<!-- build:js(app/public) scripts/vendor.js -->
-		<!-- bower:js -->
-		<!-- endbower -->
-		<!-- endbuild -->
-		<!-- build:js(app/public) scripts/index.js -->
 		<script src="scripts/index.js"></script>
-		<!-- endbuild -->
-
diff --git a/bower.json b/bower.json
diff --git a/build.sh b/build.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -e
+
+echo Build start
+echo esbuild
+node esbuild.mjs
+if [[ -z "$1" || "$1" -ne spa ]]; then
+	echo Full build
+	cp -R app/src/ dist/src/
+	cp -R app/views/ dist/views/
+else
+	echo SPA build
+fi
+cp app/public/* dist/public/ 2> /dev/null || :
+cp -R app/public/images dist/public/
+echo Build complete
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -8,6 +8,7 @@ services:
     restart: always
     ports:
       - "80:80"
+      - "443:443"
     depends_on:
       - api