Merge remote-tracking branch 'origin/tiptap' into tiptap
# Conflicts: # src/QEditor.jsx # src/components/ToolBar.js # src/index.scss
Showing
docker-compose.yml
0 → 100644
docker/DockerFile
0 → 100644
... | @@ -24,13 +24,15 @@ | ... | @@ -24,13 +24,15 @@ |
"test:unit": "cross-env CI=1 react-scripts test --env=jsdom", | "test:unit": "cross-env CI=1 react-scripts test --env=jsdom", | ||
"test:watch": "react-scripts test --env=jsdom", | "test:watch": "react-scripts test --env=jsdom", | ||
"predeploy": "cd example && npm install && npm run build", | "predeploy": "cd example && npm install && npm run build", | ||
"deploy": "gh-pages -d example/build" | "deploy": "gh-pages -d example/build", | ||
"start:both": "concurrently \"npm start\" \"cd example && npm start\"" | |||
}, | }, | ||
"peerDependencies": { | "peerDependencies": { | ||
"react": "^17.0.2" | "react": "^17.0.2" | ||
}, | }, | ||
"devDependencies": { | "devDependencies": { | ||
"babel-eslint": "^10.0.3", | "babel-eslint": "^10.0.3", | ||
"concurrently": "^8.2.1", | |||
"cross-env": "^7.0.2", | "cross-env": "^7.0.2", | ||
"eslint": "^6.8.0", | "eslint": "^6.8.0", | ||
"eslint-config-prettier": "^6.7.0", | "eslint-config-prettier": "^6.7.0", | ||
... | @@ -60,6 +62,8 @@ | ... | @@ -60,6 +62,8 @@ |
"@tiptap/extension-highlight": "^2.0.0-beta.33", | "@tiptap/extension-highlight": "^2.0.0-beta.33", | ||
"@tiptap/extension-image": "^2.0.0-beta.27", | "@tiptap/extension-image": "^2.0.0-beta.27", | ||
"@tiptap/extension-link": "^2.0.0-beta.38", | "@tiptap/extension-link": "^2.0.0-beta.38", | ||
"@tiptap/extension-subscript": "^2.1.11", | |||
"@tiptap/extension-superscript": "^2.1.11", | |||
"@tiptap/extension-table": "^2.0.0-beta.49", | "@tiptap/extension-table": "^2.0.0-beta.49", | ||
"@tiptap/extension-table-cell": "^2.0.0-beta.20", | "@tiptap/extension-table-cell": "^2.0.0-beta.20", | ||
"@tiptap/extension-table-header": "^2.0.0-beta.22", | "@tiptap/extension-table-header": "^2.0.0-beta.22", | ||
... | ... |
Please
register
or
sign in
to comment