diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1e06eff3..871abdd53 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,7 +4,7 @@ on: push: branches: - master - + - next jobs: semantic-release: name: Build & Publish Release diff --git a/.releaserc b/.releaserc index 99d2c25c8..ea70d6e47 100644 --- a/.releaserc +++ b/.releaserc @@ -1,19 +1,42 @@ { - "branches": ["master"], + "branches": [ + "master", + { + "name": "next", + "prerelease": true + } + ], "plugins": [ [ "@semantic-release/commit-analyzer", { "preset": "angular", "releaseRules": [ - { "type": "feature", "release": "minor" }, - { "type": "feat", "release": "minor" }, - { "type": "enhance", "release": "minor" }, - { "type": "refactor", "release": "minor" }, - { "type": "style", "release": "patch" } + { + "type": "feature", + "release": "minor" + }, + { + "type": "feat", + "release": "minor" + }, + { + "type": "enhance", + "release": "minor" + }, + { + "type": "refactor", + "release": "minor" + }, + { + "type": "style", + "release": "patch" + } ], "parserOpts": { - "noteKeywords": ["BREAKING"] + "noteKeywords": [ + "BREAKING" + ] } } ], @@ -23,25 +46,76 @@ "preset": "conventionalcommits", "presetConfig": { "types": [ - { "type": "feature", "section": "✨ New & Improved", "hidden": false }, - { "type": "feat", "section": "✨ New & Improved", "hidden": false }, - { "type": "enhance", "section": "✨ New & Improved", "hidden": false }, - { "type": "refactor", "section": "✨ New & Improved", "hidden": false }, - { "type": "style", "section": "✨ New & Improved", "hidden": false }, - { "type": "fix", "section": "🛠 Fixes & Updates", "hidden": false }, - { "type": "perf", "section": "🛠 Fixes & Updates", "hidden": false }, - { "type": "chore", "section": "🛠 Fixes & Updates", "hidden": true }, - { "type": "docs", "section": "📘 Tests & Docs", "hidden": false }, - { "type": "test", "section": "📘 Tests & Docs", "hidden": true }, - { "type": "build", "hidden": true }, - { "type": "ci", "hidden": true } + { + "type": "feature", + "section": "✨ New & Improved", + "hidden": false + }, + { + "type": "feat", + "section": "✨ New & Improved", + "hidden": false + }, + { + "type": "enhance", + "section": "✨ New & Improved", + "hidden": false + }, + { + "type": "refactor", + "section": "✨ New & Improved", + "hidden": false + }, + { + "type": "style", + "section": "✨ New & Improved", + "hidden": false + }, + { + "type": "fix", + "section": "🛠 Fixes & Updates", + "hidden": false + }, + { + "type": "perf", + "section": "🛠 Fixes & Updates", + "hidden": false + }, + { + "type": "chore", + "section": "🛠 Fixes & Updates", + "hidden": true + }, + { + "type": "docs", + "section": "📘 Tests & Docs", + "hidden": false + }, + { + "type": "test", + "section": "📘 Tests & Docs", + "hidden": true + }, + { + "type": "build", + "hidden": true + }, + { + "type": "ci", + "hidden": true + } ] }, "parserOpts": { - "noteKeywords": ["BREAKING"] + "noteKeywords": [ + "BREAKING" + ] }, "writerOpts": { - "commitsSort": ["subject", "scope"], + "commitsSort": [ + "subject", + "scope" + ], "headerPartial": "## Version {{version}}" } } diff --git a/CHANGELOG.md b/CHANGELOG.md index 49f2d0f84..58359b00d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Changelog === +## Version 6.24.0-next.1 + +### ✨ New & Improved + +* **release:** add a next channel ([#91](https://github.com/readmeio/markdown/issues/91)) ([5938622](https://github.com/readmeio/markdown/commit/59386226fc8785f159fe97464ad4aef48dbb58b8)) + ## Version 6.23.0 ### ✨ New & Improved diff --git a/package-lock.json b/package-lock.json index 9c5f50f79..769d4d767 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@readme/markdown", - "version": "6.23.0", + "version": "6.24.0-next.1", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -3299,90 +3299,20 @@ } }, "@readme/syntax-highlighter": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/@readme/syntax-highlighter/-/syntax-highlighter-10.2.0.tgz", - "integrity": "sha512-tL+0vyJIFrsCsLGfMPoslagxn9Jh6EtElgEM9qUrzTLfWqCToH7C1stTyqM3WDdQTRzun3lWsFRERuaFy3yxSg==", + "version": "10.4.0", + "resolved": "https://registry.npmjs.org/@readme/syntax-highlighter/-/syntax-highlighter-10.4.0.tgz", + "integrity": "sha512-psFsZZTlULDkbBFuGDZBzpviuZnzThB38w5AYWgopReS0UhlZGE+jxxCUvAXk8HtSo98TCG4jjCdZyKUihv7OA==", "requires": { - "@readme/variable": "^7.2.1", "codemirror": "^5.48.2", "prop-types": "^15.7.2", "react-codemirror2": "^7.2.1" - }, - "dependencies": { - "@readme/variable": { - "version": "7.5.0", - "resolved": "https://registry.npmjs.org/@readme/variable/-/variable-7.5.0.tgz", - "integrity": "sha512-GC0zZA7DD6jT691x5yROUFteJd7j1pkIEQz5tlNodjZcEVaGghU/h9sLyw5KJlj+v3OYuHci69x3SJwbyt/Rug==", - "requires": { - "classnames": "^2.2.6", - "prop-types": "^15.7.2", - "react": "^16.4.2" - } - }, - "classnames": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz", - "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==" - }, - "codemirror": { - "version": "5.58.2", - "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.58.2.tgz", - "integrity": "sha512-K/hOh24cCwRutd1Mk3uLtjWzNISOkm4fvXiMO7LucCrqbh6aJDdtqUziim3MZUI6wOY0rvY1SlL1Ork01uMy6w==" - }, - "js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" - }, - "loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "requires": { - "js-tokens": "^3.0.0 || ^4.0.0" - } - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" - }, - "prop-types": { - "version": "15.7.2", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.7.2.tgz", - "integrity": "sha512-8QQikdH7//R2vurIJSutZ1smHYTcLpRWEOlHnzcWHmBYrOGUysKwSsrC89BCiFj3CbrfJ/nXFdJepOVrY1GCHQ==", - "requires": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.8.1" - } - }, - "react": { - "version": "16.14.0", - "resolved": "https://registry.npmjs.org/react/-/react-16.14.0.tgz", - "integrity": "sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==", - "requires": { - "loose-envify": "^1.1.0", - "object-assign": "^4.1.1", - "prop-types": "^15.6.2" - } - }, - "react-codemirror2": { - "version": "7.2.1", - "resolved": "https://registry.npmjs.org/react-codemirror2/-/react-codemirror2-7.2.1.tgz", - "integrity": "sha512-t7YFmz1AXdlImgHXA9Ja0T6AWuopilub24jRaQdPVbzUJVNKIYuy3uCFZYa7CE5S3UW6SrSa5nAqVQvtzRF9gw==" - }, - "react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==" - } } }, "@readme/variable": { - "version": "9.2.1", - "resolved": "https://registry.npmjs.org/@readme/variable/-/variable-9.2.1.tgz", - "integrity": "sha512-wcBpqM9H+pmVSV7IyhLjZ5Hjf6ltmRD38egv3tffmxb7simyLzrsOJQ+YF+f+yJEI7qSQJMdd4RMnhbYENbWSA==", + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/@readme/variable/-/variable-10.0.0.tgz", + "integrity": "sha512-YJ0ow5AicxrsCnlJvDiSoJoevKDS3kXLVVs1F7D6nV+uqQIWgQZNRc1VgLcrhZZukYFbGwc07TuPE7gaHa3yhA==", + "dev": true, "requires": { "classnames": "^2.2.6", "prop-types": "^15.7.2" @@ -5873,7 +5803,8 @@ "classnames": { "version": "2.2.6", "resolved": "https://registry.npmjs.org/classnames/-/classnames-2.2.6.tgz", - "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==" + "integrity": "sha512-JR/iSQOSt+LQIWwrwEzJ9uk0xfN3mTVYMwt1Ir5mUcSN6pU+V4zQFFaJsclJbPuAUQH+yfWef6tm7l1quW3C8Q==", + "dev": true }, "clean-regexp": { "version": "1.0.0", @@ -5961,8 +5892,7 @@ "codemirror": { "version": "5.58.3", "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-5.58.3.tgz", - "integrity": "sha512-KBhB+juiyOOgn0AqtRmWyAT3yoElkuvWTI6hsHa9E6GQrl6bk/fdAYcvuqW1/upO9T9rtEtapWdw4XYcNiVDEA==", - "dev": true + "integrity": "sha512-KBhB+juiyOOgn0AqtRmWyAT3yoElkuvWTI6hsHa9E6GQrl6bk/fdAYcvuqW1/upO9T9rtEtapWdw4XYcNiVDEA==" }, "collapse-white-space": { "version": "1.0.6", @@ -20236,6 +20166,11 @@ "prop-types": "^15.6.2" } }, + "react-codemirror2": { + "version": "7.2.1", + "resolved": "https://registry.npmjs.org/react-codemirror2/-/react-codemirror2-7.2.1.tgz", + "integrity": "sha512-t7YFmz1AXdlImgHXA9Ja0T6AWuopilub24jRaQdPVbzUJVNKIYuy3uCFZYa7CE5S3UW6SrSa5nAqVQvtzRF9gw==" + }, "react-dom": { "version": "16.14.0", "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-16.14.0.tgz", diff --git a/package.json b/package.json index 52e0f3875..adbd5274d 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "@readme/markdown", "description": "ReadMe's React-based Markdown parser", "author": "Rafe Goldberg ", - "version": "6.23.0", + "version": "6.24.0-next.1", "main": "dist/main.node.js", "browser": "dist/main.js", "files": [ @@ -17,14 +17,13 @@ "prettier": "prettier --list-different --write \"./**/**.{js,jsx}\"", "test": "jest --coverage --runInBand", "test.watch": "npm test -- --watch --coverage=false", - "watch": "webpack -w --progress --mode development", + "watch": "webpack -w --progress --mode production", "release": "npx semantic-release", "release.dry": "npx semantic-release --dry-run" }, "dependencies": { "@readme/emojis": "^1.0.0", - "@readme/syntax-highlighter": "^10.2.0", - "@readme/variable": "^9.0.0", + "@readme/syntax-highlighter": "^10.4.0", "copy-to-clipboard": "^3.3.1", "hast-util-sanitize": "^2.0.2", "hast-util-to-string": "^1.0.3", @@ -46,6 +45,7 @@ "unist-util-select": "^3.0.1" }, "peerDependencies": { + "@readme/variable": "^10.0.0", "react": "^16.14.0", "react-dom": "^16.14.0" }, @@ -60,6 +60,7 @@ "@commitlint/config-angular": "^9.1.1", "@commitlint/config-conventional": "^9.1.1", "@readme/eslint-config": "^3.7.1", + "@readme/variable": "^10.0.0", "@semantic-release/changelog": "^5.0.1", "@semantic-release/git": "^9.0.0", "babel-core": "^7.0.0-bridge.0", diff --git a/webpack.config.js b/webpack.config.js index ca3407b9c..16407763e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -12,6 +12,7 @@ const output = { const browserConfig = { entry: ['./index.js'], externals: { + '@readme/variable': '@readme/variable', react: { amd: 'react', commonjs: 'react',