Skip to content

Merge main #205

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
# v0.6.1 (Mon Jun 20 2022)

#### 🐛 Bug Fix

- `@code-hike/mdx`
- Stable annotations [#203](https://github.com/code-hike/codehike/pull/203) ([@pomber](https://github.com/pomber))
- Merge main [#201](https://github.com/code-hike/codehike/pull/201) ([@pomber](https://github.com/pomber))

#### Authors: 1

- Rodrigo Pombo ([@pomber](https://github.com/pomber))

---

# v0.6.0 (Wed Jun 15 2022)

#### 🚀 Enhancement
Expand Down
4 changes: 2 additions & 2 deletions examples/bundle-test/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "bundle-test",
"private": true,
"version": "0.6.0",
"version": "0.6.1",
"scripts": {
"dev": "next",
"build": "next build"
},
"dependencies": {
"@code-hike/mdx": "^0.6.0",
"@code-hike/mdx": "^0.6.1",
"@mdx-js/loader": "^2.0.0",
"@next/mdx": "^12.1.0",
"next": "^12.1.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/contentlayer/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "codehike-contentlayer",
"version": "0.6.0",
"version": "0.6.1",
"private": true,
"scripts": {
"dev": "next dev",
"build": "INIT_CWD=$PWD next build",
"start": "next start"
},
"dependencies": {
"@code-hike/mdx": "^0.6.0",
"@code-hike/mdx": "^0.6.1",
"@types/node": "^17.0.30",
"contentlayer": "0.2.5",
"next": "^12.1.5",
Expand Down
4 changes: 2 additions & 2 deletions examples/docusaurus/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "codehike-docusaurus",
"version": "0.6.0",
"version": "0.6.1",
"private": true,
"scripts": {
"docusaurus": "docusaurus",
Expand All @@ -14,7 +14,7 @@
"write-heading-ids": "docusaurus write-heading-ids"
},
"dependencies": {
"@code-hike/mdx": "^0.6.0",
"@code-hike/mdx": "^0.6.1",
"@docusaurus/core": "2.0.0-beta.18",
"@docusaurus/preset-classic": "2.0.0-beta.18",
"@mdx-js/react": "^2.1.1",
Expand Down
4 changes: 2 additions & 2 deletions examples/mdx-bundler/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "codehike-mdx-bundler",
"private": true,
"version": "0.6.0",
"version": "0.6.1",
"scripts": {
"dev": "next",
"build": "next build"
},
"dependencies": {
"@code-hike/mdx": "^0.6.0",
"@code-hike/mdx": "^0.6.1",
"esbuild": "^0.14.23",
"mdx-bundler": "^8.0.1",
"next": "^12.1.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/next-mdx-remote/package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"name": "codehike-next-mdx-remote",
"private": true,
"version": "0.6.0",
"version": "0.6.1",
"dependencies": {
"@code-hike/mdx": "^0.6.0",
"@code-hike/mdx": "^0.6.1",
"next": "^12.1.0",
"next-mdx-remote": "^4.0.0",
"react": "^17.0.2",
Expand Down
4 changes: 2 additions & 2 deletions examples/nextjs/package.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
{
"name": "codehike-nextjs",
"private": true,
"version": "0.6.0",
"version": "0.6.1",
"scripts": {
"dev": "next",
"build": "next build"
},
"dependencies": {
"@code-hike/mdx": "^0.6.0",
"@code-hike/mdx": "^0.6.1",
"@mdx-js/loader": "^2.0.0",
"@next/mdx": "^12.1.0",
"next": "^12.1.0",
Expand Down
4 changes: 2 additions & 2 deletions examples/nextra/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "codehike-nextra",
"private": true,
"version": "0.6.0",
"version": "0.6.1",
"scripts": {
"build": "next build"
},
"dependencies": {
"@code-hike/mdx": "^0.6.0",
"@code-hike/mdx": "^0.6.1",
"next": "^12.1.0",
"nextra": "^1.1.0",
"nextra-theme-docs": "^1.2.6",
Expand Down
4 changes: 2 additions & 2 deletions examples/remix/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "codehike-remix",
"private": true,
"version": "0.6.0",
"version": "0.6.1",
"sideEffects": false,
"scripts": {
"build": "cross-env NODE_ENV=production remix build",
Expand All @@ -10,7 +10,7 @@
"start": "cross-env NODE_ENV=production remix-serve build"
},
"dependencies": {
"@code-hike/mdx": "^0.6.0",
"@code-hike/mdx": "^0.6.1",
"@remix-run/react": "^1.2.2",
"@remix-run/serve": "^1.2.2",
"cross-env": "^7.0.3",
Expand Down
4 changes: 2 additions & 2 deletions examples/vite/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "codehike-vite",
"private": true,
"version": "0.6.0",
"version": "0.6.1",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@code-hike/mdx": "^0.6.0",
"@code-hike/mdx": "^0.6.1",
"@mdx-js/rollup": "^2.0.0",
"react": "^17.0.2",
"react-dom": "^17.0.2"
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.6.0",
"version": "0.6.1",
"npmClient": "yarn",
"packages": [
"packages/*"
Expand Down
17 changes: 17 additions & 0 deletions packages/mdx/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# v0.6.1 (Mon Jun 20 2022)

#### 🐛 Bug Fix

- Stable annotations [#203](https://github.com/code-hike/codehike/pull/203) ([@pomber](https://github.com/pomber))
- Throw for two annotations in the same line ([@pomber](https://github.com/pomber))
- Fix annotation type ([@pomber](https://github.com/pomber))
- Support multiline links ([@pomber](https://github.com/pomber))
- Fix annotation index greater than line ([@pomber](https://github.com/pomber))
- Merge main [#201](https://github.com/code-hike/codehike/pull/201) ([@pomber](https://github.com/pomber))

#### Authors: 1

- Rodrigo Pombo ([@pomber](https://github.com/pomber))

---

# v0.6.0 (Wed Jun 15 2022)

#### 🚀 Enhancement
Expand Down
2 changes: 1 addition & 1 deletion packages/mdx/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@code-hike/mdx",
"version": "0.6.0",
"version": "0.6.1",
"files": [
"dist"
],
Expand Down
4 changes: 2 additions & 2 deletions playground/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "playground",
"private": true,
"version": "0.6.0",
"version": "0.6.1",
"scripts": {
"dev": "vite",
"build": "vite build",
"preview": "vite preview"
},
"dependencies": {
"@code-hike/mdx": "^0.6.0",
"@code-hike/mdx": "^0.6.1",
"@mdx-js/mdx": "^2.1.1",
"@monaco-editor/react": "^4.4.5",
"lz-string": "^1.4.4",
Expand Down