bridgetown-core 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ceaadbfc504f5ac87f7ffbca7b5b87ed2967f564a12ca69f577f9d3a5216cf4
-  data.tar.gz: be1d543b08eb98d7e02f7f0eb00d0e31d112363601f716956e140e1949f09d8e
+  metadata.gz: 31902453cc98a9dd7477a25c07f005b5f4faecbd69bf45e166d13c7ff9406c79
+  data.tar.gz: 5d9d919d9f2d13c0a6f572d166057c437e1e996ea7f5658972fc31f5e7cb539c
 SHA512:
-  metadata.gz: 9e7b7feb4ee52314b2ca52893c22484e2419f0af871519e8f5417b04cc8dce91bf1b65931a993b0ae46c7c62a7ee77fabd8c210ec2f1cac4b21af6ce6d14a22e
-  data.tar.gz: c4e9971e2887f3c2490c21a7207d684fa6c8194e5c27b7a375f81a7aca79d0b42632f96b7a6762e25c6749be22976cba84c234d2b176d92082f342c5e8465369
+  metadata.gz: 54a5ad80eccbc1702bd5743afa6eb78cb3e5c5615495acbe7fe178c55447ef3ae45bdd7be8aae6e89278258f8c2cbc86ec6a826f79a15a41b38b7c2ad498d815
+  data.tar.gz: b6504df792cb0804cfb0a0feba76c90da44e63a38d325d40f5b543cb616ba06b5ce26ea957b883404d65bfbbefeb539e1170654d00cc4ff9144e25e260acd931

data/lib/bridgetown-core/tags/webpack_path.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module Bridgetown
+  module Tags
+    class WebpackPath < Liquid::Tag
+      include Bridgetown::Filters::URLFilters
+
+      def initialize(tag_name, asset_type, tokens)
+        super
+
+        # js or css
+        @asset_type = asset_type.strip
+      end
+
+      def render(context)
+        @context = context
+        site = context.registers[:site]
+
+        frontend_path = relative_url("_bridgetown/static")
+
+        manifest_file = site.in_root_dir(".bridgetown-webpack", "manifest.json")
+        if File.exist?(manifest_file)
+          manifest = JSON.parse(File.read(manifest_file))
+          if @asset_type == "js"
+            js_path = manifest["main.js"].split("/").last
+            [frontend_path, "js", js_path].join("/")
+          elsif @asset_type == "css"
+            css_path = manifest["main.css"].split("/").last
+            [frontend_path, "css", css_path].join("/")
+          else
+            Bridgetown.logger.error("Unknown Webpack asset type", @asset_type)
+            nil
+          end
+        else
+          "MISSING_WEBPACK_MANIFEST"
+        end
+      end
+    end
+  end
+end
+
+Liquid::Template.register_tag("webpack_path", Bridgetown::Tags::WebpackPath)

data/lib/bridgetown-core/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.10.0"
+  VERSION = "0.10.1"
 end

data/lib/bridgetown-core/watcher.rb

@@ -37,8 +37,11 @@ module Bridgetown
     private
 
     def build_listener(site, options)
+      webpack_path = site.in_root_dir(".bridgetown-webpack")
+      FileUtils.mkdir(webpack_path) unless Dir.exist?(webpack_path)
       Listen.to(
         options["source"],
+        site.in_root_dir(".bridgetown-webpack"),
         ignore: listen_ignore_paths(options),
         force_polling: options["force_polling"],
         &listen_handler(site)
@@ -54,7 +57,7 @@ module Bridgetown
         Bridgetown.logger.info "Regenerating…"
         Bridgetown.logger.info "", "#{n} file(s) changed at #{t.strftime("%Y-%m-%d %H:%M:%S")}"
 
-        c.each { |path| Bridgetown.logger.info "", path["#{site.source}/".length..-1] }
+        c.each { |path| Bridgetown.logger.info "", path["#{site.root_dir}/".length..-1] }
         process(site, t)
       end
     end

data/lib/site_template/.gitignore

@@ -3,4 +3,5 @@ node_modules
 .sass-cache
 .bridgetown-cache
 .bridgetown-metadata
+.bridgetown-webpack
 vendor

data/lib/site_template/package.json

@@ -19,6 +19,7 @@
     "sass-loader": "^8.0.2",
     "style-loader": "^1.1.3",
     "webpack": "^4.42.1",
-    "webpack-cli": "^3.3.11"
+    "webpack-cli": "^3.3.11",
+    "webpack-manifest-plugin": "^2.2.0"
   }
 }

