diff --git a/.circleci/config.yml b/.circleci/config.yml index e9b1b8919..17a4f92d0 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,8 +1,17 @@ -version: 2 +version: 2.1 + +orbs: + # orbs are basically bundles of pre-written build scripts that work for common cases + # https://github.com/CircleCI-Public/ruby-orb + ruby: circleci/ruby@1.1 + jobs: - build: + test: + parameters: + ruby-version: + type: string docker: - - image: circleci/ruby:2.6.5-node + - image: cimg/ruby:<< parameters.ruby-version >>-node steps: - checkout - restore_cache: @@ -22,3 +31,12 @@ jobs: - run: name: Parse SassDoc comments command: npm run sassdoc +workflows: + build_and_test: + jobs: + - test: + matrix: + parameters: + # https://github.com/CircleCI-Public/cimg-ruby + # only supports the last three ruby versions + ruby-version: ["2.7", "3.0", "3.1", "3.2"] diff --git a/.hound.yml b/.hound.yml index b1b610c9d..2b376ab67 100644 --- a/.hound.yml +++ b/.hound.yml @@ -1,8 +1 @@ -ruby: - enabled: true -scss: - enabled: false -stylelint: - config_file: .stylelintrc.json - enabled: true - # version: 10.1.0 +CLEAR diff --git a/.stylelintrc.json b/.stylelintrc.json deleted file mode 100644 index 3171f405a..000000000 --- a/.stylelintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@thoughtbot/stylelint-config" -} diff --git a/.tool-versions b/.tool-versions deleted file mode 100644 index 91196966f..000000000 --- a/.tool-versions +++ /dev/null @@ -1,2 +0,0 @@ -ruby 2.6.5 -nodejs 12.16.1 diff --git a/CHANGELOG.md b/CHANGELOG.md index b8871fc48..0369551be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,11 +3,26 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org). -## [Unreleased (`master`)][unreleased] +## [7.3.0] - 2023-01-20 -Nothing at the moment. +## Changed +- Update initializers so they only include assets for >=Rails 5. [https://github.com/thoughtbot/bourbon/pull/1109/](https://github.com/thoughtbot/bourbon/pull/1109/files) + +## [7.2.0] - 2022-02-22 + +### Changed + +- Revert "Replace `/` with `math.div` per Dart Sass 2.0.0 updates." + +[7.2.0]: https://github.com/thoughtbot/bourbon/compare/v7.1.0...v7.2.0 + +## [7.1.0] - 2022-02-22 + +### Changed + +- Replace `/` with `math.div` per Dart Sass 2.0.0 updates. -[unreleased]: https://github.com/thoughtbot/bourbon/compare/v6.0.0...HEAD +[7.1.0]: https://github.com/thoughtbot/bourbon/compare/v7.0.0...v7.1.0 ## [7.0.0] - 2020-03-09 diff --git a/LICENSE.md b/LICENSE.md deleted file mode 100644 index 1ba822ca9..000000000 --- a/LICENSE.md +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright © 2011-2020 [thoughtbot, inc.](http://thoughtbot.com) - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the “Software”), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md index 0494a6eb0..fb5f0b1d1 100644 --- a/README.md +++ b/README.md @@ -202,6 +202,6 @@ We love open-source software! See [our other projects][community] or [hire us][hire] to design, develop, and grow your product. [thoughtbot]: https://thoughtbot.com?utm_source=github - [thoughtbot-logo]: http://presskit.thoughtbot.com/images/thoughtbot-logo-for-readmes.svg + [thoughtbot-logo]: https://thoughtbot.com/brand_assets/93:44.svg [community]: https://thoughtbot.com/community?utm_source=github [hire]: https://thoughtbot.com/hire-us?utm_source=github diff --git a/core/_bourbon.scss b/core/_bourbon.scss index cb541bb1c..c36979356 100644 --- a/core/_bourbon.scss +++ b/core/_bourbon.scss @@ -1,4 +1,4 @@ -// Bourbon 7.0.0 +// Bourbon 7.3.0 // https://www.bourbon.io/ // Copyright 2011-2020 thoughtbot, inc. // MIT License diff --git a/eyeglass-exports.js b/eyeglass-exports.js deleted file mode 100644 index 33b3e8cd2..000000000 --- a/eyeglass-exports.js +++ /dev/null @@ -1,7 +0,0 @@ -var bourbon = require("./index"); - -module.exports = function(eyeglass, sass) { - return { - sassDir: bourbon.includePaths[0] - }; -}; diff --git a/features/install.feature b/features/install.feature deleted file mode 100644 index dca42f994..000000000 --- a/features/install.feature +++ /dev/null @@ -1,28 +0,0 @@ -Feature: Install bourbon files - - Scenario: Bourbon generates a new bourbon installation - When I run `bundle exec bourbon install` - Then the sass directories should have been generated - And the following directories should exist: - | bourbon | - And the master bourbon partial should have been generated - And the output should contain "Bourbon files installed to bourbon/" - - Scenario: Generating does not overwrite an existing bourbon directory - Given bourbon is already installed - When I run `bundle exec bourbon install` - Then the output should contain "Bourbon files already installed, doing nothing." - - Scenario: Install Bourbon into a custom path - When I run `bundle exec bourbon install --path=custom_path` - Then the sass directories with "custom_path" prefix should have been generated - And the following directories should exist: - | custom_path/bourbon | - And the master bourbon partial should have been generated within "custom_path" directory - And the output should contain "Bourbon files installed to custom_path/bourbon/" - - Scenario: Forcing install of bourbon - Given bourbon is already installed - When I run `bundle exec bourbon install --force` - Then the output from "bundle exec bourbon install --force" should contain "Bourbon files installed to bourbon/" - And the output should not contain "Bourbon files already installed, doing nothing." diff --git a/lib/bourbon.rb b/lib/bourbon.rb index 4339108e9..10474b0ae 100644 --- a/lib/bourbon.rb +++ b/lib/bourbon.rb @@ -3,7 +3,9 @@ module Bourbon if defined?(Rails) && defined?(Rails::Engine) class Engine < ::Rails::Engine - config.assets.paths << File.expand_path("../core", __dir__) + initializer "bourbon.paths", group: :all do |app| + app.config.assets.paths << File.expand_path("../core", __dir__) + end end else begin diff --git a/lib/bourbon/version.rb b/lib/bourbon/version.rb index d3037d998..37ad7a584 100644 --- a/lib/bourbon/version.rb +++ b/lib/bourbon/version.rb @@ -1,3 +1,3 @@ module Bourbon - VERSION = "7.0.0" + VERSION = "7.3.0".freeze end diff --git a/package.json b/package.json deleted file mode 100644 index a9eccec93..000000000 --- a/package.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "author": { - "name": "thoughtbot", - "url": "http://thoughtbot.com" - }, - "bugs": { - "url": "https://github.com/thoughtbot/bourbon/issues" - }, - "description": "A lightweight Sass tool set.", - "devDependencies": { - "@thoughtbot/stylelint-config": "1.1.0", - "sassdoc": "^2.5.0", - "stylelint": "10.1.0" - }, - "eyeglass": { - "needs": "*", - "exports": "eyeglass-exports.js" - }, - "homepage": "https://www.bourbon.io/", - "keywords": [ - "css", - "eyeglass-module", - "mixins", - "sass", - "scss" - ], - "license": "MIT", - "main": "index.js", - "style": "core/_bourbon.scss", - "name": "bourbon", - "repository": { - "type": "git", - "url": "https://github.com/thoughtbot/bourbon.git" - }, - "scripts": { - "sassdoc": "npx sassdoc core/ --parse --verbose --strict", - "stylelint": "npx stylelint 'core/**/*.scss'", - "test": "bundle exec rake" - }, - "version": "7.0.0" -}