Skip to content

Commit f2c7fec

Browse files
committed
Merge branch 'release/6.3.5'
2 parents ad413b5 + 58d0808 commit f2c7fec

File tree

28 files changed

+902
-1115
lines changed

28 files changed

+902
-1115
lines changed

.github/workflows/node-tests.yml

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
name: Node Tests
2+
3+
on:
4+
pull_request:
5+
paths:
6+
- packages/**/src/**/*.js
7+
- packages/**/package.json
8+
- package.json
9+
- package-lock.json
10+
11+
jobs:
12+
lint:
13+
name: lint
14+
runs-on: macos-latest
15+
steps:
16+
- uses: actions/checkout@v4
17+
18+
- uses: actions/setup-node@v4
19+
with:
20+
node-version: 22
21+
registry-url: https://registry.npmjs.org/
22+
23+
- run: npm install --no-audit --no-fund --no-progress
24+
25+
- run: npm run lint
26+
27+
tests:
28+
name: tests
29+
runs-on: macos-latest
30+
steps:
31+
- uses: actions/checkout@v4
32+
33+
- uses: actions/setup-node@v4
34+
with:
35+
node-version: 22
36+
registry-url: https://registry.npmjs.org/
37+
38+
- run: npm install --no-audit --no-fund --no-progress
39+
40+
- run: npm run test -- --test-reporter=spec --test-reporter=lcov --test-reporter-destination=stdout --test-reporter-destination=coverage.txt
41+
42+
- name: Upload coverage to Codecov
43+
uses: codecov/codecov-action@v5
44+
with:
45+
token: ${{ secrets.CODECOV_TOKEN }}
46+
files: ./coverage.txt
47+
flags: unittests
48+
fail_ci_if_error: false
49+
verbose: true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Tests
1+
name: PHP Tests
22

33
on:
44
pull_request:

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313

1414
- uses: actions/setup-node@v4
1515
with:
16-
node-version: 20
16+
node-version: 22
1717
registry-url: https://registry.npmjs.org/
1818

1919
- run: npm i

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@ backup/
1515

1616
/vendor/
1717
.phpunit.result.cache
18+
/coverage.xml
19+
/coverage.txt
20+
/.eslintcache

.nvmrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
20
1+
22

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,19 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
## [v6.3.5](https://github.com/studiometa/webpack-config/compare/6.3.4..6.3.5) (2025-06-04)
10+
11+
### Fixed
12+
13+
- **@studiometa/webpack-config-preset-prototyping:**
14+
- add support for null style object values ([#196](https://github.com/studiometa/webpack-config/pull/196), [7a49821](https://github.com/studiometa/webpack-config/commit/7a49821))
15+
- add support for null parameters ([#196](https://github.com/studiometa/webpack-config/pull/196), [63b36fa](https://github.com/studiometa/webpack-config/commit/63b36fa))
16+
17+
### Changed
18+
19+
- **@studiometa/webpack-config-preset-prototyping:** improve Twig template compilation by adding html-loader ([#195](https://github.com/studiometa/webpack-config/pull/195), [19a09aa](https://github.com/studiometa/webpack-config/commit/19a09aa))
20+
- **@studiometa/webpack-config:** update dependencies ([3c9c35c](https://github.com/studiometa/webpack-config/commit/3c9c35c))
21+
922
## [v6.3.4](https://github.com/studiometa/webpack-config/compare/6.3.3..6.3.4) (2025-05-06)
1023

1124
### Changed

composer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "studiometa/webpack-config",
3-
"version": "6.3.4",
3+
"version": "6.3.5",
44
"description": "PHP Helpers for @studiometa/webpack-config",
55
"type": "library",
66
"require": {

eslint.config.js

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
import { js, prettier } from '@studiometa/eslint-config';
2-
import { globals } from '@studiometa/eslint-config/utils';
1+
import { defineConfig, js, prettier, globals } from '@studiometa/eslint-config';
32

4-
export default [
5-
...js,
6-
...prettier,
3+
export default defineConfig(
4+
js,
5+
prettier,
76
{
87
files: ['packages/preset-*/**/*', 'packages/webpack-config/**/*'],
98
languageOptions: {
109
globals: globals.node,
1110
},
1211
},
13-
];
12+
{
13+
ignores: ['**/dist/**'],
14+
},
15+
);

0 commit comments

Comments
 (0)