Skip to content

Commit

Permalink
Merge branch 'release/5.2.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
titouanmathis committed Oct 2, 2023
2 parents c33a060 + a3482e7 commit df884b5
Show file tree
Hide file tree
Showing 11 changed files with 485 additions and 456 deletions.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "studiometa/webpack-config",
"version": "5.2.1",
"version": "5.2.2",
"description": "PHP Helpers for @studiometa/webpack-config",
"type": "library",
"require": {
Expand Down
871 changes: 450 additions & 421 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studiometa/webpack-config-root",
"version": "5.2.1",
"version": "5.2.2",
"private": true,
"type": "commonjs",
"workspaces": [
Expand All @@ -17,7 +17,7 @@
"devDependencies": {
"@studiometa/eslint-config": "^3.1.3",
"@studiometa/prettier-config": "^3.0.0",
"eslint": "^8.45.0",
"eslint": "^8.49.0",
"prettier": "^2.8.8"
}
}
4 changes: 2 additions & 2 deletions packages/demo/meta.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import { vue } from '@studiometa/webpack-config-preset-vue-3';

export default defineConfig({
presets: [
(isDev) => (isDev ? null : eslint({ fix: false })),
(isDev) => (isDev ? null : stylelint({ fix: false })),
(isDev) => isDev && eslint({ fix: false }),
(isDev) => isDev && stylelint({ fix: false }),
prototyping({ ts: true }),
vue(),
(isDev) => (isDev ? https() : null),
Expand Down
8 changes: 4 additions & 4 deletions packages/demo/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studiometa/webpack-config-demo",
"version": "5.2.1",
"version": "5.2.2",
"private": true,
"type": "module",
"scripts": {
Expand All @@ -13,10 +13,10 @@
"@studiometa/prettier-config": "^3.0.0",
"@studiometa/stylelint-config": "^3.0.2",
"@studiometa/webpack-config": "file:../webpack-config",
"eslint": "^8.45.0",
"prettier": "^3.0.0",
"eslint": "^8.49.0",
"prettier": "^3.0.3",
"remark": "^14.0.3",
"stylelint": "^15.10.2",
"stylelint": "^15.10.3",
"tailwindcss": "^3.3.3",
"vue-loader": "^17.2.2",
"vue-svg-loader": "^0.17.0-beta.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-markdown/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studiometa/webpack-config-preset-markdown",
"version": "5.2.1",
"version": "5.2.2",
"publishConfig": {
"access": "public"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/preset-prototyping/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studiometa/webpack-config-preset-prototyping",
"version": "5.2.1",
"version": "5.2.2",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -35,7 +35,7 @@
"@studiometa/webpack-config-preset-markdown": "file:../preset-markdown",
"collect.js": "^4.36.1",
"filemanager-webpack-plugin": "^8.0.0",
"glob": "^10.3.3",
"glob": "^10.3.5",
"html-escaper": "^3.0.3",
"html-webpack-harddisk-plugin": "^2.0.0",
"html-webpack-plugin": "^5.5.3",
Expand Down
4 changes: 2 additions & 2 deletions packages/preset-vue-2/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studiometa/webpack-config-preset-vue-2",
"version": "5.2.1",
"version": "5.2.2",
"publishConfig": {
"access": "public"
},
Expand Down Expand Up @@ -30,7 +30,7 @@
"prepublishOnly": "node scripts/add-peer-dependencies.js"
},
"dependencies": {
"vue-loader": "^15.10.1",
"vue-loader": "^15.10.2",
"vue-svg-loader": "^0.16.0",
"vue-template-compiler": "^2.7.14"
}
Expand Down
2 changes: 1 addition & 1 deletion packages/preset-vue-3/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studiometa/webpack-config-preset-vue-3",
"version": "5.2.1",
"version": "5.2.2",
"publishConfig": {
"access": "public"
},
Expand Down
38 changes: 19 additions & 19 deletions packages/webpack-config/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@studiometa/webpack-config",
"version": "5.2.1",
"version": "5.2.2",
"description": "A basic webpack config",
"type": "module",
"main": "src/index.js",
Expand Down Expand Up @@ -46,56 +46,56 @@
"devDependencies": {
"@studiometa/eslint-config": "^3.1.3",
"@studiometa/prettier-config": "^3.0.0",
"@types/browser-sync": "^2.27.0",
"@types/browser-sync": "^2.27.1",
"@types/minimatch": "^5.1.2",
"eslint": "^8.45.0",
"eslint": "^8.50.0",
"prettier": "^2.8.8",
"stylelint": "^15.10.2"
"stylelint": "^15.10.3"
},
"optionalDependencies": {
"@studiometa/eslint-config": ">=3.0.0",
"@studiometa/prettier-config": ">=2.1.1",
"@studiometa/stylelint-config": ">=2.0.0",
"eslint": ">=8.20.0",
"prettier": ">=2.3.2",
"stylelint": ">=13.13.1"
"@studiometa/eslint-config": ">=3.1.3",
"@studiometa/prettier-config": ">=3.0.0",
"@studiometa/stylelint-config": ">=3.0.2",
"eslint": ">=8.49.0",
"prettier": ">=3.0.3",
"stylelint": ">=15.10.3"
},
"dependencies": {
"@soda/friendly-errors-webpack-plugin": "^1.8.1",
"autoprefixer": "^10.4.15",
"autoprefixer": "^10.4.16",
"browser-sync": "^2.29.3",
"cac": "^6.7.14",
"chalk": "^5.3.0",
"common-dir": "^3.0.1",
"css-minimizer-webpack-plugin": "^5.0.1",
"dotenv": "^16.3.1",
"dotenv-expand": "^10.0.0",
"esbuild": "^0.19.2",
"esbuild-loader": "^4.0.0",
"esbuild": "^0.19.3",
"esbuild-loader": "^4.0.2",
"eslint-webpack-plugin": "^4.0.1",
"find-up": "^6.3.0",
"get-port": "^7.0.0",
"glob": "^10.3.3",
"glob": "^10.3.10",
"hot-accept-webpack-plugin": "^4.0.2",
"js-yaml-loader": "^1.2.2",
"lodash.merge": "^4.6.2",
"postcss": "^8.4.28",
"postcss": "^8.4.30",
"postcss-loader": "^7.3.3",
"postcss-preset-env": "^9.1.1",
"postcss-preset-env": "^9.1.4",
"resolve-url-loader": "^5.0.0",
"sass": "^1.65.1",
"sass": "^1.68.0",
"sass-loader": "^13.3.2",
"stylelint-webpack-plugin": "^4.1.1",
"tailwind-config-viewer": "^1.7.2",
"terser-webpack-plugin": "^5.3.9",
"webpack": "^5.88.2",
"webpack-assets-manifest": "^5.1.0",
"webpack-bundle-analyzer": "^4.9.0",
"webpack-bundle-analyzer": "^4.9.1",
"webpack-dev-middleware": "^6.1.1",
"webpack-hot-middleware": "^2.25.4",
"webpack-merge": "^5.9.0",
"webpack-module-hot-accept": "^1.0.5",
"webpack-remove-empty-scripts": "^1.0.3",
"webpack-remove-empty-scripts": "^1.0.4",
"webpackbar": "^5.0.2"
}
}
2 changes: 1 addition & 1 deletion packages/webpack-config/src/presets/tailwindcss.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import merge from 'lodash.merge';
import { findUpSync } from 'find-up';
import chalk from 'chalk';
import createServer from 'tailwind-config-viewer/server/index.js';
import { createRequire } from 'module';
import { withTrailingSlash, withoutTrailingSlash, withLeadingSlash } from '../utils/index.js';

Expand All @@ -27,6 +26,7 @@ export default function tailwindcss(options = {}) {
);

if (isDev) {
const { default: createServer } = await import('tailwind-config-viewer/server/index.js');
await extendBrowsersync(config, async (bsConfig) => {
const tailwindConfigViewerServer = createServer({
tailwindConfigProvider: () =>
Expand Down

0 comments on commit df884b5

Please sign in to comment.