diff --git a/.vscode/extensions.json b/.vscode/extensions.json index be2e5e88..e09a92b7 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -2,7 +2,6 @@ "recommendations": [ "ginfuru.vscode-jekyll-snippets", "eliostruyf.vscode-front-matter", - "amphtml.amphtml-validator", "catherinekorres.amp-snippets", "mervin.markdown-formatter", "rohgarg.jekyll-post", @@ -14,6 +13,7 @@ "mathiassoeholm.markdown-link-updater", "redhat.vscode-yaml", "josee9988.minifyall", - "janne252.fontawesome-autocomplete" + "janne252.fontawesome-autocomplete", + "takumii.markdowntable" ] } diff --git a/.vscode/settings.json b/.vscode/settings.json index ec093900..edf13758 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -44,6 +44,7 @@ "--glob=stash", "--glob=tags/*" ], + "html.validate.styles": false, "markdownlint.config": { "MD046": { "style": "fenced" diff --git a/Gemfile b/Gemfile index 9cd11c30..3de9f0da 100644 --- a/Gemfile +++ b/Gemfile @@ -1,44 +1,45 @@ -source "https://rubygems.org" - -ruby RUBY_VERSION - -# Hello! This is where you manage which Jekyll version is used to run. -# When you want to use a different version, change it below, save the -# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: -# -# bundle exec jekyll serve -# -# This will help ensure the proper Jekyll version is running. -# Happy Jekylling! -gem "jekyll", "~> 4.2.0" - -# If you want to use GitHub Pages, remove the "gem "jekyll"" above and -# uncomment the line below. To upgrade, run `bundle update github-pages`. -# gem "github-pages", group: :jekyll_plugins -# If you have any plugins, put them here! -group :jekyll_plugins do - gem 'jekyll-archives' - gem 'jekyll-feed' - gem 'jekyll-paginate' - gem 'jekyll-redirect-from' - gem 'jekyll-seo-tag' - gem 'jekyll-sitemap' - gem "jekyll-github-metadata" -end - -# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem -# and associated library. -platforms :mingw, :x64_mingw, :mswin, :jruby do - gem "tzinfo" - gem "tzinfo-data" -end - -if RUBY_PLATFORM.downcase.include?('mswin') || RUBY_PLATFORM.downcase.include?('mingw') - gem "tzinfo" - gem "tzinfo-data" -end - -gem "webrick" - -# Performance-booster for watching directories on Windows -gem "wdm", ">= 0.1.0", :platforms => [:mingw, :x64_mingw, :mswin] +source "https://rubygems.org" + +ruby RUBY_VERSION + +# Hello! This is where you manage which Jekyll version is used to run. +# When you want to use a different version, change it below, save the +# file and run `bundle install`. Run Jekyll with `bundle exec`, like so: +# +# bundle exec jekyll serve +# +# This will help ensure the proper Jekyll version is running. +# Happy Jekylling! + +# Manage Jekyll version +gem "jekyll", "~> 4.3.4" + +# If you want to use GitHub Pages, remove the "gem "jekyll"" above and +# uncomment the line below. To upgrade, run `bundle update github-pages`. +# gem "github-pages", group: :jekyll_plugins +# If you have any plugins, put them here! + +# Jekyll plugins +group :jekyll_plugins do + gem 'jekyll-archives' + gem 'jekyll-feed' + gem 'jekyll-paginate' + gem 'jekyll-redirect-from' + gem 'jekyll-seo-tag' + gem 'jekyll-sitemap' + gem "jekyll-github-metadata" +end + +# Platform-specific gems +# Windows and JRuby does not include zoneinfo files, so bundle the tzinfo-data gem +# and associated library. +platforms :mingw, :x64_mingw, :mswin, :jruby do + gem "tzinfo" + gem "tzinfo-data" +end + +# Performance booster for watching directories on Windows +gem "wdm", ">= 0.1.0", platforms: [:mingw, :x64_mingw, :mswin] + +# Required for running Jekyll on Windows +gem "webrick" diff --git a/Gemfile.lock b/Gemfile.lock index 76cfec96..cef0ca6c 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -3,8 +3,9 @@ GEM specs: addressable (2.8.7) public_suffix (>= 2.0.2, < 7.0) + bigdecimal (3.1.9) colorator (1.1.0) - concurrent-ruby (1.3.4) + concurrent-ruby (1.3.5) em-websocket (0.5.3) eventmachine (>= 0.12.9) http_parser.rb (~> 0) @@ -16,28 +17,31 @@ GEM logger faraday-net_http (3.4.0) net-http (>= 0.5.0) - ffi (1.15.5) - ffi (1.15.5-x64-mingw32) + ffi (1.17.1) forwardable-extended (2.6.0) + google-protobuf (4.29.3) + bigdecimal + rake (>= 13) http_parser.rb (0.8.0) i18n (1.14.6) concurrent-ruby (~> 1.0) - jekyll (4.2.2) + jekyll (4.3.4) addressable (~> 2.4) colorator (~> 1.0) em-websocket (~> 0.5) i18n (~> 1.0) - jekyll-sass-converter (~> 2.0) + jekyll-sass-converter (>= 2.0, < 4.0) jekyll-watch (~> 2.0) - kramdown (~> 2.3) + kramdown (~> 2.3, >= 2.3.1) kramdown-parser-gfm (~> 1.0) liquid (~> 4.0) - mercenary (~> 0.4.0) + mercenary (>= 0.3.6, < 0.5) pathutil (~> 0.9) - rouge (~> 3.0) + rouge (>= 3.0, < 5.0) safe_yaml (~> 1.0) - terminal-table (~> 2.0) - jekyll-archives (2.2.1) + terminal-table (>= 1.8, < 4.0) + webrick (~> 1.7) + jekyll-archives (2.3.0) jekyll (>= 3.6, < 5.0) jekyll-feed (0.17.0) jekyll (>= 3.7, < 5.0) @@ -47,8 +51,8 @@ GEM jekyll-paginate (1.1.0) jekyll-redirect-from (0.16.0) jekyll (>= 3.3, < 5.0) - jekyll-sass-converter (2.2.0) - sassc (> 2.0.1, < 3.0) + jekyll-sass-converter (3.0.0) + sass-embedded (~> 1.54) jekyll-seo-tag (2.8.0) jekyll (>= 3.8, < 5.0) jekyll-sitemap (1.4.0) @@ -74,29 +78,33 @@ GEM pathutil (0.16.2) forwardable-extended (~> 2.6) public_suffix (6.0.1) + rake (13.2.1) rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rexml (3.3.9) + rexml (3.4.0) rouge (3.30.0) safe_yaml (1.0.5) - sassc (2.4.0) - ffi (~> 1.9) - sassc (2.4.0-x64-mingw32) - ffi (~> 1.9) + sass-embedded (1.83.4) + google-protobuf (~> 4.29) + rake (>= 13) + sass-embedded (1.83.4-x64-mingw32) + google-protobuf (~> 4.29) + sass-embedded (1.83.4-x86_64-linux) + google-protobuf (~> 4.29) sawyer (0.9.2) addressable (>= 2.3.5) faraday (>= 0.17.3, < 3) - terminal-table (2.0.0) - unicode-display_width (~> 1.1, >= 1.1.1) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) tzinfo (2.0.6) concurrent-ruby (~> 1.0) tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) - unicode-display_width (1.8.0) + unicode-display_width (2.6.0) uri (1.0.2) wdm (0.2.0) - webrick (1.9.0) + webrick (1.9.1) PLATFORMS ruby @@ -104,7 +112,7 @@ PLATFORMS x86_64-linux DEPENDENCIES - jekyll (~> 4.2.0) + jekyll (~> 4.3.4) jekyll-archives jekyll-feed jekyll-github-metadata diff --git a/package-lock.json b/package-lock.json index 17662d01..3d5898aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7,6 +7,7 @@ "": { "name": "amp-affiliately-jekyll-theme", "version": "3.2.0", + "hasInstallScript": true, "license": "MIT", "devDependencies": { "@ampproject/toolbox-optimizer": "^2.9.0", diff --git a/package.json b/package.json index b590ab46..8c250991 100644 --- a/package.json +++ b/package.json @@ -3,13 +3,18 @@ "description": "AMP Affiliately is an AMP-ready Jekyll theme for your blogs and websites.", "version": "3.2.0", "scripts": { - "convert:css2scss": "bash ./css_to_scss.sh", + "install": "bundle install", + "start": "npm run jekyll", "jekyll": "bundle exec jekyll serve --livereload", "jekyll:trace": "bundle exec jekyll serve --trace --livereload", - "build": "bundle exec jekyll build && npx gulp build", - "build:prod": "npx cross-env JEKYLL_ENV=production bundle exec jekyll build && npx gulp build", + "build": "npm run build:jekyll && npm run build:gulp", + "build:prod": "npx cross-env JEKYLL_ENV=production npm run build:jekyll && npm run build:gulp", + "build:jekyll": "bundle exec jekyll build", + "build:gulp": "npx gulp build", "test": "npx gulp validate", - "watch": "npx gulp" + "watch": "npx gulp", + "convert": "npm run convert:css2scss", + "convert:css2scss": "bash ./css_to_scss.sh" }, "homepage": "https://github.com/chriskyfung/amp-affiliately-jekyll-theme", "repository": {