Skip to content

Commit

Permalink
Merge branch 'main' into renderGroups-refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
Tishasoumya-02 committed Aug 8, 2024
2 parents 57744c3 + ac85e20 commit 9314b9b
Show file tree
Hide file tree
Showing 4,583 changed files with 260,868 additions and 178,472 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
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;
5 changes: 3 additions & 2 deletions .github/ISSUE_TEMPLATE/PLIP.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,17 @@
name: "\U0001F680 PLIP"
about: Plone Improvement Proposal
title: ''
labels: ''
labels: '03 type: feature (plip)'
assignees: ''
projects: 'plone/47'

---

## PLIP (Plone Improvement Proposal)

<!--
Read http://5.docs.plone.org/develop/coredev/docs/plips.html first!
Read https://6.docs.plone.org/contributing/core/plips.html first!
Set "03 type: feature: plip" as label.
Expand Down
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
50 changes: 50 additions & 0 deletions .github/actions/node_env_setup/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: Set up Node.js environment

runs:
using: "composite"
steps:
- uses: actions/checkout@v4

- name: Use Node.js ${{ inputs.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}

- name: Enable corepack
shell: bash
run: corepack enable

- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
restore-keys: |
${{ runner.os }}-pnpm-store-
- name: Cache Cypress Binary
id: cache-cypress-binary
uses: actions/cache@v4
with:
path: ~/.cache/Cypress
key: binary-${{ inputs.node-version }}-${{ hashFiles('pnpm-lock.yaml') }}

- name: Install Volto dependencies
shell: bash
run: make install

- name: Install Cypress if not in cache
if: steps.cache-cypress-binary.outputs.cache-hit != 'true'
shell: bash
working-directory: packages/volto
run: make cypress-install

inputs:
node-version:
description: 'Node.js version'
required: true
Loading

0 comments on commit 9314b9b

Please sign in to comment.