From b79122affbf85600a912ded6d5a266b3c2a34c68 Mon Sep 17 00:00:00 2001 From: Jason Caldwell Date: Fri, 15 Dec 2023 01:11:35 -0500 Subject: [PATCH] Project update. [p][robotic] --- .browserslistrc | 2 +- .dockerignore | 2 +- .gitattributes | 2 +- .gitignore | 2 +- .npmignore | 2 +- .prettierignore | 2 +- .vscode/settings.json | 2 +- .vscodeignore | 2 +- dev/.files/brand/config.mjs | 6 +- dev/.files/madrun/config.mjs | 46 +++--- dev/.files/madrun/includes/events.mjs | 62 +++---- .../vite/includes/c10n/pre-processing.mjs | 15 +- dev/.files/wrangler/config.mjs | 35 ++-- dev/.files/wrangler/settings.mjs | 78 ++++----- package-lock.json | 152 +++++++++--------- package.json | 8 +- tsconfig.json | 2 +- wrangler.toml | 2 +- 18 files changed, 221 insertions(+), 201 deletions(-) diff --git a/.browserslistrc b/.browserslistrc index 5d535aeb..64529940 100644 --- a/.browserslistrc +++ b/.browserslistrc @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Dec 14, 2023 9:16 PM UTC. +# Last generated Dec 15, 2023 6:11 AM UTC. [production] node >= 20.9.0 diff --git a/.dockerignore b/.dockerignore index 8a7a6e45..4aab1fc2 100644 --- a/.dockerignore +++ b/.dockerignore @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Dec 14, 2023 9:16 PM UTC. +# Last generated Dec 15, 2023 6:11 AM UTC. # Locals diff --git a/.gitattributes b/.gitattributes index a524803b..e92da553 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Dec 14, 2023 9:16 PM UTC. +# Last generated Dec 15, 2023 6:11 AM UTC. # Default diff --git a/.gitignore b/.gitignore index 4abebdca..5f9b2bf1 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Dec 14, 2023 9:16 PM UTC. +# Last generated Dec 15, 2023 6:11 AM UTC. # Locals diff --git a/.npmignore b/.npmignore index 984f186a..6ae669f1 100644 --- a/.npmignore +++ b/.npmignore @@ -25,7 +25,7 @@ # Generated data. # -# Last generated Dec 14, 2023 9:16 PM UTC. +# Last generated Dec 15, 2023 6:11 AM UTC. # Locals diff --git a/.prettierignore b/.prettierignore index 18fef6bb..5e73a44c 100644 --- a/.prettierignore +++ b/.prettierignore @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Dec 14, 2023 9:16 PM UTC. +# Last generated Dec 15, 2023 6:11 AM UTC. # Packages diff --git a/.vscode/settings.json b/.vscode/settings.json index e8b3ce8b..36771296 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -7,7 +7,7 @@ * @note This entire file will be updated automatically. * @note Instead of editing here, please review `./settings.mjs`. * - * Last generated using `./settings.mjs` Dec 14, 2023 9:16 PM UTC. + * Last generated using `./settings.mjs` Dec 15, 2023 6:11 AM UTC. */ { "editor.formatOnType": false, diff --git a/.vscodeignore b/.vscodeignore index 7f5a0800..ac03fa7b 100644 --- a/.vscodeignore +++ b/.vscodeignore @@ -17,7 +17,7 @@ # Generated data. # -# Last generated Dec 14, 2023 9:16 PM UTC. +# Last generated Dec 15, 2023 6:11 AM UTC. # Locals diff --git a/dev/.files/brand/config.mjs b/dev/.files/brand/config.mjs index cf6696e8..aee9db68 100644 --- a/dev/.files/brand/config.mjs +++ b/dev/.files/brand/config.mjs @@ -19,9 +19,5 @@ export default async (/* {} */) => { /** * Composition. */ - return { - name: 'Skeleton', - slogan: 'Masters of the digital divide.', - description: 'Great things, built on great technology.', - }; + return {}; // Nothing at this time. }; diff --git a/dev/.files/madrun/config.mjs b/dev/.files/madrun/config.mjs index a290d5a3..8a17418a 100644 --- a/dev/.files/madrun/config.mjs +++ b/dev/.files/madrun/config.mjs @@ -130,6 +130,7 @@ export default async () => { * Wrangler commands. */ 'wrangler': async ({ args }) => { + const settings = wranglerSettings(); return { env: { ...nodeEnvVars, ...cloudflareEnvVars }, opts: { ...('pages' === args._?.[0] ? { cwd: distDir } : {}) }, @@ -139,18 +140,18 @@ export default async () => { ...('dev' === args._?.[0] || 'pages' === args._?.[0] ? [ async () => { - if (!(await fs.existsSync(wranglerSettings.osDir))) return; + if (!(await fs.existsSync(settings.osDir))) return; // Ensure `~/.wrangler/local-cert` directory exists. - await fsp.mkdir(wranglerSettings.osSSLCertDir, { recursive: true, mode: 0o700 }); + await fsp.mkdir(settings.osSSLCertDir, { recursive: true, mode: 0o700 }); // Link our custom SSL key to that used by Wrangler. - await fsp.rm(wranglerSettings.osSSLKeyFile, { recursive: true, force: true }); - await fsp.symlink(wranglerSettings.customSSLKeyFile, wranglerSettings.osSSLKeyFile); + await fsp.rm(settings.osSSLKeyFile, { recursive: true, force: true }); + await fsp.symlink(settings.customSSLKeyFile, settings.osSSLKeyFile); // Link our custom SSL certificate to that used by Wrangler. - await fsp.rm(wranglerSettings.osSSLCertFile, { recursive: true, force: true }); - await fsp.symlink(wranglerSettings.customSSLCertFile, wranglerSettings.osSSLCertFile); + await fsp.rm(settings.osSSLCertFile, { recursive: true, force: true }); + await fsp.symlink(settings.customSSLCertFile, settings.osSSLCertFile); }, ] : []), @@ -180,7 +181,7 @@ export default async () => { { opts: { cwd: projDir }, cmd: ['npx', 'vite', 'build', '--mode', // Mode can only be `prod` or `stage` when deploying remotely. - args.branch && args.branch !== wranglerSettings.defaultPagesProductionBranch ? 'stage' : 'prod'], // prettier-ignore + args.branch && args.branch !== settings.defaultPagesProductionBranch ? 'stage' : 'prod'], // prettier-ignore }, ] : []), @@ -191,48 +192,48 @@ export default async () => { '{{@}}', // Default `project` command args. - ...('project' === args._?.[1] && 'create' === args._?.[2] ? (args._?.[3] ? [] : [wranglerSettings.defaultPagesProjectName]) : []), + ...('project' === args._?.[1] && 'create' === args._?.[2] ? (args._?.[3] ? [] : [settings.defaultPagesProjectName]) : []), ...('project' === args._?.[1] && 'create' === args._?.[2] ? args.productionBranch ? [] // This is the production branch on the Cloudflare side. - : ['--production-branch', wranglerSettings.defaultPagesProductionBranch] + : ['--production-branch', settings.defaultPagesProductionBranch] : []), // Default `dev` command args. ...('dev' === args._?.[1] ? (args._?.[2] ? [] : [distDir]) : []), - ...('dev' === args._?.[1] ? (args.ip ? [] : ['--ip', wranglerSettings.defaultLocalIP]) : []), - ...('dev' === args._?.[1] ? (args.port ? [] : ['--port', wranglerSettings.defaultLocalPort]) : []), - ...('dev' === args._?.[1] ? (args.localProtocol ? [] : ['--local-protocol', wranglerSettings.defaultLocalProtocol]) : []), - ...('dev' === args._?.[1] ? (args.compatibilityDate ? [] : ['--compatibility-date', wranglerSettings.compatibilityDate]) : []), + ...('dev' === args._?.[1] ? (args.ip ? [] : ['--ip', settings.defaultLocalIP]) : []), + ...('dev' === args._?.[1] ? (args.port ? [] : ['--port', settings.defaultLocalPort]) : []), + ...('dev' === args._?.[1] ? (args.localProtocol ? [] : ['--local-protocol', settings.defaultLocalProtocol]) : []), + ...('dev' === args._?.[1] ? (args.compatibilityDate ? [] : ['--compatibility-date', settings.compatibilityDate]) : []), ...('dev' === args._?.[1] ? args.compatibilityFlag || args.compatibilityFlags ? [] // `--compatibility-flag` is an alias of `--compatibility-flags`. - : wranglerSettings.compatibilityFlags.map((f) => ['--compatibility-flag', f]).flat() + : settings.compatibilityFlags.map((f) => ['--compatibility-flag', f]).flat() : []), - ...('dev' === args._?.[1] ? (args.logLevel ? [] : ['--log-level', wranglerSettings.defaultDevLogLevel]) : []), - ...('dev' === args._?.[1] ? ['--binding', wranglerSettings.miniflareEnvVarAsString] : []), // Always on for `dev`. Note: `--binding` can be passed multiple times. + ...('dev' === args._?.[1] ? (args.logLevel ? [] : ['--log-level', settings.defaultDevLogLevel]) : []), + ...('dev' === args._?.[1] ? ['--binding', settings.miniflareEnvVarAsString] : []), // Always on for `dev`. Note: `--binding` can be passed multiple times. // Default `deploy|publish` command args. ...(['deploy', 'publish'].includes(args._?.[1]) ? (args._?.[2] ? [] : [distDir]) : []), - ...(['deploy', 'publish'].includes(args._?.[1]) ? (args.projectName ? [] : ['--project-name', wranglerSettings.defaultPagesProjectName]) : []), - ...(['deploy', 'publish'].includes(args._?.[1]) ? (args.branch ? [] : ['--branch', wranglerSettings.defaultPagesProductionBranch]) : []), + ...(['deploy', 'publish'].includes(args._?.[1]) ? (args.projectName ? [] : ['--project-name', settings.defaultPagesProjectName]) : []), + ...(['deploy', 'publish'].includes(args._?.[1]) ? (args.branch ? [] : ['--branch', settings.defaultPagesProductionBranch]) : []), ...(['deploy', 'publish'].includes(args._?.[1]) ? (args.commitDirty ? [] : ['--commit-dirty', 'true']) : []), // Let’s not nag ourselves. // Default `deployment` command args. ...('deployment' === args._?.[1] && 'list' === args._?.[2] ? args.projectName ? [] - : ['--project-name', wranglerSettings.defaultPagesProjectName] + : ['--project-name', settings.defaultPagesProjectName] : []), ...('deployment' === args._?.[1] && 'tail' === args._?.[2] ? args.projectName ? [] - : ['--project-name', wranglerSettings.defaultPagesProjectName] + : ['--project-name', settings.defaultPagesProjectName] : []), ...('deployment' === args._?.[1] && 'tail' === args._?.[2] ? args.environment ? [] - : ['--environment', wranglerSettings.defaultPagesProductionEnvironment] + : ['--environment', settings.defaultPagesProductionEnvironment] : []), ], ] @@ -242,12 +243,13 @@ export default async () => { }; }, 'wrangler:flush': async () => { + const settings = wranglerSettings(); return { env: { ...nodeEnvVars, ...cloudflareEnvVars }, cmds: [ async () => { u.log($chalk.green('Flushing Wrangler state.')); - await fsp.rm(wranglerSettings.projStateDir, { recursive: true, force: true }); + await fsp.rm(settings.projStateDir, { recursive: true, force: true }); }, ], }; diff --git a/dev/.files/madrun/includes/events.mjs b/dev/.files/madrun/includes/events.mjs index 6809c4de..18fddcf7 100644 --- a/dev/.files/madrun/includes/events.mjs +++ b/dev/.files/madrun/includes/events.mjs @@ -13,7 +13,7 @@ import fs from 'node:fs'; import fsp from 'node:fs/promises'; import path from 'node:path'; import { $chalk, $fs } from '../../../../node_modules/@clevercanyon/utilities.node/dist/index.js'; -import { $app, $brand, $fn, $is, $json, $url } from '../../../../node_modules/@clevercanyon/utilities/dist/index.js'; +import { $app, $brand, $fn, $is, $json, $obp, $url } from '../../../../node_modules/@clevercanyon/utilities/dist/index.js'; import u from '../../bin/includes/utilities.mjs'; const __dirname = $fs.imuDirname(import.meta.url); @@ -110,12 +110,14 @@ export default { * Acquires updated `./package.json` file. */ const pkg = await u.pkg(); // Log it for review. + const appType = $obp.get(pkg, 'config.c10n.&.build.appType'), + targetEnv = $obp.get(pkg, 'config.c10n.&.build.targetEnv'); u.log($chalk.gray($json.stringify(pkg, { pretty: true }))); /** * Gets Wrangler settings now that we have a valid `./package.json` file. */ - const wranglerSettings = (await import('../../wrangler/settings.mjs')).default; + const wranglerSettings = await (await import('../../wrangler/settings.mjs')).default(); /** * Updates `./dev/.envs`, if applicable. @@ -128,25 +130,28 @@ export default { .readFile(envFiles.main) .then((buffer) => buffer.toString()) .then(async (contents) => { - if ('cfw' === pkg.config.c10n.build.targetEnv) { + if (['cma'].includes(appType) && 'cfw' === targetEnv) { contents = contents.replace(/^(BASE_PATH)\s*=\s*[^\r\n]*$/gmu, "$1='/" + wranglerSettings.defaultWorkerShortName + "'"); - } else if ('cfp' === pkg.config.c10n.build.targetEnv) { + // + } else if (['spa', 'mpa'].includes(appType) && 'cfp' === targetEnv) { contents = contents.replace(/^(BASE_PATH)\s*=\s*[^\r\n]*$/gmu, "$1='' # No base path."); } + u.log($chalk.gray('Updating `./' + path.relative(projDir, envFiles.main) + '`.')); await fsp.writeFile(envFiles.main, contents); }) - .catch((error) => { - if ('ENOENT' !== error.code) throw error; + .catch((thrown) => { + if (!$is.error(thrown) || 'ENOENT' !== thrown.code) throw thrown; }); await fsp .readFile(envFiles.stage) .then((buffer) => buffer.toString()) .then(async (contents) => { - if ('cfw' === pkg.config.c10n.build.targetEnv) { + if (['cma'].includes(appType) && 'cfw' === targetEnv) { contents = contents.replace(/^(BASE_PATH)\s*=\s*[^\r\n]*$/gmu, "$1='/" + wranglerSettings.defaultWorkerStageShortName + "'"); contents = contents.replace(/^(APP_BASE_URL)\s*=\s*[^\r\n]*$/gmu, "$1='https://" + wranglerSettings.defaultWorkersDomain + "${BASE_PATH}/'"); - } else if ('cfp' === pkg.config.c10n.build.targetEnv) { + // + } else if (['spa', 'mpa'].includes(appType) && 'cfp' === targetEnv) { contents = contents.replace( /^(APP_BASE_URL)\s*=\s*[^\r\n]*$/gmu, "$1='https://" + @@ -158,28 +163,31 @@ export default { "${BASE_PATH}/'", ); } + u.log($chalk.gray('Updating `./' + path.relative(projDir, envFiles.stage) + '`.')); await fsp.writeFile(envFiles.stage, contents); }) - .catch((error) => { - if ('ENOENT' !== error.code) throw error; + .catch((thrown) => { + if (!$is.error(thrown) || 'ENOENT' !== thrown.code) throw thrown; }); await fsp .readFile(envFiles.prod) .then((buffer) => buffer.toString()) .then(async (contents) => { - if ('cfw' === pkg.config.c10n.build.targetEnv) { + if (['cma'].includes(appType) && 'cfw' === targetEnv) { contents = contents.replace(/^(APP_BASE_URL)\s*=\s*[^\r\n]*$/gmu, "$1='https://" + wranglerSettings.defaultWorkersDomain + "${BASE_PATH}/'"); - } else if ('cfp' === pkg.config.c10n.build.targetEnv) { + // + } else if (['spa', 'mpa'].includes(appType) && 'cfp' === targetEnv) { contents = contents.replace( /^(APP_BASE_URL)\s*=\s*[^\r\n]*$/gmu, "$1='https://" + wranglerSettings.defaultPagesProjectShortName + '.' + wranglerSettings.defaultPagesZoneName + "${BASE_PATH}/'", ); } + u.log($chalk.gray('Updating `./' + path.relative(projDir, envFiles.prod) + '`.')); await fsp.writeFile(envFiles.prod, contents); }) - .catch((error) => { - if ('ENOENT' !== error.code) throw error; + .catch((thrown) => { + if (!$is.error(thrown) || 'ENOENT' !== thrown.code) throw thrown; }); } @@ -196,8 +204,8 @@ export default { contents = contents.replace(/^(#\s+)(@[^/?#\s]+\/[^/?#\s]+)/gmu, '$1' + pkgName); await fsp.writeFile(readmeFile, contents); }) - .catch((error) => { - if ('ENOENT' !== error.code) throw error; + .catch((thrown) => { + if (!$is.error(thrown) || 'ENOENT' !== thrown.code) throw thrown; }); } @@ -226,30 +234,30 @@ export default { await u.gitAddCommit('Initializing project directory. [n]'); /** - * Attempts to create a remote repository origin at GitHub; if at all possible. + * Attempts to create a remote repository origin at GitHub. * - * The `--add-readme` argument to `gh repo create` is important because it forces repo creation to also - * create the default branch. Without creating a readme, the repo will exist, but it will have no branch - * yet, which is confusing and problematic; i.e., the rest of our automation routines expect a default - * `main` branch to exist, such that we can configure branch protection, etc. + * The `--gitignore` argument to `gh repo create` is important because it forces repo creation to also + * create the default branch. Without creating a `.gitignore`, the repo will exist, but it will have no + * branch yet, which is confusing and problematic; i.e., the rest of our automation routines expect a + * default `main` branch to exist, such that we can configure branch protection, etc. */ if ('clevercanyon' === repoOwner) { if (process.env.GH_TOKEN && 'owner' === (await u.gistGetC10NUser()).github?.role) { u.log($chalk.green('Creating remote project repo at GitHub [' + (args.public ? 'public' : 'private') + '].')); - await u.spawn('gh', ['repo', 'create', repoOwner + '/' + repoName, '--source', projDir, args.public ? '--public' : '--private', '--add-readme']); + await u.spawn('gh', ['repo', 'create', repoOwner + '/' + repoName, args.public ? '--public' : '--private', '--gitignore', 'Yeoman']); + await u.spawn('git', ['remote', 'add', 'origin', 'https://github.com/' + $url.encode(repoOwner) + '/' + $url.encode(repoName) + '.git']); } else { u.log($chalk.green('Configuring a remote repo origin.')); - const origin = 'https://github.com/' + $url.encode(repoOwner) + '/' + $url.encode(repoName) + '.git'; - await u.spawn('git', ['remote', 'add', 'origin', origin]); + await u.spawn('git', ['remote', 'add', 'origin', 'https://github.com/' + $url.encode(repoOwner) + '/' + $url.encode(repoName) + '.git']); } } else if (process.env.USER_GITHUB_USERNAME === repoOwner) { if (process.env.GH_TOKEN) { u.log($chalk.green('Creating remote project repo at GitHub [' + (args.public ? 'public' : 'private') + '].')); - await u.spawn('gh', ['repo', 'create', repoOwner + '/' + repoName, '--source', projDir, args.public ? '--public' : '--private', '--add-readme']); + await u.spawn('gh', ['repo', 'create', repoOwner + '/' + repoName, args.public ? '--public' : '--private', '--gitignore', 'Yeoman']); + await u.spawn('git', ['remote', 'add', 'origin', 'https://github.com/' + $url.encode(repoOwner) + '/' + $url.encode(repoName) + '.git']); } else { u.log($chalk.green('Configuring a remote repo origin.')); - const origin = 'https://github.com/' + $url.encode(repoOwner) + '/' + $url.encode(repoName) + '.git'; - await u.spawn('git', ['remote', 'add', 'origin', origin]); + await u.spawn('git', ['remote', 'add', 'origin', 'https://github.com/' + $url.encode(repoOwner) + '/' + $url.encode(repoName) + '.git']); } } diff --git a/dev/.files/vite/includes/c10n/pre-processing.mjs b/dev/.files/vite/includes/c10n/pre-processing.mjs index 9cbb99bd..4bd0642d 100644 --- a/dev/.files/vite/includes/c10n/pre-processing.mjs +++ b/dev/.files/vite/includes/c10n/pre-processing.mjs @@ -35,17 +35,24 @@ export default async ({ command, isSSRBuild, projDir, distDir, appType }) => { if (!distDir || !fs.existsSync(distDir)) return; if (['spa', 'mpa'].includes(appType)) { - const wranglerCacheDir = path.resolve(distDir, './node_modules/.cache/wrangler'), - tmpDir = fs.mkdtempSync(path.resolve(projDir, './.~c10n-')), - wranglerTmpCacheDir = path.resolve(tmpDir, './tGuaPyXd'); + // Preserving this, as Wrangler saves a few important-ish things here. + const wranglerCacheDir = path.resolve(distDir, './node_modules/.cache/wrangler'); if (fs.existsSync(wranglerCacheDir)) { + const tmpDir = fs.mkdtempSync(path.resolve(projDir, './.~c10n-')), + wranglerTmpCacheDir = path.resolve(tmpDir, './tGuaPyXd'); + + u.log($chalk.gray('Preserving `./node_modules/.cache/wrangler`.')); fs.renameSync(wranglerCacheDir, wranglerTmpCacheDir); resetDistDir(); // Resets `./dist` directory. + + u.log($chalk.gray('Restoring `./node_modules/.cache/wrangler`.')); fs.mkdirSync(path.dirname(wranglerCacheDir), { recursive: true }); fs.renameSync(wranglerTmpCacheDir, wranglerCacheDir); - return fs.rmSync(tmpDir, { force: true, recursive: true }); + fs.rmSync(tmpDir, { force: true, recursive: true }); + + return; // Done; stop here. } } resetDistDir(); // Resets `./dist` directory. diff --git a/dev/.files/wrangler/config.mjs b/dev/.files/wrangler/config.mjs index 7c15a5fb..60b0cb00 100755 --- a/dev/.files/wrangler/config.mjs +++ b/dev/.files/wrangler/config.mjs @@ -38,7 +38,12 @@ const appType = $obp.get(pkg, 'config.c10n.&.build.appType'); */ export default async () => { /** - * Base config. + * Gets settings. + */ + const settings = await wranglerSettings(); + + /** + * Defines base config. */ const baseConfig = { // Platform settings. @@ -51,12 +56,12 @@ export default async () => { // Compatibility settings. - compatibility_date: wranglerSettings.compatibilityDate, - compatibility_flags: wranglerSettings.compatibilityFlags, + compatibility_date: settings.compatibilityDate, + compatibility_flags: settings.compatibilityFlags, // Worker account ID. - account_id: wranglerSettings.defaultAccountId, + account_id: settings.defaultAccountId, // The rest of these settings are applied conditionally. @@ -72,7 +77,7 @@ export default async () => { // Worker name. - name: wranglerSettings.defaultWorkerName, + name: settings.defaultWorkerName, // App main entry configuration. @@ -168,15 +173,15 @@ export default async () => { // Worker route configuration. route: { - zone_name: wranglerSettings.defaultWorkerZoneName, - pattern: wranglerSettings.defaultWorkersDomain + '/' + wranglerSettings.defaultWorkerShortName + '/*', + zone_name: settings.defaultWorkerZoneName, + pattern: settings.defaultWorkersDomain + '/' + settings.defaultWorkerShortName + '/*', }, // `$ madrun wrangler dev` settings. dev: { - local_protocol: wranglerSettings.defaultLocalProtocol, - ip: wranglerSettings.defaultLocalIP, // e.g., `0.0.0.0`. - port: Number(wranglerSettings.defaultLocalPort), + local_protocol: settings.defaultLocalProtocol, + ip: settings.defaultLocalIP, // e.g., `0.0.0.0`. + port: Number(settings.defaultLocalPort), }, // Environments used by this worker. @@ -184,10 +189,10 @@ export default async () => { // `$ madrun wrangler dev` environment, for local testing. dev: { route: { - zone_name: wranglerSettings.defaultLocalHostname, - pattern: wranglerSettings.defaultLocalHostname + '/' + wranglerSettings.defaultWorkerShortName + '/*', + zone_name: settings.defaultLocalHostname, + pattern: settings.defaultLocalHostname + '/' + settings.defaultWorkerShortName + '/*', }, - vars: wranglerSettings.miniflareEnvVarAsObject, + vars: settings.miniflareEnvVarAsObject, build: { cwd: './' + path.relative(projDir, './'), watch_dir: './' + path.relative(projDir, './src'), @@ -197,8 +202,8 @@ export default async () => { // `$ madrun wrangler deploy --env=stage`. stage: { route: { - zone_name: wranglerSettings.defaultWorkerZoneName, - pattern: wranglerSettings.defaultWorkersDomain + '/' + wranglerSettings.defaultWorkerStageShortName + '/*', + zone_name: settings.defaultWorkerZoneName, + pattern: settings.defaultWorkersDomain + '/' + settings.defaultWorkerStageShortName + '/*', }, build: { cwd: './' + path.relative(projDir, './'), diff --git a/dev/.files/wrangler/settings.mjs b/dev/.files/wrangler/settings.mjs index b34ca22d..ceec9f2f 100755 --- a/dev/.files/wrangler/settings.mjs +++ b/dev/.files/wrangler/settings.mjs @@ -18,56 +18,58 @@ import u from '../bin/includes/utilities.mjs'; const __dirname = $fs.imuDirname(import.meta.url); const projDir = path.resolve(__dirname, '../../..'); -const pkg = await u.pkg(); -const pkgSlug = $app.pkgSlug(pkg.name); - -const hop = $brand.get('@clevercanyon/hop.gdn'); - /** * Defines Wrangler settings. */ -export default { - // This is Clever Canyon’s account ID. ↓ - defaultAccountId: 'f1176464a976947aa5665d989814a4b1', +export default async () => { + const pkg = await u.pkg(); + const pkgSlug = $app.pkgSlug(pkg.name); + const hop = $brand.get('@clevercanyon/hop.gdn'); + + return { + // This is Clever Canyon’s account ID. ↓ + defaultAccountId: 'f1176464a976947aa5665d989814a4b1', - compatibilityDate: '2023-08-15', - compatibilityFlags: [], // None, for now. + compatibilityDate: '2023-08-15', + compatibilityFlags: [], // None, for now. - defaultLocalIP: '0.0.0.0', - defaultLocalHostname: 'localhost', - defaultLocalProtocol: 'https', - defaultLocalPort: '443', + defaultLocalIP: '0.0.0.0', + defaultLocalHostname: 'localhost', + defaultLocalProtocol: 'https', + defaultLocalPort: '443', - defaultDevLogLevel: 'error', - miniflareEnvVarAsString: 'MINIFLARE=true', - miniflareEnvVarAsObject: { MINIFLARE: 'true' }, + defaultDevLogLevel: 'error', + miniflareEnvVarAsString: 'MINIFLARE=true', + miniflareEnvVarAsObject: { MINIFLARE: 'true' }, - defaultPagesZoneName: hop.hostname, - defaultPagesDevZoneName: 'pages.dev', + defaultPagesZoneName: hop.hostname, + defaultPagesDevZoneName: 'pages.dev', - defaultPagesProjectName: pkgSlug, - defaultPagesProjectShortName: pkgSlug.replace(/-hop-gdn$/iu, ''), + defaultPagesProjectName: pkgSlug, + defaultPagesProjectShortName: pkgSlug // + .replace(/-(?:com|net|org|gdn|hop-gdn)$/iu, ''), - defaultPagesProductionBranch: 'production', - defaultPagesProjectStageBranchName: 'stage', - defaultPagesProductionEnvironment: 'production', + defaultPagesProductionBranch: 'production', + defaultPagesProjectStageBranchName: 'stage', + defaultPagesProductionEnvironment: 'production', - defaultWorkerZoneName: hop.hostname, - defaultWorkersDevZoneName: 'c10n.workers.dev', - defaultWorkersDomain: 'workers.' + hop.hostname, + defaultWorkerZoneName: hop.hostname, + defaultWorkersDevZoneName: 'c10n.workers.dev', + defaultWorkersDomain: 'workers.' + hop.hostname, - defaultWorkerName: pkgSlug.replace(/^workers-/iu, ''), - defaultWorkerShortName: pkgSlug.replace(/^(?:workers-)?hop-gdn-/iu, ''), - defaultWorkerStageShortName: pkgSlug.replace(/^(?:workers-)?hop-gdn-/iu, '') + '-stage', + defaultWorkerName: pkgSlug.replace(/^workers-/iu, ''), + defaultWorkerShortName: pkgSlug.replace(/^workers-hop-gdn-/iu, ''), + defaultWorkerStageShortName: pkgSlug.replace(/^workers-hop-gdn-/iu, '') + '-stage', - osDir: path.resolve(os.homedir(), './.wrangler'), - projDir: path.resolve(projDir, './.wrangler'), - projStateDir: path.resolve(projDir, './.wrangler/state'), + osDir: path.resolve(os.homedir(), './.wrangler'), + projDir: path.resolve(projDir, './.wrangler'), + projStateDir: path.resolve(projDir, './.wrangler/state'), - osSSLCertDir: path.resolve(os.homedir(), './.wrangler/local-cert'), - osSSLKeyFile: path.resolve(os.homedir(), './.wrangler/local-cert/key.pem'), - osSSLCertFile: path.resolve(os.homedir(), './.wrangler/local-cert/cert.pem'), + osSSLCertDir: path.resolve(os.homedir(), './.wrangler/local-cert'), + osSSLKeyFile: path.resolve(os.homedir(), './.wrangler/local-cert/key.pem'), + osSSLCertFile: path.resolve(os.homedir(), './.wrangler/local-cert/cert.pem'), - customSSLKeyFile: path.resolve(projDir, './dev/.files/bin/ssl-certs/i10e-ca-key.pem'), - customSSLCertFile: path.resolve(projDir, './dev/.files/bin/ssl-certs/i10e-ca-crt.pem'), + customSSLKeyFile: path.resolve(projDir, './dev/.files/bin/ssl-certs/i10e-ca-key.pem'), + customSSLCertFile: path.resolve(projDir, './dev/.files/bin/ssl-certs/i10e-ca-crt.pem'), + }; }; diff --git a/package-lock.json b/package-lock.json index b1a032c1..c05a0196 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@clevercanyon/micromatch.fork", - "version": "4.0.82", + "version": "4.0.83", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@clevercanyon/micromatch.fork", - "version": "4.0.82", + "version": "4.0.83", "cpu": [ "x64", "arm64" @@ -17,11 +17,11 @@ "linux" ], "dependencies": { - "braces": "npm:@clevercanyon/braces.fork@^3.0.78", - "picomatch": "npm:@clevercanyon/picomatch.fork@^2.3.77" + "braces": "npm:@clevercanyon/braces.fork@^3.0.79", + "picomatch": "npm:@clevercanyon/picomatch.fork@^2.3.78" }, "devDependencies": { - "@clevercanyon/dev-deps": "^1.0.301" + "@clevercanyon/dev-deps": "^1.0.302" }, "engines": { "node": "^20.5.0 || ^20.9.0", @@ -837,9 +837,9 @@ "dev": true }, "node_modules/@clevercanyon/dev-deps": { - "version": "1.0.301", - "resolved": "https://registry.npmjs.org/@clevercanyon/dev-deps/-/dev-deps-1.0.301.tgz", - "integrity": "sha512-IlxT+8busji8LSTWR7auva0bpkinCvOp3FQW2aAxUPU8x+JXp+hs0KqOalocSrfBywI1hmZGqYr2qSvhucsuTg==", + "version": "1.0.302", + "resolved": "https://registry.npmjs.org/@clevercanyon/dev-deps/-/dev-deps-1.0.302.tgz", + "integrity": "sha512-t5UzcRL2R1iAiOQtonBZgKczV7PGxTdWyQrzHK2omqcN+SV2ce5Vn+xusHjYW7wQNXSXfzFy487FP0IrVUM7TQ==", "cpu": [ "x64", "arm64" @@ -850,11 +850,11 @@ "linux" ], "dependencies": { - "@clevercanyon/madrun": "^1.0.130", - "@clevercanyon/utilities": "^1.0.596", - "@clevercanyon/utilities.bash": "^1.0.146", - "@clevercanyon/utilities.cfp": "^1.0.133", - "@clevercanyon/utilities.node": "^1.0.139", + "@clevercanyon/madrun": "^1.0.131", + "@clevercanyon/utilities": "^1.0.598", + "@clevercanyon/utilities.bash": "^1.0.147", + "@clevercanyon/utilities.cfp": "^1.0.134", + "@clevercanyon/utilities.node": "^1.0.140", "@cloudflare/workers-types": "4.20231121.0", "@eslint/js": "8.48.0", "@iarna/toml": "2.2.5", @@ -966,9 +966,9 @@ } }, "node_modules/@clevercanyon/madrun": { - "version": "1.0.131", - "resolved": "https://registry.npmjs.org/@clevercanyon/madrun/-/madrun-1.0.131.tgz", - "integrity": "sha512-YsBNbPXmTN5BCzPOBCJgtfF4l1ZQgFJrSnP+CNnnSV/TjsZ+DqxW6N+skGqzzYvZaVnGbruhbynwdHGm9MYg2g==", + "version": "1.0.132", + "resolved": "https://registry.npmjs.org/@clevercanyon/madrun/-/madrun-1.0.132.tgz", + "integrity": "sha512-s7V8Iq84Fle/UFktvctVyxIPr81F+CVteCKp0dLn0yFuAzS7D7WH/lUB8qataCvC0f3pb8KsNJB0rkN5T6Vn8g==", "cpu": [ "x64", "arm64" @@ -979,8 +979,8 @@ "linux" ], "dependencies": { - "@clevercanyon/utilities": "^1.0.596", - "@clevercanyon/utilities.node": "^1.0.139" + "@clevercanyon/utilities": "^1.0.598", + "@clevercanyon/utilities.node": "^1.0.140" }, "bin": { "madrun": "dist/bin/cli.js" @@ -994,9 +994,9 @@ } }, "node_modules/@clevercanyon/split-cmd.fork": { - "version": "1.0.80", - "resolved": "https://registry.npmjs.org/@clevercanyon/split-cmd.fork/-/split-cmd.fork-1.0.80.tgz", - "integrity": "sha512-g0/19m2oecK2UdrGDz1A51amwtCOeDYbEOVJ5BLfCWEGy0BGS4fAYK8kGP/byYth4FOoEr+V/JZTOjxHZmVubQ==", + "version": "1.0.81", + "resolved": "https://registry.npmjs.org/@clevercanyon/split-cmd.fork/-/split-cmd.fork-1.0.81.tgz", + "integrity": "sha512-b5UfewvBXYIkiKVJP31xzuxj3U43cco29dHEbD2sy0Pvns7wDp7IiQ84ijC5IaYwj4IXId0+Elw+ykQ40SFbPw==", "cpu": [ "x64", "arm64" @@ -1016,9 +1016,9 @@ } }, "node_modules/@clevercanyon/utilities": { - "version": "1.0.598", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities/-/utilities-1.0.598.tgz", - "integrity": "sha512-nzduf/HwJc0w9TJCobITZ4ICW025OSueXmsHhFqrMYrTyu0PMSpMGni5d50tQabgQ/XsNuvuaZxXYZDpOeX7NA==", + "version": "1.0.602", + "resolved": "https://registry.npmjs.org/@clevercanyon/utilities/-/utilities-1.0.602.tgz", + "integrity": "sha512-1C6+DEM/SR2Edx/kBGEyPoFpXUYw2GWL/DikUyYTHPtvjiu+Lhnz7IZ+0xkOw2K8Wx8Untr47IGhNJtKZ8ETkw==", "cpu": [ "x64", "arm64" @@ -1043,7 +1043,7 @@ "ignore": "5.3.0", "ip-regex": "5.0.0", "micro-memoize": "4.1.2", - "micromatch": "npm:@clevercanyon/micromatch.fork@^4.0.81", + "micromatch": "npm:@clevercanyon/micromatch.fork@^4.0.82", "parse-css-color": "0.2.1", "preact": "10.19.2", "preact-render-to-string": "6.3.1", @@ -1052,9 +1052,9 @@ } }, "node_modules/@clevercanyon/utilities.bash": { - "version": "1.0.147", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.bash/-/utilities.bash-1.0.147.tgz", - "integrity": "sha512-z242sKsLcL8R8t1stUnEvgwPWJ7AsccSkslcI8XIPa2GQ6tSp1tyrMy8LOqi2BhZeMp4uzFB9nTdJkKKEFznUw==", + "version": "1.0.148", + "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.bash/-/utilities.bash-1.0.148.tgz", + "integrity": "sha512-rizLpCueVDoJCLdSY0xNLBwmYFotUXEBSyNdKB5CHqfYO/+DdRzLxiW7FKqBaKu8SlZPFjIqJUGRAwHXsftr5Q==", "cpu": [ "x64", "arm64" @@ -1072,14 +1072,14 @@ "url": "https://github.com/sponsors/clevercanyon" }, "peerDependencies": { - "@clevercanyon/utilities": "^1.0.596", - "@clevercanyon/utilities.node": "^1.0.139" + "@clevercanyon/utilities": "^1.0.598", + "@clevercanyon/utilities.node": "^1.0.140" } }, "node_modules/@clevercanyon/utilities.cfp": { - "version": "1.0.134", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.cfp/-/utilities.cfp-1.0.134.tgz", - "integrity": "sha512-CSYmiwITxcOT1oZU4hS2HJ/p+RAUPZKYpVuXlqDvQmrojvRSP5HwBBLT0SZikIaowesOWl0RFGsESH1BKQWpFA==", + "version": "1.0.135", + "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.cfp/-/utilities.cfp-1.0.135.tgz", + "integrity": "sha512-/zEo0mIuXHtNLT61YhLILAnnlmXyKxXhKWrJ2NDXvJvC+H1tsMW38++CnvP2vS0lnF98E6S+UzeyPvYBTQPgig==", "cpu": [ "x64", "arm64" @@ -1097,15 +1097,15 @@ "url": "https://github.com/sponsors/clevercanyon" }, "peerDependencies": { - "@clevercanyon/utilities": "^1.0.596", - "@clevercanyon/utilities.cfw": "^1.0.138", - "@clevercanyon/utilities.web": "^1.0.94" + "@clevercanyon/utilities": "^1.0.598", + "@clevercanyon/utilities.cfw": "^1.0.139", + "@clevercanyon/utilities.web": "^1.0.95" } }, "node_modules/@clevercanyon/utilities.cfw": { - "version": "1.0.139", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.cfw/-/utilities.cfw-1.0.139.tgz", - "integrity": "sha512-C5wS2vDGVWeLyj5bNmPZt5ImF0NV/GAZxM1iluSIP9DMVLinLL2EBo29VFDrfBYQBv6GXYSWm36PUPpIz24FLA==", + "version": "1.0.140", + "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.cfw/-/utilities.cfw-1.0.140.tgz", + "integrity": "sha512-RtOfSV1KWYE3gny/AbMEJ/u6oJxY3rvNGQWri/Iuv2e+F66b0RfxceAdmKhS8ViWSz0l5JeWmlcaq7zxn87vBA==", "cpu": [ "x64", "arm64" @@ -1124,14 +1124,14 @@ "url": "https://github.com/sponsors/clevercanyon" }, "peerDependencies": { - "@clevercanyon/utilities": "^1.0.596", + "@clevercanyon/utilities": "^1.0.598", "@cloudflare/kv-asset-handler": "0.2.0" } }, "node_modules/@clevercanyon/utilities.node": { - "version": "1.0.140", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.node/-/utilities.node-1.0.140.tgz", - "integrity": "sha512-kqvhrNcBkIlbsaWPJV+KiYGZUpbkCbW3vJnha8Gs3PYQUXe1neWzdfDqDs2emQvYvUgTPW9xeJHFjbb+bowFBw==", + "version": "1.0.141", + "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.node/-/utilities.node-1.0.141.tgz", + "integrity": "sha512-okx5A3//hi7QqCOkI1UyooctI4KwJJi6ymmsICMOaHJPGIzNBuEb8E+atZufMn319xLC4oNqHubuEZtnT3ep9w==", "cpu": [ "x64", "arm64" @@ -1149,8 +1149,8 @@ "url": "https://github.com/sponsors/clevercanyon" }, "peerDependencies": { - "@clevercanyon/split-cmd.fork": "^1.0.79", - "@clevercanyon/utilities": "^1.0.596", + "@clevercanyon/split-cmd.fork": "^1.0.80", + "@clevercanyon/utilities": "^1.0.598", "archiver": "6.0.1", "boxen": "7.1.1", "chalk": "5.3.0", @@ -1161,16 +1161,16 @@ "globby": "14.0.0", "prettier": "3.1.0", "shescape": "2.0.2", - "spawn-please": "npm:@clevercanyon/spawn-please.fork@^2.0.73", + "spawn-please": "npm:@clevercanyon/spawn-please.fork@^2.0.74", "term-img": "6.0.0", "yargs": "17.7.2", "yargs-parser": "21.1.1" } }, "node_modules/@clevercanyon/utilities.web": { - "version": "1.0.95", - "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.web/-/utilities.web-1.0.95.tgz", - "integrity": "sha512-JBClUo9eA56Q59dsIuRncVvhngHoTzESW0x/UhAU9YysYbbDDjVb91MXeyEaeSxMIxuJRjcCoe6S/rU3Lpz/Nw==", + "version": "1.0.96", + "resolved": "https://registry.npmjs.org/@clevercanyon/utilities.web/-/utilities.web-1.0.96.tgz", + "integrity": "sha512-ucbn6Goknu2lyiZVC1vfxVWECKM88CufOmEznJieEIP5aAtxMxuRjBlvhwENsir3Me4b3jZhTted4u9w4tNbAA==", "cpu": [ "x64", "arm64" @@ -1189,7 +1189,7 @@ "url": "https://github.com/sponsors/clevercanyon" }, "peerDependencies": { - "@clevercanyon/utilities": "^1.0.596" + "@clevercanyon/utilities": "^1.0.598" } }, "node_modules/@cloudflare/kv-asset-handler": { @@ -7773,9 +7773,9 @@ }, "node_modules/braces": { "name": "@clevercanyon/braces.fork", - "version": "3.0.78", - "resolved": "https://registry.npmjs.org/@clevercanyon/braces.fork/-/braces.fork-3.0.78.tgz", - "integrity": "sha512-mK4q9G9E2CoxxYHm+KdFtBKtBvSxh5fiMkohP29g2qrU+nBoYgyZqvci8VLZ7lVsSJYn15OIFqGaK368VEV8bA==", + "version": "3.0.79", + "resolved": "https://registry.npmjs.org/@clevercanyon/braces.fork/-/braces.fork-3.0.79.tgz", + "integrity": "sha512-vUPewM66rpEETNci5v9nVeTuVP9Z+JmYlFYaKumdoUErh4K9nl/UObJYaJ3cx+4cab4RMhYjQ/uW1IYCLNMnwQ==", "cpu": [ "x64", "arm64" @@ -7785,7 +7785,7 @@ "linux" ], "dependencies": { - "fill-range": "npm:@clevercanyon/fill-range.fork@^7.0.76" + "fill-range": "npm:@clevercanyon/fill-range.fork@^7.0.77" }, "engines": { "node": "^20.5.0 || ^20.9.0", @@ -12727,9 +12727,9 @@ }, "node_modules/fill-range": { "name": "@clevercanyon/fill-range.fork", - "version": "7.0.77", - "resolved": "https://registry.npmjs.org/@clevercanyon/fill-range.fork/-/fill-range.fork-7.0.77.tgz", - "integrity": "sha512-qeFwL9V1FbqO/oUtfL9VX8egxOx+PqtPqHAlL99+GIxOSnpAIy44knTdwjJZg7pttI3+a4djnvU/SXvcHbSvBw==", + "version": "7.0.78", + "resolved": "https://registry.npmjs.org/@clevercanyon/fill-range.fork/-/fill-range.fork-7.0.78.tgz", + "integrity": "sha512-njzNizYcFxaiQd4xNLfVpECH+WzIy9Hd1xK+MI4rUvPA6loJBbKCTfW86pM7drj1khAmuE+IWwIX83O0Y7unWw==", "cpu": [ "x64", "arm64" @@ -12739,7 +12739,7 @@ "linux" ], "dependencies": { - "to-regex-range": "npm:@clevercanyon/to-regex-range.fork@^5.0.76" + "to-regex-range": "npm:@clevercanyon/to-regex-range.fork@^5.0.77" }, "engines": { "node": "^20.5.0 || ^20.9.0", @@ -14345,9 +14345,9 @@ }, "node_modules/is-number": { "name": "@clevercanyon/is-number.fork", - "version": "7.0.80", - "resolved": "https://registry.npmjs.org/@clevercanyon/is-number.fork/-/is-number.fork-7.0.80.tgz", - "integrity": "sha512-8hGKJnCOFRnMVMYupWlB+WsTzpTJwbxkiO864O3odDqrC00ZCOF7ANUc65rmBatw6VLp7cf7nZbrvvtoSxaXEA==", + "version": "7.0.81", + "resolved": "https://registry.npmjs.org/@clevercanyon/is-number.fork/-/is-number.fork-7.0.81.tgz", + "integrity": "sha512-brtmpuzJmexTqtNBflHgWb6EQvpXbeZdqLDamCQ9Zm8Umy3ha0uETr7MbZE4dR+nE3XoIyaiP4RH0zcrpJDEow==", "cpu": [ "x64", "arm64" @@ -20087,9 +20087,9 @@ }, "node_modules/micromatch": { "name": "@clevercanyon/micromatch.fork", - "version": "4.0.82", - "resolved": "https://registry.npmjs.org/@clevercanyon/micromatch.fork/-/micromatch.fork-4.0.82.tgz", - "integrity": "sha512-TESOcNNBU8dmgdJW+GOgjp22T1eSZemt5ys34EYwTi8PtNG+mLfUPEt8VL33NAfCBz6aVtnxJu8c1xgxHgTzdQ==", + "version": "4.0.83", + "resolved": "https://registry.npmjs.org/@clevercanyon/micromatch.fork/-/micromatch.fork-4.0.83.tgz", + "integrity": "sha512-vo/ZNQ8bkN91n7EblNt+A/VA8htI2RdJ1lq5uwhp9KqAM9zi/mnMaEPOzZVwUFmQ0X7ZZYNlxt7EvEx+stsFrg==", "cpu": [ "x64", "arm64" @@ -20100,8 +20100,8 @@ "linux" ], "dependencies": { - "braces": "npm:@clevercanyon/braces.fork@^3.0.77", - "picomatch": "npm:@clevercanyon/picomatch.fork@^2.3.76" + "braces": "npm:@clevercanyon/braces.fork@^3.0.78", + "picomatch": "npm:@clevercanyon/picomatch.fork@^2.3.77" }, "engines": { "node": "^20.5.0 || ^20.9.0", @@ -21296,9 +21296,9 @@ }, "node_modules/picomatch": { "name": "@clevercanyon/picomatch.fork", - "version": "2.3.77", - "resolved": "https://registry.npmjs.org/@clevercanyon/picomatch.fork/-/picomatch.fork-2.3.77.tgz", - "integrity": "sha512-4jTagw9FSXwOtZZYGTouHme4wORsqMH2lUcZm1SStd90R4uCfAo98B9R/wVb1WUhpMY15X3oqPOHk2/xqGL+lw==", + "version": "2.3.78", + "resolved": "https://registry.npmjs.org/@clevercanyon/picomatch.fork/-/picomatch.fork-2.3.78.tgz", + "integrity": "sha512-Fg5wQiKllURkwPCE70SFxCQNkpWCrxbBT4fCVYP52/NZd98VIDB2as02v2PM8VD6PdGhuEiPl7t2fx9vbuR97Q==", "cpu": [ "x64", "arm64" @@ -27363,9 +27363,9 @@ }, "node_modules/spawn-please": { "name": "@clevercanyon/spawn-please.fork", - "version": "2.0.74", - "resolved": "https://registry.npmjs.org/@clevercanyon/spawn-please.fork/-/spawn-please.fork-2.0.74.tgz", - "integrity": "sha512-pb5VyaB6wAOJ5mH/rsV/hJFXLbXtV+q/WhH0guOdFIxryQBA5WLxfu+imPQnC9tyOmZf1krZb9sW3EozGvNd7w==", + "version": "2.0.75", + "resolved": "https://registry.npmjs.org/@clevercanyon/spawn-please.fork/-/spawn-please.fork-2.0.75.tgz", + "integrity": "sha512-qwJHHiTXytM/0WBT0xMQqQ8f0meu8f3MF3C80d773WtOXluNqBxy2kg6WTHVJ6K96BEN+z6TaMR7zIbK9t7uhA==", "cpu": [ "x64", "arm64" @@ -28681,9 +28681,9 @@ }, "node_modules/to-regex-range": { "name": "@clevercanyon/to-regex-range.fork", - "version": "5.0.77", - "resolved": "https://registry.npmjs.org/@clevercanyon/to-regex-range.fork/-/to-regex-range.fork-5.0.77.tgz", - "integrity": "sha512-r3tUePAzuw49uxnjwMdtyfl+xGH/6DJ5idgeD0JfDfazhByA+EEC2yTdFUIXV0vqVK1qUoc6OrPiOFcDC/7VTA==", + "version": "5.0.78", + "resolved": "https://registry.npmjs.org/@clevercanyon/to-regex-range.fork/-/to-regex-range.fork-5.0.78.tgz", + "integrity": "sha512-7ZNpRKPVsiGofPAWKroK9IAHwh/F8u6ArpZ4peYwnPWxbLtimCbXwhOrIzr7qeUYLX9vCDYyTBK/mhSlD7ygDA==", "cpu": [ "x64", "arm64" @@ -28693,7 +28693,7 @@ "linux" ], "dependencies": { - "is-number": "npm:@clevercanyon/is-number.fork@^7.0.79" + "is-number": "npm:@clevercanyon/is-number.fork@^7.0.80" }, "engines": { "node": "^20.5.0 || ^20.9.0", diff --git a/package.json b/package.json index 9afc5e76..c65e08c6 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "publishConfig": { "access": "public" }, - "version": "4.0.83", + "version": "4.0.84", "license": "MIT", "name": "@clevercanyon/micromatch.fork", "description": "Glob matching. A replacement and faster alternative to minimatch and multimatch.", @@ -35,15 +35,15 @@ "types": "", "typesVersions": {}, "dependencies": { - "braces": "npm:@clevercanyon/braces.fork@^3.0.78", - "picomatch": "npm:@clevercanyon/picomatch.fork@^2.3.77" + "braces": "npm:@clevercanyon/braces.fork@^3.0.79", + "picomatch": "npm:@clevercanyon/picomatch.fork@^2.3.78" }, "peerDependencies": {}, "peerDependenciesMeta": {}, "optionalDependencies": {}, "bundleDependencies": [], "devDependencies": { - "@clevercanyon/dev-deps": "^1.0.301" + "@clevercanyon/dev-deps": "^1.0.302" }, "overrides": {}, "cpu": ["x64", "arm64"], diff --git a/tsconfig.json b/tsconfig.json index 1c408c5f..f48e3e74 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -7,7 +7,7 @@ * @note This entire file will be updated automatically. * @note Instead of editing here, please review `./tsconfig.mjs`. * - * Last generated using `./tsconfig.mjs` Dec 14, 2023 9:16 PM UTC. + * Last generated using `./tsconfig.mjs` Dec 15, 2023 6:11 AM UTC. */ { "include": ["./src/**/*", "./dev-types.d.ts"], diff --git a/wrangler.toml b/wrangler.toml index 9eef0a48..40804ac5 100644 --- a/wrangler.toml +++ b/wrangler.toml @@ -7,7 +7,7 @@ # @note This entire file will be updated automatically. # @note Instead of editing here, please review `./wrangler.mjs`. # -# Last generated using `./wrangler.mjs` Dec 14, 2023 9:16 PM UTC. +# Last generated using `./wrangler.mjs` Dec 15, 2023 6:11 AM UTC. ## send_metrics = false