Skip to content
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

Turn latest into main (#72) #77

Closed
wants to merge 1 commit into from
Closed
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
5 changes: 0 additions & 5 deletions .changeset/curly-parents-cry.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/green-kiwis-smell.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/metal-cheetahs-dream.md

This file was deleted.

5 changes: 0 additions & 5 deletions .changeset/old-cheetahs-care.md

This file was deleted.

53 changes: 53 additions & 0 deletions .github/workflows/preview-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
# This is for deploying release tags

name: GitHub Actions Vercel Preview Deployment
env:
VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
on:
push:
branches:
- main
tags:
- v*
jobs:
Deploy-Preview:
runs-on: ubuntu-latest
steps:
- name: Checkout Repo
uses: actions/checkout@v3

- name: Setup Node.js v${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- uses: ruby/setup-ruby@v1
with:
ruby-version: '3.0'
rubygems: latest
bundler-cache: true

- uses: pnpm/action-setup@v2
with:
version: 7

- name: use node.js 18
uses: actions/setup-node@v3
with:
node-version: 18.x
cache: 'pnpm'
cache-dependency-path: |
pnpm-lock.yaml

- name: Install dependencies
run: pnpm install
- name: Install Vercel CLI
run: npm install --global vercel@canary
- name: Pull Vercel Environment Information
run: vercel pull --yes --environment=preview --token=${{ secrets.VERCEL_TOKEN }}
- name: Build Project Artifacts
run: vercel build --token=${{ secrets.VERCEL_TOKEN }}
- name: Deploy Project Artifacts to Vercel
run: vercel deploy --prebuilt --token=${{ secrets.VERCEL_TOKEN }}

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -157,3 +157,4 @@ package-lock.json
docs/output
docs/.bridgetown-cache
/cdn
.vercel
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# Changelog

## 0.6.0

### Minor Changes

- f03f155: Add error messages for failed uploads
- f03f155: Added increase / decrease indentation

### Patch Changes

- f03f155: Upgrade to v2.0.2 of TipTap, fix flaky test suite, improve mobile safari support.
- 560c5a3: Fix image uploader alignment

## 0.5.0

### Minor Changes
Expand Down
4 changes: 4 additions & 0 deletions docs/plugins/builders/helpers.rb
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ def on_github(resource)
end

def version_number
if ENV["GITHUB_REF_NAME"] === "main" || `git rev-parse --abbrev-ref HEAD`.chomp === "main"
return "main"
end

package_json_file = File.join(File.expand_path("../../../", __dir__), "package.json")

return unless File.exist?(package_json_file)
Expand Down
2 changes: 1 addition & 1 deletion docs/src/_partials/_version_number.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% if version_number %>
<div style="font-size: var(--sl-font-large); margin-left: 0.5rem;">
<%= "v#{version_number}" %>
<%= version_number == "main" ? "main" : "v#{version_number}" %>
</div>
<% end %>
45 changes: 29 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rhino-editor",
"version": "0.5.0",
"version": "0.6.0",
"description": "A custom element wrapped rich text editor",
"type": "module",
"main": "exports/index.js",
Expand Down Expand Up @@ -49,20 +49,37 @@
},
"dependencies": {
"@rails/activestorage": "^7.0.4",
"@tiptap/core": "^2.0.2",
"@tiptap/extension-code-block": "^2.0.2",
"@tiptap/extension-focus": "^2.0.2",
"@tiptap/extension-image": "^2.0.2",
"@tiptap/extension-link": "^2.0.2",
"@tiptap/extension-placeholder": "^2.0.2",
"@tiptap/extension-strike": "^2.0.2",
"@tiptap/extension-text-align": "^2.0.2",
"@tiptap/pm": "^2.0.2",
"@tiptap/starter-kit": "^2.0.3",
"@tiptap/core": "2.0.3",
"@tiptap/extension-code-block": "2.0.3",
"@tiptap/extension-focus": "2.0.3",
"@tiptap/extension-image": "2.0.3",
"@tiptap/extension-link": "2.0.3",
"@tiptap/extension-placeholder": "2.0.3",
"@tiptap/extension-strike": "2.0.3",
"@tiptap/extension-text-align": "2.0.3",
"@tiptap/pm": "2.0.3",
"@tiptap/starter-kit": "2.0.3",
"lit": "^2.7.2",
"role-components": "^1.1.5",
"prosemirror-commands": "^1.5.1",
"prosemirror-dropcursor": "1.5.0",
"prosemirror-gapcursor": "^1.3.1",
"prosemirror-history": "^1.3.0",
"prosemirror-keymap": "^1.2.1",
"prosemirror-model": "^1.19.0",
"prosemirror-schema-list": "^1.2.2",
"prosemirror-state": "^1.4.2",
"prosemirror-transform": "^1.7.1",
"prosemirror-view": "~1.29.0",
"role-components": "^1.1.4",
"tslib": "^2.5.0"
},
"pnpm": {
"overrides": {
"prosemirror-model": "^1.18.1",
"prosemirror-state": "^1.4.2",
"prosemirror-view": "~1.29.0"
}
},
"repository": "git@github.com:KonnorRogers/rhino-editor.git",
"bugs": {
"url": "https://github.com/KonnorRogers/rhino-editor/issues"
Expand All @@ -72,9 +89,5 @@
"license": "MIT",
"publishConfig": {
"access": "public"
},
"pnpm": {
"resolutions": {
}
}
}
Loading