enhance: use native glob
This commit is contained in:
parent
3afe7c5348
commit
b433d9d15d
|
|
@ -61,7 +61,6 @@
|
||||||
"esbuild": "0.27.0",
|
"esbuild": "0.27.0",
|
||||||
"execa": "9.6.0",
|
"execa": "9.6.0",
|
||||||
"fast-glob": "3.3.3",
|
"fast-glob": "3.3.3",
|
||||||
"glob": "13.0.0",
|
|
||||||
"ignore-walk": "8.0.0",
|
"ignore-walk": "8.0.0",
|
||||||
"js-yaml": "4.1.1",
|
"js-yaml": "4.1.1",
|
||||||
"postcss": "8.5.6",
|
"postcss": "8.5.6",
|
||||||
|
|
|
||||||
|
|
@ -3,14 +3,13 @@ import { fileURLToPath } from 'node:url';
|
||||||
import { dirname } from 'node:path';
|
import { dirname } from 'node:path';
|
||||||
import * as esbuild from 'esbuild';
|
import * as esbuild from 'esbuild';
|
||||||
import { build } from 'esbuild';
|
import { build } from 'esbuild';
|
||||||
import { globSync } from 'glob';
|
|
||||||
import { execa } from 'execa';
|
import { execa } from 'execa';
|
||||||
|
|
||||||
const _filename = fileURLToPath(import.meta.url);
|
const _filename = fileURLToPath(import.meta.url);
|
||||||
const _dirname = dirname(_filename);
|
const _dirname = dirname(_filename);
|
||||||
const _package = JSON.parse(fs.readFileSync(_dirname + '/package.json', 'utf-8'));
|
const _package = JSON.parse(fs.readFileSync(_dirname + '/package.json', 'utf-8'));
|
||||||
|
|
||||||
const entryPoints = globSync('./js/**/**.{ts,tsx}');
|
const entryPoints = fs.globSync('./js/**/**.{ts,tsx}');
|
||||||
|
|
||||||
/** @type {import('esbuild').BuildOptions} */
|
/** @type {import('esbuild').BuildOptions} */
|
||||||
const options = {
|
const options = {
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,11 @@
|
||||||
* SPDX-License-Identifier: AGPL-3.0-only
|
* SPDX-License-Identifier: AGPL-3.0-only
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import { existsSync, readFileSync } from 'node:fs';
|
import { existsSync, readFileSync, globSync as glob } from 'node:fs';
|
||||||
import { writeFile } from 'node:fs/promises';
|
import { writeFile } from 'node:fs/promises';
|
||||||
import { basename, dirname } from 'node:path/posix';
|
import { basename, dirname } from 'node:path/posix';
|
||||||
import { GENERATOR, type State, generate } from 'astring';
|
import { GENERATOR, type State, generate } from 'astring';
|
||||||
import type * as estree from 'estree';
|
import type * as estree from 'estree';
|
||||||
import glob from 'fast-glob';
|
|
||||||
import { format } from 'prettier';
|
import { format } from 'prettier';
|
||||||
|
|
||||||
interface SatisfiesExpression extends estree.BaseExpression {
|
interface SatisfiesExpression extends estree.BaseExpression {
|
||||||
|
|
@ -439,7 +438,7 @@ function toStories(component: string): Promise<string> {
|
||||||
|
|
||||||
// glob('src/{components,pages,ui,widgets}/**/*.vue')
|
// glob('src/{components,pages,ui,widgets}/**/*.vue')
|
||||||
(async () => {
|
(async () => {
|
||||||
const globs = await Promise.all([
|
const components = [
|
||||||
glob('src/components/global/Mk*.vue'),
|
glob('src/components/global/Mk*.vue'),
|
||||||
glob('src/components/global/RouterView.vue'),
|
glob('src/components/global/RouterView.vue'),
|
||||||
glob('src/components/MkAbuseReportWindow.vue'),
|
glob('src/components/MkAbuseReportWindow.vue'),
|
||||||
|
|
@ -469,8 +468,7 @@ function toStories(component: string): Promise<string> {
|
||||||
glob('src/pages/admin/overview.ap-requests.vue'),
|
glob('src/pages/admin/overview.ap-requests.vue'),
|
||||||
glob('src/pages/user/home.vue'),
|
glob('src/pages/user/home.vue'),
|
||||||
glob('src/pages/search.vue'),
|
glob('src/pages/search.vue'),
|
||||||
]);
|
].flat();
|
||||||
const components = globs.flat();
|
|
||||||
await Promise.all(components.map(async (component) => {
|
await Promise.all(components.map(async (component) => {
|
||||||
const stories = component.replace(/\.vue$/, '.stories.ts');
|
const stories = component.replace(/\.vue$/, '.stories.ts');
|
||||||
await writeFile(stories, await toStories(component));
|
await writeFile(stories, await toStories(component));
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@ import {
|
||||||
type PluginOption
|
type PluginOption
|
||||||
} from 'vite';
|
} from 'vite';
|
||||||
import fs from 'node:fs';
|
import fs from 'node:fs';
|
||||||
import { glob } from 'glob';
|
|
||||||
import JSON5 from 'json5';
|
import JSON5 from 'json5';
|
||||||
import MagicString, { SourceMap } from 'magic-string';
|
import MagicString, { SourceMap } from 'magic-string';
|
||||||
import path from 'node:path'
|
import path from 'node:path'
|
||||||
|
|
@ -724,7 +723,7 @@ export function pluginCreateSearchIndexVirtualModule(options: Options, asigner:
|
||||||
|
|
||||||
async load(id) {
|
async load(id) {
|
||||||
if (id == '\0' + allSearchIndexFile) {
|
if (id == '\0' + allSearchIndexFile) {
|
||||||
const files = await Promise.all(options.targetFilePaths.map(async (filePathPattern) => await glob(filePathPattern))).then(paths => paths.flat());
|
const files = options.targetFilePaths.map((filePathPattern) => fs.globSync(filePathPattern)).flat();
|
||||||
let generatedFile = '';
|
let generatedFile = '';
|
||||||
let arrayElements = '';
|
let arrayElements = '';
|
||||||
for (let file of files) {
|
for (let file of files) {
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,6 @@ import { watch as chokidarWatch } from 'chokidar';
|
||||||
import * as esbuild from 'esbuild';
|
import * as esbuild from 'esbuild';
|
||||||
import { build } from 'esbuild';
|
import { build } from 'esbuild';
|
||||||
import { execa } from 'execa';
|
import { execa } from 'execa';
|
||||||
import { globSync } from 'glob';
|
|
||||||
import { generateLocaleInterface } from './scripts/generateLocaleInterface.js';
|
import { generateLocaleInterface } from './scripts/generateLocaleInterface.js';
|
||||||
import type { BuildOptions, BuildResult, Plugin, PluginBuild } from 'esbuild';
|
import type { BuildOptions, BuildResult, Plugin, PluginBuild } from 'esbuild';
|
||||||
|
|
||||||
|
|
@ -22,7 +21,7 @@ const _rootPackage = JSON.parse(fs.readFileSync(resolve(_rootPackageDir, 'packag
|
||||||
const _frontendLocalesDir = resolve(_dirname, '../../built/_frontend_dist_/locales');
|
const _frontendLocalesDir = resolve(_dirname, '../../built/_frontend_dist_/locales');
|
||||||
const _localesDir = resolve(_rootPackageDir, 'locales');
|
const _localesDir = resolve(_rootPackageDir, 'locales');
|
||||||
|
|
||||||
const entryPoints = globSync('./src/**/**.{ts,tsx}');
|
const entryPoints = fs.globSync('./src/**/**.{ts,tsx}');
|
||||||
|
|
||||||
const options: BuildOptions = {
|
const options: BuildOptions = {
|
||||||
entryPoints,
|
entryPoints,
|
||||||
|
|
|
||||||
|
|
@ -35,7 +35,6 @@
|
||||||
"chokidar": "4.0.3",
|
"chokidar": "4.0.3",
|
||||||
"esbuild": "0.27.0",
|
"esbuild": "0.27.0",
|
||||||
"execa": "9.6.0",
|
"execa": "9.6.0",
|
||||||
"glob": "11.1.0",
|
|
||||||
"nodemon": "3.1.11",
|
"nodemon": "3.1.11",
|
||||||
"tsx": "4.20.6",
|
"tsx": "4.20.6",
|
||||||
"typescript": "5.9.3"
|
"typescript": "5.9.3"
|
||||||
|
|
|
||||||
|
|
@ -3,14 +3,13 @@ import { fileURLToPath } from 'node:url';
|
||||||
import { dirname } from 'node:path';
|
import { dirname } from 'node:path';
|
||||||
import * as esbuild from 'esbuild';
|
import * as esbuild from 'esbuild';
|
||||||
import { build } from 'esbuild';
|
import { build } from 'esbuild';
|
||||||
import { globSync } from 'glob';
|
|
||||||
import { execa } from 'execa';
|
import { execa } from 'execa';
|
||||||
|
|
||||||
const _filename = fileURLToPath(import.meta.url);
|
const _filename = fileURLToPath(import.meta.url);
|
||||||
const _dirname = dirname(_filename);
|
const _dirname = dirname(_filename);
|
||||||
const _package = JSON.parse(fs.readFileSync(_dirname + '/package.json', 'utf-8'));
|
const _package = JSON.parse(fs.readFileSync(_dirname + '/package.json', 'utf-8'));
|
||||||
|
|
||||||
const entryPoints = globSync('./src/**/**.{ts,tsx}');
|
const entryPoints = fs.globSync('./src/**/**.{ts,tsx}');
|
||||||
|
|
||||||
/** @type {import('esbuild').BuildOptions} */
|
/** @type {import('esbuild').BuildOptions} */
|
||||||
const options = {
|
const options = {
|
||||||
|
|
|
||||||
|
|
@ -31,7 +31,6 @@
|
||||||
"@typescript-eslint/parser": "8.48.0",
|
"@typescript-eslint/parser": "8.48.0",
|
||||||
"esbuild": "0.27.0",
|
"esbuild": "0.27.0",
|
||||||
"execa": "9.6.0",
|
"execa": "9.6.0",
|
||||||
"glob": "11.1.0",
|
|
||||||
"nodemon": "3.1.11",
|
"nodemon": "3.1.11",
|
||||||
"typescript": "5.9.3"
|
"typescript": "5.9.3"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -3,14 +3,13 @@ import { fileURLToPath } from 'node:url';
|
||||||
import { dirname } from 'node:path';
|
import { dirname } from 'node:path';
|
||||||
import * as esbuild from 'esbuild';
|
import * as esbuild from 'esbuild';
|
||||||
import { build } from 'esbuild';
|
import { build } from 'esbuild';
|
||||||
import { globSync } from 'glob';
|
|
||||||
import { execa } from 'execa';
|
import { execa } from 'execa';
|
||||||
|
|
||||||
const _filename = fileURLToPath(import.meta.url);
|
const _filename = fileURLToPath(import.meta.url);
|
||||||
const _dirname = dirname(_filename);
|
const _dirname = dirname(_filename);
|
||||||
const _package = JSON.parse(fs.readFileSync(_dirname + '/package.json', 'utf-8'));
|
const _package = JSON.parse(fs.readFileSync(_dirname + '/package.json', 'utf-8'));
|
||||||
|
|
||||||
const entryPoints = globSync('./src/**/**.{ts,tsx}');
|
const entryPoints = fs.globSync('./src/**/**.{ts,tsx}');
|
||||||
|
|
||||||
/** @type {import('esbuild').BuildOptions} */
|
/** @type {import('esbuild').BuildOptions} */
|
||||||
const options = {
|
const options = {
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,6 @@
|
||||||
"@vitest/coverage-v8": "4.0.13",
|
"@vitest/coverage-v8": "4.0.13",
|
||||||
"esbuild": "0.27.0",
|
"esbuild": "0.27.0",
|
||||||
"execa": "9.6.0",
|
"execa": "9.6.0",
|
||||||
"glob": "13.0.0",
|
|
||||||
"ncp": "2.0.0",
|
"ncp": "2.0.0",
|
||||||
"nodemon": "3.1.11",
|
"nodemon": "3.1.11",
|
||||||
"tsd": "0.33.0",
|
"tsd": "0.33.0",
|
||||||
|
|
|
||||||
|
|
@ -3,14 +3,13 @@ import { fileURLToPath } from 'node:url';
|
||||||
import { dirname } from 'node:path';
|
import { dirname } from 'node:path';
|
||||||
import * as esbuild from 'esbuild';
|
import * as esbuild from 'esbuild';
|
||||||
import { build } from 'esbuild';
|
import { build } from 'esbuild';
|
||||||
import { globSync } from 'glob';
|
|
||||||
import { execa } from 'execa';
|
import { execa } from 'execa';
|
||||||
|
|
||||||
const _filename = fileURLToPath(import.meta.url);
|
const _filename = fileURLToPath(import.meta.url);
|
||||||
const _dirname = dirname(_filename);
|
const _dirname = dirname(_filename);
|
||||||
const _package = JSON.parse(fs.readFileSync(_dirname + '/package.json', 'utf-8'));
|
const _package = JSON.parse(fs.readFileSync(_dirname + '/package.json', 'utf-8'));
|
||||||
|
|
||||||
const entryPoints = globSync('./src/**/**.{ts,tsx}');
|
const entryPoints = fs.globSync('./src/**/**.{ts,tsx}');
|
||||||
|
|
||||||
/** @type {import('esbuild').BuildOptions} */
|
/** @type {import('esbuild').BuildOptions} */
|
||||||
const options = {
|
const options = {
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,6 @@
|
||||||
"@typescript-eslint/parser": "8.48.0",
|
"@typescript-eslint/parser": "8.48.0",
|
||||||
"esbuild": "0.27.0",
|
"esbuild": "0.27.0",
|
||||||
"execa": "9.6.0",
|
"execa": "9.6.0",
|
||||||
"glob": "11.1.0",
|
|
||||||
"nodemon": "3.1.11",
|
"nodemon": "3.1.11",
|
||||||
"typescript": "5.9.3"
|
"typescript": "5.9.3"
|
||||||
},
|
},
|
||||||
|
|
|
||||||
|
|
@ -25,9 +25,6 @@ importers:
|
||||||
fast-glob:
|
fast-glob:
|
||||||
specifier: 3.3.3
|
specifier: 3.3.3
|
||||||
version: 3.3.3
|
version: 3.3.3
|
||||||
glob:
|
|
||||||
specifier: 13.0.0
|
|
||||||
version: 13.0.0
|
|
||||||
ignore-walk:
|
ignore-walk:
|
||||||
specifier: 8.0.0
|
specifier: 8.0.0
|
||||||
version: 8.0.0
|
version: 8.0.0
|
||||||
|
|
@ -1354,9 +1351,6 @@ importers:
|
||||||
execa:
|
execa:
|
||||||
specifier: 9.6.0
|
specifier: 9.6.0
|
||||||
version: 9.6.0
|
version: 9.6.0
|
||||||
glob:
|
|
||||||
specifier: 11.1.0
|
|
||||||
version: 11.1.0
|
|
||||||
nodemon:
|
nodemon:
|
||||||
specifier: 3.1.11
|
specifier: 3.1.11
|
||||||
version: 3.1.11
|
version: 3.1.11
|
||||||
|
|
@ -1434,9 +1428,6 @@ importers:
|
||||||
execa:
|
execa:
|
||||||
specifier: 9.6.0
|
specifier: 9.6.0
|
||||||
version: 9.6.0
|
version: 9.6.0
|
||||||
glob:
|
|
||||||
specifier: 11.1.0
|
|
||||||
version: 11.1.0
|
|
||||||
nodemon:
|
nodemon:
|
||||||
specifier: 3.1.11
|
specifier: 3.1.11
|
||||||
version: 3.1.11
|
version: 3.1.11
|
||||||
|
|
@ -1477,9 +1468,6 @@ importers:
|
||||||
execa:
|
execa:
|
||||||
specifier: 9.6.0
|
specifier: 9.6.0
|
||||||
version: 9.6.0
|
version: 9.6.0
|
||||||
glob:
|
|
||||||
specifier: 13.0.0
|
|
||||||
version: 13.0.0
|
|
||||||
ncp:
|
ncp:
|
||||||
specifier: 2.0.0
|
specifier: 2.0.0
|
||||||
version: 2.0.0
|
version: 2.0.0
|
||||||
|
|
@ -1553,9 +1541,6 @@ importers:
|
||||||
execa:
|
execa:
|
||||||
specifier: 9.6.0
|
specifier: 9.6.0
|
||||||
version: 9.6.0
|
version: 9.6.0
|
||||||
glob:
|
|
||||||
specifier: 11.1.0
|
|
||||||
version: 11.1.0
|
|
||||||
nodemon:
|
nodemon:
|
||||||
specifier: 3.1.11
|
specifier: 3.1.11
|
||||||
version: 3.1.11
|
version: 3.1.11
|
||||||
|
|
@ -7283,10 +7268,6 @@ packages:
|
||||||
engines: {node: 20 || >=22}
|
engines: {node: 20 || >=22}
|
||||||
hasBin: true
|
hasBin: true
|
||||||
|
|
||||||
glob@13.0.0:
|
|
||||||
resolution: {integrity: sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==}
|
|
||||||
engines: {node: 20 || >=22}
|
|
||||||
|
|
||||||
glob@7.2.3:
|
glob@7.2.3:
|
||||||
resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
|
resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
|
||||||
deprecated: Glob versions prior to v9 are no longer supported
|
deprecated: Glob versions prior to v9 are no longer supported
|
||||||
|
|
@ -18789,12 +18770,6 @@ snapshots:
|
||||||
package-json-from-dist: 1.0.1
|
package-json-from-dist: 1.0.1
|
||||||
path-scurry: 2.0.1
|
path-scurry: 2.0.1
|
||||||
|
|
||||||
glob@13.0.0:
|
|
||||||
dependencies:
|
|
||||||
minimatch: 10.1.1
|
|
||||||
minipass: 7.1.2
|
|
||||||
path-scurry: 2.0.1
|
|
||||||
|
|
||||||
glob@7.2.3:
|
glob@7.2.3:
|
||||||
dependencies:
|
dependencies:
|
||||||
fs.realpath: 1.0.0
|
fs.realpath: 1.0.0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue