diff --git a/README.md b/README.md index d5f3fb8..6e4d634 100644 --- a/README.md +++ b/README.md @@ -351,7 +351,7 @@ module.exports = { Type: `string|string[]` Similar to [`mixinsDir`](#mixinsdir); except, you can provide -[fast-glob](https://github.com/mrmlnc/fast-glob) syntax to target or not target +[tinyglobby](https://github.com/SuperchupuDev/tinyglobby) syntax to target or not target specific files. ```js diff --git a/index.js b/index.js index 549085e..2eaf9d4 100644 --- a/index.js +++ b/index.js @@ -1,13 +1,11 @@ -let glob = require('fast-glob') let { readFileSync } = require('node:fs') -let { platform } = require('node:os') let { basename, extname, join, relative } = require('node:path') let { parse } = require('postcss-js') let vars = require('postcss-simple-vars') let sugarss = require('sugarss') +let { globSync } = require('tinyglobby') let MIXINS_GLOB = '*.{js,cjs,mjs,json,css,sss,pcss}' -let IS_WIN = platform().includes('win32') function addMixin(helpers, mixins, rule, file) { let name = rule.params.split(/\s/, 1)[0] @@ -48,7 +46,7 @@ function processModulesForHotReloadRecursively(module, helpers) { function loadGlobalMixin(helpers, globs) { let cwd = process.cwd() - let files = glob.sync(globs, { caseSensitiveMatch: IS_WIN }) + let files = globSync(globs, { caseSensitiveMatch: false }) let mixins = {} files.forEach(i => { let ext = extname(i).toLowerCase() diff --git a/package.json b/package.json index 1bc6843..44bc5d7 100644 --- a/package.json +++ b/package.json @@ -35,10 +35,10 @@ "postcss": "^8.2.14" }, "dependencies": { - "fast-glob": "^3.3.2", "postcss-js": "^4.0.1", "postcss-simple-vars": "^7.0.1", - "sugarss": "^4.0.1" + "sugarss": "^4.0.1", + "tinyglobby": "^0.2.6" }, "devDependencies": { "@logux/eslint-config": "^53.4.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index b5de91a..fb62d58 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -8,9 +8,6 @@ importers: .: dependencies: - fast-glob: - specifier: ^3.3.2 - version: 3.3.2 postcss-js: specifier: ^4.0.1 version: 4.0.1(postcss@8.4.45) @@ -20,6 +17,9 @@ importers: sugarss: specifier: ^4.0.1 version: 4.0.1(postcss@8.4.45) + tinyglobby: + specifier: ^0.2.6 + version: 0.2.6 devDependencies: '@logux/eslint-config': specifier: ^53.4.0 @@ -558,6 +558,14 @@ packages: fastq@1.17.1: resolution: {integrity: sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==} + fdir@6.3.0: + resolution: {integrity: sha512-QOnuT+BOtivR77wYvCWHfGt9s4Pz1VIMbD463vegT5MLqNXy8rYFT/lPVEqf/bhYeT6qmqrNHhsX+rWwe3rOCQ==} + peerDependencies: + picomatch: ^3 || ^4 + peerDependenciesMeta: + picomatch: + optional: true + file-entry-cache@8.0.0: resolution: {integrity: sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==} engines: {node: '>=16.0.0'} @@ -929,6 +937,10 @@ packages: resolution: {integrity: sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==} engines: {node: '>=8.6'} + picomatch@4.0.2: + resolution: {integrity: sha512-M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==} + engines: {node: '>=12'} + possible-typed-array-names@1.0.0: resolution: {integrity: sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==} engines: {node: '>= 0.4'} @@ -1095,6 +1107,10 @@ packages: text-table@0.2.0: resolution: {integrity: sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==} + tinyglobby@0.2.6: + resolution: {integrity: sha512-NbBoFBpqfcgd1tCiO8Lkfdk+xrA7mlLR9zgvZcZWQQwU63XAfUePyd6wZBaU93Hqw347lHnwFzttAkemHzzz4g==} + engines: {node: '>=12.0.0'} + to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -1846,6 +1862,10 @@ snapshots: dependencies: reusify: 1.0.4 + fdir@6.3.0(picomatch@4.0.2): + optionalDependencies: + picomatch: 4.0.2 + file-entry-cache@8.0.0: dependencies: flat-cache: 4.0.1 @@ -2203,6 +2223,8 @@ snapshots: picomatch@2.3.1: {} + picomatch@4.0.2: {} + possible-typed-array-names@1.0.0: {} postcss-js@4.0.1(postcss@8.4.45): @@ -2366,6 +2388,11 @@ snapshots: text-table@0.2.0: {} + tinyglobby@0.2.6: + dependencies: + fdir: 6.3.0(picomatch@4.0.2) + picomatch: 4.0.2 + to-regex-range@5.0.1: dependencies: is-number: 7.0.0