Housekeeping

gulpfile.js

@@ -35,7 +35,7 @@ var paths = {
 		output: 'src/assets/svg/'
 	},
 	copy: {
-		input: 'src/raw_assets/assets/copy/**/*',
+		input: 'src/raw_assets/copy/**/*',
 		output: 'src/assets/'
 	},
 	reload: 'src/'
@@ -98,9 +98,6 @@ var svgmin = require('gulp-svgmin');
 // BrowserSync
 var browserSync = require('browser-sync');
 
-// fileinclude for "includes" in HTML files
-var fileinclude = require('gulp-file-include')
-
 
 /**
  * Gulp Tasks
@@ -113,8 +110,10 @@ var cleanDist = function (done) {
 	if (!settings.clean) return done();
 
 	// Clean the dist folder
-	del.sync([
+  del.sync([
 		paths.output
+    // and also delete the layout file which contains references to static assets because we’re updating static asset filenames to bust browser caches.
+    //,paths.copy.outputLayoutCacheBust
 	]);
 
 	// Signal completion
@@ -321,7 +320,7 @@ var watchSource = function (done) {
  */
 
 // Default task
-// gulp
+// Just run "gulp"
 exports.default = series(
 	cleanDist,
 	parallel(
@@ -334,9 +333,11 @@ exports.default = series(
 );
 
 // Watch and reload
-// gulp watch
+// Run "gulp watch"
 exports.watch = series(
 	exports.default,
 	startServer,
 	watchSource
-);
+);
+
+

package.json

@@ -29,7 +29,6 @@
     "gulp": "^4.0.2",
     "gulp-concat": "^2.6.1",
     "gulp-cssnano": "^2.1.3",
-    "gulp-file-include": "^2.1.0",
     "gulp-flatmap": "^1.0.2",
     "gulp-header": "^2.0.9",
     "gulp-jshint": "^2.1.0",

src/_includes/layout.liquid

@@ -7,17 +7,17 @@
 
 	<title>{{ title }}</title>
 	<meta name="description" content="">
-	
+
 	<link rel="authorization_endpoint" href="https://indieauth.com/auth">
 	<link rel="token_endpoint" href="https://tokens.indieauth.com/token">
 
 	<link rel="alternate" type="application/rss+xml" title="RSS" href="/blog/rss.php" />
 	<meta name="robots" content="index,follow" />
-	
+
 	<link rel="manifest" href="site.webmanifest">
 	<!-- <link rel="apple-touch-icon" href="icon.png"> -->
 
-	<link rel="stylesheet" href="/css/screen.css">
+	<link rel="stylesheet" href="/assets/css/main_v1.0.0.min.css">
 
 	<!-- third-generation iPad with high-resolution Retina display: -->
 	<link rel="apple-touch-icon-precomposed" sizes="144x144" href="/img/favicon144.png">
@@ -65,7 +65,7 @@
         <p>If you’re interested, read more <a href="/about/">about me</a>.</p>
     </div>
 
-    
+
     <div class="sidebar-module">
         <h3>Search</h3>
 <form id="form1_search" action="/search" method="get">
@@ -80,7 +80,7 @@
         <p>You can also <a href="mailto:laurence@fuzzylogic.me">email me</a>.</p>
     </div>
 
-      
+
 
 </aside>