diff --git a/sources/@roots/browserslist-config/package.json b/sources/@roots/browserslist-config/package.json index 32513ef1cd..98c955ce21 100644 --- a/sources/@roots/browserslist-config/package.json +++ b/sources/@roots/browserslist-config/package.json @@ -67,18 +67,6 @@ "tslib": "2.5.0", "update-browserslist-db": "1.0.10" }, - "peerDependencies": { - "browserslist": ">=4.21.5", - "update-browserslist-db": "*" - }, - "peerDependenciesMeta": { - "browserslist": { - "optional": true - }, - "update-browserslist-db": { - "optional": true - } - }, "scripts": { "postinstall": "node scripts/postinstall.mjs" }, diff --git a/sources/@roots/bud-api/src/api/service.ts b/sources/@roots/bud-api/src/api/service.ts index 6f702fb8d4..6094ae3964 100644 --- a/sources/@roots/bud-api/src/api/service.ts +++ b/sources/@roots/bud-api/src/api/service.ts @@ -1,7 +1,7 @@ import type {Bud} from '@roots/bud-framework' import {ServiceContainer} from '@roots/bud-framework/service' import type {Api as Contract} from '@roots/bud-framework/services' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {BudError, InputError} from '@roots/bud-support/errors' import isFunction from '@roots/bud-support/lodash/isFunction' diff --git a/sources/@roots/bud-build/src/index.ts b/sources/@roots/bud-build/src/index.ts index 2996fbbcc7..8031f320e2 100644 --- a/sources/@roots/bud-build/src/index.ts +++ b/sources/@roots/bud-build/src/index.ts @@ -10,6 +10,11 @@ import './types.js' +import {Item} from './item/index.js' +import {Loader} from './loader/index.js' +import {Rule} from './rule/index.js' import {Build} from './service.js' export default Build + +export {Item, Loader, Rule} diff --git a/sources/@roots/bud-build/src/item/index.ts b/sources/@roots/bud-build/src/item/index.ts index f87061a92f..23c5f16723 100644 --- a/sources/@roots/bud-build/src/item/index.ts +++ b/sources/@roots/bud-build/src/item/index.ts @@ -1,6 +1,6 @@ import type {Bud, Loaders} from '@roots/bud-framework' import type * as Build from '@roots/bud-framework/services/build' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import isString from '@roots/bud-support/lodash/isString' import {basename} from 'path' diff --git a/sources/@roots/bud-build/src/rule/index.ts b/sources/@roots/bud-build/src/rule/index.ts index 400b147529..83e66a5716 100644 --- a/sources/@roots/bud-build/src/rule/index.ts +++ b/sources/@roots/bud-build/src/rule/index.ts @@ -5,7 +5,7 @@ import type { Parser, Rule as Interface, } from '@roots/bud-framework/services/build/rule' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import isFunction from '@roots/bud-support/lodash/isFunction' import isString from '@roots/bud-support/lodash/isString' import type {RuleSetRule} from '@roots/bud-support/webpack' diff --git a/sources/@roots/bud-build/src/service.ts b/sources/@roots/bud-build/src/service.ts index 85e9320f5e..e8a8d37ccf 100644 --- a/sources/@roots/bud-build/src/service.ts +++ b/sources/@roots/bud-build/src/service.ts @@ -1,7 +1,7 @@ import type {Items, Loaders, Rules} from '@roots/bud-framework' import {Service} from '@roots/bud-framework/service' import type * as Base from '@roots/bud-framework/services/build' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import isFunction from '@roots/bud-support/lodash/isFunction' import isUndefined from '@roots/bud-support/lodash/isUndefined' import type {Configuration} from '@roots/bud-support/webpack' diff --git a/sources/@roots/bud-build/src/shared/base.ts b/sources/@roots/bud-build/src/shared/base.ts index 0a470fd4ee..ff9f4536f8 100644 --- a/sources/@roots/bud-build/src/shared/base.ts +++ b/sources/@roots/bud-build/src/shared/base.ts @@ -1,6 +1,6 @@ import type {Bud} from '@roots/bud-framework' import type {Base as BuildBase} from '@roots/bud-framework/services/build' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import isFunction from '@roots/bud-support/lodash/isFunction' export default class Base implements BuildBase { diff --git a/sources/@roots/bud-cache/src/service/index.ts b/sources/@roots/bud-cache/src/service/index.ts index 7a51a0284d..61dfdb6b50 100644 --- a/sources/@roots/bud-cache/src/service/index.ts +++ b/sources/@roots/bud-cache/src/service/index.ts @@ -4,7 +4,7 @@ import {join} from 'node:path' import type {Bud} from '@roots/bud-framework' import {Service} from '@roots/bud-framework/service' import type * as Services from '@roots/bud-framework/services' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import isString from '@roots/bud-support/lodash/isString' import {hash} from '@roots/bud-support/utilities/args' import type {Configuration} from '@roots/bud-support/webpack' diff --git a/sources/@roots/bud-client/package.json b/sources/@roots/bud-client/package.json index e10faf7e0c..6c337c5982 100644 --- a/sources/@roots/bud-client/package.json +++ b/sources/@roots/bud-client/package.json @@ -75,18 +75,6 @@ "dependencies": { "tslib": "2.5.0" }, - "peerDependencies": { - "@roots/bud": "*", - "@types/webpack-env": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "@types/webpack-env": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-compiler/src/compiler.service.tsx b/sources/@roots/bud-compiler/src/compiler.service.tsx index ce942041f9..c6a189fb07 100644 --- a/sources/@roots/bud-compiler/src/compiler.service.tsx +++ b/sources/@roots/bud-compiler/src/compiler.service.tsx @@ -4,7 +4,7 @@ import * as App from '@roots/bud-dashboard/app' import type {Bud} from '@roots/bud-framework/bud' import {Service} from '@roots/bud-framework/service' import type {Compiler as Contract} from '@roots/bud-framework/services' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {BudError, CompilerError} from '@roots/bud-support/errors' import {duration} from '@roots/bud-support/human-readable' import type { @@ -50,10 +50,14 @@ export class Compiler extends Service implements Contract.Service { */ @bind public async compile(): Promise { - this.implementation = await this.app.module.import( + const compilerPath = await this.app.module.resolve( `webpack`, import.meta.url, ) + this.implementation = await this.app.module.import( + compilerPath, + import.meta.url, + ) this.logger.log(`imported webpack`, this.implementation.version) this.config = !this.app.hasChildren diff --git a/sources/@roots/bud-compress/package.json b/sources/@roots/bud-compress/package.json index 8fd985e05f..334bca3f7e 100644 --- a/sources/@roots/bud-compress/package.json +++ b/sources/@roots/bud-compress/package.json @@ -79,29 +79,17 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-support": "workspace:sources/@roots/bud-support", - "compression-webpack-plugin": "^10.0.0", + "compression-webpack-plugin": "10.0.0", "tslib": "2.5.0", "webpack": "5.76.3" }, - "peerDependencies": { - "@roots/bud": "*", - "compression-webpack-plugin": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "compression-webpack-plugin": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-criticalcss/package.json b/sources/@roots/bud-criticalcss/package.json index 7f91657c7f..817600d8d4 100644 --- a/sources/@roots/bud-criticalcss/package.json +++ b/sources/@roots/bud-criticalcss/package.json @@ -67,12 +67,12 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10", "@types/vinyl": "2.0.7" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-support": "workspace:sources/@roots/bud-support", "@roots/critical-css-webpack-plugin": "workspace:sources/@roots/critical-css-webpack-plugin", @@ -80,26 +80,6 @@ "tslib": "2.5.0", "vinyl": "3.0.0" }, - "peerDependencies": { - "@roots/bud": "*", - "@roots/critical-css-webpack-plugin": "*", - "critical": "*", - "vinyl": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "@roots/critical-css-webpack-plugin": { - "optional": true - }, - "critical": { - "optional": true - }, - "vinyl": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-criticalcss/src/extension.ts b/sources/@roots/bud-criticalcss/src/extension.ts index f2f8d45df7..1026c2ced6 100644 --- a/sources/@roots/bud-criticalcss/src/extension.ts +++ b/sources/@roots/bud-criticalcss/src/extension.ts @@ -9,9 +9,8 @@ import { plugin, } from '@roots/bud-framework/extension/decorators' import {deprecated} from '@roots/bud-support/decorators' -import CriticalCssWebpackPlugin, { - Options, -} from '@roots/critical-css-webpack-plugin' +import type {Options} from '@roots/critical-css-webpack-plugin' +import CriticalCssWebpackPlugin from '@roots/critical-css-webpack-plugin' import {extractCss} from './api/extract.js' diff --git a/sources/@roots/bud-dashboard/src/service.tsx b/sources/@roots/bud-dashboard/src/service.tsx index 0c7affcf93..3c5dc2503d 100644 --- a/sources/@roots/bud-dashboard/src/service.tsx +++ b/sources/@roots/bud-dashboard/src/service.tsx @@ -1,7 +1,7 @@ /* eslint-disable no-console */ import {Service} from '@roots/bud-framework/service' import type {Service as Contract} from '@roots/bud-framework/services/dashboard' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import figures from '@roots/bud-support/figures' import isString from '@roots/bud-support/lodash/isString' import type { diff --git a/sources/@roots/bud-emotion/package.json b/sources/@roots/bud-emotion/package.json index a1ca132f35..be1ff77726 100644 --- a/sources/@roots/bud-emotion/package.json +++ b/sources/@roots/bud-emotion/package.json @@ -72,63 +72,26 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-babel": "workspace:sources/@roots/bud-babel", "@roots/bud-swc": "workspace:sources/@roots/bud-swc", "@skypack/package-check": "0.2.2", "@types/babel__core": "7.20.0", - "@types/node": "18.15.10" + "@types/node": "18.15.10", + "@types/react": "18.0.30" }, "dependencies": { + "@babel/core": "7.21.3", "@emotion/babel-plugin": "^11.10.6", "@emotion/css": "^11.10.6", "@emotion/react": "^11.10.6", "@emotion/styled": "^11.10.6", + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-support": "workspace:sources/@roots/bud-support", "@swc/plugin-emotion": "2.5.51", + "react": "18.2.0", "tslib": "2.5.0" }, - "peerDependencies": { - "@babel/core": "7.20.7", - "@emotion/babel-plugin": "*", - "@emotion/css": "*", - "@emotion/react": "*", - "@emotion/styled": "*", - "@roots/bud": "*" - }, - "peerDependenciesMeta": { - "@babel/core": { - "optional": true - }, - "@emotion/babel-plugin": { - "optional": true - }, - "@emotion/css": { - "optional": true - }, - "@emotion/react": { - "optional": true - }, - "@emotion/styled": { - "optional": true - }, - "@roots/bud": { - "optional": true - }, - "@roots/bud-babel": { - "optional": true - }, - "@roots/bud-swc": { - "optional": true - }, - "@swc/plugin-emotion": { - "optional": true - }, - "react": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-emotion/src/extension.ts b/sources/@roots/bud-emotion/src/extension.ts index 5bbdecb91b..deecc17ee5 100644 --- a/sources/@roots/bud-emotion/src/extension.ts +++ b/sources/@roots/bud-emotion/src/extension.ts @@ -17,22 +17,14 @@ export class BudEmotion extends Extension<{}, null> { */ @bind public override async boot(bud: Bud) { - bud - .when( - `babel` in bud, - ({babel}) => babel.setPlugin(`@emotion/babel-plugin`), - undefined, - `@roots\/bud-emotion: register \`@emotion/babel-plugin\``, - ) - .when( - `swc` in bud, - ({swc}) => - swc.plugins((plugins = []) => [ - ...plugins, - [`@swc/plugin-emotion`, {}], - ]), - undefined, - `@roots\/bud-emotion: register \`@swc/plugin-emotion\``, - ) + if (`babel` in bud) { + const babelPlugin = await this.resolve(`@emotion/babel-plugin`) + bud.babel.setPlugin(`@emotion/babel-plugin`, babelPlugin) + } + + if (`swc` in bud) { + const swcPlugin = await this.resolve(`@swc/plugin-emotion`) + bud.swc.plugins((plugins = []) => [...plugins, [swcPlugin, {}]]) + } } } diff --git a/sources/@roots/bud-entrypoints/package.json b/sources/@roots/bud-entrypoints/package.json index c737cf034b..7b83b08356 100644 --- a/sources/@roots/bud-entrypoints/package.json +++ b/sources/@roots/bud-entrypoints/package.json @@ -74,18 +74,11 @@ "@types/node": "18.15.10" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/entrypoints-webpack-plugin": "workspace:sources/@roots/entrypoints-webpack-plugin", "tslib": "2.5.0" }, - "peerDependencies": { - "@roots/bud": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-esbuild/package.json b/sources/@roots/bud-esbuild/package.json index 47da6ac997..bf2e8d0ad9 100644 --- a/sources/@roots/bud-esbuild/package.json +++ b/sources/@roots/bud-esbuild/package.json @@ -65,34 +65,18 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-build": "workspace:sources/@roots/bud-build", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-support": "workspace:sources/@roots/bud-support", "esbuild-loader": "2.21.0", "tslib": "2.5.0", "webpack": "5.76.3" }, - "peerDependencies": { - "@roots/bud": "*", - "esbuild-loader": "*", - "ts-node": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "esbuild-loader": { - "optional": true - }, - "ts-node": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-esbuild/src/index.ts b/sources/@roots/bud-esbuild/src/index.ts index ef6529a15e..15bf0d966c 100644 --- a/sources/@roots/bud-esbuild/src/index.ts +++ b/sources/@roots/bud-esbuild/src/index.ts @@ -11,4 +11,5 @@ import './types.js' import BudEsbuild from './extension.js' + export default BudEsbuild diff --git a/sources/@roots/bud-esbuild/src/types.ts b/sources/@roots/bud-esbuild/src/types.ts index 481d05f695..e9c441edbc 100644 --- a/sources/@roots/bud-esbuild/src/types.ts +++ b/sources/@roots/bud-esbuild/src/types.ts @@ -3,9 +3,7 @@ /// /// -import type {Item} from '@roots/bud-build/item' -import type {Loader} from '@roots/bud-build/loader' -import type {Rule} from '@roots/bud-build/rule' +import type {Item, Loader, Rule} from '@roots/bud-build' import type Esbuild from './extension.js' diff --git a/sources/@roots/bud-extensions/src/extensions/interpolate-html-webpack-plugin/plugin/index.ts b/sources/@roots/bud-extensions/src/extensions/interpolate-html-webpack-plugin/plugin/index.ts index 43887f243e..23f47597b0 100644 --- a/sources/@roots/bud-extensions/src/extensions/interpolate-html-webpack-plugin/plugin/index.ts +++ b/sources/@roots/bud-extensions/src/extensions/interpolate-html-webpack-plugin/plugin/index.ts @@ -1,4 +1,4 @@ -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import type {Plugin} from '@roots/bud-support/html-webpack-plugin' import type { Compiler, diff --git a/sources/@roots/bud-extensions/src/service/index.ts b/sources/@roots/bud-extensions/src/service/index.ts index 5b59ce741f..a7af10b815 100644 --- a/sources/@roots/bud-extensions/src/service/index.ts +++ b/sources/@roots/bud-extensions/src/service/index.ts @@ -4,7 +4,7 @@ import type {Bud, Modules} from '@roots/bud-framework' import {ApplyPlugin, Extension} from '@roots/bud-framework/extension' import {Service} from '@roots/bud-framework/service' import type {Extensions as Contract} from '@roots/bud-framework/services' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import isUndefined from '@roots/bud-support/lodash/isUndefined' import Container from '@roots/container' diff --git a/sources/@roots/bud-framework/src/bud.ts b/sources/@roots/bud-framework/src/bud.ts index e7f130c8bd..d6f3ee1032 100644 --- a/sources/@roots/bud-framework/src/bud.ts +++ b/sources/@roots/bud-framework/src/bud.ts @@ -1,4 +1,4 @@ -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {InputError} from '@roots/bud-support/errors' import isNull from '@roots/bud-support/lodash/isNull' import isString from '@roots/bud-support/lodash/isString' diff --git a/sources/@roots/bud-framework/src/configuration/configuration.ts b/sources/@roots/bud-framework/src/configuration/configuration.ts index 5f21512e90..7d37b661a0 100644 --- a/sources/@roots/bud-framework/src/configuration/configuration.ts +++ b/sources/@roots/bud-framework/src/configuration/configuration.ts @@ -1,4 +1,4 @@ -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {BudError} from '@roots/bud-support/errors' import get from '@roots/bud-support/lodash/get' import isArray from '@roots/bud-support/lodash/isArray' diff --git a/sources/@roots/bud-framework/src/extension/decorators/index.ts b/sources/@roots/bud-framework/src/extension/decorators/index.ts index 224cb7b0e2..e154e2f2a9 100644 --- a/sources/@roots/bud-framework/src/extension/decorators/index.ts +++ b/sources/@roots/bud-framework/src/extension/decorators/index.ts @@ -1,4 +1,4 @@ -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {dependsOn} from './dependsOn.js' import {dependsOnOptional} from './dependsOnOptional.js' diff --git a/sources/@roots/bud-framework/src/extension/index.ts b/sources/@roots/bud-framework/src/extension/index.ts index d6a0d2486d..c89e1afaff 100644 --- a/sources/@roots/bud-framework/src/extension/index.ts +++ b/sources/@roots/bud-framework/src/extension/index.ts @@ -1,4 +1,4 @@ -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {BudError, ImportError} from '@roots/bud-support/errors' import get from '@roots/bud-support/lodash/get' import isFunction from '@roots/bud-support/lodash/isFunction' diff --git a/sources/@roots/bud-framework/src/module.ts b/sources/@roots/bud-framework/src/module.ts index f80e0bbb56..5d7ff8bbe8 100644 --- a/sources/@roots/bud-framework/src/module.ts +++ b/sources/@roots/bud-framework/src/module.ts @@ -2,7 +2,7 @@ import {createRequire} from 'node:module' import {join, normalize, relative} from 'node:path' import {fileURLToPath, pathToFileURL} from 'node:url' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {ImportError} from '@roots/bud-support/errors' import {resolve} from '@roots/bud-support/import-meta-resolve' import args from '@roots/bud-support/utilities/args' diff --git a/sources/@roots/bud-framework/src/services/console.ts b/sources/@roots/bud-framework/src/services/console.ts index 522a0164a3..8d8d9055a6 100644 --- a/sources/@roots/bud-framework/src/services/console.ts +++ b/sources/@roots/bud-framework/src/services/console.ts @@ -1,4 +1,4 @@ -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import patchConsole from '@roots/bud-support/patch-console' import type {Bud} from '../bud.js' diff --git a/sources/@roots/bud-framework/src/services/notifier/notifier.ts b/sources/@roots/bud-framework/src/services/notifier/notifier.ts index 7056959c38..5b9faf6c00 100644 --- a/sources/@roots/bud-framework/src/services/notifier/notifier.ts +++ b/sources/@roots/bud-framework/src/services/notifier/notifier.ts @@ -1,7 +1,7 @@ import {platform} from 'node:os' import {Bud, Service} from '@roots/bud-framework' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import isEmpty from '@roots/bud-support/lodash/isEmpty' import isString from '@roots/bud-support/lodash/isString' import type { diff --git a/sources/@roots/bud-hooks/src/async/async.ts b/sources/@roots/bud-hooks/src/async/async.ts index 63fef74553..85ac401125 100644 --- a/sources/@roots/bud-hooks/src/async/async.ts +++ b/sources/@roots/bud-hooks/src/async/async.ts @@ -5,7 +5,7 @@ import type { AsyncStore, } from '@roots/bud-framework/registry' import type Value from '@roots/bud-framework/value' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import isFunction from '@roots/bud-support/lodash/isFunction' import {Hooks} from '../base/base.js' diff --git a/sources/@roots/bud-hooks/src/base/base.ts b/sources/@roots/bud-hooks/src/base/base.ts index 111476fa64..17b22e2432 100644 --- a/sources/@roots/bud-hooks/src/base/base.ts +++ b/sources/@roots/bud-hooks/src/base/base.ts @@ -1,5 +1,5 @@ import type {Bud} from '@roots/bud-framework' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {BudError} from '@roots/bud-support/errors' import isUndefined from '@roots/bud-support/lodash/isUndefined' diff --git a/sources/@roots/bud-hooks/src/event/event.ts b/sources/@roots/bud-hooks/src/event/event.ts index 3736312152..1b27d0ecbd 100644 --- a/sources/@roots/bud-hooks/src/event/event.ts +++ b/sources/@roots/bud-hooks/src/event/event.ts @@ -1,6 +1,6 @@ import type {Bud} from '@roots/bud-framework' import type {Events, EventsStore} from '@roots/bud-framework/registry' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {Hooks} from '../base/base.js' diff --git a/sources/@roots/bud-hooks/src/sync/sync.ts b/sources/@roots/bud-hooks/src/sync/sync.ts index 665b3c2df4..e6761b09a5 100644 --- a/sources/@roots/bud-hooks/src/sync/sync.ts +++ b/sources/@roots/bud-hooks/src/sync/sync.ts @@ -5,7 +5,7 @@ import type { SyncStore, } from '@roots/bud-framework/registry' import type Value from '@roots/bud-framework/value' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import isFunction from '@roots/bud-support/lodash/isFunction' import {Hooks} from '../base/base.js' diff --git a/sources/@roots/bud-imagemin/package.json b/sources/@roots/bud-imagemin/package.json index 7e4acc4536..1f2c1f2713 100644 --- a/sources/@roots/bud-imagemin/package.json +++ b/sources/@roots/bud-imagemin/package.json @@ -82,27 +82,11 @@ "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-support": "workspace:sources/@roots/bud-support", - "image-minimizer-webpack-plugin": "^3.8.2", + "image-minimizer-webpack-plugin": "3.8.2", "sharp": "0.32.0", "tslib": "2.5.0", "webpack": "5.76.3" }, - "peerDependencies": { - "@roots/bud": "*", - "image-minimizer-webpack-plugin": "*", - "sharp": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "image-minimizer-webpack-plugin": { - "optional": true - }, - "sharp": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-mdx/package.json b/sources/@roots/bud-mdx/package.json index d3f472f7c2..32907182d3 100644 --- a/sources/@roots/bud-mdx/package.json +++ b/sources/@roots/bud-mdx/package.json @@ -61,7 +61,6 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-build": "workspace:sources/@roots/bud-build", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10", @@ -72,29 +71,13 @@ }, "dependencies": { "@mdx-js/loader": "^2.3.0", + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-babel": "workspace:sources/@roots/bud-babel", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-react": "workspace:sources/@roots/bud-react", "tslib": "2.5.0", "webpack": "5.76.3" }, - "peerDependencies": { - "@mdx-js/loader": "*", - "@roots/bud": "*", - "@roots/bud-babel": "*", - "@roots/bud-react": "*" - }, - "peerDependenciesMeta": { - "@mdx-js/loader": { - "optional": true - }, - "@roots/bud-babel": { - "optional": true - }, - "@roots/bud-react": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-postcss/package.json b/sources/@roots/bud-postcss/package.json index 89874e08a9..182a9bfe43 100644 --- a/sources/@roots/bud-postcss/package.json +++ b/sources/@roots/bud-postcss/package.json @@ -71,12 +71,12 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10", "@types/postcss-import": "14.0.0" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-build": "workspace:sources/@roots/bud-build", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-support": "workspace:sources/@roots/bud-support", @@ -88,31 +88,6 @@ "tslib": "2.5.0", "webpack": "5.76.3" }, - "peerDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", - "postcss": "*", - "postcss-import": "*", - "postcss-loader": "*", - "postcss-nested": "*", - "postcss-preset-env": "*" - }, - "peerDependenciesMeta": { - "postcss": { - "optional": true - }, - "postcss-import": { - "optional": true - }, - "postcss-loader": { - "optional": true - }, - "postcss-nested": { - "optional": true - }, - "postcss-preset-env": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-preset-recommend/package.json b/sources/@roots/bud-preset-recommend/package.json index daffc2508d..b77c74f17c 100644 --- a/sources/@roots/bud-preset-recommend/package.json +++ b/sources/@roots/bud-preset-recommend/package.json @@ -69,43 +69,19 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-esbuild": "workspace:sources/@roots/bud-esbuild", "@roots/bud-swc": "workspace:sources/@roots/bud-swc", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-babel": "workspace:sources/@roots/bud-babel", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-postcss": "workspace:sources/@roots/bud-postcss", "tslib": "2.5.0", "webpack": "5.76.3" }, - "peerDependencies": { - "@roots/bud": "*", - "@roots/bud-babel": "*", - "@roots/bud-esbuild": "*", - "@roots/bud-postcss": "*", - "@roots/bud-swc": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "@roots/bud-babel": { - "optional": true - }, - "@roots/bud-esbuild": { - "optional": true - }, - "@roots/bud-postcss": { - "optional": true - }, - "@roots/bud-swc": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-preset-wordpress/package.json b/sources/@roots/bud-preset-wordpress/package.json index ab41dbd1db..49e62c98e5 100644 --- a/sources/@roots/bud-preset-wordpress/package.json +++ b/sources/@roots/bud-preset-wordpress/package.json @@ -93,11 +93,11 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-preset-recommend": "workspace:sources/@roots/bud-preset-recommend", "@roots/bud-react": "workspace:sources/@roots/bud-react", @@ -108,34 +108,6 @@ "@roots/wordpress-hmr": "workspace:sources/@roots/wordpress-hmr", "tslib": "2.5.0" }, - "peerDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", - "@roots/bud-preset-recommend": "*", - "@roots/bud-react": "*", - "@roots/bud-tailwindcss-theme-json": "*", - "@roots/bud-wordpress-manifests": "*", - "@roots/wordpress-hmr": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "@roots/bud-preset-recommend": { - "optional": true - }, - "@roots/bud-react": { - "optional": true - }, - "@roots/bud-tailwindcss-theme-json": { - "optional": true - }, - "@roots/bud-wordpress-manifests": { - "optional": true - }, - "@roots/wordpress-hmr": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-prettier/package.json b/sources/@roots/bud-prettier/package.json index 4e8c43c942..503046e921 100644 --- a/sources/@roots/bud-prettier/package.json +++ b/sources/@roots/bud-prettier/package.json @@ -77,29 +77,17 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10", "@types/prettier": "2.7.2" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-support": "workspace:sources/@roots/bud-support", "prettier": "2.8.7", "tslib": "2.5.0" }, - "peerDependencies": { - "@roots/bud": "*", - "prettier": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "prettier": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-purgecss/package.json b/sources/@roots/bud-purgecss/package.json index 60b31e6eaa..64763fad55 100644 --- a/sources/@roots/bud-purgecss/package.json +++ b/sources/@roots/bud-purgecss/package.json @@ -77,29 +77,11 @@ }, "dependencies": { "@fullhuman/postcss-purgecss": "5.0.0", + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", + "postcss": "8.4.21", "tslib": "2.5.0" }, - "peerDependencies": { - "@fullhuman/postcss-purgecss": "*", - "@roots/bud": "*", - "@roots/bud-postcss": "*", - "postcss": "*" - }, - "peerDependenciesMeta": { - "@fullhuman/postcss-purgecss": { - "optional": true - }, - "@roots/bud": { - "optional": true - }, - "@roots/bud-postcss": { - "optional": true - }, - "postcss": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-purgecss/src/api.ts b/sources/@roots/bud-purgecss/src/api.ts index f231aee1b3..ab69076870 100644 --- a/sources/@roots/bud-purgecss/src/api.ts +++ b/sources/@roots/bud-purgecss/src/api.ts @@ -1,4 +1,4 @@ -import type * as purge from './extension.js' +import type {Bud} from '@roots/bud' /** * Purge unused CSS from compiled stylesheets @@ -15,9 +15,74 @@ import type * as purge from './extension.js' * }) * ``` */ -export const purgecss: purge.api = function ( - userOptions: purge.UserOptions, -) { +export interface purge { + (this: Bud, userOptions: Options): Bud +} + +/** + * PurgeCSS options + * + * @see https://purgecss.com/plugins/postcss.html#options + */ +export interface Options { + content?: Array< + | string + | { + extension: string + raw: string + } + > + contentFunction?: (sourceFile: string) => Array< + | string + | { + extension: string + raw: string + } + > + defaultExtractor?: ExtractorFunction + extractors?: Array + fontFace?: boolean + keyframes?: boolean + output?: string + rejected?: boolean + stdin?: boolean + stdout?: boolean + variables?: boolean + safelist?: + | { + standard?: Array + deep?: RegExp[] + greedy?: RegExp[] + variables?: Array + keyframes?: Array + } + | Array + blocklist?: Array +} + +export type ExtractorFunction = (content: T) => string[] + +export interface Extractors { + extensions: string[] + extractor: ExtractorFunction +} + +/** + * Purge unused CSS from compiled stylesheets + * + * @remarks + * For more information, see [the PurgeCSS API](https://purgecss.com/configuration.html) + * + * @example + * ```js + * app.purgecss({ + * content: [app.path('resources/views/**')], + * allow: require('purgecss-with-wordpress').whitelist, + * allowPatterns: require('purgecss-with-wordpress').whitelistPatterns, + * }) + * ``` + */ +export const purgecss: purge = function (userOptions) { this.postcss.setPlugin(`purgecss`, [ `@fullhuman/postcss-purgecss`, userOptions, diff --git a/sources/@roots/bud-purgecss/src/extension.ts b/sources/@roots/bud-purgecss/src/extension.ts index a68f0d3d68..e85f8f4f34 100644 --- a/sources/@roots/bud-purgecss/src/extension.ts +++ b/sources/@roots/bud-purgecss/src/extension.ts @@ -1,90 +1,19 @@ -import type {Bud, Extension} from '@roots/bud-framework' +import type {Bud} from '@roots/bud-framework' +import {Extension} from '@roots/bud-framework/extension' +import {dependsOn, label} from '@roots/bud-framework/extension/decorators' -/** - * Module registration - */ -export interface register { - (options: any, app: Bud): Promise -} - -/** - * Purge unused CSS from compiled stylesheets - * - * @remarks - * For more information, see [the PurgeCSS API](https://purgecss.com/configuration.html) - * - * @example - * ```js - * app.purgecss({ - * content: [app.path('resources/views/**')], - * allow: require('purgecss-with-wordpress').whitelist, - * allowPatterns: require('purgecss-with-wordpress').whitelistPatterns, - * }) - * ``` - */ -export interface api { - (this: Bud, userOptions: UserOptions): Bud -} - -export interface Purge extends Extension { - name: string - register: register -} +import {purgecss} from './api.js' /** - * PurgeCSS UserOptions - * - * @see https://purgecss.com/plugins/postcss.html#options + * ## purgecss configuration */ -export interface UserOptions { - content?: Array< - | string - | { - extension: string - raw: string - } - > - contentFunction?: (sourceFile: string) => Array< - | string - | { - extension: string - raw: string - } - > - defaultExtractor?: ExtractorFunction - extractors?: Array - fontFace?: boolean - keyframes?: boolean - output?: string - rejected?: boolean - stdin?: boolean - stdout?: boolean - variables?: boolean - safelist?: - | { - standard?: Array - deep?: RegExp[] - greedy?: RegExp[] - variables?: Array - keyframes?: Array - } - | Array - blocklist?: Array -} - -export type ExtractorFunction = (content: T) => string[] - -export interface Extractors { - extensions: string[] - extractor: ExtractorFunction -} - -import {purgecss} from './api.js' - -export const label = `@roots/bud-purgecss` - -export const dependsOn = new Set([`@roots/bud-postcss`]) - -export const register = async (app: Bud) => { - app.api.bindFacade(`purgecss`, purgecss) +@label(`@roots/bud-purgecss`) +@dependsOn([`@roots/bud-postcss`]) +export default class BudPurgeCSS extends Extension { + /** + * {@link Extension.register} + */ + public override async register(bud: Bud) { + bud.api.bindFacade(`purgecss`, purgecss) + } } diff --git a/sources/@roots/bud-purgecss/src/index.ts b/sources/@roots/bud-purgecss/src/index.ts index 6b2bb83ce2..cfd44feed7 100644 --- a/sources/@roots/bud-purgecss/src/index.ts +++ b/sources/@roots/bud-purgecss/src/index.ts @@ -19,6 +19,6 @@ import './types.js' -import * as purgeExtension from './extension.js' +import BudPurgeCSS from './extension.js' -export default purgeExtension +export default BudPurgeCSS diff --git a/sources/@roots/bud-purgecss/src/types.ts b/sources/@roots/bud-purgecss/src/types.ts index a264b10290..c051849724 100644 --- a/sources/@roots/bud-purgecss/src/types.ts +++ b/sources/@roots/bud-purgecss/src/types.ts @@ -1,7 +1,7 @@ /// import type {purgecss} from './api.js' -import type * as purgeExtension from './extension.js' +import type BudPurgeCSS from './extension.js' declare module '@roots/bud-framework' { interface Bud { @@ -9,6 +9,6 @@ declare module '@roots/bud-framework' { } interface Modules { - '@roots/bud-purgecss': typeof purgeExtension + '@roots/bud-purgecss': BudPurgeCSS } } diff --git a/sources/@roots/bud-purgecss/src/extension.test.ts b/sources/@roots/bud-purgecss/test/extension.test.ts similarity index 84% rename from sources/@roots/bud-purgecss/src/extension.test.ts rename to sources/@roots/bud-purgecss/test/extension.test.ts index fb2771b7fa..3f78b09fe9 100644 --- a/sources/@roots/bud-purgecss/src/extension.test.ts +++ b/sources/@roots/bud-purgecss/test/extension.test.ts @@ -1,17 +1,20 @@ import {Bud, factory} from '@repo/test-kit/bud' import postcss from '@roots/bud-postcss' -import {purgecss} from './api.js' import {beforeEach, describe, expect, it} from 'vitest' -import * as Extension from './extension.js' +import {purgecss} from '../src/api.js' +import BudPurgeCSS from '../src/extension.js' describe(`@roots/bud-purgecss`, () => { let bud: Bud + let Extension: BudPurgeCSS beforeEach(async () => { bud = await factory() await bud.build.make() await bud.extensions.add(postcss) + // @ts-ignore + Extension = new BudPurgeCSS(bud) }) it(`should be constructable`, () => { diff --git a/sources/@roots/bud-react/package.json b/sources/@roots/bud-react/package.json index 3140580e48..20a3cf64af 100644 --- a/sources/@roots/bud-react/package.json +++ b/sources/@roots/bud-react/package.json @@ -118,7 +118,7 @@ "@types/react-dom": "18.0.11" }, "dependencies": { - "@babel/preset-react": "^7.18.6", + "@babel/preset-react": "7.18.6", "@pmmmwh/react-refresh-webpack-plugin": "0.5.10", "@roots/bud-babel": "workspace:sources/@roots/bud-babel", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", @@ -129,60 +129,6 @@ "tslib": "2.5.0", "webpack": "5.76.3" }, - "peerDependencies": { - "@babel/core": "*", - "@babel/preset-react": "*", - "@pmmmwh/react-refresh-webpack-plugin": "*", - "@roots/bud": "*", - "@roots/bud-babel": "*", - "@types/babel__core": "*", - "@types/react": "*", - "@types/react-dom": "*", - "react": "*", - "react-dom": "*", - "react-refresh": "*" - }, - "peerDependenciesMeta": { - "@babel/core": { - "optional": true - }, - "@babel/preset-react": { - "optional": true - }, - "@pmmmwh/react-refresh-webpack-plugin": { - "optional": true - }, - "@roots/bud-babel": { - "optional": true - }, - "@roots/bud-esbuild": { - "optional": true - }, - "@roots/bud-swc": { - "optional": true - }, - "@roots/bud-typescript": { - "optional": true - }, - "@types/babel__core": { - "optional": true - }, - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - }, - "react": { - "optional": true - }, - "react-dom": { - "optional": true - }, - "react-refresh": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-sass/package.json b/sources/@roots/bud-sass/package.json index 50ff18ebf1..5da7ae581b 100644 --- a/sources/@roots/bud-sass/package.json +++ b/sources/@roots/bud-sass/package.json @@ -93,7 +93,6 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-build": "workspace:sources/@roots/bud-build", "@roots/bud-postcss": "workspace:sources/@roots/bud-postcss", "@skypack/package-check": "0.2.2", @@ -103,6 +102,7 @@ "webpack": "5.76.3" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "postcss-scss": "^4.0.6", "resolve-url-loader": "5.0.0", @@ -112,34 +112,6 @@ "stylelint-scss": "^4.6.0", "tslib": "2.5.0" }, - "peerDependencies": { - "@roots/bud": "*", - "postcss-scss": "*", - "sass": "*", - "sass-loader": "*", - "stylelint-config-recommended-scss": "*", - "stylelint-scss": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "postcss-scss": { - "optional": true - }, - "sass": { - "optional": true - }, - "sass-loader": { - "optional": true - }, - "stylelint-config-recommended-scss": { - "optional": true - }, - "stylelint-scss": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-server/package.json b/sources/@roots/bud-server/package.json index ff8a5acc0d..e7ba673f43 100644 --- a/sources/@roots/bud-server/package.json +++ b/sources/@roots/bud-server/package.json @@ -103,14 +103,6 @@ "@roots/bud-support": "workspace:sources/@roots/bud-support", "tslib": "2.5.0" }, - "peerDependencies": { - "@roots/bud-client": "*" - }, - "peerDependenciesMeta": { - "@roots/bud-client": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-server/src/server/base.ts b/sources/@roots/bud-server/src/server/base.ts index 28ab59367f..2caae75b0a 100644 --- a/sources/@roots/bud-server/src/server/base.ts +++ b/sources/@roots/bud-server/src/server/base.ts @@ -8,7 +8,7 @@ import type {Server as HttpsServer} from 'node:https' import type {Bud} from '@roots/bud-framework/bud' import type {Server} from '@roots/bud-framework/services' import type {Connection} from '@roots/bud-framework/services/server' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {BudError, ServerError} from '@roots/bud-support/errors' /** diff --git a/sources/@roots/bud-server/src/server/http.ts b/sources/@roots/bud-server/src/server/http.ts index 0dcebc65d9..7587880322 100644 --- a/sources/@roots/bud-server/src/server/http.ts +++ b/sources/@roots/bud-server/src/server/http.ts @@ -6,7 +6,7 @@ import { import type {Connection} from '@roots/bud-framework/services/server' import {BaseServer} from '@roots/bud-server/server/base' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' /** * HTTP Server diff --git a/sources/@roots/bud-server/src/server/https.ts b/sources/@roots/bud-server/src/server/https.ts index c8effda79c..ec48c89233 100644 --- a/sources/@roots/bud-server/src/server/https.ts +++ b/sources/@roots/bud-server/src/server/https.ts @@ -3,7 +3,7 @@ import {createServer, Server as HttpsServer} from 'node:https' import type {Connection} from '@roots/bud-framework/services/server' import {BaseServer} from '@roots/bud-server/server/base' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' /** * HTTPS Server diff --git a/sources/@roots/bud-server/src/server/watcher.ts b/sources/@roots/bud-server/src/server/watcher.ts index b7115e66c3..be5cd1088c 100644 --- a/sources/@roots/bud-server/src/server/watcher.ts +++ b/sources/@roots/bud-server/src/server/watcher.ts @@ -3,7 +3,7 @@ import type {FSWatcher} from 'node:fs' import type {Bud} from '@roots/bud-framework/bud' import type {Server} from '@roots/bud-framework/services' import chokidar from '@roots/bud-support/chokidar' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' /** * FS Watcher diff --git a/sources/@roots/bud-server/src/service/index.ts b/sources/@roots/bud-server/src/service/index.ts index 2550bfe50f..1edb14622f 100644 --- a/sources/@roots/bud-server/src/service/index.ts +++ b/sources/@roots/bud-server/src/service/index.ts @@ -7,7 +7,7 @@ import type { } from '@roots/bud-framework/services/server' import {inject} from '@roots/bud-server/inject' import type {Watcher} from '@roots/bud-server/server/watcher' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {BudError, ServerError} from '@roots/bud-support/errors' /** diff --git a/sources/@roots/bud-solid/package.json b/sources/@roots/bud-solid/package.json index 03150d712c..dd57385b1b 100644 --- a/sources/@roots/bud-solid/package.json +++ b/sources/@roots/bud-solid/package.json @@ -72,43 +72,19 @@ "module": "./lib/index.js", "devDependencies": { "@babel/core": "7.21.3", - "@roots/bud": "workspace:sources/@roots/bud", "@skypack/package-check": "0.2.2", "@types/babel__core": "7.20.0", "@types/node": "18.15.10" }, "dependencies": { "@babel/plugin-syntax-jsx": "7.18.6", + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-babel": "workspace:sources/@roots/bud-babel", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "babel-preset-solid": "1.6.16", "solid-js": "1.6.16", "tslib": "2.5.0" }, - "peerDependencies": { - "@babel/plugin-syntax-jsx": "*", - "@roots/bud": "*", - "@types/babel__core": "*", - "babel-preset-solid": "*", - "solid-js": "*" - }, - "peerDependenciesMeta": { - "@babel/plugin-syntax-jsx": { - "optional": true - }, - "@roots/bud": { - "optional": true - }, - "@types/babel__core": { - "optional": true - }, - "babel-preset-solid": { - "optional": true - }, - "solid-js": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-stylelint/package.json b/sources/@roots/bud-stylelint/package.json index a18d25a78b..684d20f0c3 100644 --- a/sources/@roots/bud-stylelint/package.json +++ b/sources/@roots/bud-stylelint/package.json @@ -85,12 +85,12 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10", "webpack": "5.76.3" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-support": "workspace:sources/@roots/bud-support", "stylelint": "15.3.0", @@ -98,30 +98,6 @@ "stylelint-webpack-plugin": "4.1.0", "tslib": "2.5.0" }, - "peerDependencies": { - "@roots/bud": "*", - "stylelint": "*", - "stylelint-config-standard": "*", - "stylelint-scss": "*", - "stylelint-webpack-plugin": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "stylelint": { - "optional": true - }, - "stylelint-config-standard": { - "optional": true - }, - "stylelint-scss": { - "optional": true - }, - "stylelint-webpack-plugin": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-support/package.json b/sources/@roots/bud-support/package.json index 71f8fadebe..a90432557c 100644 --- a/sources/@roots/bud-support/package.json +++ b/sources/@roots/bud-support/package.json @@ -82,6 +82,10 @@ "require": "./lib/yml-loader/index.cjs", "default": "./lib/yml-loader/index.cjs" }, + "./decorators/*": { + "import": "./lib/decorators/*.js", + "default": "./lib/decorators/*.js" + }, "./utilities/*": { "import": "./lib/utilities/*.js", "default": "./lib/utilities/*.js" @@ -115,9 +119,9 @@ "@types/cookie-parser": "1.4.3", "@types/express": "4.17.17", "@types/express-serve-static-core": "4.17.33", - "@types/file-loader": "^5.0.1", + "@types/file-loader": "5.0.1", "@types/lodash-es": "4.17.7", - "@types/minimist": "^1.2.2", + "@types/minimist": "1.2.2", "@types/node-notifier": "8.0.2", "@types/signale": "1.4.4", "@types/webpack-manifest-plugin": "3.0.5" @@ -133,9 +137,9 @@ "common-path": "1.0.1", "cookie-parser": "1.4.6", "copy-webpack-plugin": "11.0.0", - "css-loader": "^6.7.3", + "css-loader": "6.7.3", "css-minimizer-webpack-plugin": "4.2.2", - "csv-loader": "^3.0.5", + "csv-loader": "3.0.5", "dotenv": "16.0.3", "dotenv-expand": "10.0.0", "env-paths": "3.0.0", @@ -143,11 +147,11 @@ "execa": "7.1.1", "express": "4.18.2", "figures": "5.0.0", - "file-loader": "^6.2.0", + "file-loader": "6.2.0", "get-port": "6.1.2", "globby": "13.1.3", "highlight.js": "11.7.0", - "html-loader": "^4.2.0", + "html-loader": "4.2.0", "html-webpack-plugin": "5.5.0", "http-proxy-middleware": "3.0.0-beta.1", "human-readable": "0.2.1", diff --git a/sources/@roots/bud-support/src/highlight/index.ts b/sources/@roots/bud-support/src/highlight/index.ts index 2a878af198..5c63654119 100644 --- a/sources/@roots/bud-support/src/highlight/index.ts +++ b/sources/@roots/bud-support/src/highlight/index.ts @@ -4,7 +4,7 @@ import css from 'highlight.js/lib/languages/css' import js from 'highlight.js/lib/languages/javascript' import scss from 'highlight.js/lib/languages/scss' import ts from 'highlight.js/lib/languages/typescript' -import * as parse5 from 'parse5' +import {parseFragment} from 'parse5' import {adapter} from 'parse5-htmlparser2-tree-adapter' import {theme} from './theme.js' @@ -45,7 +45,7 @@ const colorizeNode = (node: node): string => { const colorize = (code: string): string => { // @ts-ignore - const fragment = parse5.parseFragment(code, {treeAdapter: adapter}) + const fragment = parseFragment(code, {treeAdapter: adapter}) return fragment.childNodes .map(node => colorizeNode(node as any)) .join(``) @@ -62,8 +62,6 @@ const colorize = (code: string): string => { !hljs.listLanguages().includes(`scss`) && hljs.registerLanguage(`scss`, scss) -export default hljs - export const highlight = (code: string): string => colorize( hljs.highlight(code, { diff --git a/sources/@roots/bud-support/src/utilities/logger.ts b/sources/@roots/bud-support/src/utilities/logger.ts index 44ebb6fb9f..984380cf27 100644 --- a/sources/@roots/bud-support/src/utilities/logger.ts +++ b/sources/@roots/bud-support/src/utilities/logger.ts @@ -1,7 +1,7 @@ /* eslint-disable n/no-process-env */ import Signale, {SignaleOptions} from 'signale' -import {bind} from '../decorators/index.js' +import {bind} from '../decorators/bind.js' import isUndefined from '../lodash/isUndefined/index.js' import args from './args.js' diff --git a/sources/@roots/bud-swc/package.json b/sources/@roots/bud-swc/package.json index 357d1cbe84..a21752eaa7 100644 --- a/sources/@roots/bud-swc/package.json +++ b/sources/@roots/bud-swc/package.json @@ -81,9 +81,6 @@ "tslib": "2.5.0", "webpack": "5.76.3" }, - "peerDependencies": { - "@roots/bud": "workspace:sources/@roots/bud" - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-tailwindcss-theme-json/package.json b/sources/@roots/bud-tailwindcss-theme-json/package.json index 09b1e8fb9c..35ff1812b2 100644 --- a/sources/@roots/bud-tailwindcss-theme-json/package.json +++ b/sources/@roots/bud-tailwindcss-theme-json/package.json @@ -66,25 +66,17 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-tailwindcss": "workspace:sources/@roots/bud-tailwindcss", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-support": "workspace:sources/@roots/bud-support", "@roots/bud-wordpress-theme-json": "workspace:sources/@roots/bud-wordpress-theme-json", "tslib": "2.5.0" }, - "peerDependencies": { - "@roots/bud": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-tailwindcss/package.json b/sources/@roots/bud-tailwindcss/package.json index 8f9ca09f12..f2db68b3ff 100644 --- a/sources/@roots/bud-tailwindcss/package.json +++ b/sources/@roots/bud-tailwindcss/package.json @@ -114,7 +114,6 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10", "@types/tailwindcss": "3.1.0", @@ -122,6 +121,7 @@ "webpack": "5.76.3" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-postcss": "workspace:sources/@roots/bud-postcss", "@roots/bud-support": "workspace:sources/@roots/bud-support", @@ -131,18 +131,6 @@ "tslib": "2.5.0", "webpack-virtual-modules": "0.5.0" }, - "peerDependencies": { - "@roots/bud": "*", - "tailwindcss": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "tailwindcss": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-tailwindcss/src/index.ts b/sources/@roots/bud-tailwindcss/src/index.ts index 221cbb33d9..788344082b 100644 --- a/sources/@roots/bud-tailwindcss/src/index.ts +++ b/sources/@roots/bud-tailwindcss/src/index.ts @@ -11,4 +11,5 @@ import './types/index.js' import {BudTailwindCss} from './extension/index.js' + export default BudTailwindCss diff --git a/sources/@roots/bud-terser/package.json b/sources/@roots/bud-terser/package.json index 22a4ff5cae..61fdd78d12 100644 --- a/sources/@roots/bud-terser/package.json +++ b/sources/@roots/bud-terser/package.json @@ -77,34 +77,18 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-swc": "workspace:sources/@roots/bud-swc", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-support": "workspace:sources/@roots/bud-support", "terser-webpack-plugin": "5.3.7", "tslib": "2.5.0", "webpack": "5.76.3" }, - "peerDependencies": { - "@roots/bud": "*", - "@roots/bud-support": "*", - "terser-webpack-plugin": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "@roots/bud-support": { - "optional": true - }, - "terser-webpack-plugin": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-typescript/package.json b/sources/@roots/bud-typescript/package.json index 9235b8c056..2d722f5dcb 100644 --- a/sources/@roots/bud-typescript/package.json +++ b/sources/@roots/bud-typescript/package.json @@ -85,7 +85,6 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-babel": "workspace:sources/@roots/bud-babel", "@skypack/package-check": "0.2.2", "@types/fork-ts-checker-webpack-plugin": "0.4.5", @@ -94,18 +93,17 @@ "webpack": "5.76.3" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/bud-support": "workspace:sources/@roots/bud-support", "fork-ts-checker-webpack-plugin": "7.3.0", + "react-refresh": "0.14.0", "react-refresh-typescript": "2.0.8", "ts-loader": "9.4.2", "ts-node": "10.9.1", "tslib": "2.5.0", "typescript": "4.9.5" }, - "peerDependencies": { - "@roots/bud": "workspace:sources/@roots/bud" - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-typescript/src/bud/commands/bud.ts.check.command.tsx b/sources/@roots/bud-typescript/src/bud/commands/bud.ts.check.command.tsx index 3b03eb49e4..d1fed28fe7 100644 --- a/sources/@roots/bud-typescript/src/bud/commands/bud.ts.check.command.tsx +++ b/sources/@roots/bud-typescript/src/bud/commands/bud.ts.check.command.tsx @@ -2,7 +2,7 @@ import {join} from 'node:path' import BudCommand from '@roots/bud/cli/commands/bud' import {dry} from '@roots/bud/cli/decorators/command.dry' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' @dry export class BudTSCheckCommand extends BudCommand { diff --git a/sources/@roots/bud-vue/package.json b/sources/@roots/bud-vue/package.json index fe6f47353a..b14200a421 100644 --- a/sources/@roots/bud-vue/package.json +++ b/sources/@roots/bud-vue/package.json @@ -87,34 +87,6 @@ "vue-style-loader": "^4.1.3", "vue-template-compiler": "^2.7.14" }, - "peerDependencies": { - "@roots/bud": "*", - "@vue/compiler-sfc": "*", - "vue": "*", - "vue-loader": "*", - "vue-style-loader": "*", - "vue-template-compiler": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "@vue/compiler-sfc": { - "optional": true - }, - "vue": { - "optional": true - }, - "vue-loader": { - "optional": true - }, - "vue-style-loader": { - "optional": true - }, - "vue-template-compiler": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-vue/src/extension.ts b/sources/@roots/bud-vue/src/extension.ts index 358df0a7b7..d1bd480dbd 100644 --- a/sources/@roots/bud-vue/src/extension.ts +++ b/sources/@roots/bud-vue/src/extension.ts @@ -103,7 +103,9 @@ export default class Vue extends Extension< typeof rule === `object` && `oneOf` in rule ? rule.oneOf : rule, ), ] + config.plugins.push(new VueLoaderPlugin()) + return config }) } diff --git a/sources/@roots/bud-wordpress-dependencies/package.json b/sources/@roots/bud-wordpress-dependencies/package.json index 228f7485dd..badbe1efe1 100644 --- a/sources/@roots/bud-wordpress-dependencies/package.json +++ b/sources/@roots/bud-wordpress-dependencies/package.json @@ -64,27 +64,15 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10" }, "dependencies": { + "@roots/bud": "workspace:sources/@roots/bud", "@roots/bud-framework": "workspace:sources/@roots/bud-framework", "@roots/wordpress-dependencies-webpack-plugin": "workspace:sources/@roots/wordpress-dependencies-webpack-plugin", "tslib": "2.5.0" }, - "peerDependencies": { - "@roots/bud": "*", - "@roots/wordpress-dependencies-webpack-plugin": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "@roots/wordpress-dependencies-webpack-plugin": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-wordpress-externals/package.json b/sources/@roots/bud-wordpress-externals/package.json index d233646431..52a2e6dd47 100644 --- a/sources/@roots/bud-wordpress-externals/package.json +++ b/sources/@roots/bud-wordpress-externals/package.json @@ -73,18 +73,6 @@ "@roots/wordpress-externals-webpack-plugin": "workspace:sources/@roots/wordpress-externals-webpack-plugin", "tslib": "2.5.0" }, - "peerDependencies": { - "@roots/bud": "*", - "@roots/wordpress-externals-webpack-plugin": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "@roots/wordpress-externals-webpack-plugin": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-wordpress-manifests/package.json b/sources/@roots/bud-wordpress-manifests/package.json index 7c7f448ea5..a60dd8fdc1 100644 --- a/sources/@roots/bud-wordpress-manifests/package.json +++ b/sources/@roots/bud-wordpress-manifests/package.json @@ -70,7 +70,6 @@ "types": "./lib/index.d.ts", "module": "./lib/index.js", "devDependencies": { - "@roots/bud": "workspace:sources/@roots/bud", "@skypack/package-check": "0.2.2", "@types/node": "18.15.10" }, @@ -82,27 +81,6 @@ "@roots/merged-manifest-webpack-plugin": "workspace:sources/@roots/merged-manifest-webpack-plugin", "tslib": "2.5.0" }, - "peerDependencies": { - "@roots/bud": "*", - "@roots/bud-framework": "*", - "@roots/bud-wordpress-dependencies": "*", - "@roots/bud-wordpress-externals": "*", - "@roots/merged-manifest-webpack-plugin": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - }, - "@roots/bud-wordpress-dependencies": { - "optional": true - }, - "@roots/bud-wordpress-externals": { - "optional": true - }, - "@roots/merged-manifest-webpack-plugin": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud-wordpress-theme-json/package.json b/sources/@roots/bud-wordpress-theme-json/package.json index e11b4d3676..d34adaabe1 100644 --- a/sources/@roots/bud-wordpress-theme-json/package.json +++ b/sources/@roots/bud-wordpress-theme-json/package.json @@ -77,14 +77,6 @@ "@roots/wordpress-theme-json-webpack-plugin": "workspace:sources/@roots/wordpress-theme-json-webpack-plugin", "tslib": "2.5.0" }, - "peerDependencies": { - "@roots/bud": "*" - }, - "peerDependenciesMeta": { - "@roots/bud": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud/package.json b/sources/@roots/bud/package.json index 17b4a1b48a..8b56e4baca 100644 --- a/sources/@roots/bud/package.json +++ b/sources/@roots/bud/package.json @@ -182,69 +182,6 @@ "react": "18.2.0", "tslib": "2.5.0" }, - "peerDependencies": { - "@roots/browserslist-config": "*", - "@roots/bud-api": "*", - "@roots/bud-build": "*", - "@roots/bud-cache": "*", - "@roots/bud-client": "*", - "@roots/bud-compiler": "*", - "@roots/bud-dashboard": "*", - "@roots/bud-entrypoints": "*", - "@roots/bud-extensions": "*", - "@roots/bud-framework": "*", - "@roots/bud-hooks": "*", - "@roots/bud-server": "*", - "@roots/bud-support": "*", - "@roots/bud-terser": "*" - }, - "peerDependenciesMeta": { - "@roots/browserslist-config": { - "optional": true - }, - "@roots/bud-api": { - "optional": true - }, - "@roots/bud-build": { - "optional": true - }, - "@roots/bud-cache": { - "optional": true - }, - "@roots/bud-client": { - "optional": true - }, - "@roots/bud-compiler": { - "optional": true - }, - "@roots/bud-dashboard": { - "optional": true - }, - "@roots/bud-entrypoints": { - "optional": true - }, - "@roots/bud-extensions": { - "optional": true - }, - "@roots/bud-framework": { - "optional": true - }, - "@roots/bud-hooks": { - "optional": true - }, - "@roots/bud-server": { - "optional": true - }, - "@roots/bud-support": { - "optional": true - }, - "@roots/bud-terser": { - "optional": true - }, - "tslib": { - "optional": true - } - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/bud/src/cli/commands/bud.clean.tsx b/sources/@roots/bud/src/cli/commands/bud.clean.tsx index 398c24642a..7ad48a434d 100644 --- a/sources/@roots/bud/src/cli/commands/bud.clean.tsx +++ b/sources/@roots/bud/src/cli/commands/bud.clean.tsx @@ -2,7 +2,7 @@ import type {Bud} from '@roots/bud' import BudCommand from '@roots/bud/cli/commands/bud' import {dry} from '@roots/bud/cli/decorators/command.dry' import {Command, Option} from '@roots/bud-support/clipanion' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import * as Ink from 'ink' /** diff --git a/sources/@roots/bud/src/cli/commands/bud.tsx b/sources/@roots/bud/src/cli/commands/bud.tsx index f091e81c57..eb003abca6 100644 --- a/sources/@roots/bud/src/cli/commands/bud.tsx +++ b/sources/@roots/bud/src/cli/commands/bud.tsx @@ -11,7 +11,7 @@ import type { Context, } from '@roots/bud-framework/options/context' import {BaseContext, Command, Option} from '@roots/bud-support/clipanion' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {BudError, BudHandler} from '@roots/bud-support/errors' import isString from '@roots/bud-support/lodash/isString' import * as t from '@roots/bud-support/typanion' diff --git a/sources/@roots/bud/src/cli/commands/bud.upgrade.tsx b/sources/@roots/bud/src/cli/commands/bud.upgrade.tsx index 3e6bac7dfe..5aa2a34dbb 100644 --- a/sources/@roots/bud/src/cli/commands/bud.upgrade.tsx +++ b/sources/@roots/bud/src/cli/commands/bud.upgrade.tsx @@ -1,7 +1,7 @@ import BudCommand, {ArgsModifier} from '@roots/bud/cli/commands/bud' import {dry} from '@roots/bud/cli/decorators/command.dry' import {Command, Option} from '@roots/bud-support/clipanion' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {detectPackageManager} from '../helpers/detectPackageManager.js' import {isInternalDevelopmentEnv} from '../helpers/isInternalDevelopmentEnv.js' diff --git a/sources/@roots/bud/src/cli/commands/doctor/index.tsx b/sources/@roots/bud/src/cli/commands/doctor/index.tsx index 88f86a2ff2..d43ce547a0 100644 --- a/sources/@roots/bud/src/cli/commands/doctor/index.tsx +++ b/sources/@roots/bud/src/cli/commands/doctor/index.tsx @@ -4,7 +4,7 @@ import {Error} from '@roots/bud-dashboard/app' import type {Extension} from '@roots/bud-framework' import type {CommandContext} from '@roots/bud-framework/options' import {Command} from '@roots/bud-support/clipanion' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {BudError, InputError} from '@roots/bud-support/errors' import figures from '@roots/bud-support/figures' import prettyFormat from '@roots/bud-support/pretty-format' diff --git a/sources/@roots/bud/src/cli/finder.ts b/sources/@roots/bud/src/cli/finder.ts index ec9e472382..36fe8851b7 100644 --- a/sources/@roots/bud/src/cli/finder.ts +++ b/sources/@roots/bud/src/cli/finder.ts @@ -3,7 +3,7 @@ import {dirname, join} from 'node:path/posix' import {fileURLToPath} from 'node:url' import type {Context} from '@roots/bud-framework/options' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import globby from '@roots/bud-support/globby' import {resolve} from '@roots/bud-support/import-meta-resolve' import isString from '@roots/bud-support/lodash/isString' diff --git a/sources/@roots/bud/src/services/env/env.ts b/sources/@roots/bud/src/services/env/env.ts index f48b4784d8..ffaeb88dc5 100644 --- a/sources/@roots/bud/src/services/env/env.ts +++ b/sources/@roots/bud/src/services/env/env.ts @@ -1,6 +1,6 @@ import type {Bud} from '@roots/bud' import {ServiceContainer} from '@roots/bud-framework/service' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' /** * Env service diff --git a/sources/@roots/bud/src/services/project/project.ts b/sources/@roots/bud/src/services/project/project.ts index eebddd4bac..74312db8b8 100644 --- a/sources/@roots/bud/src/services/project/project.ts +++ b/sources/@roots/bud/src/services/project/project.ts @@ -1,6 +1,6 @@ import type {Bud} from '@roots/bud-framework' import {Service} from '@roots/bud-framework/service' -import {bind} from '@roots/bud-support/decorators' +import {bind} from '@roots/bud-support/decorators/bind' import {BudError, FileWriteError} from '@roots/bud-support/errors' import * as args from '@roots/bud-support/utilities/args' diff --git a/sources/@roots/critical-css-webpack-plugin/package.json b/sources/@roots/critical-css-webpack-plugin/package.json index 3dcfef4589..b7b49c72bc 100644 --- a/sources/@roots/critical-css-webpack-plugin/package.json +++ b/sources/@roots/critical-css-webpack-plugin/package.json @@ -75,9 +75,6 @@ "vinyl": "3.0.0", "webpack": "5.76.3" }, - "peerDependencies": { - "critical": "*" - }, "volta": { "extends": "../../../package.json" } diff --git a/sources/@roots/sage/package.json b/sources/@roots/sage/package.json index f2455391c3..053f9393a8 100644 --- a/sources/@roots/sage/package.json +++ b/sources/@roots/sage/package.json @@ -155,10 +155,6 @@ "tslib": "2.5.0", "webpack": "5.76.3" }, - "peerDependencies": { - "@roots/blade-loader": "*", - "@roots/bud": "workspace:sources/@roots/bud" - }, "volta": { "extends": "../../../package.json" }, diff --git a/yarn.lock b/yarn.lock index d962bf76ca..43dbe64685 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3514,7 +3514,7 @@ __metadata: languageName: node linkType: hard -"@babel/preset-react@npm:^7.18.6": +"@babel/preset-react@npm:7.18.6, @babel/preset-react@npm:^7.18.6": version: 7.18.6 resolution: "@babel/preset-react@npm:7.18.6" dependencies: @@ -7289,14 +7289,6 @@ __metadata: execa: 7.1.1 tslib: 2.5.0 update-browserslist-db: 1.0.10 - peerDependencies: - browserslist: ">=4.21.5" - update-browserslist-db: "*" - peerDependenciesMeta: - browserslist: - optional: true - update-browserslist-db: - optional: true languageName: unknown linkType: soft @@ -7374,14 +7366,6 @@ __metadata: "@types/node": 18.15.10 "@types/webpack-env": 1.18.0 tslib: 2.5.0 - peerDependencies: - "@roots/bud": "*" - "@types/webpack-env": "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - "@types/webpack-env": - optional: true languageName: unknown linkType: soft @@ -7412,17 +7396,9 @@ __metadata: "@roots/bud-support": "workspace:sources/@roots/bud-support" "@skypack/package-check": 0.2.2 "@types/node": 18.15.10 - compression-webpack-plugin: ^10.0.0 + compression-webpack-plugin: 10.0.0 tslib: 2.5.0 webpack: 5.76.3 - peerDependencies: - "@roots/bud": "*" - compression-webpack-plugin: "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - compression-webpack-plugin: - optional: true languageName: unknown linkType: soft @@ -7440,20 +7416,6 @@ __metadata: critical: 5.0.4 tslib: 2.5.0 vinyl: 3.0.0 - peerDependencies: - "@roots/bud": "*" - "@roots/critical-css-webpack-plugin": "*" - critical: "*" - vinyl: "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - "@roots/critical-css-webpack-plugin": - optional: true - critical: - optional: true - vinyl: - optional: true languageName: unknown linkType: soft @@ -7481,6 +7443,7 @@ __metadata: version: 0.0.0-use.local resolution: "@roots/bud-emotion@workspace:sources/@roots/bud-emotion" dependencies: + "@babel/core": 7.21.3 "@emotion/babel-plugin": ^11.10.6 "@emotion/css": ^11.10.6 "@emotion/react": ^11.10.6 @@ -7494,35 +7457,9 @@ __metadata: "@swc/plugin-emotion": 2.5.51 "@types/babel__core": 7.20.0 "@types/node": 18.15.10 + "@types/react": 18.0.30 + react: 18.2.0 tslib: 2.5.0 - peerDependencies: - "@babel/core": 7.20.7 - "@emotion/babel-plugin": "*" - "@emotion/css": "*" - "@emotion/react": "*" - "@emotion/styled": "*" - "@roots/bud": "*" - peerDependenciesMeta: - "@babel/core": - optional: true - "@emotion/babel-plugin": - optional: true - "@emotion/css": - optional: true - "@emotion/react": - optional: true - "@emotion/styled": - optional: true - "@roots/bud": - optional: true - "@roots/bud-babel": - optional: true - "@roots/bud-swc": - optional: true - "@swc/plugin-emotion": - optional: true - react: - optional: true languageName: unknown linkType: soft @@ -7530,16 +7467,12 @@ __metadata: version: 0.0.0-use.local resolution: "@roots/bud-entrypoints@workspace:sources/@roots/bud-entrypoints" dependencies: + "@roots/bud": "workspace:sources/@roots/bud" "@roots/bud-framework": "workspace:sources/@roots/bud-framework" "@roots/entrypoints-webpack-plugin": "workspace:sources/@roots/entrypoints-webpack-plugin" "@skypack/package-check": 0.2.2 "@types/node": 18.15.10 tslib: 2.5.0 - peerDependencies: - "@roots/bud": "*" - peerDependenciesMeta: - "@roots/bud": - optional: true languageName: unknown linkType: soft @@ -7556,17 +7489,6 @@ __metadata: esbuild-loader: 2.21.0 tslib: 2.5.0 webpack: 5.76.3 - peerDependencies: - "@roots/bud": "*" - esbuild-loader: "*" - ts-node: "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - esbuild-loader: - optional: true - ts-node: - optional: true languageName: unknown linkType: soft @@ -7641,21 +7563,10 @@ __metadata: "@roots/bud-support": "workspace:sources/@roots/bud-support" "@skypack/package-check": 0.2.2 "@types/node": 18.15.10 - image-minimizer-webpack-plugin: ^3.8.2 + image-minimizer-webpack-plugin: 3.8.2 sharp: 0.32.0 tslib: 2.5.0 webpack: 5.76.3 - peerDependencies: - "@roots/bud": "*" - image-minimizer-webpack-plugin: "*" - sharp: "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - image-minimizer-webpack-plugin: - optional: true - sharp: - optional: true languageName: unknown linkType: soft @@ -7677,18 +7588,6 @@ __metadata: react-dom: 18.2.0 tslib: 2.5.0 webpack: 5.76.3 - peerDependencies: - "@mdx-js/loader": "*" - "@roots/bud": "*" - "@roots/bud-babel": "*" - "@roots/bud-react": "*" - peerDependenciesMeta: - "@mdx-js/loader": - optional: true - "@roots/bud-babel": - optional: true - "@roots/bud-react": - optional: true languageName: unknown linkType: soft @@ -7710,24 +7609,6 @@ __metadata: postcss-preset-env: 8.1.0 tslib: 2.5.0 webpack: 5.76.3 - peerDependencies: - "@roots/bud": "workspace:sources/@roots/bud" - postcss: "*" - postcss-import: "*" - postcss-loader: "*" - postcss-nested: "*" - postcss-preset-env: "*" - peerDependenciesMeta: - postcss: - optional: true - postcss-import: - optional: true - postcss-loader: - optional: true - postcss-nested: - optional: true - postcss-preset-env: - optional: true languageName: unknown linkType: soft @@ -7745,23 +7626,6 @@ __metadata: "@types/node": 18.15.10 tslib: 2.5.0 webpack: 5.76.3 - peerDependencies: - "@roots/bud": "*" - "@roots/bud-babel": "*" - "@roots/bud-esbuild": "*" - "@roots/bud-postcss": "*" - "@roots/bud-swc": "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - "@roots/bud-babel": - optional: true - "@roots/bud-esbuild": - optional: true - "@roots/bud-postcss": - optional: true - "@roots/bud-swc": - optional: true languageName: unknown linkType: soft @@ -7781,26 +7645,6 @@ __metadata: "@skypack/package-check": 0.2.2 "@types/node": 18.15.10 tslib: 2.5.0 - peerDependencies: - "@roots/bud": "workspace:sources/@roots/bud" - "@roots/bud-preset-recommend": "*" - "@roots/bud-react": "*" - "@roots/bud-tailwindcss-theme-json": "*" - "@roots/bud-wordpress-manifests": "*" - "@roots/wordpress-hmr": "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - "@roots/bud-preset-recommend": - optional: true - "@roots/bud-react": - optional: true - "@roots/bud-tailwindcss-theme-json": - optional: true - "@roots/bud-wordpress-manifests": - optional: true - "@roots/wordpress-hmr": - optional: true languageName: unknown linkType: soft @@ -7816,14 +7660,6 @@ __metadata: "@types/prettier": 2.7.2 prettier: 2.8.7 tslib: 2.5.0 - peerDependencies: - "@roots/bud": "*" - prettier: "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - prettier: - optional: true languageName: unknown linkType: soft @@ -7837,21 +7673,8 @@ __metadata: "@roots/bud-postcss": "workspace:sources/@roots/bud-postcss" "@skypack/package-check": 0.2.2 "@types/node": 18.15.10 + postcss: 8.4.21 tslib: 2.5.0 - peerDependencies: - "@fullhuman/postcss-purgecss": "*" - "@roots/bud": "*" - "@roots/bud-postcss": "*" - postcss: "*" - peerDependenciesMeta: - "@fullhuman/postcss-purgecss": - optional: true - "@roots/bud": - optional: true - "@roots/bud-postcss": - optional: true - postcss: - optional: true languageName: unknown linkType: soft @@ -7860,7 +7683,7 @@ __metadata: resolution: "@roots/bud-react@workspace:sources/@roots/bud-react" dependencies: "@babel/core": 7.21.3 - "@babel/preset-react": ^7.18.6 + "@babel/preset-react": 7.18.6 "@pmmmwh/react-refresh-webpack-plugin": 0.5.10 "@roots/bud": "workspace:sources/@roots/bud" "@roots/bud-babel": "workspace:sources/@roots/bud-babel" @@ -7879,45 +7702,6 @@ __metadata: react-refresh: 0.14.0 tslib: 2.5.0 webpack: 5.76.3 - peerDependencies: - "@babel/core": "*" - "@babel/preset-react": "*" - "@pmmmwh/react-refresh-webpack-plugin": "*" - "@roots/bud": "*" - "@roots/bud-babel": "*" - "@types/babel__core": "*" - "@types/react": "*" - "@types/react-dom": "*" - react: "*" - react-dom: "*" - react-refresh: "*" - peerDependenciesMeta: - "@babel/core": - optional: true - "@babel/preset-react": - optional: true - "@pmmmwh/react-refresh-webpack-plugin": - optional: true - "@roots/bud-babel": - optional: true - "@roots/bud-esbuild": - optional: true - "@roots/bud-swc": - optional: true - "@roots/bud-typescript": - optional: true - "@types/babel__core": - optional: true - "@types/react": - optional: true - "@types/react-dom": - optional: true - react: - optional: true - react-dom: - optional: true - react-refresh: - optional: true languageName: unknown linkType: soft @@ -7941,26 +7725,6 @@ __metadata: stylelint-scss: ^4.6.0 tslib: 2.5.0 webpack: 5.76.3 - peerDependencies: - "@roots/bud": "*" - postcss-scss: "*" - sass: "*" - sass-loader: "*" - stylelint-config-recommended-scss: "*" - stylelint-scss: "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - postcss-scss: - optional: true - sass: - optional: true - sass-loader: - optional: true - stylelint-config-recommended-scss: - optional: true - stylelint-scss: - optional: true languageName: unknown linkType: soft @@ -7974,11 +7738,6 @@ __metadata: "@roots/bud-support": "workspace:sources/@roots/bud-support" "@skypack/package-check": 0.2.2 tslib: 2.5.0 - peerDependencies: - "@roots/bud-client": "*" - peerDependenciesMeta: - "@roots/bud-client": - optional: true languageName: unknown linkType: soft @@ -7997,23 +7756,6 @@ __metadata: babel-preset-solid: 1.6.16 solid-js: 1.6.16 tslib: 2.5.0 - peerDependencies: - "@babel/plugin-syntax-jsx": "*" - "@roots/bud": "*" - "@types/babel__core": "*" - babel-preset-solid: "*" - solid-js: "*" - peerDependenciesMeta: - "@babel/plugin-syntax-jsx": - optional: true - "@roots/bud": - optional: true - "@types/babel__core": - optional: true - babel-preset-solid: - optional: true - solid-js: - optional: true languageName: unknown linkType: soft @@ -8031,23 +7773,6 @@ __metadata: stylelint-webpack-plugin: 4.1.0 tslib: 2.5.0 webpack: 5.76.3 - peerDependencies: - "@roots/bud": "*" - stylelint: "*" - stylelint-config-standard: "*" - stylelint-scss: "*" - stylelint-webpack-plugin: "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - stylelint: - optional: true - stylelint-config-standard: - optional: true - stylelint-scss: - optional: true - stylelint-webpack-plugin: - optional: true languageName: unknown linkType: soft @@ -8060,9 +7785,9 @@ __metadata: "@types/cookie-parser": 1.4.3 "@types/express": 4.17.17 "@types/express-serve-static-core": 4.17.33 - "@types/file-loader": ^5.0.1 + "@types/file-loader": 5.0.1 "@types/lodash-es": 4.17.7 - "@types/minimist": ^1.2.2 + "@types/minimist": 1.2.2 "@types/node-notifier": 8.0.2 "@types/signale": 1.4.4 "@types/webpack-manifest-plugin": 3.0.5 @@ -8075,9 +7800,9 @@ __metadata: common-path: 1.0.1 cookie-parser: 1.4.6 copy-webpack-plugin: 11.0.0 - css-loader: ^6.7.3 + css-loader: 6.7.3 css-minimizer-webpack-plugin: 4.2.2 - csv-loader: ^3.0.5 + csv-loader: 3.0.5 dotenv: 16.0.3 dotenv-expand: 10.0.0 env-paths: 3.0.0 @@ -8085,11 +7810,11 @@ __metadata: execa: 7.1.1 express: 4.18.2 figures: 5.0.0 - file-loader: ^6.2.0 + file-loader: 6.2.0 get-port: 6.1.2 globby: 13.1.3 highlight.js: 11.7.0 - html-loader: ^4.2.0 + html-loader: 4.2.0 html-webpack-plugin: 5.5.0 http-proxy-middleware: 3.0.0-beta.1 human-readable: 0.2.1 @@ -8147,8 +7872,6 @@ __metadata: swc-loader: 0.2.3 tslib: 2.5.0 webpack: 5.76.3 - peerDependencies: - "@roots/bud": "workspace:sources/@roots/bud" languageName: unknown linkType: soft @@ -8164,11 +7887,6 @@ __metadata: "@skypack/package-check": 0.2.2 "@types/node": 18.15.10 tslib: 2.5.0 - peerDependencies: - "@roots/bud": "*" - peerDependenciesMeta: - "@roots/bud": - optional: true languageName: unknown linkType: soft @@ -8190,14 +7908,6 @@ __metadata: tslib: 2.5.0 webpack: 5.76.3 webpack-virtual-modules: 0.5.0 - peerDependencies: - "@roots/bud": "*" - tailwindcss: "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - tailwindcss: - optional: true languageName: unknown linkType: soft @@ -8214,17 +7924,6 @@ __metadata: terser-webpack-plugin: 5.3.7 tslib: 2.5.0 webpack: 5.76.3 - peerDependencies: - "@roots/bud": "*" - "@roots/bud-support": "*" - terser-webpack-plugin: "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - "@roots/bud-support": - optional: true - terser-webpack-plugin: - optional: true languageName: unknown linkType: soft @@ -8241,14 +7940,13 @@ __metadata: "@types/node": 18.15.10 "@types/webpack-env": 1.18.0 fork-ts-checker-webpack-plugin: 7.3.0 + react-refresh: 0.14.0 react-refresh-typescript: 2.0.8 ts-loader: 9.4.2 ts-node: 10.9.1 tslib: 2.5.0 typescript: 4.9.5 webpack: 5.76.3 - peerDependencies: - "@roots/bud": "workspace:sources/@roots/bud" languageName: unknown linkType: soft @@ -8271,26 +7969,6 @@ __metadata: vue-style-loader: ^4.1.3 vue-template-compiler: ^2.7.14 webpack: 5.76.3 - peerDependencies: - "@roots/bud": "*" - "@vue/compiler-sfc": "*" - vue: "*" - vue-loader: "*" - vue-style-loader: "*" - vue-template-compiler: "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - "@vue/compiler-sfc": - optional: true - vue: - optional: true - vue-loader: - optional: true - vue-style-loader: - optional: true - vue-template-compiler: - optional: true languageName: unknown linkType: soft @@ -8304,14 +7982,6 @@ __metadata: "@skypack/package-check": 0.2.2 "@types/node": 18.15.10 tslib: 2.5.0 - peerDependencies: - "@roots/bud": "*" - "@roots/wordpress-dependencies-webpack-plugin": "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - "@roots/wordpress-dependencies-webpack-plugin": - optional: true languageName: unknown linkType: soft @@ -8325,14 +7995,6 @@ __metadata: "@skypack/package-check": 0.2.2 "@types/node": 18.15.10 tslib: 2.5.0 - peerDependencies: - "@roots/bud": "*" - "@roots/wordpress-externals-webpack-plugin": "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - "@roots/wordpress-externals-webpack-plugin": - optional: true languageName: unknown linkType: soft @@ -8348,21 +8010,6 @@ __metadata: "@skypack/package-check": 0.2.2 "@types/node": 18.15.10 tslib: 2.5.0 - peerDependencies: - "@roots/bud": "*" - "@roots/bud-framework": "*" - "@roots/bud-wordpress-dependencies": "*" - "@roots/bud-wordpress-externals": "*" - "@roots/merged-manifest-webpack-plugin": "*" - peerDependenciesMeta: - "@roots/bud": - optional: true - "@roots/bud-wordpress-dependencies": - optional: true - "@roots/bud-wordpress-externals": - optional: true - "@roots/merged-manifest-webpack-plugin": - optional: true languageName: unknown linkType: soft @@ -8378,11 +8025,6 @@ __metadata: "@skypack/package-check": 0.2.2 "@types/node": 18.15.10 tslib: 2.5.0 - peerDependencies: - "@roots/bud": "*" - peerDependenciesMeta: - "@roots/bud": - optional: true languageName: unknown linkType: soft @@ -8413,52 +8055,6 @@ __metadata: ink-text-input: 5.0.0 react: 18.2.0 tslib: 2.5.0 - peerDependencies: - "@roots/browserslist-config": "*" - "@roots/bud-api": "*" - "@roots/bud-build": "*" - "@roots/bud-cache": "*" - "@roots/bud-client": "*" - "@roots/bud-compiler": "*" - "@roots/bud-dashboard": "*" - "@roots/bud-entrypoints": "*" - "@roots/bud-extensions": "*" - "@roots/bud-framework": "*" - "@roots/bud-hooks": "*" - "@roots/bud-server": "*" - "@roots/bud-support": "*" - "@roots/bud-terser": "*" - peerDependenciesMeta: - "@roots/browserslist-config": - optional: true - "@roots/bud-api": - optional: true - "@roots/bud-build": - optional: true - "@roots/bud-cache": - optional: true - "@roots/bud-client": - optional: true - "@roots/bud-compiler": - optional: true - "@roots/bud-dashboard": - optional: true - "@roots/bud-entrypoints": - optional: true - "@roots/bud-extensions": - optional: true - "@roots/bud-framework": - optional: true - "@roots/bud-hooks": - optional: true - "@roots/bud-server": - optional: true - "@roots/bud-support": - optional: true - "@roots/bud-terser": - optional: true - tslib: - optional: true bin: bud: ./bin/bud.mjs bund: ./bin/bund.mjs @@ -8491,8 +8087,6 @@ __metadata: tslib: 2.5.0 vinyl: 3.0.0 webpack: 5.76.3 - peerDependencies: - critical: "*" languageName: unknown linkType: soft @@ -8602,9 +8196,6 @@ __metadata: "@types/node": 18.15.10 tslib: 2.5.0 webpack: 5.76.3 - peerDependencies: - "@roots/blade-loader": "*" - "@roots/bud": "workspace:sources/@roots/bud" languageName: unknown linkType: soft @@ -9789,7 +9380,7 @@ __metadata: languageName: node linkType: hard -"@types/file-loader@npm:5.0.1, @types/file-loader@npm:^5.0.1": +"@types/file-loader@npm:5.0.1": version: 5.0.1 resolution: "@types/file-loader@npm:5.0.1" dependencies: @@ -10012,7 +9603,7 @@ __metadata: languageName: node linkType: hard -"@types/minimist@npm:^1.2.0, @types/minimist@npm:^1.2.2": +"@types/minimist@npm:1.2.2, @types/minimist@npm:^1.2.0, @types/minimist@npm:^1.2.2": version: 1.2.2 resolution: "@types/minimist@npm:1.2.2" checksum: b8da83c66eb4aac0440e64674b19564d9d86c80ae273144db9681e5eeff66f238ade9515f5006ffbfa955ceff8b89ad2bd8ec577d7caee74ba101431fb07045d @@ -16124,7 +15715,7 @@ __metadata: languageName: node linkType: hard -"compression-webpack-plugin@npm:^10.0.0": +"compression-webpack-plugin@npm:10.0.0": version: 10.0.0 resolution: "compression-webpack-plugin@npm:10.0.0" dependencies: @@ -16770,39 +16361,39 @@ __metadata: languageName: node linkType: hard -"css-loader@npm:^6.7.1": - version: 6.7.1 - resolution: "css-loader@npm:6.7.1" +"css-loader@npm:6.7.3": + version: 6.7.3 + resolution: "css-loader@npm:6.7.3" dependencies: icss-utils: ^5.1.0 - postcss: ^8.4.7 + postcss: ^8.4.19 postcss-modules-extract-imports: ^3.0.0 postcss-modules-local-by-default: ^4.0.0 postcss-modules-scope: ^3.0.0 postcss-modules-values: ^4.0.0 postcss-value-parser: ^4.2.0 - semver: ^7.3.5 + semver: ^7.3.8 peerDependencies: webpack: ^5.0.0 - checksum: 170fdbc630a05a43679ef60fa97694766b568dbde37adccc0faafa964fc675f08b976bc68837bb73b61d60240e8d2cbcbf51540fe94ebc9dafc56e7c46ba5527 + checksum: 473cc32b6c837c2848e2051ad1ba331c1457449f47442e75a8c480d9891451434ada241f7e3de2347e57de17fcd84610b3bcfc4a9da41102cdaedd1e17902d31 languageName: node linkType: hard -"css-loader@npm:^6.7.3": - version: 6.7.3 - resolution: "css-loader@npm:6.7.3" +"css-loader@npm:^6.7.1": + version: 6.7.1 + resolution: "css-loader@npm:6.7.1" dependencies: icss-utils: ^5.1.0 - postcss: ^8.4.19 + postcss: ^8.4.7 postcss-modules-extract-imports: ^3.0.0 postcss-modules-local-by-default: ^4.0.0 postcss-modules-scope: ^3.0.0 postcss-modules-values: ^4.0.0 postcss-value-parser: ^4.2.0 - semver: ^7.3.8 + semver: ^7.3.5 peerDependencies: webpack: ^5.0.0 - checksum: 473cc32b6c837c2848e2051ad1ba331c1457449f47442e75a8c480d9891451434ada241f7e3de2347e57de17fcd84610b3bcfc4a9da41102cdaedd1e17902d31 + checksum: 170fdbc630a05a43679ef60fa97694766b568dbde37adccc0faafa964fc675f08b976bc68837bb73b61d60240e8d2cbcbf51540fe94ebc9dafc56e7c46ba5527 languageName: node linkType: hard @@ -17104,7 +16695,7 @@ __metadata: languageName: node linkType: hard -"csv-loader@npm:^3.0.5": +"csv-loader@npm:3.0.5": version: 3.0.5 resolution: "csv-loader@npm:3.0.5" dependencies: @@ -22186,7 +21777,7 @@ __metadata: languageName: node linkType: hard -"html-loader@npm:^4.2.0": +"html-loader@npm:4.2.0": version: 4.2.0 resolution: "html-loader@npm:4.2.0" dependencies: @@ -22582,7 +22173,7 @@ __metadata: languageName: node linkType: hard -"image-minimizer-webpack-plugin@npm:^3.8.2": +"image-minimizer-webpack-plugin@npm:3.8.2": version: 3.8.2 resolution: "image-minimizer-webpack-plugin@npm:3.8.2" dependencies: