Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update dependency glob to v8 (2.x-dev) #18370

Merged
merged 5 commits into from Feb 2, 2023
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
Expand Up @@ -62,7 +62,7 @@
"finalhandler": "^1.2.0",
"fs-extra": "^10.1.0",
"get-port": "^5.1.1",
"glob": "^7.2.3",
"glob": "^8.1.0",
"got": "^11.8.6",
"improved-yarn-audit": "^3.0.0",
"jest": "^28.1.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/builder/package.json
Expand Up @@ -16,7 +16,7 @@
"chokidar": "^3.5.3",
"consola": "^2.15.3",
"fs-extra": "^10.1.0",
"glob": "^7.2.3",
"glob": "^8.1.0",
"hash-sum": "^2.0.0",
"ignore": "^5.2.4",
"lodash": "^4.17.21",
Expand Down
2 changes: 1 addition & 1 deletion packages/builder/src/builder.js
Expand Up @@ -573,7 +573,7 @@ export default class Builder {
// Check plugins exist then set alias to their real path
return Promise.all(this.plugins.map(async (p) => {
const ext = '{?(.+([^.])),/index.+([^.])}'
const pluginFiles = await glob(`${p.src}${ext}`)
const pluginFiles = await glob(upath.normalize(`${p.src}${ext}`))

if (!pluginFiles || pluginFiles.length === 0) {
throw new Error(`Plugin not found: ${p.src}`)
Expand Down
2 changes: 1 addition & 1 deletion packages/webpack/package.json
Expand Up @@ -21,7 +21,7 @@
"eventsource-polyfill": "^0.9.6",
"extract-css-chunks-webpack-plugin": "^4.9.0",
"file-loader": "^6.2.0",
"glob": "^7.2.3",
"glob": "^8.1.0",
"hard-source-webpack-plugin": "^0.13.1",
"hash-sum": "^2.0.0",
"html-webpack-plugin": "^4.5.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/webpack/src/builder.js
@@ -1,4 +1,4 @@
import path from 'path'
import upath from 'upath'
import pify from 'pify'
import webpack from 'webpack'
import Glob from 'glob'
Expand Down Expand Up @@ -68,7 +68,7 @@ export class WebpackBundler {
)
for (const ext of Object.keys(styleResources)) {
await Promise.all(wrapArray(styleResources[ext]).map(async (p) => {
const styleResourceFiles = await glob(path.resolve(this.buildContext.options.rootDir, p))
const styleResourceFiles = await glob(upath.resolve(this.buildContext.options.rootDir, p))

if (!styleResourceFiles || styleResourceFiles.length === 0) {
throw new Error(`Style Resource not found: ${p}`)
Expand Down
4 changes: 2 additions & 2 deletions test/dev/basic.config.defaults.test.js
@@ -1,4 +1,4 @@
import { resolve } from 'path'
import { normalize, resolve } from 'upath'
import consola from 'consola'
import Glob from 'glob'
import pify from 'pify'
Expand All @@ -15,7 +15,7 @@ describe('basic config defaults', () => {
test('modulesDir uses /node_modules as default if not set', () => {
const options = getNuxtConfig({})
const currentNodeModulesDir = resolve(__dirname, '..', '..', 'node_modules')
expect(options.modulesDir).toContain(currentNodeModulesDir)
expect(options.modulesDir.map(d => normalize(d))).toContain(currentNodeModulesDir)
})

test('client source map not generated', async () => {
Expand Down
2 changes: 1 addition & 1 deletion test/dev/full-static.test.js
@@ -1,5 +1,5 @@
import http from 'http'
import { join, resolve } from 'path'
import { join, resolve } from 'upath'
import serveStatic from 'serve-static'
import finalhandler from 'finalhandler'
import glob from 'glob'
Expand Down
2 changes: 1 addition & 1 deletion test/dev/with-config.test.js
@@ -1,5 +1,5 @@
import { resolve } from 'path'
import { existsSync } from 'fs'
import { resolve } from 'upath'
import jsdom from 'jsdom'
import Glob from 'glob'
import pify from 'pify'
Expand Down
4 changes: 2 additions & 2 deletions yarn.lock
Expand Up @@ -7583,7 +7583,7 @@ glob@7.1.4:
once "^1.3.0"
path-is-absolute "^1.0.0"

glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0, glob@^7.2.3, glob@~7.2.0:
glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0, glob@~7.2.0:
version "7.2.3"
resolved "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
Expand All @@ -7595,7 +7595,7 @@ glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.1.7, glob@^7.2.0, glob@^7.2.3, gl
once "^1.3.0"
path-is-absolute "^1.0.0"

glob@^8.0.1, glob@^8.0.3:
glob@^8.0.1, glob@^8.0.3, glob@^8.1.0:
version "8.1.0"
resolved "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e"
integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==
Expand Down