From 0c5547d5d97de29690ee7b05b6cc9f3473770d21 Mon Sep 17 00:00:00 2001 From: Kaleb Fulgham Date: Wed, 15 Apr 2020 21:02:18 -0500 Subject: [PATCH] fix: rewrite more files --- .gitignore | 1 + .versionrc.json | 3 +- README.md | 12 +-- _config.yml | 61 +++++++++------ build/change-version.js | 6 +- build/config-updater.js | 29 +++++--- package-lock.json | 140 +++++++++++++++++++++++++++++++++++ package.js | 6 +- package.json | 29 ++++++++ scss/bootstrap-grid.scss | 2 +- scss/bootstrap-reboot.scss | 2 +- scss/bootstrap.scss | 2 +- site/_data/docs-versions.yml | 50 ++----------- site/index.html | 2 +- 14 files changed, 250 insertions(+), 95 deletions(-) diff --git a/.gitignore b/.gitignore index 7d4ea45b2..1399d802e 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ Thumbs.db /js/dist/ /node_modules/ /dist/ +/tmp diff --git a/.versionrc.json b/.versionrc.json index 0660544a6..ff2d7c048 100644 --- a/.versionrc.json +++ b/.versionrc.json @@ -14,5 +14,6 @@ "filename": "_config.yml", "updater": "build/config-updater.js" } - ] + ], + "releaseCommitMessageFormat": "chore(release): {{currentTag}} [skip ci]" } diff --git a/README.md b/README.md index 56f0c96e4..d47076503 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Several quick start options are available: - Clone the repo: `git clone git@github.com:flocasts/flo-scss` -- OR [download the latest release](https://github.com/flocasts/flo-scss/archive/vflo-scss.zip) +- OR [download the latest release](https://github.com/flocasts/flo-scss/archive/v0.6.2.zip) - OR install with [npm](https://www.npmjs.com/): `npm install flocasts/flo-scss` ### Running documentation locally @@ -52,11 +52,11 @@ Learn more about using Jekyll by reading its [documentation](https://jekyllrb.co Make sure you follow these instructions for installing Ruby on macOS. Mistakes made in the process of installing Ruby on macOS can result in the operating system failing to boot. - + 1. Install `gpg` and `curl` * `brew install gpg curl` - + 2. Install RVM by following the instructions [here](https://rvm.io/rvm/install) * If you have an issue installing the GPG keys, contact your sysadmin * @Sysadmins, this could be a DNS issue. Try switching to 8.8.8.8 temporarily. @@ -65,16 +65,16 @@ Learn more about using Jekyll by reading its [documentation](https://jekyllrb.co 3. Run the RVM startup script and restart your terminals * Run `source ~/.rvm/scripts/rvm` - + 4. Install the correct version of ruby for the project * The version can be found in the [Gemfile](./Gemfile) * Run `rvm install x.x.x` replacing Xs with the correct version - + 5. Run `rvm use x.x.x` to set your ruby version, and you're ready to go! ## Documentation -Flo-SCSS's documentation is built off of bootstrap's and can be found: . +Flo-SCSS's documentation is built off of bootstrap's and can be found: . Read the [Getting started page](https://flo-scss.flo.center/docs/getting-started/introduction/) for information on the framework contents, templates and examples, and more. diff --git a/_config.yml b/_config.yml index 1cb35cdc6..6b22ec671 100644 --- a/_config.yml +++ b/_config.yml @@ -1,44 +1,56 @@ -current_version: 0.6.2 -markdown: kramdown -highlighter: rouge +# Dependencies +markdown: kramdown +highlighter: rouge kramdown: - auto_ids: true + auto_ids: true + permalink: pretty -source: site -destination: ./docs -host: flo-scss.flo.center -port: 80 -baseurl: '' -url: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN' -encoding: UTF-8 + +# Server +source: "site" +destination: ./docs +host: flo-scss.flo.center +port: 80 +baseurl: "" +url: "https://flo-scss.flo.center" +encoding: UTF-8 exclude: - docs/assets/scss/ + plugins: - jekyll-redirect-from - jekyll-sitemap - jekyll-toc + +# Social title: Flo-SCSS description: 'Based on The most popular HTML, CSS, and JS library in the world.' twitter: flosports authors: 'FloSports Engineering, Mark Otto, Jacob Thornton, and Bootstrap contributors' social_image_path: /docs/assets/brand/bootstrap-social.png social_logo_path: /docs/assets/brand/bootstrap-social-logo.png -current_ruby_version: 0.0.1 -repo: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN' -slack: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN' -opencollective: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN' -blog: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN' -expo: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN' -themes: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN' -icons: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN' + +# Custom Variables +current_version: 0.6.2 +current_ruby_version: 0.6.2 +docs_version: 0.6.2 +github_org: "https://github.com/flocasts" +repo: "https://github.com/flocasts/flo-scss" +slack: "https://www.flosports.tv" +opencollective: "https://www.flosports.tv" +blog: "https://www.flosports.tv" +expo: "https://www.flosports.tv" +themes: "https://www.flosports.tv" +icons: "https://flo-scss.flo.center" + download: - source: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN' - dist: >- - https://github.com/twbs/bootstrap/releases/download/v4.4.1/bootstrap-4.4.1-dist.zip + source: "https://github.com/flocasts/flo-scss/archive/v0.6.2.zip" + cdn: - css: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN' + # See https://www.srihash.org for info on how to generate the hashes + css: 'https://unpkg.com/@flosportsinc/flo-scss@0.6.2/dist/css/bootstrap.min.css' css_hash: sha384-hnvsmW4CEqIE9xpwdmvw+oyi2zalIdkqZJKT8ovyObj2fiPNSLt7xdsda4JGUfSf - js: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN' + js: 'https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.min.js' js_hash: sha384-1RkA5wjfeG5u+6ycZ90q+PMlafLBaMCHvGk6PlVrQmIuTvpdA9qupxwbnPf9QbHH js_bundle: >- https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/js/bootstrap.bundle.min.js @@ -47,6 +59,7 @@ cdn: jquery_hash: sha384-J6qa4849blE2+poT4WnyKhv5vZF5SrPo0iEjwBvKU7imGFAV0wwj1yYfoRSJoZ+n popper: 'sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN' popper_hash: sha384-9/reFTGAW83EW2RDu2S0VKaIzap3H66lZH81PoYlFhbGU+6BZp6G7niu735Sk7lN + toc: min_level: 2 max_level: 4 diff --git a/build/change-version.js b/build/change-version.js index cf567d1bc..fdcdf4a84 100755 --- a/build/change-version.js +++ b/build/change-version.js @@ -56,13 +56,15 @@ function replaceRecursively(directory, excludedDirectories, allowedExtensions, o original = new RegExp(regExpQuote(original), 'g') replacement = regExpQuoteReplacement(replacement) const updateFile = DRY_RUN ? (filepath) => { - if (allowedExtensions.has(path.parse(filepath).ext)) { + const parsedPath = path.parse(filepath) + if (allowedExtensions.has(parsedPath.ext) && parsedPath.base !== 'package-lock.json') { console.log(`FILE: ${filepath}`) } else { console.log(`EXCLUDED:${filepath}`) } } : (filepath) => { - if (allowedExtensions.has(path.parse(filepath).ext)) { + const parsedPath = path.parse(filepath) + if (allowedExtensions.has(parsedPath.ext) && parsedPath.base !== 'package-lock.json') { sh.sed('-i', original, replacement, filepath) } } diff --git a/build/config-updater.js b/build/config-updater.js index 690fe72da..4549568a9 100644 --- a/build/config-updater.js +++ b/build/config-updater.js @@ -1,22 +1,29 @@ -const yaml = require("js-yaml"); -const fs = require("fs"); +'use strict' + +const yaml = require('js-yaml') +const fs = require('fs') // Get document, or throw exception on error -module.exports.readVersion = content => { +module.exports.readVersion = (content) => { try { - const doc = yaml.safeLoad(content); - return doc.current_version; + const doc = yaml.safeLoad(content) + return doc.current_version } catch (e) { - console.log(e); + console.log(e) } -}; +} // Get document, or throw exception on error module.exports.writeVersion = (content, version) => { try { - const doc = yaml.safeLoad(content); - return yaml.safeDump({ ...doc, current_version: version }); + const doc = yaml.safeLoad(content) + return yaml.safeDump({ + ...doc, + current_version: version, + current_ruby_version: version, + docs_version: version + }) } catch (e) { - console.log(e); + console.log(e) } -}; +} diff --git a/package-lock.json b/package-lock.json index 145e670a6..8849a29cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1478,6 +1478,146 @@ "integrity": "sha512-9Tj/qn+y2j+sjCI3Jd+qseGtHjOAeg7dU2/lVcqIQ9TV3QDaDXDYXcoOHU+7o2Hwh8L8ymL4gfuO7KxDs3q2zg==", "dev": true }, + "@semantic-release/exec": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@semantic-release/exec/-/exec-5.0.0.tgz", + "integrity": "sha512-t7LWXIvDJQbuGCy2WmMG51WyaGSLTvZBv9INvcI4S0kn+QjnnVVUMhcioIqhb0r3yqqarMzHVcABFug0q0OXjw==", + "dev": true, + "requires": { + "@semantic-release/error": "^2.1.0", + "aggregate-error": "^3.0.0", + "debug": "^4.0.0", + "execa": "^4.0.0", + "lodash": "^4.17.4", + "parse-json": "^5.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz", + "integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "debug": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz", + "integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==", + "dev": true, + "requires": { + "ms": "^2.1.1" + } + }, + "execa": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.0.0.tgz", + "integrity": "sha512-JbDUxwV3BoT5ZVXQrSVbAiaXhXUkIwvbhPIwZ0N13kX+5yCzOhUNdocxB/UQRuYOHRYYwAxKYwJYc0T4D12pDA==", + "dev": true, + "requires": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + } + }, + "get-stream": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz", + "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==", + "dev": true, + "requires": { + "pump": "^3.0.0" + } + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==", + "dev": true + }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "dev": true, + "requires": { + "path-key": "^3.0.0" + } + }, + "onetime": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.0.tgz", + "integrity": "sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==", + "dev": true, + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "parse-json": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.0.0.tgz", + "integrity": "sha512-OOY5b7PAEFV0E2Fir1KOkxchnZNCdowAJgQ5NuxjpBKTRP3pQhwkrkxqQjeoKJ+fO7bCpmIZaogI4eZGDMEGOw==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1", + "lines-and-columns": "^1.1.6" + } + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, "@semantic-release/github": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/@semantic-release/github/-/github-7.0.4.tgz", diff --git a/package.js b/package.js index 5e94194ca..d91daa5a0 100644 --- a/package.js +++ b/package.js @@ -1,10 +1,10 @@ // package metadata file for Meteor.js Package.describe({ - name: 'twbs:bootstrap', // https://atmospherejs.com/twbs/bootstrap + name: 'flosports:flo-scss', // https://atmospherejs.com/twbs/bootstrap summary: 'The most popular front-end framework for developing responsive, mobile first projects on the web.', - version: 'flo-scss', - git: 'https://github.com/twbs/bootstrap.git' + version: '0.6.2', + git: 'https://github.com/flocasts/flo-scss' }); Package.onUse(function (api) { diff --git a/package.json b/package.json index 1d56c2fec..891dea66e 100644 --- a/package.json +++ b/package.json @@ -121,6 +121,7 @@ "@babel/preset-env": "^7.7.7", "@commitlint/cli": "^8.3.5", "@commitlint/config-conventional": "^8.3.4", + "@semantic-release/exec": "^5.0.0", "autoprefixer": "^9.7.3", "babel-eslint": "^10.0.3", "babel-plugin-istanbul": "^5.2.0", @@ -204,9 +205,37 @@ { "name": "master" } + ], + "plugins": [ + "@semantic-release/commit-analyzer", + "@semantic-release/release-notes-generator", + "@semantic-release/changelog", + "@semantic-release/npm", + [ + "@semantic-release/exec", + { + "prepareCmd": "./build/change-version.js ${lastRelease.version} ${nextRelease.version}" + } + ], + [ + "@semantic-release/git", + { + "assets": [ + "package.json", + "CHANGELOG.md" + ], + "message": "chore(release): ${nextRelease.version} [skip ci]\n\n${nextRelease.notes}" + } + ], + "@semantic-release/github" ] }, "standard-version": { + "scripts": { + "prerelease": "./build/snapshot-before-version.sh", + "postbump": "./build/update-version.sh && npm run release", + "precommit": "git add ." + }, "skip": { "tag": true } diff --git a/scss/bootstrap-grid.scss b/scss/bootstrap-grid.scss index e8c3ccc16..6b9eddf85 100644 --- a/scss/bootstrap-grid.scss +++ b/scss/bootstrap-grid.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Grid vflo-scss (https://getbootstrap.com/) + * Bootstrap Grid v0.6.2 (https://getbootstrap.com/) * Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2020 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) diff --git a/scss/bootstrap-reboot.scss b/scss/bootstrap-reboot.scss index 00503001f..1ceebde55 100644 --- a/scss/bootstrap-reboot.scss +++ b/scss/bootstrap-reboot.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap Reboot vflo-scss (https://getbootstrap.com/) + * Bootstrap Reboot v0.6.2 (https://getbootstrap.com/) * Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2020 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) diff --git a/scss/bootstrap.scss b/scss/bootstrap.scss index 9ed49121f..522fc185f 100644 --- a/scss/bootstrap.scss +++ b/scss/bootstrap.scss @@ -1,5 +1,5 @@ /*! - * Bootstrap vflo-scss (https://getbootstrap.com/) + * Bootstrap v0.6.2 (https://getbootstrap.com/) * Copyright 2011-2020 The Bootstrap Authors * Copyright 2011-2020 Twitter, Inc. * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE) diff --git a/site/_data/docs-versions.yml b/site/_data/docs-versions.yml index 7d7918b54..d941008cb 100644 --- a/site/_data/docs-versions.yml +++ b/site/_data/docs-versions.yml @@ -1,45 +1,7 @@ -- group: v1.x - baseurl: https://getbootstrap.com - description: Every minor and patch release from v1 is listed below. +- group: v0.x + baseurl: https://flo-scss.flo.center + description: Current major release with two minor releases. Last update was v0.6.2. versions: - - v: 1.0.0 - - v: 1.1.0 - - v: 1.1.1 - - v: 1.2.0 - - v: 1.3.0 - - v: 1.4.0 - -- group: v2.x - baseurl: https://getbootstrap.com - description: Every minor and patch release from v2 is listed below. - versions: - - v: 2.0.0 - - v: 2.0.1 - - v: 2.0.2 - - v: 2.0.3 - - v: 2.0.4 - - v: 2.1.0 - - v: 2.1.1 - - v: 2.2.0 - - v: 2.2.1 - - v: 2.2.2 - - v: 2.3.0 - - v: 2.3.1 - - v: 2.3.2 - -- group: v3.x - baseurl: https://getbootstrap.com/docs - description: Our previous major release and its minor versions. Last update was v3.4.1. - versions: - - v: 3.3 - - v: 3.4 - -- group: v4.x - baseurl: https://getbootstrap.com/docs - description: Current major release with two minor releases. Last update was vflo-scss. - versions: - - v: 4.0 - - v: 4.1 - - v: 4.2 - - v: 4.3 - - v: 4.4 + - v: 0.6.0 + - v: 0.6.1 + - v: 0.6.2 diff --git a/site/index.html b/site/index.html index 7e59e3eb3..f69d570b8 100644 --- a/site/index.html +++ b/site/index.html @@ -12,7 +12,7 @@

Flo-SCSS

- FloSport's style library built on top of Bootstrap's foundations. This contains only styles and no JS. + FloSports' style library built on top of Bootstrap's foundations. This contains only styles and no JS.

More on Bootstrap: It is an open source toolkit for web development. Quickly prototype your ideas or build your entire app with our Sass variables and mixins, and responsive grid system.