data/lib/site_template/src/_includes/head.html

@@ -5,5 +5,5 @@
 
 <meta name="description" content="{{ site.metadata.description }}" />
 
-<link rel="stylesheet" href="/_bridgetown/static/css/all.css{% if bridgetown.environment == 'development' %}?{{ site.time | date: '%I%M%s' }}{% endif %}" />
-<script src="/_bridgetown/static/js/all.js{% if bridgetown.environment == 'development' %}?{{ site.time | date: '%I%M%s' }}{% endif %}"></script>
+<link rel="stylesheet" href="{% webpack_path css %}" />
+<script src="{% webpack_path js %}" defer></script>

data/lib/site_template/webpack.config.js

@@ -1,19 +1,30 @@
-const path = require('path');
-const MiniCssExtractPlugin = require("mini-css-extract-plugin");
+const path = require("path")
+const MiniCssExtractPlugin = require("mini-css-extract-plugin")
+const ManifestPlugin = require("webpack-manifest-plugin")
 
 module.exports = {
-  entry: './frontend/javascript/index.js',
+  entry: "./frontend/javascript/index.js",
   devtool: "source-map",
+  // Set some or all of these to true if you want more verbose logging:
+  stats: {
+    modules: false,
+    builtAt: false,
+    timings: false,
+    children: false
+  },
   output: {
-    path: path.resolve(__dirname, 'output', '_bridgetown', 'static', 'js'),
-    filename: 'all.js'
+    path: path.resolve(__dirname, "output", "_bridgetown", "static", "js"),
+    filename: "all.[contenthash].js"
   },
   resolve: {
-    extensions: ['.js']
+    extensions: [".js"]
   },
   plugins: [
     new MiniCssExtractPlugin({
-      filename: "../css/all.css",
+      filename: "../css/all.[contenthash].css",
+    }),
+    new ManifestPlugin({
+      fileName: path.resolve(__dirname, ".bridgetown-webpack", "manifest.json")
     })
   ],
   module: {
@@ -21,13 +32,13 @@ module.exports = {
       {
         test: /\.js/,
         use: {
-          loader: 'babel-loader',
+          loader: "babel-loader",
           options: {
             presets: [
-              '@babel/preset-env'
+              "@babel/preset-env"
             ],
             plugins: [
-              '@babel/plugin-proposal-class-properties'
+              "@babel/plugin-proposal-class-properties"
             ]
           }
         }
@@ -36,12 +47,12 @@ module.exports = {
         test: /\.(sc|c)ss$/,
         use: [
           MiniCssExtractPlugin.loader,
-          'css-loader',
+          "css-loader",
           {
-            loader: 'sass-loader',
+            loader: "sass-loader",
             options: {
               sassOptions: {
-                includePaths: [path.resolve(__dirname, 'src/_includes')]
+                includePaths: [path.resolve(__dirname, "src/_includes")]
               }
             }
           }
@@ -49,12 +60,12 @@ module.exports = {
       },
       {
         test: /\.woff2?$|\.ttf$|\.eot$|\.svg$/,
-        loader: 'file-loader',
+        loader: "file-loader",
         options: {
-          outputPath: '../fonts',
-          publicPath: '../fonts'
+          outputPath: "../fonts",
+          publicPath: "../fonts"
         },
       }
     ]
   }
-};
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-18 00:00:00.000000000 Z
+date: 2020-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -264,6 +264,7 @@ files:
 - lib/bridgetown-core/tags/link.rb
 - lib/bridgetown-core/tags/post_url.rb
 - lib/bridgetown-core/tags/render_content.rb
+- lib/bridgetown-core/tags/webpack_path.rb
 - lib/bridgetown-core/url.rb
 - lib/bridgetown-core/utils.rb
 - lib/bridgetown-core/utils/ansi.rb