Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
72 commits
Select commit Hold shift + click to select a range
638c54a
Add Drupal-paranoia
0tofu Jul 30, 2020
0d4651c
内容にあわせたREADMEへの変更
0tofu Jul 30, 2020
967acd9
Fork元に自動追従するGitHub actionsを定義
0tofu Jul 30, 2020
c711c9d
Lando実行環境の追加
0tofu Jul 30, 2020
d14b614
Drupal consoleの削除
0tofu Jul 31, 2020
f76288d
GitHub Actions のステータスバッジ追加
0tofu Jul 31, 2020
ce8050e
create-project時、不要なGitHub Actionsを削除
0tofu Aug 5, 2020
754bfe8
Drupal9用のベース作成
0tofu Aug 28, 2020
26e4dd7
各種文言をDrupal9用に変更
0tofu Aug 28, 2020
03048b1
create-project をD9用に変更
0tofu Aug 28, 2020
be69466
eslint実行時prettierの設定が読み込まれるよう予めシンボリックリンクを定義
0tofu Oct 9, 2020
5749684
eslint実行時prettierの設定が読み込まれるよう予めシンボリックリンクを定義
0tofu Oct 9, 2020
8c01f54
サイト全体のカスタムモジュール・テーマでGulp.jsによるビルドを実行できる機能を追加
u7aro Jan 5, 2021
d4c296a
見出しレベルを訂正
u7aro Jan 5, 2021
f103fd7
タスクランナーの説明を追加
u7aro Jan 5, 2021
628c914
Merge pull request #1 from u7aro/9.x
0tofu Jan 7, 2021
25a4315
npmパッケージを最新化
0tofu Jan 7, 2021
27a2694
Merge pull request #2 from studioumi/upgrade-npm-packages
0tofu Jan 7, 2021
a917661
Merge remote-tracking branch 'upstream/9.x' into 9.x
0tofu Jan 7, 2021
31507c8
scssのコンパイルにDart sassを利用するように変更
0tofu Jan 7, 2021
341d13a
fibers,sassをdevDependenciesに移動
0tofu Jan 7, 2021
8e59ef6
mapファイルをバージョン管理の除外対象に追加
u7aro Jan 7, 2021
c642f6b
Autoprefixer を追加
u7aro Jan 7, 2021
00dfca5
Merge pull request #3 from studioumi/feature-use-dart-sass
u7aro Feb 16, 2021
c2fa398
Drupal のハッシュソルト値を定義するサンプルを追加
u7aro May 25, 2021
98e8e79
MySQL設定例の `$_ENV` 変数を `getenv()` に置き換え
u7aro May 31, 2021
3be729c
Yarn のロックファイルを削除
u7aro Jun 1, 2021
7394e4a
Drupal paranoia が認識するアセットファイルの対象に SVGZ と WebP を追加
u7aro Aug 3, 2021
0078e20
stylelint-no-browser-hacks の依存を削除
u7aro Sep 13, 2021
e297b11
Webルートディレクトリを設定ファイルで変更できる機能を追加
u7aro Sep 16, 2021
f48227c
Drupal scaffold で生成される default.settings.yml と defautl.services.yml のフ…
u7aro Sep 26, 2021
0f1091b
Node.js のバージョンを指定
u7aro Apr 6, 2022
ab5d9fb
Gulp.js の SASS のタスクランナーのリファクタリング
u7aro Apr 6, 2022
fa65864
stylelint-config-drupal を v3.0.0 にアップグレード
u7aro Apr 6, 2022
45dc6c7
SCSS用のルールを stylelint-config-standard-scss の導入に合わせて修正
u7aro Apr 6, 2022
77b79b4
使用できる単位に dppx を追加
u7aro Apr 6, 2022
572adc8
node v16で利用不可となっているfibersを削除
0tofu Apr 22, 2022
825522e
Lando実行環境にnodeサービスを追加
0tofu Apr 22, 2022
60bc308
デフォルトのPHPを7.4に変更
0tofu May 30, 2022
648c6a6
Xdebugに関するlando定義
0tofu May 30, 2022
8fcbe99
nodeのバージョンを16に変更
0tofu May 30, 2022
7128451
GulpでのJSトランスパイル時にコメントを除去
0tofu Oct 14, 2022
1e7e140
ddev定義追加
0tofu Oct 14, 2022
700ff87
Merge remote-tracking branch 'upstream/10.x' into 10.x
0tofu Dec 16, 2022
69aa0a2
upstreamとマージするGitHub CIを更新
0tofu Dec 16, 2022
608422d
update ddev
0tofu Dec 16, 2022
7049f8f
Drupal Paranoiaの実行を許可
0tofu Dec 16, 2022
cd96957
テスト用のCI修正
0tofu Dec 16, 2022
06194d0
Merge用のCIを最新化
0tofu Dec 16, 2022
5c6dd26
Merge branch 'upstream/10.x' into 10.x
0tofu Dec 17, 2022
e31b136
DDEVで動かす為、lando定義を削除
0tofu Feb 3, 2023
091eb87
phpcs及びphpstanライブラリ追加
0tofu Feb 3, 2023
5e4ff9e
DDEVのsettings.ddev.phpを読み込むように変更。settings.php/services.yml以外の定義をGit管理…
0tofu May 26, 2023
a942f90
Update README
0tofu May 26, 2023
019c8ee
PHPCS のルールセットをローカルに設置して読み込む仕様に変更
u7aro Aug 31, 2023
a5bddff
PHPCS 実行用のスクリプトを追加
u7aro Aug 31, 2023
f9b93bc
PHPStan で使用するキャッシュ用の一時ディレクトリをプロジェクト直下に置く
u7aro Aug 31, 2023
27b5887
PHPCS のオプションはすべて phpcs.xml.dist にまとめキャッシュする
u7aro Aug 31, 2023
9865028
PHPCS の検証対象として YAML ファイルを追加
u7aro Aug 31, 2023
95326ea
PHPCSのルールセットを修正
u7aro Aug 31, 2023
0a0b19a
コメント修正
u7aro Aug 31, 2023
2664b7b
キャッシュディレクトリを .cache に集約
u7aro Aug 31, 2023
e395998
Merge remote-tracking branch 'upstream/10.x' into 10.x
0tofu Feb 26, 2024
b292d97
依存関係でインストールされるパッケージを削除
0tofu Feb 26, 2024
987553c
Drupal10.1で非推奨となったメソッドを更新
0tofu Feb 26, 2024
ce51cd7
DDEV環境最新化
0tofu Feb 26, 2024
f4dc9bd
DDEV環境最新化
0tofu Feb 26, 2024
947e3db
phpcsでダブルクォーテーションがエラーにならない件を変更
0tofu Apr 16, 2024
ed2ff29
browserslistrcを更新
mymy0225 Jul 15, 2024
008e474
Merge pull request #5 from studioumi/feature-update-browserslistrc
u7aro Aug 20, 2024
cd8b230
Drupal11用の composer.json 及び DDEV を設定
t-nakai10 Jan 15, 2025
fd16a6f
ci.yml を Drupal11用に更新
t-nakai10 Jan 15, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .browserslistrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
##
# @file
# Browsers supported by this project.
#
# @see https://github.com/browserslist/browserslist
last 3 Chrome versions
last 3 ChromeAndroid versions
last 3 Edge versions
last 3 Firefox versions
last 3 Safari major versions
last 3 iOS major versions
1 change: 1 addition & 0 deletions .cache/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
This directory is used to store cache files such as PHPCS and PHPStan.
279 changes: 279 additions & 0 deletions .ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,279 @@
name: drupal-project
type: drupal10
docroot: web
php_version: "8.3"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
xdebug_enabled: false
additional_hostnames: []
additional_fqdns: []
database:
type: mariadb
version: "10.11"
use_dns_when_possible: true
timezone: Asia/Tokyo
composer_version: "2"
web_environment: []
nodejs_version: "20"

# Key features of DDEV's config.yaml:

# name: <projectname> # Name of the project, automatically provides
# http://projectname.ddev.site and https://projectname.ddev.site

# type: <projecttype> # backdrop, craftcms, django4, drupal6/7/8/9/10, laravel, magento, magento2, php, python, shopware6, silverstripe, typo3, wordpress
# See https://ddev.readthedocs.io/en/latest/users/quickstart/ for more
# information on the different project types

# docroot: <relative_path> # Relative path to the directory containing index.php.

# php_version: "8.1" # PHP version to use, "5.6", "7.0", "7.1", "7.2", "7.3", "7.4", "8.0", "8.1", "8.2", "8.3"

# You can explicitly specify the webimage but this
# is not recommended, as the images are often closely tied to DDEV's' behavior,
# so this can break upgrades.

# webimage: <docker_image> # nginx/php docker image.

# database:
# type: <dbtype> # mysql, mariadb, postgres
# version: <version> # database version, like "10.4" or "8.0"
# MariaDB versions can be 5.5-10.8 and 10.11, MySQL versions can be 5.5-8.0
# PostgreSQL versions can be 9-16.

# router_http_port: <port> # Port to be used for http (defaults to global configuration, usually 80)
# router_https_port: <port> # Port for https (defaults to global configuration, usually 443)

# xdebug_enabled: false # Set to true to enable Xdebug and "ddev start" or "ddev restart"
# Note that for most people the commands
# "ddev xdebug" to enable Xdebug and "ddev xdebug off" to disable it work better,
# as leaving Xdebug enabled all the time is a big performance hit.

# xhprof_enabled: false # Set to true to enable Xhprof and "ddev start" or "ddev restart"
# Note that for most people the commands
# "ddev xhprof" to enable Xhprof and "ddev xhprof off" to disable it work better,
# as leaving Xhprof enabled all the time is a big performance hit.

# webserver_type: nginx-fpm, apache-fpm, or nginx-gunicorn

# timezone: Europe/Berlin
# This is the timezone used in the containers and by PHP;
# it can be set to any valid timezone,
# see https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
# For example Europe/Dublin or MST7MDT

# composer_root: <relative_path>
# Relative path to the Composer root directory from the project root. This is
# the directory which contains the composer.json and where all Composer related
# commands are executed.

# composer_version: "2"
# You can set it to "" or "2" (default) for Composer v2 or "1" for Composer v1
# to use the latest major version available at the time your container is built.
# It is also possible to use each other Composer version channel. This includes:
# - 2.2 (latest Composer LTS version)
# - stable
# - preview
# - snapshot
# Alternatively, an explicit Composer version may be specified, for example "2.2.18".
# To reinstall Composer after the image was built, run "ddev debug refresh".

# nodejs_version: "18"
# change from the default system Node.js version to any other version.
# Numeric version numbers can be complete (i.e. 18.15.0) or
# incomplete (18, 17.2, 16). 'lts' and 'latest' can be used as well along with
# other named releases.
# see https://www.npmjs.com/package/n#specifying-nodejs-versions
# Note that you can continue using 'ddev nvm' or nvm inside the web container
# to change the project's installed node version if you need to.

# additional_hostnames:
# - somename
# - someothername
# would provide http and https URLs for "somename.ddev.site"
# and "someothername.ddev.site".

# additional_fqdns:
# - example.com
# - sub1.example.com
# would provide http and https URLs for "example.com" and "sub1.example.com"
# Please take care with this because it can cause great confusion.

# upload_dirs: "custom/upload/dir"
#
# upload_dirs:
# - custom/upload/dir
# - ../private
#
# would set the destination paths for ddev import-files to <docroot>/custom/upload/dir
# When Mutagen is enabled this path is bind-mounted so that all the files
# in the upload_dirs don't have to be synced into Mutagen.

# disable_upload_dirs_warning: false
# If true, turns off the normal warning that says
# "You have Mutagen enabled and your 'php' project type doesn't have upload_dirs set"

# ddev_version_constraint: ""
# Example:
# ddev_version_constraint: ">= 1.22.4"
# This will enforce that the running ddev version is within this constraint.
# See https://github.com/Masterminds/semver#checking-version-constraints for
# supported constraint formats

# working_dir:
# web: /var/www/html
# db: /home
# would set the default working directory for the web and db services.
# These values specify the destination directory for ddev ssh and the
# directory in which commands passed into ddev exec are run.

# omit_containers: [db, ddev-ssh-agent]
# Currently only these containers are supported. Some containers can also be
# omitted globally in the ~/.ddev/global_config.yaml. Note that if you omit
# the "db" container, several standard features of DDEV that access the
# database container will be unusable. In the global configuration it is also
# possible to omit ddev-router, but not here.

# performance_mode: "global"
# DDEV offers performance optimization strategies to improve the filesystem
# performance depending on your host system. Should be configured globally.
#
# If set, will override the global config. Possible values are:
# - "global": uses the value from the global config.
# - "none": disables performance optimization for this project.
# - "mutagen": enables Mutagen for this project.
# - "nfs": enables NFS for this project.
#
# See https://ddev.readthedocs.io/en/latest/users/install/performance/#nfs
# See https://ddev.readthedocs.io/en/latest/users/install/performance/#mutagen

# fail_on_hook_fail: False
# Decide whether 'ddev start' should be interrupted by a failing hook

# host_https_port: "59002"
# The host port binding for https can be explicitly specified. It is
# dynamic unless otherwise specified.
# This is not used by most people, most people use the *router* instead
# of the localhost port.

# host_webserver_port: "59001"
# The host port binding for the ddev-webserver can be explicitly specified. It is
# dynamic unless otherwise specified.
# This is not used by most people, most people use the *router* instead
# of the localhost port.

# host_db_port: "59002"
# The host port binding for the ddev-dbserver can be explicitly specified. It is dynamic
# unless explicitly specified.

# mailpit_http_port: "8025"
# mailpit_https_port: "8026"
# The Mailpit ports can be changed from the default 8025 and 8026

# host_mailpit_port: "8025"
# The mailpit port is not normally bound on the host at all, instead being routed
# through ddev-router, but it can be bound directly to localhost if specified here.

# webimage_extra_packages: [php7.4-tidy, php-bcmath]
# Extra Debian packages that are needed in the webimage can be added here

# dbimage_extra_packages: [telnet,netcat]
# Extra Debian packages that are needed in the dbimage can be added here

# use_dns_when_possible: true
# If the host has internet access and the domain configured can
# successfully be looked up, DNS will be used for hostname resolution
# instead of editing /etc/hosts
# Defaults to true

# project_tld: ddev.site
# The top-level domain used for project URLs
# The default "ddev.site" allows DNS lookup via a wildcard
# If you prefer you can change this to "ddev.local" to preserve
# pre-v1.9 behavior.

# ngrok_args: --basic-auth username:pass1234
# Provide extra flags to the "ngrok http" command, see
# https://ngrok.com/docs/ngrok-agent/config or run "ngrok http -h"

# disable_settings_management: false
# If true, DDEV will not create CMS-specific settings files like
# Drupal's settings.php/settings.ddev.php or TYPO3's AdditionalConfiguration.php
# In this case the user must provide all such settings.

# You can inject environment variables into the web container with:
# web_environment:
# - SOMEENV=somevalue
# - SOMEOTHERENV=someothervalue

# no_project_mount: false
# (Experimental) If true, DDEV will not mount the project into the web container;
# the user is responsible for mounting it manually or via a script.
# This is to enable experimentation with alternate file mounting strategies.
# For advanced users only!

# bind_all_interfaces: false
# If true, host ports will be bound on all network interfaces,
# not the localhost interface only. This means that ports
# will be available on the local network if the host firewall
# allows it.

# default_container_timeout: 120
# The default time that DDEV waits for all containers to become ready can be increased from
# the default 120. This helps in importing huge databases, for example.

#web_extra_exposed_ports:
#- name: nodejs
# container_port: 3000
# http_port: 2999
# https_port: 3000
#- name: something
# container_port: 4000
# https_port: 4000
# http_port: 3999
# Allows a set of extra ports to be exposed via ddev-router
# Fill in all three fields even if you don’t intend to use the https_port!
# If you don’t add https_port, then it defaults to 0 and ddev-router will fail to start.
#
# The port behavior on the ddev-webserver must be arranged separately, for example
# using web_extra_daemons.
# For example, with a web app on port 3000 inside the container, this config would
# expose that web app on https://<project>.ddev.site:9999 and http://<project>.ddev.site:9998
# web_extra_exposed_ports:
# - name: myapp
# container_port: 3000
# http_port: 9998
# https_port: 9999

#web_extra_daemons:
#- name: "http-1"
# command: "/var/www/html/node_modules/.bin/http-server -p 3000"
# directory: /var/www/html
#- name: "http-2"
# command: "/var/www/html/node_modules/.bin/http-server /var/www/html/sub -p 3000"
# directory: /var/www/html

# override_config: false
# By default, config.*.yaml files are *merged* into the configuration
# But this means that some things can't be overridden
# For example, if you have 'use_dns_when_possible: true'' you can't override it with a merge
# and you can't erase existing hooks or all environment variables.
# However, with "override_config: true" in a particular config.*.yaml file,
# 'use_dns_when_possible: false' can override the existing values, and
# hooks:
# post-start: []
# or
# web_environment: []
# or
# additional_hostnames: []
# can have their intended affect. 'override_config' affects only behavior of the
# config.*.yaml file it exists in.

