Merge pull request #188 from bangkokrb/release/4.0.0

.gitignore

@@ -1,50 +1,38 @@
-*.gem
-*.rbc
-/.config
-/coverage/
-/InstalledFiles
-/pkg/
-/spec/reports/
-/spec/examples.txt
-/test/tmp/
-/test/version_tmp/
-/tmp/
-.idea/
-.DS_Store
+# Bridgetown
+output
+.bridgetown-cache
+.bridgetown-metadata
+.bridgetown-webpack
+
+# Dependency folders
+node_modules
+bower_components
+
+# Caches
+.sass-cache
+.npm
+.node_repl_history
+
+# Ignore bundler config.
+/.bundle
+
+# Ignore Byebug command history file.
+.byebug_history
 
-## Documentation cache and generated files:
-/.yardoc/
-/_yardoc/
-/doc/
-/rdoc/
-
-## Environment normalization:
-/.bundle/
-/vendor/bundle
-/lib/bundler/man/
-
-# for a library or gem, you might want to ignore these files since the code is
-# intended to run in multiple environments; otherwise, check them in:
-# Gemfile.lock
-# .ruby-version
-# .ruby-gemset
-
-# unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
-
-# Jekyll specific
-.jekyll-cache/
-.jekyll-metadata
-.sass-cache/
-_site/
-
-# JS
-node_modules/
-
-# Webpack compiled files
-assets/javascript/*.js
-assets/javascript/*.js.map
-assets/javascript/*sprite*
-
-# Deployment
+# dotenv environment variables file
 .env
+
+# Mac files
+.DS_Store
+
+# Yarn
+yarn-error.log
+yarn-debug.log*
+.pnp/
+.pnp.js
+
+# Yarn Integrity file
+.yarn-integrity
+
+# Git Submodules
+src/past

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "past/2019"]
-	path = past/2019
+[submodule "src/past/2019"]
+	path = src/past/2019
 	url = https://github.com/bangkokrb/rubyconfth-2019.git

CONTRIBUTING.md

@@ -21,15 +21,15 @@ Here are some ways *you* can contribute:
 
 1. Push your code to a topic branch. We use the [standard git flow](https://guides.github.com/introduction/flow/) with 
 feature, chore and bug branches so name the branch accordingly.
-2. [Submit a pull request](https://help.github.com/articles/using-pull-requests/) by setting the `development` branch as destination.
+2. [Submit a pull request](https://help.github.com/articles/using-pull-requests/) by setting the `develop` branch as destination.
 3. Fill in the PR description following the [PR template](https://github.com/bangkokrb/rubyconfth/blob/master/.github/PULL_REQUEST_TEMPLATE.md) sections.
 4. Once submitted, the test suite will run for the branch automatically.
 4. Request for a code review from on the reviewer
 
 ## Releasing a new version
 
-1. Checkout a release branch from the `development` branch. Naming for the branch must follow the pattern `release/<version number>` e.g. `release/1.0.0`.
-2. Open a pull request with the release branch as origin and the `master` branch as destination.
+1. Checkout a release branch from the `develop` branch. Naming for the branch must follow the pattern `release/<version number>` e.g. `release/1.0.0`.
+2. Open a pull request with the release branch as origin and the `main` branch as destination.
 3. Once the pull request is approved and / or the test suite has run successfully, merge the release branch.
 4. Add a git tag for the version e.g. `git tag -a 1.0.0` with releases notes when entering the interactive mode.
 5. Push newly added tag to the remote with `git push --tags`.

Dockerfile

@@ -69,9 +69,10 @@ COPY . ./
 # Make the init files executable
 RUN chmod +x ./bin/*
 
-# Generate Jekyll site
-RUN ./bin/build
+# Build static site
+RUN npm run esbuild \
+     ./bin/bridgetown build
 
 EXPOSE $PORT
 
-CMD ./bin/start
+CMD ./bin/bridgetown start

Gemfile

@@ -1,15 +1,24 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
 ruby '3.1.1'
 
-gem 'jekyll'        # Static site generator
+# If you need to upgrade/switch Bridgetown versions, change the line below
+# and then run `bundle update bridgetown`
+gem "bridgetown", "~> 1.1.0"
 
-group :development, :test do
-  gem 'rake'        # A make-like build utility for Ruby. Required to run tests.
-  gem 'dotenv'      # A Ruby gem to load environment variables from `.env`
-  gem 'foreman'     # Manage Procfile-based applications
-  gem "webrick"     # Ruby Web server
-end
+# Uncomment to add file-based dynamic routing to your project:
+# gem "bridgetown-routes", "~> 1.1.0", group: :bridgetown_plugins
+
+# Uncomment to use the Inspectors API to manipulate the output
+# of your HTML or XML resources:
+# gem "nokogiri", "~> 1.13"
+
+# Puma is a Rack-compatible server used by Bridgetown
+# (you can optionally limit this to the "development" group)
+gem "puma", "~> 5.6"
 
 group :test do
-  gem 'html-proofer'# Test rendered HTML files to make sure they are accurate
+# Test rendered HTML files to make sure they are accurate
+  gem 'html-proofer'
 end