From ba31eb0071979ff2dfc99f7947b3ec31a4c3af1f Mon Sep 17 00:00:00 2001
From: Alex Ling <hkalexling@gmail.com>
Date: Sun, 19 Jul 2020 13:50:46 +0000
Subject: [PATCH] Use UIKit JS files from `node_modules/`

---
 .gitignore                |  1 +
 gulpfile.js               | 14 ++++++++++----
 src/views/layout.html.ecr |  4 ++--
 src/views/login.html.ecr  |  4 ++--
 src/views/reader.html.ecr |  4 ++--
 5 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6ec8d2b..b8047b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ mango
 *.md
 public/css/uikit.css
 public/img/*.svg
+public/js/*.min.js
diff --git a/gulpfile.js b/gulpfile.js
index 1387718..0228d62 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -3,10 +3,16 @@ const minify = require("gulp-babel-minify");
 const minifyCss = require('gulp-minify-css');
 const less = require('gulp-less');
 
+gulp.task('copy-uikit-js', () => {
+	return gulp.src('node_modules/uikit/dist/js/*.min.js')
+		.pipe(gulp.dest('public/js'));
+});
+
 gulp.task('minify-js', () => {
 	return gulp.src('public/js/*.js')
 		.pipe(minify({
-			removeConsole: true
+			removeConsole: true,
+			builtIns: false
 		}))
 		.pipe(gulp.dest('dist/js'));
 });
@@ -23,7 +29,7 @@ gulp.task('minify-css', () => {
 		.pipe(gulp.dest('dist/css'));
 });
 
-gulp.task('copy-icons', () => {
+gulp.task('copy-uikit-icons', () => {
 	return gulp.src('node_modules/uikit/src/images/backgrounds/*.svg')
 		.pipe(gulp.dest('public/img'));
 });
@@ -39,8 +45,8 @@ gulp.task('copy-files', () => {
 });
 
 gulp.task('default', gulp.parallel(
-	'minify-js',
+	gulp.series('copy-uikit-js', 'minify-js'),
 	gulp.series('less', 'minify-css'),
-	gulp.series('copy-icons', 'img'),
+	gulp.series('copy-uikit-icons', 'img'),
 	'copy-files'
 ));
diff --git a/src/views/layout.html.ecr b/src/views/layout.html.ecr
index f98d3f8..cd5b6a2 100644
--- a/src/views/layout.html.ecr
+++ b/src/views/layout.html.ecr
@@ -59,8 +59,8 @@
       setTheme();
       const base_url = "<%= base_url %>";
     </script>
-    <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
+    <script src="<%= base_url %>js/uikit.min.js"></script>
+    <script src="<%= base_url %>js/uikit-icons.min.js"></script>
 
     <%= yield_content "script" %>
   </body>
diff --git a/src/views/login.html.ecr b/src/views/login.html.ecr
index be186c5..052f118 100644
--- a/src/views/login.html.ecr
+++ b/src/views/login.html.ecr
@@ -29,8 +29,8 @@
     <script>
       setTheme();
     </script>
-    <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
+    <script src="<%= base_url %>js/uikit.min.js"></script>
+    <script src="<%= base_url %>js/uikit-icons.min.js"></script>
   </body>
 
 </html>
diff --git a/src/views/reader.html.ecr b/src/views/reader.html.ecr
index f791163..70cfffc 100644
--- a/src/views/reader.html.ecr
+++ b/src/views/reader.html.ecr
@@ -53,9 +53,9 @@
       const base_url = "<%= base_url %>"
     </script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit.min.js"></script>
-    <script src="https://cdn.jsdelivr.net/npm/uikit@3.3.1/dist/js/uikit-icons.min.js"></script>
     <script src="https://cdnjs.cloudflare.com/ajax/libs/ScrollMagic/2.0.7/ScrollMagic.min.js"></script>
+    <script src="<%= base_url %>js/uikit.min.js"></script>
+    <script src="<%= base_url %>js/uikit-icons.min.js"></script>
     <script src="<%= base_url %>js/reader.js"></script>
   </body>