Skip to content

Commit

Permalink
Merge branch 'main' into newDandDBlueLine
Browse files Browse the repository at this point in the history
* main: (1206 commits)
  Allow Makefile to be modified by Makefile.local if present (#5997)
  Cypress replaced wait with assertions (#5998)
  Replace spinner with Progress bar and fix it's position . (#5620) (#5929)
  Fix type for component registry components (#6002)
  Fix 301 and 302 redirects. (#5999)
  Release 18.0.0-alpha.30
  Force add .d.ts files to releaser
  Release generate-volto 9.0.0-alpha.15
  Fix server side sidebar rendering (#5993)
  Cleaned up useless injectIntl in DefaultView (#5995)
  Fix image disappears after pressing the Enter key on title field in i… (#5975)
  Update to Plone 6.0.11 (#5989)
  Defines the last 4 parameters of the `asyncConnect` function with optional (#5986)
  Flexibilize the pins for all ESlint deps, in Volto and generators (#5991)
  Release 18.0.0-alpha.29
  Release @plone/types 1.0.0-alpha.11
  fix: pass down locale to IntlProvider (#5976)
  Add Vite (client only, no SSR) build. Update Next.js 14.2.2 and Remix to 2.8.0 (#5970)
  Fix no router link in logo (#5981)
  Improve postinstall script, building all the deps (#5980)
  ...
  • Loading branch information
sneridagh committed May 7, 2024
2 parents 134e04b + 092c6d5 commit e121183
Show file tree
Hide file tree
Showing 4,707 changed files with 272,133 additions and 149,302 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
36 changes: 0 additions & 36 deletions .editorconfig

This file was deleted.

9 changes: 6 additions & 3 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
webpack/*
karma.conf.js
tests.webpack.js
node_modules
build
packages/volto
packages/volto-guillotina
!.*
dist
65 changes: 0 additions & 65 deletions .eslintrc

This file was deleted.

79 changes: 79 additions & 0 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
// @ts-check

/** @type {import('eslint').Linter.Config} */
const config = {
parser: '@typescript-eslint/parser', // Specifies the ESLint parser
parserOptions: {
ecmaVersion: 'ESNext', // Allows for the parsing of modern ECMAScript features
sourceType: 'module', // Allows for the use of imports
ecmaFeatures: {
jsx: true, // Allows for the parsing of JSX
},
},
rules: {
// 'import/no-unresolved': ['error', { ignore: ['^@plone/'] }],
// 'import/extensions': 'off',
// Place to specify ESLint rules. Can be used to overwrite rules specified from the extended configs
// e.g. "@typescript-eslint/explicit-function-return-type": "off",
},
settings: {
react: {
version: 'detect', // Tells eslint-plugin-react to automatically detect the version of React to use
},
settings: {
'import/parsers': {
'@typescript-eslint/parser': ['.ts', '.tsx'],
},
'import/resolver': {
// node: {
// extensions: ['.js', '.jsx', '.ts', '.tsx'],
// },
typescript: {
alwaysTryTypes: true, // always try to resolve types under `<root>@types` directory even it doesn't contain any source code, like `@types/unist`

// use an array of glob patterns
project: [
'packages/*/tsconfig.json',
// 'other-packages/*/tsconfig.json',
],
},
},
},
},
overrides: [
{
files: ['**/*.ts', '**/*.tsx'],
plugins: ['@typescript-eslint', 'import'],
extends: [
// 'plugin:@typescript-eslint/eslint-recommended',
// 'plugin:@typescript-eslint/recommended',
'plugin:react/recommended',
// 'plugin:import/recommended',
'plugin:import/typescript',
'plugin:prettier/recommended',
// 'plugin:react/jsx-runtime', // We only want this for non-library code (eg. volto add-ons)
// 'plugin:storybook/recommended',
],
rules: {
'@typescript-eslint/no-explicit-any': 'off',
},
},
{
files: ['**/*.js', '**/*.jsx'],
plugins: ['import'],
extends: [
'plugin:react/recommended',
// 'plugin:import/recommended',
'plugin:prettier/recommended',
'plugin:react/jsx-runtime',
// 'plugin:storybook/recommended',
],
rules: {
'react/prop-types': 0,
'react/no-unescaped-entities': 0,
},
},
],
};

module.exports = config;
64 changes: 64 additions & 0 deletions .github/ISSUE_TEMPLATE/PLIP.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
---
name: "\U0001F680 PLIP"
about: Plone Improvement Proposal
title: ''
labels: ''
assignees: ''

---

## PLIP (Plone Improvement Proposal)

<!--
Read http://5.docs.plone.org/develop/coredev/docs/plips.html first!
Set "03 type: feature: plip" as label.
Mention the @plone/volto-team when the PLIP is information complete!
-->

## Responsible Persons

### Proposer: <!-- full NAME of the proposer, should lead the PLIP - if not possible, tell about it! -->

### Seconder: <!-- NAME of another person supporting this PLIP -->

## Abstract

<!-- a comprehensive overview of the subject -->

## Motivation

<!--
Reason or motivation this proposal was created
-->

## Assumptions

<!-- Preconditions -->

## Proposal & Implementation

<!--
Detailed proposal with implementation details and - if needed - possible variants to be discussed.
-->

## Deliverables

<!--
Packages and documentation chapters involved, includes also third party if needed.
-->

## Risks

<!--
What will break/ affect existing installations of Plone after upgrade, including end user point of view, training efforts etc.
-->

## Participants

<!--
list of persons and roles known
-->
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
name: Bug report
about: Create a report to help us improve Volto
title: ''
labels: '01 type: bug'
labels: ['01 type: bug', 'needs: triage']
assignees: ''
---

Expand Down

0 comments on commit e121183

Please sign in to comment.