Skip to content

Commit e1d1e4a

Browse files
authored
Merge branch 'decaporg:master' into widget-boolean
2 parents 4aed4e8 + 07ef726 commit e1d1e4a

260 files changed

Lines changed: 9685 additions & 7739 deletions

File tree

Some content is hidden

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

.eslintrc.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ module.exports = {
5252
},
5353
],
5454
'unicorn/prefer-string-slice': 'error',
55+
'react/no-unknown-property': ['error', { ignore: ['css', 'bold', 'italic', 'delete'] }],
5556
},
5657
plugins: ['babel', '@emotion', 'cypress', 'unicorn'],
5758
settings: {

.github/workflows/nodejs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
- name: Use Node.js
3333
uses: actions/setup-node@v3
3434
with:
35-
node-version: '*'
35+
node-version: 18
3636
check-latest: true
3737
if: ${{ needs.changes.outputs.cms == 'true' }}
3838
- name: log versions
@@ -73,7 +73,7 @@ jobs:
7373
- name: Use Node.js
7474
uses: actions/setup-node@v3
7575
with:
76-
node-version: '*'
76+
node-version: 18
7777
check-latest: true
7878
cache: yarn
7979
if: ${{ needs.changes.outputs.cms == 'true' }}

babel.config.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
const path = require('path');
2-
const { extendDefaultPlugins } = require('svgo');
32

43
const appVersion = require('./packages/netlify-cms-app/package.json').version;
54
const coreVersion = require('./packages/netlify-cms-core/package.json').version;
@@ -28,12 +27,16 @@ const defaultPlugins = [
2827
];
2928

3029
const svgo = {
31-
plugins: extendDefaultPlugins([
30+
plugins: [
3231
{
33-
name: 'removeViewBox',
34-
active: false,
32+
name: 'preset-default',
33+
params: {
34+
overrides: {
35+
removeViewBox: false,
36+
},
37+
},
3538
},
36-
]),
39+
],
3740
};
3841

3942
function presets() {
@@ -83,7 +86,7 @@ function plugins() {
8386
}
8487

8588
if (!isProduction) {
86-
return [...defaultPlugins, 'react-hot-loader/babel'];
89+
return [...defaultPlugins];
8790
}
8891

8992
return defaultPlugins;

cypress.config.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import { defineConfig } from 'cypress';
2+
3+
export default defineConfig({
4+
projectId: '1c35bs',
5+
retries: {
6+
runMode: 4,
7+
openMode: 0,
8+
},
9+
e2e: {
10+
video: false,
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+
// eslint-disable-next-line @typescript-eslint/no-var-requires
15+
return require('./cypress/plugins/index.js')(on, config);
16+
},
17+
baseUrl: 'http://localhost:8080',
18+
specPattern: 'cypress/e2e/*spec*.js',
19+
},
20+
});

cypress.json

Lines changed: 0 additions & 9 deletions
This file was deleted.
File renamed without changes.

cypress/integration/common/editorial_workflow_migrations.js renamed to cypress/e2e/common/editorial_workflow_migrations.js

File renamed without changes.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ export const updateTranslation = () => {
3434

3535
enterTranslation('de de');
3636
});
37-
flushClockAndSave();
37+
cy.contains('button', 'Save').click();
3838
};
3939

4040
export const assertTranslation = () => {

cypress/integration/common/i18n_editorial_workflow_spec.js renamed to cypress/e2e/common/i18n_editorial_workflow_spec.js

File renamed without changes.

0 commit comments

Comments
 (0)