# Many DDEV commands can be extended to run tasks before or after the
# DDEV command is executed, for example "post-start", "post-import-db",
# "pre-composer", "post-composer"
# See https://ddev.readthedocs.io/en/stable/users/extend/custom-commands/ for more
# information on the commands that can be extended and the tasks you can define
# for them. Example:
#hooks:
18 changes: 13 additions & 5 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,26 @@
# Copy and rename this file to .env at root of this project.
#

# A common use case is to supply Drupal hash salt via the system. Edit settings.php
# like so:
#
# $settings['hash_salt'] = getenv('DRUPAL_HASH_SALT');
#
# Uncomment and populate as needed.
# DRUPAL_HASH_SALT=

# A common use case is to supply database credentials via the environment. Edit settings.php
# like so:
#
# $databases['default']['default'] = [
# 'database' => $_ENV['MYSQL_DATABASE'],
# 'database' => getenv('MYSQL_DATABASE'),
# 'driver' => 'mysql',
# 'host' => $_ENV['MYSQL_HOSTNAME'],
# 'host' => getenv('MYSQL_HOSTNAME'),
# 'namespace' => 'Drupal\\Core\\Database\\Driver\\mysql',
# 'password' => $_ENV['MYSQL_PASSWORD'],
# 'port' => $_ENV['MYSQL_PORT'],
# 'password' => getenv('MYSQL_PASSWORD'),
# 'port' => getenv('MYSQL_PORT'),
# 'prefix' => '',
# 'username' => $_ENV['MYSQL_USER'],
# 'username' => getenv('MYSQL_USER'),
# ];
#
# Uncomment and populate as needed.
Expand Down
5 changes: 5 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"root": true,
"extends": "drupal",
"globals": {}
}
12 changes: 6 additions & 6 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@ jobs:
strategy:
fail-fast: false
matrix:
php-versions: ['8.1']
php-versions: ['8.3']
drupal-release: ['stable']
composer-channel: ['stable']
include:
- php-versions: '8.1'
- php-versions: '8.3'
drupal-release: dev
composer-channel: stable
- php-versions: '8.1'
- php-versions: '8.3'
drupal-release: stable
composer-channel: snapshot
steps:
Expand Down Expand Up @@ -51,7 +51,7 @@ jobs:
run: composer --verbose install

- if: matrix.drupal-release == 'dev'
run: composer --verbose require --no-update drupal/core-recommended:10.0.x-dev && composer --verbose require --no-update --dev drupal/core-dev:10.0.x-dev
run: composer --verbose require --no-update drupal/core-recommended:11.0.x-dev && composer --verbose require --no-update --dev drupal/core-dev:11.0.x-dev

- if: matrix.drupal-release == 'dev'
run: composer --verbose update
Expand All @@ -64,10 +64,10 @@ jobs:

# https://www.drupal.org/project/drupal/issues/3182653
# https://www.drupal.org/node/3176567
- if: ${{ matrix.php-versions == '8.1' }}
- if: ${{ matrix.php-versions == '8.3' }}
run: composer require phpspec/prophecy-phpunit:^2

- name: Run a single unit test to verify the testing setup.
run: ./vendor/bin/phpunit -c ./web/core ./web/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php
run: ./vendor/bin/phpunit -c ./app/core ./app/core/modules/user/tests/src/Unit/UserAccessControlHandlerTest.php

- run: ./vendor/bin/drush
26 changes: 26 additions & 0 deletions .github/workflows/scheduled_sync.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Merge upstream branches

on:
schedule:
- cron: '0 0,12 * * *'

jobs:
merge:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Merge upstream
run: |
git config --global user.name ${NAME}
git config --global user.email ${EMAIL}
git config --global pull.rebase merges
git pull --unshallow
git remote add upstream ${REPO_FORK}
git fetch upstream
git checkout 11.x
git merge --no-edit upstream/11.x
git push origin 11.x
env:
NAME: studioumi
EMAIL: motoki.kobayashi+github@studio-umi.jp
REPO_FORK: 'https://github.com/drupal-composer/drupal-project.git'
Loading