Skip to content

Commit 626acb1

Browse files
authored
Merge branch 'codex-team:next' into next
2 parents 9db1fe2 + aafab1d commit 626acb1

83 files changed

Lines changed: 3098 additions & 5360 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.babelrc

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/FUNDING.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# These are supported funding model platforms
22

3-
github: neSpecc
43
patreon: editorjs
54
open_collective: editorjs
5+
custom: https://codex.so/donate

.github/workflows/cypress.yml

Lines changed: 11 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,21 @@
1-
name: Tests
1+
name: Cypress
2+
23
on: [pull_request]
4+
35
jobs:
4-
firefox:
6+
run-tests:
7+
strategy:
8+
matrix:
9+
browser: [firefox, chrome, edge]
10+
511
runs-on: ubuntu-latest
6-
container:
7-
image: cypress/browsers:node14.17.0-chrome88-ff89
8-
options: --user 1001
912
steps:
1013
- uses: actions/setup-node@v3
1114
with:
1215
node-version: 16
13-
- uses: actions/checkout@v2
14-
- run: yarn ci:pull_paragraph
15-
- uses: cypress-io/github-action@v2
16+
- uses: actions/checkout@v3
17+
- uses: cypress-io/github-action@v5
1618
with:
1719
config: video=false
18-
browser: firefox
19-
build: yarn build
20-
chrome:
21-
runs-on: ubuntu-latest
22-
steps:
23-
- uses: actions/setup-node@v3
24-
with:
25-
node-version: 16
26-
- uses: actions/checkout@v2
27-
- run: yarn ci:pull_paragraph
28-
- uses: cypress-io/github-action@v2
29-
with:
30-
config: video=false
31-
browser: chrome
32-
build: yarn build
33-
edge:
34-
runs-on: windows-latest
35-
steps:
36-
- uses: actions/setup-node@v3
37-
with:
38-
node-version: 16
39-
- uses: actions/checkout@v2
40-
- run: yarn ci:pull_paragraph
41-
- uses: cypress-io/github-action@v2
42-
with:
43-
config: video=false
44-
browser: edge
20+
browser: ${{ matrix.browser }}
4521
build: yarn build

.github/workflows/eslint.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,5 @@ jobs:
1919
${{ runner.OS }}-build-
2020
${{ runner.OS }}-
2121
22-
- run: yarn install
23-
22+
- run: yarn
2423
- run: yarn lint

.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
[submodule "example/tools/simple-image"]
1717
path = example/tools/simple-image
1818
url = https://github.com/editor-js/simple-image
19-
[submodule "src/tools/paragraph"]
20-
path = src/tools/paragraph
21-
url = https://github.com/editor-js/paragraph
2219
[submodule "example/tools/marker"]
2320
path = example/tools/marker
2421
url = https://github.com/editor-js/marker

.npmignore

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,6 @@
1-
.idea
2-
.github
3-
docs
4-
example
5-
src
6-
test
7-
.babelrc
8-
.editorconfig
9-
.eslintignore
10-
.eslintrc
11-
.git
12-
.gitmodules
13-
.jshintrc
14-
.postcssrc.yml
15-
.stylelintrc
16-
CODEOWNERS
17-
cypress.json
18-
tsconfig.json
19-
tslint.json
20-
webpack.config.js
21-
yarn.lock
22-
devserver.js
1+
*
2+
!/dist/**/*
3+
!/types/**/*
4+
!/LICENSE
5+
!/README.md
6+
!/package.json

.postcssrc.yml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
plugins:
2-
# Consumes files by @import rule
3-
# https://github.com/postcss/postcss-import
4-
postcss-import: {}
5-
62
# Apply custom property sets via @apply rule
73
# https://github.com/pascalduez/postcss-apply
84
postcss-apply: {}
@@ -26,24 +22,10 @@ plugins:
2622
# https://github.com/csstools/postcss-preset-env#preserve
2723
preserve: false
2824

29-
# Enable or disable specific polyfills
30-
# https://github.com/csstools/postcss-preset-env#features
31-
#
32-
# List of available plugins
33-
# https://github.com/csstools/postcss-preset-env/blob/master/src/lib/plugins-by-id.js
34-
features:
35-
# Modify colors using the color-mod() function in CSS
36-
# https://github.com/jonathantneal/postcss-color-mod-function
37-
color-mod-function: {}
38-
3925
# Nested rules unwrapper
4026
# https://github.com/postcss/postcss-nested
4127
#
4228
# As you know 'postcss-preset-env' plugin has an ability to process
4329
# 'postcss-nesting' feature but it does not work with BEM
4430
# Report: https://github.com/csstools/postcss-preset-env/issues/40
4531
postcss-nested: {}
46-
47-
# Compression tool
48-
# https://github.com/cssnano/cssnano
49-
cssnano: {}

cypress.config.ts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
import { defineConfig } from 'cypress';
2+
3+
export default defineConfig({
4+
env: {
5+
NODE_ENV: 'test',
6+
},
7+
fixturesFolder: 'test/cypress/fixtures',
8+
screenshotsFolder: 'test/cypress/screenshots',
9+
videosFolder: 'test/cypress/videos',
10+
e2e: {
11+
// We've imported your old cypress plugins here.
12+
// You may want to clean this up later by importing these.
13+
setupNodeEvents(on, config) {
14+
return require('./test/cypress/plugins/index.ts')(on, config);
15+
},
16+
specPattern: 'test/cypress/tests/**/*.cy.{js,jsx,ts,tsx}',
17+
supportFile: 'test/cypress/support/index.ts',
18+
},
19+
});

cypress.json

Lines changed: 0 additions & 11 deletions
This file was deleted.

docs/CHANGELOG.md

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,19 @@
22

33
### 2.27.0
44

5+
- `New`*Toolbar API* — Toolbox toggling method added.
56
- `Refactoring` — Popover class refactored.
67
- `Improvement`*Toolbox* — Number of `close()` method calls optimized.
78
- `Improvement` — The `onChange` callback won't be triggered only if all mutations contain nodes with the `data-mutation-free` attributes.
8-
- `Fix` — Resolve compiler error from importing the BlockToolData type
9+
- `Fix` — Resolve compiler error from importing the BlockToolData type.
10+
- `Fix` — Resolved a problem when document was being scrolled to the beginning after moving up a Block above the viewport.
11+
- `Improvement` — Package size reduced by removing redundant files.
12+
- `Fix`- Several bugs caused by random browser extensions.
13+
- `Improvement`*Dependencies* — Upgrade TypeScript to v5.
14+
- `Fix`*ToolsAPI*`pasteConfig` getter with `false` value could be used to disable paste handling by Editor.js core. Could be useful if your tool has its own paste handler.
15+
- `Improvement`*Dependencies* — Upgrade Cypress to v12, upgrade related libraries to latest versions.
16+
- `CI` — Use Ubuntu container for Edge tests runner.
17+
- `Improvement` — Use Vite as build system instead of Webpack.
918

1019
### 2.26.5
1120

@@ -46,6 +55,7 @@
4655
- `Improvement`*CodeStyle*[CodeX ESLint Config](https://github.com/codex-team/eslint-config) has bee updated. All ESLint/Spelling issues resolved
4756
- `Improvement`*ToolsAPI* — The `icon` property of the `toolbox` getter became optional.
4857

58+
4959
### 2.25.0
5060

5161
- `New`*Tools API* — Introducing new feature — toolbox now can have multiple entries for one tool! <br>

0 commit comments

Comments
 (0)