Merge branch 'next'

readmeio · Dec 4, 2020 · 7f7407f · 7f7407f
2 parents 9e4029d + 3b35fb7
commit 7f7407f
Show file tree

Hide file tree

Showing 6 changed files with 124 additions and 107 deletions.
diff --git 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
@@ -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
@@ -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
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "@readme/markdown",
   "description": "ReadMe's React-based Markdown parser",
   "author": "Rafe Goldberg <[email protected]>",
-  "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
@@ -12,6 +12,7 @@ const output = {
 const browserConfig = {
   entry: ['./index.js'],
   externals: {
+    '@readme/variable': '@readme/variable',
     react: {
       amd: 'react',
       commonjs: 'react',