From f93572fe215d0bf36eb5b519ef3eafa8968451f3 Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Mon, 6 May 2024 10:29:53 -0300 Subject: [PATCH 1/2] chore(deps-dev): upgrade Release Please and Husky --- .github/workflows/release-please.yml | 7 +- .husky/commit-message | 3 - .husky/pre-commit | 3 - .release-please-manifest.json | 3 + package.json | 141 +++++++++++++-------------- release-please-config.json | 14 +++ 6 files changed, 88 insertions(+), 83 deletions(-) create mode 100644 .release-please-manifest.json create mode 100644 release-please-config.json diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index e8a46f8..85d10fd 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -2,16 +2,13 @@ name: Publish release on: push: - branches: [ main ] + branches: [main] jobs: release-please: runs-on: ubuntu-latest steps: - - uses: google-github-actions/release-please-action@v3 + - uses: google-github-actions/release-please-action@v4 id: release with: token: ${{ secrets.GITHUB_TOKEN }} - release-type: node - package-name: "@inclusive-design/guide" - pull-request-title-pattern: "chore(release): release${component} ${version}" diff --git a/.husky/commit-message b/.husky/commit-message index b567676..da99483 100755 --- a/.husky/commit-message +++ b/.husky/commit-message @@ -1,4 +1 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - npx --no -- commitlint --edit "$1" diff --git a/.husky/pre-commit b/.husky/pre-commit index 41ae0d5..718da8a 100755 --- a/.husky/pre-commit +++ b/.husky/pre-commit @@ -1,4 +1 @@ -#!/usr/bin/env sh -. "$(dirname -- "$0")/_/husky.sh" - npx --no lint-staged diff --git a/.release-please-manifest.json b/.release-please-manifest.json new file mode 100644 index 0000000..37fcefa --- /dev/null +++ b/.release-please-manifest.json @@ -0,0 +1,3 @@ +{ + ".": "1.0.0" +} diff --git a/package.json b/package.json index 471e698..cefb548 100644 --- a/package.json +++ b/package.json @@ -1,74 +1,71 @@ { - "name": "@inclusive-design/guide", - "version": "1.0.0", - "description": "Strategies and best practices for inclusive design.", - "scripts": { - "build": "npm-run-all -l clean -p build:*", - "build:eleventy": "cross-env NODE_ENV=production eleventy", - "clean": "rimraf _site", - "debug": "DEBUG=Eleventy* eleventy", - "dev": "npx netlify dev", - "lint": "run-s -l lint:*", - "lint:styles": "stylelint \"**/*.css\"", - "lint:scripts": "eslint \"**/*.{js,md}\"", - "lint:markdown": "markdownlint-cli2 \"**/*.md\"", - "lint:yml": "eslint \"**/*.yml\"", - "start": "npm-run-all -l clean -p start:*", - "start:eleventy": "cross-env NODE_ENV=development eleventy --serve", - "start:cms": "decap-server", - "prepare": "husky install" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/inclusive-design/guide.git" - }, - "author": "OCAD University", - "license": "BSD-3-Clause", - "bugs": { - "url": "https://github.com/inclusive-design/guide/issues" - }, - "homepage": "https://guide.inclusivedesign.ca", - "dependencies": { - "@11ty/eleventy": "2.0.1", - "@11ty/eleventy-navigation": "0.3.5", - "@11ty/eleventy-plugin-rss": "1.2.0", - "@11ty/eleventy-plugin-syntaxhighlight": "5.0.0", - "decap-cms": "3.0.7", - "eleventy-plugin-fluid": "2.6.0", - "idg-design-system": "1.0.0", - "infusion": "4.6.0", - "prop-types": "15.8.1", - "react": "16.14.0" - }, - "devDependencies": { - "@commitlint/cli": "17.7.1", - "@commitlint/config-conventional": "17.7.0", - "cross-env": "7.0.3", - "debug": "4.3.4", - "decap-server": "3.0.0", - "eslint": "8.49.0", - "eslint-config-fluid": "2.1.1", - "eslint-plugin-jsdoc": "46.6.0", - "eslint-plugin-markdown": "3.0.1", - "eslint-plugin-yml": "1.8.0", - "husky": "8.0.3", - "image-size": "1.0.2", - "linkedom": "0.15.1", - "lint-staged": "14.0.1", - "markdownlint-cli2": "0.9.2", - "markdownlint-config-fluid": "0.1.5", - "npm-run-all": "4.1.5", - "rimraf": "5.0.1", - "stylelint": "14.16.1", - "stylelint-config-fluid": "1.0.0", - "stylelint-use-logical-spec": "5.0.1" - }, - "lint-staged": { - "*.css": "stylelint --fix", - "*.{js,yml}": "eslint --fix", - "*.md": [ - "markdownlint-cli2 --fix", - "eslint --fix" - ] - } + "name": "@inclusive-design/guide", + "version": "1.0.0", + "description": "Strategies and best practices for inclusive design.", + "scripts": { + "build": "npm-run-all -l clean -p build:*", + "build:eleventy": "cross-env NODE_ENV=production eleventy", + "clean": "rimraf _site", + "debug": "DEBUG=Eleventy* eleventy", + "dev": "npx netlify dev", + "lint": "run-s -l lint:*", + "lint:styles": "stylelint \"**/*.css\"", + "lint:scripts": "eslint \"**/*.{js,md}\"", + "lint:markdown": "markdownlint-cli2 \"**/*.md\"", + "lint:yml": "eslint \"**/*.yml\"", + "start": "npm-run-all -l clean -p start:*", + "start:eleventy": "cross-env NODE_ENV=development eleventy --serve", + "start:cms": "decap-server", + "prepare": "husky" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/inclusive-design/guide.git" + }, + "author": "OCAD University", + "license": "BSD-3-Clause", + "bugs": { + "url": "https://github.com/inclusive-design/guide/issues" + }, + "homepage": "https://guide.inclusivedesign.ca", + "dependencies": { + "@11ty/eleventy": "2.0.1", + "@11ty/eleventy-navigation": "0.3.5", + "@11ty/eleventy-plugin-rss": "1.2.0", + "@11ty/eleventy-plugin-syntaxhighlight": "5.0.0", + "decap-cms": "3.0.7", + "eleventy-plugin-fluid": "2.6.0", + "idg-design-system": "1.0.0", + "infusion": "4.6.0", + "prop-types": "15.8.1", + "react": "16.14.0" + }, + "devDependencies": { + "@commitlint/cli": "17.7.1", + "@commitlint/config-conventional": "17.7.0", + "cross-env": "7.0.3", + "debug": "4.3.4", + "decap-server": "3.0.0", + "eslint": "8.49.0", + "eslint-config-fluid": "2.1.1", + "eslint-plugin-jsdoc": "46.6.0", + "eslint-plugin-markdown": "3.0.1", + "eslint-plugin-yml": "1.8.0", + "husky": "8.0.3", + "image-size": "1.0.2", + "linkedom": "0.15.1", + "lint-staged": "14.0.1", + "markdownlint-cli2": "0.9.2", + "markdownlint-config-fluid": "0.1.5", + "npm-run-all": "4.1.5", + "rimraf": "5.0.1", + "stylelint": "14.16.1", + "stylelint-config-fluid": "1.0.0", + "stylelint-use-logical-spec": "5.0.1" + }, + "lint-staged": { + "*.css": "stylelint --fix", + "*.{js,yml}": "eslint --fix", + "*.md": ["markdownlint-cli2 --fix", "eslint --fix"] + } } diff --git a/release-please-config.json b/release-please-config.json new file mode 100644 index 0000000..9996b17 --- /dev/null +++ b/release-please-config.json @@ -0,0 +1,14 @@ +{ + "changelog-path": "CHANGELOG.md", + "release-type": "node", + "bump-minor-pre-major": false, + "bump-patch-for-minor-pre-major": false, + "draft": false, + "prerelease": false, + "packages": { + ".": { + "include-component-in-tag": false + } + }, + "$schema": "https://raw.githubusercontent.com/googleapis/release-please/main/schemas/config.json" +} From 6b4a2eef7d3893d8fada46d9004c4f3eb0c69c2e Mon Sep 17 00:00:00 2001 From: Ned Zimmerman Date: Mon, 6 May 2024 10:35:13 -0300 Subject: [PATCH 2/2] chore: upgrade commitlint config --- commitlint.config.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/commitlint.config.js b/commitlint.config.js index 8f04e00..0fca76f 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -1,5 +1 @@ -"use strict"; - -module.exports = { - extends: ["@commitlint/config-conventional"] -}; +export default {extends: ['@commitlint/config-conventional']};