diff --git a/sources/@roots/bud-framework/src/registry/build.ts b/sources/@roots/bud-framework/src/registry/build.ts index 07698148be..3321034e0e 100644 --- a/sources/@roots/bud-framework/src/registry/build.ts +++ b/sources/@roots/bud-framework/src/registry/build.ts @@ -14,75 +14,75 @@ export interface Sync { 'cache.cacheDirectory': string 'cache.managedPaths': Array 'cache.name': string - 'cache.type': 'filesystem' | 'memory' + 'cache.type': `filesystem` | `memory` 'cache.version': string - context: Configuration['context'] - dependencies: Configuration['dependencies'] - devtool: Configuration['devtool'] + context: Configuration[`context`] + dependencies: Configuration[`dependencies`] + devtool: Configuration[`devtool`] entry: Record - experiments: Configuration['experiments'] + experiments: Configuration[`experiments`] externals: Record | RegExp | string> - externalsType: Configuration['externalsType'] - infrastructureLogging: Configuration['infrastructureLogging'] + externalsType: Configuration[`externalsType`] + infrastructureLogging: Configuration[`infrastructureLogging`] 'infrastructureLogging.console': - | Configuration['infrastructureLogging']['console'] - 'infrastructureLogging.level': Configuration['infrastructureLogging']['level'] - loader: Configuration['loader'] - mode: Configuration['mode'] & ('development' | 'production') - module: Configuration['module'] - 'module.noParse': Configuration['module']['noParse'] - 'module.rules': Configuration['module']['rules'] + | Configuration[`infrastructureLogging`][`console`] + 'infrastructureLogging.level': Configuration[`infrastructureLogging`][`level`] + loader: Configuration[`loader`] + mode: Configuration[`mode`] & ('development' | 'production') + module: Configuration[`module`] + 'module.noParse': Configuration[`module`][`noParse`] + 'module.rules': Configuration[`module`][`rules`] 'module.rules.after': Array 'module.rules.before': Array 'module.rules.oneOf': Array - 'module.unsafeCache': Configuration['module']['unsafeCache'] - name: Configuration['name'] - node: Configuration['node'] - optimization: Configuration['optimization'] - 'optimization.emitOnErrors': Configuration['optimization']['emitOnErrors'] - 'optimization.innerGraph': Configuration['optimization']['innerGraph'] - 'optimization.mergeDuplicateChunks': Configuration['optimization']['mergeDuplicateChunks'] - 'optimization.minimize': Configuration['optimization']['minimize'] + 'module.unsafeCache': Configuration[`module`][`unsafeCache`] + name: Configuration[`name`] + node: Configuration[`node`] + optimization: Configuration[`optimization`] + 'optimization.emitOnErrors': Configuration[`optimization`][`emitOnErrors`] + 'optimization.innerGraph': Configuration[`optimization`][`innerGraph`] + 'optimization.mergeDuplicateChunks': Configuration[`optimization`][`mergeDuplicateChunks`] + 'optimization.minimize': Configuration[`optimization`][`minimize`] 'optimization.minimizer': Array< '...' | ((compiler: Compiler) => void) | {apply: any} > - 'optimization.moduleIds': Configuration['optimization']['moduleIds'] - 'optimization.nodeEnv': Configuration['optimization']['nodeEnv'] - 'optimization.providedExports': Configuration['optimization']['providedExports'] - 'optimization.removeAvailableModules': Configuration['optimization']['removeAvailableModules'] + 'optimization.moduleIds': Configuration[`optimization`][`moduleIds`] + 'optimization.nodeEnv': Configuration[`optimization`][`nodeEnv`] + 'optimization.providedExports': Configuration[`optimization`][`providedExports`] + 'optimization.removeAvailableModules': Configuration[`optimization`][`removeAvailableModules`] 'optimization.removeEmptyChunks': - | Configuration['optimization']['removeEmptyChunks'] - 'optimization.runtimeChunk': Configuration['optimization']['runtimeChunk'] - 'optimization.sideEffects': Configuration['optimization']['sideEffects'] + | Configuration[`optimization`][`removeEmptyChunks`] + 'optimization.runtimeChunk': Configuration[`optimization`][`runtimeChunk`] + 'optimization.sideEffects': Configuration[`optimization`][`sideEffects`] 'optimization.splitChunks': false | Optimization.SplitChunks - 'optimization.usedExports': Configuration['optimization']['usedExports'] - output: Configuration['output'] - 'output.assetModuleFilename': Configuration['output']['assetModuleFilename'] - 'output.chunkFilename': Configuration['output']['chunkFilename'] - 'output.chunkFormat': Configuration['output']['chunkFormat'] - 'output.chunkLoading': Configuration['output']['chunkLoading'] - 'output.clean': Configuration['output']['clean'] & boolean - 'output.environment': Configuration['output']['environment'] - 'output.filename': Configuration['output']['filename'] - 'output.hashFunction': Configuration['output']['hashFunction'] + 'optimization.usedExports': Configuration[`optimization`][`usedExports`] + output: Configuration[`output`] + 'output.assetModuleFilename': Configuration[`output`][`assetModuleFilename`] + 'output.chunkFilename': Configuration[`output`][`chunkFilename`] + 'output.chunkFormat': Configuration[`output`][`chunkFormat`] + 'output.chunkLoading': Configuration[`output`][`chunkLoading`] + 'output.clean': Configuration[`output`][`clean`] & boolean + 'output.environment': Configuration[`output`][`environment`] + 'output.filename': Configuration[`output`][`filename`] + 'output.hashFunction': Configuration[`output`][`hashFunction`] 'output.hotUpdateChunkFilename': - | Configuration['output']['hotUpdateChunkFilename'] + | Configuration[`output`][`hotUpdateChunkFilename`] 'output.hotUpdateMainFilename': - | Configuration['output']['hotUpdateMainFilename'] - 'output.iife': Configuration['output']['iife'] - 'output.module': Configuration['output']['module'] - 'output.path': Configuration['output']['path'] - 'output.pathinfo': Configuration['output']['pathinfo'] + | Configuration[`output`][`hotUpdateMainFilename`] + 'output.iife': Configuration[`output`][`iife`] + 'output.module': Configuration[`output`][`module`] + 'output.path': Configuration[`output`][`path`] + 'output.pathinfo': Configuration[`output`][`pathinfo`] 'output.publicPath': string 'output.scriptType': `module` | `text/javascript` | false 'output.uniqueName': string - parallelism: Configuration['parallelism'] - performance: Configuration['performance'] - profile: Configuration['profile'] - recordsPath: Configuration['recordsPath'] - 'resolve.extensionAlias': Configuration['resolve']['extensionAlias'] + parallelism: Configuration[`parallelism`] + performance: Configuration[`performance`] + profile: Configuration[`profile`] + recordsPath: Configuration[`recordsPath`] + 'resolve.extensionAlias': Configuration[`resolve`][`extensionAlias`] 'resolve.extensions': Set - resolveLoader: Configuration['resolveLoader'] + resolveLoader: Configuration[`resolveLoader`] 'resolveLoader.alias': Configuration[`resolveLoader`][`alias`] snapshot: Configuration[`snapshot`] 'snapshot.buildDependencies': Configuration[`snapshot`][`buildDependencies`] @@ -93,9 +93,9 @@ export interface Sync { 'snapshot.resolveBuildDependencies': Configuration[`snapshot`][`resolveBuildDependencies`] stats: StatsOptions 'stats.preset': string - target: Configuration['target'] - watch: Configuration['watch'] - watchOptions: Configuration['watchOptions'] + target: Configuration[`target`] + watch: Configuration[`watch`] + watchOptions: Configuration[`watchOptions`] } export type SyncRegistry = { @@ -106,9 +106,9 @@ export interface Async { plugins: Array resolve: any 'resolve.alias': {[index: string]: false | string | string[]} | undefined - 'resolve.aliasFields': Configuration['resolve']['aliasFields'] - 'resolve.extensionAlias': Configuration['resolve']['extensionAlias'] - 'resolve.modules': Configuration['resolve']['modules'] | undefined + 'resolve.aliasFields': Configuration[`resolve`][`aliasFields`] + 'resolve.extensionAlias': Configuration[`resolve`][`extensionAlias`] + 'resolve.modules': Configuration[`resolve`][`modules`] | undefined } export type AsyncRegistry = { diff --git a/sources/@roots/bud/package.json b/sources/@roots/bud/package.json index dc32166654..f3ef61ecee 100644 --- a/sources/@roots/bud/package.json +++ b/sources/@roots/bud/package.json @@ -91,12 +91,24 @@ "cli/flags": [ "./lib/cli/flags/index.d.ts" ], + "cli/flags/*": [ + "./lib/cli/flags/*.d.ts" + ], + "cli/helpers/*": [ + "./lib/cli/helpers/*.d.ts" + ], "context": [ "./lib/context/index.d.ts" ], + "context/*": [ + "./lib/context/*.d.ts" + ], "factory": [ "./lib/factory.d.ts" ], + "instance": [ + "./lib/instance.d.ts" + ], "services/*": [ "./lib/services/*.d.ts" ] diff --git a/sources/@roots/bud/src/instance.ts b/sources/@roots/bud/src/instance.ts index 80a0f03ea3..f4f6720ff8 100644 --- a/sources/@roots/bud/src/instance.ts +++ b/sources/@roots/bud/src/instance.ts @@ -18,4 +18,4 @@ const set = (bud: Bud) => { instance = bud } -export {get, instance, set} +export {get, instance as bud, instance, set} diff --git a/tests/util/project/.storage/@tests/project/cache/production/build/0.pack.br b/tests/util/project/.storage/@tests/project/cache/production/build/0.pack.br deleted file mode 100644 index 3b2de5d6f8..0000000000 Binary files a/tests/util/project/.storage/@tests/project/cache/production/build/0.pack.br and /dev/null differ diff --git a/tests/util/project/.storage/@tests/project/cache/production/build/index.pack.br b/tests/util/project/.storage/@tests/project/cache/production/build/index.pack.br deleted file mode 100644 index 11ecd1a2fa..0000000000 Binary files a/tests/util/project/.storage/@tests/project/cache/production/build/index.pack.br and /dev/null differ diff --git a/tests/util/project/.storage/@tests/project/modules.json b/tests/util/project/.storage/@tests/project/modules.json deleted file mode 100644 index 3af0019c91..0000000000 --- a/tests/util/project/.storage/@tests/project/modules.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "HtmlWebpackCompiler": [ - { - "chunks": { - "byName": { - "HtmlWebpackPlugin_0-0": 563 - }, - "bySource": { - "0 HtmlWebpackPlugin_0-0": 563 - }, - "usedIds": [ - 563 - ] - }, - "modules": { - "byIdentifier": {}, - "usedIds": [] - } - } - ], - "chunks": { - "byName": { - "app": 143, - "runtime": 666 - }, - "bySource": { - "0 app": 666, - "1 app": 143 - }, - "usedIds": [ - 143, - 666 - ] - }, - "modules": { - "byIdentifier": {}, - "usedIds": [] - } -} \ No newline at end of file diff --git a/tests/util/project/.storage/bud.commands.yml b/tests/util/project/.storage/bud.commands.yml deleted file mode 100644 index 28ebfe4ded..0000000000 --- a/tests/util/project/.storage/bud.commands.yml +++ /dev/null @@ -1,2 +0,0 @@ -- >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-tailwindcss/lib/bud/commands/index.js diff --git a/tests/util/project/.storage/bud.resolutions.yml b/tests/util/project/.storage/bud.resolutions.yml deleted file mode 100644 index 3e10fb3dba..0000000000 --- a/tests/util/project/.storage/bud.resolutions.yml +++ /dev/null @@ -1,88 +0,0 @@ -resolutions: - '@roots/bud/services/env': /Users/kellymears/code/git/roots/bud/sources/@roots/bud/lib/services/env.js - '@roots/bud-hooks': /Users/kellymears/code/git/roots/bud/sources/@roots/bud-hooks/lib/index.js - '@roots/bud-api': /Users/kellymears/code/git/roots/bud/sources/@roots/bud-api/lib/index.js - '@roots/bud-build': /Users/kellymears/code/git/roots/bud/sources/@roots/bud-build/lib/index.js - '@roots/bud-cache': /Users/kellymears/code/git/roots/bud/sources/@roots/bud-cache/lib/index.js - '@roots/bud-compiler': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-compiler/lib/index.js - '@roots/bud-dashboard': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-dashboard/lib/index.js - '@roots/bud-extensions': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/index.js - '@roots/bud/services/project': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud/lib/services/project.js - webpack: /Users/kellymears/code/git/roots/bud/node_modules/webpack/lib/index.js - '@roots/bud-support/css-loader': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-support/lib/css-loader/index.cjs - '@roots/bud-support/csv-loader': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-support/lib/csv-loader/index.cjs - '@roots/bud-support/file-loader': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-support/lib/file-loader/index.cjs - '@roots/bud-support/html-loader': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-support/vendor/html-loader/index.cjs - '@roots/bud-support/remark-loader': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-support/lib/remark-loader/index.cjs - '@roots/bud-support/style-loader': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-support/lib/style-loader/index.cjs - '@roots/bud-support/yml-loader': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-support/lib/yml-loader/index.cjs - '@roots/bud-entrypoints': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-entrypoints/lib/index.js - '@roots/bud-minify': /Users/kellymears/code/git/roots/bud/sources/@roots/bud-minify/lib/index.js - '@roots/bud-extensions/cdn': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/cdn/index.js - '@roots/bud-extensions/esm': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/esm/index.js - '@roots/bud-extensions/fix-style-only-entrypoints': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/fix-style-only-entrypoints/index.js - '@roots/bud-extensions/clean-webpack-plugin': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/clean-webpack-plugin/index.js - '@roots/bud-extensions/copy-webpack-plugin': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/copy-webpack-plugin/index.js - '@roots/bud-extensions/html-webpack-plugin': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/html-webpack-plugin/index.js - '@roots/bud-extensions/import-map': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/import-map/index.js - '@roots/bud-extensions/interpolate-html-webpack-plugin': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/interpolate-html-webpack-plugin/index.js - '@roots/bud-extensions/mini-css-extract-plugin': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/mini-css-extract-plugin/index.js - '@roots/bud-extensions/webpack-define-plugin': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/webpack-define-plugin/index.js - '@roots/bud-extensions/webpack-hot-module-replacement-plugin': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/webpack-hot-module-replacement-plugin/index.js - '@roots/bud-extensions/webpack-lifecycle-plugin': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/webpack-lifecycle-plugin/index.js - '@roots/bud-extensions/webpack-manifest-plugin': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/webpack-manifest-plugin/index.js - '@roots/bud-extensions/webpack-provide-plugin': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/webpack-provide-plugin/index.js - '@roots/bud-extensions/tsconfig-values': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/tsconfig-values/index.js - '@roots/bud-react': /Users/kellymears/code/git/roots/bud/sources/@roots/bud-react/lib/index.js - '@roots/bud-swc': /Users/kellymears/code/git/roots/bud/sources/@roots/bud-swc/lib/index.js - '@roots/bud-tailwindcss': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-tailwindcss/lib/index.js - '@roots/bud-postcss': /Users/kellymears/code/git/roots/bud/sources/@roots/bud-postcss/lib/index.js - '@roots/bud-react/react-refresh': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-react/lib/react-refresh/index.js - swc-loader: /Users/kellymears/code/git/roots/bud/node_modules/swc-loader/src/index.js - postcss-loader: /Users/kellymears/code/git/roots/bud/node_modules/postcss-loader/dist/cjs.js - postcss-import: /Users/kellymears/code/git/roots/bud/node_modules/postcss-import/index.js - postcss-nested: /Users/kellymears/code/git/roots/bud/node_modules/postcss-nested/index.js - postcss-preset-env: >- - /Users/kellymears/code/git/roots/bud/node_modules/postcss-preset-env/dist/index.mjs - tailwindcss/nesting/index.js: >- - /Users/kellymears/code/git/roots/bud/node_modules/tailwindcss/nesting/index.js - tailwindcss: /Users/kellymears/code/git/roots/bud/node_modules/tailwindcss/lib/index.js - '@roots/bud-support/html-webpack-plugin': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-support/vendor/html-webpack-plugin/index.cjs - '@roots/bud-extensions/interpolate-html-webpack-plugin/plugin': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-extensions/lib/interpolate-html-webpack-plugin/plugin/index.js - '@roots/bud-support/json5': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-support/lib/json5/index.js - mini-svg-data-uri: /Users/kellymears/code/git/roots/bud/node_modules/mini-svg-data-uri/index.js - '@roots/bud-support/toml': >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-support/lib/toml/index.js -version: 0.0.0 diff --git a/tests/util/project/.storage/checksum.yml b/tests/util/project/.storage/checksum.yml deleted file mode 100644 index 7e76203082..0000000000 --- a/tests/util/project/.storage/checksum.yml +++ /dev/null @@ -1,7 +0,0 @@ -.env: fcaca18d0d59f3e9b8da38726a40af5892c9b4f7 -.gitignore: 6fc649d9aaf3c5d32f21cba0d65796dbff622e5d -tsconfig: 0fa38af0321a7575b74e98cc4dbeed99f0e73999 -package: b603e40f382cf2cb7489f61bbe83fbdc1afad8cb -types.d: 912f2df356bc2fb1e7618a3fdb62d4c531f6d333 -bud.config: 0a303f9624f7cfd77fa965816ce0562b56c43afe -tailwind.config: 69b723d5727bce98629d68b9bbd981b333a07409 diff --git a/tests/util/project/.storage/commands.yml b/tests/util/project/.storage/commands.yml deleted file mode 100644 index 28ebfe4ded..0000000000 --- a/tests/util/project/.storage/commands.yml +++ /dev/null @@ -1,2 +0,0 @@ -- >- - /Users/kellymears/code/git/roots/bud/sources/@roots/bud-tailwindcss/lib/bud/commands/index.js diff --git a/tests/util/project/.storage/configs/bud.config.ts/0a303f9624f7cfd77fa965816ce0562b56c43afe.js b/tests/util/project/.storage/configs/bud.config.ts/0a303f9624f7cfd77fa965816ce0562b56c43afe.js deleted file mode 100644 index 76f57520fb..0000000000 --- a/tests/util/project/.storage/configs/bud.config.ts/0a303f9624f7cfd77fa965816ce0562b56c43afe.js +++ /dev/null @@ -1,3 +0,0 @@ -export default async (bud) => { - bud.entry(`app`, [`scripts/index`, `scripts/scripts`, `styles/app`]).watch([bud.path(`@src`, `images`)]).serve(3015).html().alias(`foo`, false); -}; diff --git a/tests/util/project/.storage/configs/tailwind.config.ts/69b723d5727bce98629d68b9bbd981b333a07409.js b/tests/util/project/.storage/configs/tailwind.config.ts/69b723d5727bce98629d68b9bbd981b333a07409.js deleted file mode 100644 index 5ef25ab6e3..0000000000 --- a/tests/util/project/.storage/configs/tailwind.config.ts/69b723d5727bce98629d68b9bbd981b333a07409.js +++ /dev/null @@ -1,12 +0,0 @@ -import forms from "@tailwindcss/forms"; -export default { - content: [`./src/**/*.{js,ts,tsx}`], - theme: { - extend: { - colors: { - primary: `red` - } - } - }, - plugins: [forms] -};