Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/eslint-config-pretti…
Browse files Browse the repository at this point in the history
…er-9.1.0
  • Loading branch information
JohnAlbin authored Jan 30, 2024
2 parents b40ddf1 + 601cccb commit 30d905e
Show file tree
Hide file tree
Showing 156 changed files with 5,776 additions and 8,482 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ public
node_modules
*.esm.js
/drupal
/drupal-*
3 changes: 3 additions & 0 deletions .github/workflows/next-drupal.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
name: next-drupal
on:
push:
branches:
- main
pull_request_target:
types: [opened, reopened, synchronize]

Expand Down
25 changes: 13 additions & 12 deletions .github/workflows/next.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,20 @@ jobs:
strategy:
matrix:
# Supported PHP versions: https://www.drupal.org/docs/getting-started/system-requirements/php-requirements
php: ["8.0", "8.1", "8.2"]
php:
- "8.1"
- "8.2"
- "8.3"
# Supported Drupal versions: https://www.drupal.org/project/drupal
drupal: ["9.5", "10.0"]
drupal:
- "10.0.x"
- "10.1.x"
- "10.2.x"
exclude:
- drupal: "9.5"
php: "8.2"
- drupal: "10.0"
php: "8.0"
- drupal: "10.0.x"
php: "8.3"
- drupal: "10.1.x"
php: "8.3"
name: Drupal ${{ matrix.drupal }} - PHP ${{ matrix.php }}
services:
mysql:
Expand Down Expand Up @@ -53,7 +59,7 @@ jobs:
run: echo "::add-matcher::${{ runner.tool_cache }}/phpunit.json"
- name: Setup Drupal
run: |
COMPOSER_MEMORY_LIMIT=-1 composer create-project drupal/recommended-project:${{ matrix.drupal }}.x ~/drupal --no-interaction --no-install
COMPOSER_MEMORY_LIMIT=-1 composer create-project drupal/recommended-project:${{ matrix.drupal }} ~/drupal --no-interaction --no-install
cd ~/drupal
composer config extra.enable-patching true
composer config extra.compile-mode all
Expand All @@ -65,11 +71,6 @@ jobs:
composer config allow-plugins true -n
COMPOSER_MEMORY_LIMIT=-1 composer require drupal/core-dev --no-install
composer install
- name: Add phpspec/prophecy-phpunit
run: |
cd ~/drupal
COMPOSER_MEMORY_LIMIT=-1 composer require --dev phpspec/prophecy-phpunit:^2 -W
if: ${{ startsWith(matrix.drupal, '9') }}
- name: Run phpcs
run: |
~/drupal/vendor/bin/phpcs -p -s --colors --standard=modules/next/phpcs.xml modules/next
Expand Down
121 changes: 34 additions & 87 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,97 +1,44 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage

# nyc test coverage
.nyc_output
# See https://help.github.com/articles/ignoring-files/ for more about ignoring files.

# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (http://nodejs.org/api/addons.html)
build/Release

# Dependency directories
# dependencies
node_modules/
jspm_packages/

# Typescript v1 declaration files
typings/

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# dotenv environment variables file
.env

# gatsby files
.cache/

# Mac files
.DS_Store

# Yarn
yarn-error.log
package-lock.json
.pnp/
.pnp.js
# Yarn Integrity file
.yarn-integrity
.yarn
.yarn/install-state.gz

.netlify/
# build/test artifacts
/.eslintcache
/packages/*/.turbo
/packages/*/coverage
/packages/*/dist

# Editors
.vscode/*
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
# output of 'npm pack'
/packages/*/*.tgz

# phpstorm editor
.idea/
# misc
.DS_Store
*.pem

# NPM lock files
package-lock.json
# IDE files
/.idea
/.vscode
!/.vscode/tasks.json
!/.vscode/launch.json
!/.vscode/extensions.json

# debug
lerna-debug.log*
npm-debug.log*
yarn-debug.log*
yarn-error.log*

# Cypress
examples/**/cypress/screenshots
examples/**/cypress/videos
# environment variables file
.env
.envrc

# Other
*__clone*
dist
examples/certificates/*
drupal/web/sites/default/settings.local.php
.next
drupal/web/phpunit.xml
keys
# more misc
/*__clone__
/drupal/web/phpunit.xml
/drupal/web/sites/default/settings.local.php
/drupal-*
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ For example:

The `<scope>` can be empty (e.g. if the change is a global or difficult to assign to a single component), in which case the parentheses are omitted and the first line just becomes: `<type>: <subject>`

The `<!>` is optional. It must be used for a BREAKING CHANGE. For example, `fix(widgets)!: Fix incompatibility with widget v2` indicates the bugfix required a breaking change.
The `<!>` is optional. It should be used for a BREAKING CHANGE. For example, `fix(widgets)!: Fix incompatibility with widget v2` indicates the bugfix required a breaking change. Note that the "BREAKING CHANGE:" FOOTER is REQUIRED (see below).

### Commit message `<body>`

Expand Down
Loading

0 comments on commit 30d905e

Please sign in to comment.