Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update all non-major dependencies #1

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ jobs:
- run: npm test --reporters=jest-junit --runInBand

- name: Codecov
uses: codecov/codecov-action@v3.1.0
uses: codecov/codecov-action@v3.1.4
36 changes: 8 additions & 28 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,52 +1,32 @@
# DruxtModule (template)
# @druxt-contrib/layout-builder

<!--
[![npm](https://badgen.net/npm/v/druxt-module)](https://www.npmjs.com/package/druxt-module)
[![Known Vulnerabilities](https://snyk.io/test/github/druxt/druxt-auth/badge.svg?targetFile=package.json)](https://snyk.io/test/github/druxt/druxt-auth?targetFile=package.json)
[![npm](https://badgen.net/npm/v/@druxt-contrib/layout-builder)](https://www.npmjs.com/package/@druxt-contrib/layout-builder)
[![Known Vulnerabilities](https://snyk.io/test/github/druxt-contrib/druxt-layout-builder/badge.svg?targetFile=package.json)](https://snyk.io/test/github/druxt-contrib/druxt-layout-builder?targetFile=package.json)
-->
[![CI](https://github.com/druxt/module-template/actions/workflows/ci.yml/badge.svg)](https://github.com/druxt/module-template/actions/workflows/ci.yml)
[![codecov](https://codecov.io/gh/druxt/module-template/branch/main/graph/badge.svg?token=TwCLJOKEjm)](https://codecov.io/gh/druxt/module-template)
[![CI](https://github.com/druxt-contrib/druxt-layout-builder/actions/workflows/ci.yml/badge.svg)](https://github.com/druxt-contrib/druxt-layout-builder/actions/workflows/ci.yml)
[![codecov](https://codecov.io/gh/druxt-contrib/druxt-layout-builder/branch/main/graph/badge.svg?token=TwCLJOKEjm)](https://codecov.io/gh/druxt-contrib/druxt-layout-builder)

> This is a template for creating a DruxtJS module.
> Druxt integration with the Druxt Layout Builder.

## Links

- DruxtJS: https://druxtjs.org
- Community Discord server: https://discord.druxtjs.org

## Getting started

1. **Use this template**

Click the **Use this template** button in GitHub and follow the on-screen instructions to **Create a new repository**.

2. **Build, dev, test, commit**

This repository is setup with for development using the following tools:

- [Siroc](https://github.com/unjs/siroc): `npm run build`
- [Jest](https://jestjs.io/): `npm test`
- Linting tools: `npm run lint`
- [Changesets](https://github.com/changesets/changesets): `npm run changesets`

3. **Contribute**

Have a module you want to share with the Druxt community? Let us know via the [Community Discord server](https://discord.druxtjs.org).


<!-- TODO - Update this for your module

## Install

`$ npm install druxt-module`
`$ npm install @druxt-contrib/layout-builder`

### Nuxt.js

Add module to `nuxt.config.js`

```js
module.exports = {
buildModules: ['druxt-module'],
buildModules: ['@druxt-contrib/layout-builder'],
druxt: {
baseUrl: 'https://demo-api.druxtjs.org'
}
Expand Down
4 changes: 2 additions & 2 deletions example/drupal/.ddev/config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: druxt-module-template
name: druxt-contrib-layout-builder
type: drupal9
docroot: web
php_version: "8.0"
php_version: "8.1"
webserver_type: nginx-fpm
router_http_port: "80"
router_https_port: "443"
Expand Down
16 changes: 8 additions & 8 deletions example/drupal/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@
}
],
"require": {
"composer/installers": "2.1.1",
"composer/installers": "2.2.0",
"drupal-tome/tome_drush": "dev-master",
"drupal/core-composer-scaffold": "9.4.0",
"drupal/core-project-message": "9.4.0",
"drupal/core-recommended": "9.4.0",
"drupal/druxt": "1.1.1",
"drupal/tome": "1.7.0",
"drush/drush": "11.0.9"
"drupal/core-composer-scaffold": "9.5.9",
"drupal/core-project-message": "9.5.9",
"drupal/core-recommended": "9.5.9",
"drupal/druxt": "1.2.0",
"drupal/tome": "1.11.0",
"drush/drush": "11.5.1"
},
"require-dev": {
"drupal/core-dev": "9.4.0"
"drupal/core-dev": "9.5.9"
},
"conflict": {
"drupal/drupal": "*"
Expand Down
5 changes: 5 additions & 0 deletions example/drupal/web/.htaccess
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,11 @@ AddEncoding gzip svgz
php_value assert.active 0
</IfModule>

# PHP 8, Apache 1 and 2.
<IfModule mod_php.c>
php_value assert.active 0
</IfModule>

# Requires mod_expires to be enabled.
<IfModule mod_expires.c>
# Enable expirations.
Expand Down
8 changes: 5 additions & 3 deletions example/drupal/web/sites/default/default.settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -170,9 +170,9 @@
* information on these defaults and the potential issues.
*
* More details can be found in the constructor methods for each driver:
* - \Drupal\Core\Database\Driver\mysql\Connection::__construct()
* - \Drupal\Core\Database\Driver\pgsql\Connection::__construct()
* - \Drupal\Core\Database\Driver\sqlite\Connection::__construct()
* - \Drupal\mysql\Driver\Database\mysql\Connection::__construct()
* - \Drupal\pgsql\Driver\Database\pgsql\Connection::__construct()
* - \Drupal\sqlite\Driver\Database\sqlite\Connection::__construct()
*
* Sample Database configuration format for PostgreSQL (pgsql):
* @code
Expand Down Expand Up @@ -703,6 +703,8 @@
* @endcode
* will allow the site to run off of all variants of example.com and
* example.org, with all subdomains included.
*
* @see https://www.drupal.org/docs/installing-drupal/trusted-host-settings
*/

/**
Expand Down
4 changes: 2 additions & 2 deletions example/nuxt/nuxt.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
const baseUrl = process.env.GITPOD_WORKSPACE_ID
? `https://8080-${process.env.GITPOD_WORKSPACE_ID}.${process.env.GITPOD_WORKSPACE_CLUSTER_HOST}`
: 'http://druxt-module-template.ddev.site'
: 'http://druxt-contrib-layout-builder.ddev.site'

export default {
buildModules: [
'druxt',
'druxt-module-template'
'@druxt-contrib/layout-builder'
],
druxt: { baseUrl }
}
4 changes: 2 additions & 2 deletions example/nuxt/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"name": "druxt-module-template-example",
"name": "druxt-contrib-layout-builder-example",
"version": "0.0.0",
"scripts": {
"dev": "nuxt dev"
},
"dependencies": {
"@druxt-contrib/layout-builder": "link:../..",
"druxt": "latest",
"druxt-module-template": "link:../..",
"nuxt": "latest"
}
}
21 changes: 12 additions & 9 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
{
"name": "druxt-module-template",
"name": "@druxt-contrib/layout-builder",
"version": "0.0.0",
"keywords": [
"druxt",
"module"
"drupal",
"layout builder",
"module",
"nuxt"
],
"exports": {
".": {
Expand All @@ -27,19 +30,19 @@
"test:watch": "jest --watch"
},
"devDependencies": {
"@babel/core": "7.18.5",
"@babel/preset-env": "7.18.2",
"@changesets/cli": "2.23.0",
"@vue/test-utils": "1.3.0",
"@babel/core": "7.22.1",
"@babel/preset-env": "7.22.4",
"@changesets/cli": "2.26.1",
"@vue/test-utils": "1.3.5",
"babel-core": "7.0.0-bridge.0",
"druxt": "0.19.2",
"druxt": "0.21.1",
"esbuild-jest": "0.5.0",
"eslint": "8.18.0",
"eslint": "8.41.0",
"eslint-plugin-nuxt": "3.2.0",
"jest": "27.5.1",
"siroc": "0.16.0",
"vue-jest": "3.0.7",
"vue-template-compiler": "2.6.14"
"vue-template-compiler": "2.7.14"
},
"publishConfig": {
"access": "public"
Expand Down