Skip to content

Commit

Permalink
Merge branch 'ueberdosis:develop' into docs/installation-cdn
Browse files Browse the repository at this point in the history
  • Loading branch information
RicoTrevisan committed May 31, 2023
2 parents 405977c + 83c98ae commit b34f3a2
Show file tree
Hide file tree
Showing 334 changed files with 3,611 additions and 1,817 deletions.
41 changes: 41 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,47 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.1.0-rc.8](https://github.com/ueberdosis/tiptap/compare/v2.1.0-rc.7...v2.1.0-rc.8) (2023-05-25)

**Note:** Version bump only for package tiptap





# [2.1.0-rc.7](https://github.com/ueberdosis/tiptap/compare/v2.1.0-rc.6...v2.1.0-rc.7) (2023-05-25)

**Note:** Version bump only for package tiptap





# [2.1.0-rc.6](https://github.com/ueberdosis/tiptap/compare/v2.1.0-rc.5...v2.1.0-rc.6) (2023-05-25)

**Note:** Version bump only for package tiptap





# [2.1.0-rc.5](https://github.com/ueberdosis/tiptap/compare/v2.1.0-rc.4...v2.1.0-rc.5) (2023-05-25)


### Bug Fixes

* **extension-link:** fix paste handling ([d19267e](https://github.com/ueberdosis/tiptap/commit/d19267ecefabf08e4bd27c52424ed83991ce7270))
* typo in commands.md ([a2a9822](https://github.com/ueberdosis/tiptap/commit/a2a9822f240df2301932a67225d9adcac2f18807))


### Features

* add tiptap class ([614fc80](https://github.com/ueberdosis/tiptap/commit/614fc8082c376bf3c40a05c23ceda6b4a6fbf8d0))





# [2.1.0-rc.4](https://github.com/ueberdosis/tiptap/compare/v2.1.0-rc.3...v2.1.0-rc.4) (2023-04-27)


Expand Down
35 changes: 35 additions & 0 deletions demos/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,41 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

# [2.1.0-rc.8](https://github.com/ueberdosis/tiptap/compare/v2.1.0-rc.7...v2.1.0-rc.8) (2023-05-25)

**Note:** Version bump only for package tiptap-demos





# [2.1.0-rc.7](https://github.com/ueberdosis/tiptap/compare/v2.1.0-rc.6...v2.1.0-rc.7) (2023-05-25)

**Note:** Version bump only for package tiptap-demos





# [2.1.0-rc.6](https://github.com/ueberdosis/tiptap/compare/v2.1.0-rc.5...v2.1.0-rc.6) (2023-05-25)

**Note:** Version bump only for package tiptap-demos





# [2.1.0-rc.5](https://github.com/ueberdosis/tiptap/compare/v2.1.0-rc.4...v2.1.0-rc.5) (2023-05-25)


### Features

* add tiptap class ([614fc80](https://github.com/ueberdosis/tiptap/commit/614fc8082c376bf3c40a05c23ceda6b4a6fbf8d0))





# [2.1.0-rc.4](https://github.com/ueberdosis/tiptap/compare/v2.1.0-rc.3...v2.1.0-rc.4) (2023-04-27)

**Note:** Version bump only for package tiptap-demos
Expand Down
4 changes: 2 additions & 2 deletions demos/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion demos/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tiptap-demos",
"version": "2.1.0-rc.4",
"version": "2.1.0-rc.8",
"private": true,
"scripts": {
"start": "vite --host",
Expand Down
2 changes: 1 addition & 1 deletion demos/setup/helper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ export function debug() {
// @ts-ignore
sendData('source', window.source)

waitUntilElementExists('.ProseMirror', element => {
waitUntilElementExists('.tiptap', element => {
// @ts-ignore
const editor = element.editor

Expand Down
2 changes: 1 addition & 1 deletion demos/setup/style.scss
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ select {
}
}

.ProseMirror:focus {
.tiptap:focus {
outline: none;
}

Expand Down
2 changes: 1 addition & 1 deletion demos/src/Commands/InsertContent/Vue/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ export default {

<style lang="scss">
/* Basic editor styles */
.ProseMirror {
.tiptap {
> * + * {
margin-top: 0.75em;
}
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Demos/SingleRoomCollab/React/styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Basic editor styles */
.ProseMirror {
.tiptap {
> * + * {
margin-top: 0.75em;
}
Expand Down
54 changes: 27 additions & 27 deletions demos/src/Examples/AutolinkValidation/React/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ context('/src/Examples/AutolinkValidation/React/', () => {
})

beforeEach(() => {
cy.get('.ProseMirror').type('{selectall}{backspace}')
cy.get('.tiptap').type('{selectall}{backspace}')
})

const validLinks = [
Expand All @@ -26,75 +26,75 @@ context('/src/Examples/AutolinkValidation/React/', () => {

validLinks.forEach(([rawTextInput, textThatShouldBeLinked]) => {
it(`should autolink ${rawTextInput}`, () => {
cy.get('.ProseMirror').type(rawTextInput)
cy.get('.ProseMirror a').contains(textThatShouldBeLinked)
cy.get('.tiptap').type(rawTextInput)
cy.get('.tiptap a').contains(textThatShouldBeLinked)
})
})

invalidLinks.forEach(rawTextInput => {
it(`should not autolink ${rawTextInput}`, () => {
cy.get('.ProseMirror').type(`{selectall}{backspace}${rawTextInput}`)
cy.get('.ProseMirror a').should('not.exist')
cy.get('.tiptap').type(`{selectall}{backspace}${rawTextInput}`)
cy.get('.tiptap a').should('not.exist')
})
})

it('should not relink unset links after entering second link', () => {
cy.get('.ProseMirror').type('https://tiptap.dev {home}')
cy.get('.ProseMirror').should('have.text', 'https://tiptap.dev ')
cy.get('.tiptap').type('https://tiptap.dev {home}')
cy.get('.tiptap').should('have.text', 'https://tiptap.dev ')
cy.get('[data-testid=unsetLink]').click()
cy.get('.ProseMirror')
cy.get('.tiptap')
.find('a')
.should('have.length', 0)
cy.get('.ProseMirror').type('{end}http://www.example.com/ ')
cy.get('.ProseMirror')
cy.get('.tiptap').type('{end}http://www.example.com/ ')
cy.get('.tiptap')
.find('a')
.should('have.length', 1)
.should('have.attr', 'href', 'http://www.example.com/')
})

it('should not relink unset links after hitting next paragraph', () => {
cy.get('.ProseMirror').type('https://tiptap.dev {home}')
cy.get('.ProseMirror').should('have.text', 'https://tiptap.dev ')
cy.get('.tiptap').type('https://tiptap.dev {home}')
cy.get('.tiptap').should('have.text', 'https://tiptap.dev ')
cy.get('[data-testid=unsetLink]').click()
cy.get('.ProseMirror')
cy.get('.tiptap')
.find('a')
.should('have.length', 0)
cy.get('.ProseMirror').type('{end}typing other text should prevent the link from relinking when hitting enter{enter}')
cy.get('.ProseMirror')
cy.get('.tiptap').type('{end}typing other text should prevent the link from relinking when hitting enter{enter}')
cy.get('.tiptap')
.find('a')
.should('have.length', 0)
})

it('should not relink unset links after modifying', () => {
cy.get('.ProseMirror').type('https://tiptap.dev {home}')
cy.get('.ProseMirror').should('have.text', 'https://tiptap.dev ')
cy.get('.tiptap').type('https://tiptap.dev {home}')
cy.get('.tiptap').should('have.text', 'https://tiptap.dev ')
cy.get('[data-testid=unsetLink]').click()
cy.get('.ProseMirror')
cy.get('.tiptap')
.find('a')
.should('have.length', 0)
cy.get('.ProseMirror')
cy.get('.tiptap')
.type('{home}')
.type('{rightArrow}'.repeat('https://'.length))
.type('blah')
cy.get('.ProseMirror').should('have.text', 'https://blahtiptap.dev ')
cy.get('.ProseMirror')
cy.get('.tiptap').should('have.text', 'https://blahtiptap.dev ')
cy.get('.tiptap')
.find('a')
.should('have.length', 0)
})

it('should autolink after hitting enter (new paragraph)', () => {
cy.get('.ProseMirror').type('https://tiptap.dev{enter}')
cy.get('.ProseMirror').should('have.text', 'https://tiptap.dev')
cy.get('.ProseMirror')
cy.get('.tiptap').type('https://tiptap.dev{enter}')
cy.get('.tiptap').should('have.text', 'https://tiptap.dev')
cy.get('.tiptap')
.find('a')
.should('have.length', 1)
.should('have.attr', 'href', 'https://tiptap.dev')
})

it('should autolink after hitting shift-enter (hardbreak)', () => {
cy.get('.ProseMirror').type('https://tiptap.dev{shift+enter}')
cy.get('.ProseMirror').should('have.text', 'https://tiptap.dev')
cy.get('.ProseMirror')
cy.get('.tiptap').type('https://tiptap.dev{shift+enter}')
cy.get('.tiptap').should('have.text', 'https://tiptap.dev')
cy.get('.tiptap')
.find('a')
.should('have.length', 1)
.should('have.attr', 'href', 'https://tiptap.dev')
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Examples/AutolinkValidation/React/styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Basic editor styles */
.ProseMirror {
.tiptap {
> * + * {
margin-top: 0.75em;
}
Expand Down
10 changes: 5 additions & 5 deletions demos/src/Examples/AutolinkValidation/Vue/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ context('/src/Examples/AutolinkValidation/Vue/', () => {
})

beforeEach(() => {
cy.get('.ProseMirror').type('{selectall}{backspace}')
cy.get('.tiptap').type('{selectall}{backspace}')
})

const validLinks = [
Expand All @@ -26,15 +26,15 @@ context('/src/Examples/AutolinkValidation/Vue/', () => {

validLinks.forEach(([rawTextInput, textThatShouldBeLinked]) => {
it(`should autolink ${rawTextInput}`, () => {
cy.get('.ProseMirror').type(rawTextInput)
cy.get('.ProseMirror a').contains(textThatShouldBeLinked)
cy.get('.tiptap').type(rawTextInput)
cy.get('.tiptap a').contains(textThatShouldBeLinked)
})
})

invalidLinks.forEach(rawTextInput => {
it(`should not autolink ${rawTextInput}`, () => {
cy.get('.ProseMirror').type(`{selectall}{backspace}${rawTextInput}`)
cy.get('.ProseMirror a').should('not.exist')
cy.get('.tiptap').type(`{selectall}{backspace}${rawTextInput}`)
cy.get('.tiptap a').should('not.exist')
})
})
})
2 changes: 1 addition & 1 deletion demos/src/Examples/AutolinkValidation/Vue/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export default {

<style lang="scss">
/* Basic editor styles */
.ProseMirror {
.tiptap {
> * + * {
margin-top: 0.75em;
}
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Examples/Book/React/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ context('/src/Examples/Book/React/', () => {
})

it('should have a working tiptap instance', () => {
cy.get('.ProseMirror').then(([{ editor }]) => {
cy.get('.tiptap').then(([{ editor }]) => {
// eslint-disable-next-line
expect(editor).to.not.be.null
})
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Examples/Book/React/styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Basic editor styles */
.ProseMirror {
.tiptap {
> * + * {
margin-top: 0.75em;
}
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Examples/Book/Vue/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ context('/src/Examples/Book/Vue/', () => {
})

it('should have a working tiptap instance', () => {
cy.get('.ProseMirror').then(([{ editor }]) => {
cy.get('.tiptap').then(([{ editor }]) => {
// eslint-disable-next-line
expect(editor).to.not.be.null
})
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Examples/Book/Vue/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ export default {

<style lang="scss">
/* Basic editor styles */
.ProseMirror {
.tiptap {
> * + * {
margin-top: 0.75em;
}
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Examples/CSSModules/React/styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Basic editor styles */
.ProseMirror {
.tiptap {
> * + * {
margin-top: 0.75em;
}
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Examples/CSSModules/Vue/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ export default {

<style lang="scss">
/* Basic editor styles */
.ProseMirror {
.tiptap {
> * + * {
margin-top: 0.75em;
}
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Examples/CodeBlockLanguage/React/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ context('/src/Examples/CodeBlockLanguage/React/', () => {

expect(initialCount).to.be.greaterThan(0)

cy.get('.ProseMirror select').select('java')
cy.get('.tiptap select').select('java')
cy.wait(500)

cy.get('[class^=hljs]').then(newElements => {
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Examples/CodeBlockLanguage/React/styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Basic editor styles */
.ProseMirror {
.tiptap {
> * + * {
margin-top: 0.75em;
}
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Examples/CodeBlockLanguage/Vue/index.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ context('/src/Examples/CodeBlockLanguage/Vue/', () => {

expect(initialCount).to.be.greaterThan(0)

cy.get('.ProseMirror select').select('java')
cy.get('.tiptap select').select('java')
cy.wait(500)

cy.get('[class^=hljs]').then(newElements => {
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Examples/CodeBlockLanguage/Vue/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ export default {

<style lang="scss">
/* Basic editor styles */
.ProseMirror {
.tiptap {
> * + * {
margin-top: 0.75em;
}
Expand Down
2 changes: 1 addition & 1 deletion demos/src/Examples/CollaborativeEditing/React/styles.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* Basic editor styles */
.ProseMirror {
.tiptap {
> * + * {
margin-top: 0.75em;
}
Expand Down
Loading

0 comments on commit b34f3a2

Please sign in to comment.