Merge branch 'next' into wrap-content

Author: paescuj

.eslintrc

@@ -36,6 +36,23 @@
     "navigator": true
   },
   "rules": {
-    "jsdoc/require-returns-type": "off"
-  }
+    "jsdoc/require-returns-type": "off",
+    "@typescript-eslint/strict-boolean-expressions": "warn",
+    "@typescript-eslint/consistent-type-imports": "error",
+    "@typescript-eslint/consistent-type-exports": "error"
+  },
+  "overrides": [
+    {
+      "files": [
+        "tsconfig.json",
+        "package.json",
+        "tsconfig.*.json",
+        "tslint.json"
+      ],
+      "rules": {
+        "quotes": [1, "double"],
+        "semi": [1, "never"],
+      }
+    }
+  ]
 }

cypress.config.ts

@@ -1,4 +1,6 @@
 import { defineConfig } from 'cypress';
+import path from 'node:path';
+import vitePreprocessor from 'cypress-vite';
 
 export default defineConfig({
   env: {
@@ -12,7 +14,9 @@ export default defineConfig({
     // We've imported your old cypress plugins here.
     // You may want to clean this up later by importing these.
     setupNodeEvents(on, config) {
-      on('file:preprocessor', require('cypress-vite')(config));
+      on('file:preprocessor', vitePreprocessor({
+        configFile: path.resolve(__dirname, './vite.config.test.js'),
+      }));
 
       /**
        * Plugin for cypress that adds better terminal output for easier debugging.
@@ -21,7 +25,7 @@ export default defineConfig({
        */
       require('cypress-terminal-report/src/installLogsPrinter')(on);
 
-      require('./test/cypress/plugins/index.ts')(on, config);
+      require('@cypress/code-coverage/task')(on, config);
     },
     specPattern: 'test/cypress/tests/**/*.cy.{js,jsx,ts,tsx}',
     supportFile: 'test/cypress/support/index.ts',

docs/CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+### 2.31.0
+
+- `New` - Inline tools (those with `isReadOnlySupported` specified) can now be used in read-only mode
+- `Fix` - Fix selection of first block in read-only initialization with "autofocus=true"
+- `Fix` - Incorrect caret position after blocks merging in Safari
+
+### 2.30.6
+
+- `Fix` – Fix the display of ‘Convert To’ near blocks that do not have the ‘conversionConfig.export’ rule specified
+- `Fix` – The Plus button does not appear when the editor is loaded in an iframe in Chrome
+- `Fix` - Prevent inline toolbar from closing in nested instance of editor
+
+### 2.30.5
+
+– `Fix` – Fix exported types
+
+### 2.30.4
+
+- `Fix` - Tool's exporting types added
+
 ### 2.30.3
 
 - `Fix` – I18n in nested popover
@@ -19,7 +39,7 @@
 - `New` – Block Tunes now supports nesting items
 - `New` – Block Tunes now supports separator items
 - `New` – *Menu Config* – New item type – HTML
-– `New` – *Menu Config* – Default and HTML items now support hints
+- `New` – *Menu Config* – Default and HTML items now support hints
 - `New` – Inline Toolbar has new look 💅
 - `New` – Inline Tool's `render()` now supports [Menu Config](https://editorjs.io/menu-config/) format
 - `New` – *ToolsAPI* – All installed block tools now accessible via ToolsAPI `getBlockTools()` method

example/tools/nested-list

@@ -1,6 +1,6 @@
 {
   "name": "@editorjs/editorjs",
-  "version": "2.30.3",
+  "version": "2.31.0-rc.1",
   "description": "Editor.js — open source block-style WYSIWYG editor with JSON output",
   "main": "dist/editorjs.umd.js",
   "module": "dist/editorjs.mjs",
@@ -40,20 +40,20 @@
   },
   "devDependencies": {
     "@babel/register": "^7.21.0",
-    "@codexteam/icons": "^0.3.0",
+    "@codexteam/icons": "0.3.2",
     "@codexteam/shortcuts": "^1.1.1",
     "@cypress/code-coverage": "^3.10.3",
     "@editorjs/code": "^2.7.0",
     "@editorjs/delimiter": "^1.2.0",
-    "@editorjs/header": "^2.7.0",
+    "@editorjs/header": "^2.8.8",
     "@editorjs/paragraph": "^2.11.6",
     "@editorjs/simple-image": "^1.4.1",
     "@types/node": "^18.15.11",
     "chai-subset": "^1.6.0",
     "codex-notifier": "^1.1.2",
     "codex-tooltip": "^1.0.5",
     "core-js": "3.30.0",
-    "cypress": "^13.7.1",
+    "cypress": "^13.13.3",
     "cypress-intellij-reporter": "^0.0.7",
     "cypress-plugin-tab": "^1.0.5",
     "cypress-terminal-report": "^5.3.2",
@@ -77,5 +77,8 @@
   "collective": {
     "type": "opencollective",
     "url": "https://opencollective.com/editorjs"
+  },
+  "dependencies": {
+    "@editorjs/caret": "^1.0.1"
   }
 }

example/tools/text-variant-tune

@@ -1,6 +1,6 @@
 'use strict';
 
-import { EditorConfig } from '../types';
+import type { EditorConfig } from '../types';
 
 /**
  * Apply polyfills

package.json

@@ -1,9 +1,9 @@
-import { EditorModules } from '../types-internal/editor-modules';
-import { EditorConfig } from '../../types';
-import { ModuleConfig } from '../types-internal/module-config';
+import type { EditorModules } from '../types-internal/editor-modules';
+import type { EditorConfig } from '../../types';
+import type { ModuleConfig } from '../types-internal/module-config';
 import Listeners from './utils/listeners';
-import EventsDispatcher from './utils/events';
-import { EditorEventMap } from './events';
+import type EventsDispatcher from './utils/events';
+import type { EditorEventMap } from './events';
 
 /**
  * The type <T> of the Module generic.

src/codex.ts

@@ -3,9 +3,9 @@
  * @classdesc Editor's default tune that moves up selected block
  * @copyright <CodeX Team> 2018
  */
-import { API, BlockTune } from '../../../types';
+import type { API, BlockTune } from '../../../types';
 import { IconCross } from '@codexteam/icons';
-import { MenuConfig } from '../../../types/tools/menu-config';
+import type { MenuConfig } from '../../../types/tools/menu-config';
 
 /**
  *

src/components/__module.ts

@@ -4,9 +4,9 @@
  * @copyright <CodeX Team> 2018
  */
 
-import { API, BlockTune } from '../../../types';
+import type { API, BlockTune } from '../../../types';
 import { IconChevronDown } from '@codexteam/icons';
-import { TunesMenuConfig } from '../../../types/tools';
+import type { TunesMenuConfig } from '../../../types/tools';
 
 
 /**