Skip to content

Commit 5ccce0b

Browse files
committed
build(deps-dev): remove vitest patch
- patch will be needed again if CI environment variable is used Signed-off-by: Lexus Drumgold <unicornware@flexdevelopment.llc>
1 parent e6db385 commit 5ccce0b

File tree

6 files changed

+13
-73
lines changed

6 files changed

+13
-73
lines changed

__tests__/reporters/notifier.ts

+5-7
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,13 @@ class Notifier implements Reporter {
145145
return (Array.isArray(tasks) ? tasks : [tasks]).flatMap(task => {
146146
const { type } = task
147147

148-
if (mode === 'typecheck' && type === 'suite' && task.tasks.length === 0) {
149-
return [task] as unknown as [Test]
150-
}
151-
152-
return type === 'benchmark' || type === 'typecheck'
153-
? []
148+
return mode === 'typecheck' && type === 'suite' && task.tasks.length === 0
149+
? ([task] as unknown as [Test])
154150
: type === 'test'
155151
? [task]
156-
: task.tasks.flatMap(t => (t.type === 'test' ? [t] : this.tests(t)))
152+
: 'tasks' in task
153+
? task.tasks.flatMap(t => (t.type === 'test' ? [t] : this.tests(t)))
154+
: []
157155
})
158156
}
159157
}

package.json

+1-2
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,7 @@
184184
"@flex-development/tutils": "6.0.0-alpha.9",
185185
"esbuild": "0.16.12",
186186
"vite": "4.0.3",
187-
"vitepress@npm:1.0.0-alpha.34": "patch:vitepress@npm%3A1.0.0-alpha.34#patches/vitepress+1.0.0-alpha.34.dev.patch",
188-
"vitest@npm:0.26.3": "patch:vitest@npm%3A0.26.3#patches/vitest+0.26.3.dev.patch"
187+
"vitepress@npm:1.0.0-alpha.34": "patch:vitepress@npm%3A1.0.0-alpha.34#patches/vitepress+1.0.0-alpha.34.dev.patch"
189188
},
190189
"engines": {
191190
"node": ">=14.16",

patches/vitest+0.26.3.dev.patch

-13
This file was deleted.

vitest-env.d.ts

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
interface ImportMetaEnv {
44
readonly BASE_URL: string
5-
readonly CI: 'false' | 'true'
65
readonly DEV: '1' | import('@flex-development/tutils').EmptyString
76
readonly MODE: import('@flex-development/tutils').NodeEnv.TEST
87
readonly NODE_ENV: import('@flex-development/tutils').NodeEnv.TEST

vitest.config.ts

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import { BaseSequencer } from 'vitest/node'
2424
const config: UserConfigExport = defineConfig((): UserConfig => {
2525
return {
2626
define: {
27-
'import.meta.env.CI': JSON.stringify(ci),
2827
'import.meta.env.NODE_ENV': JSON.stringify(NodeEnv.TEST)
2928
},
3029
mode: NodeEnv.TEST,

yarn.lock

+7-49
Original file line numberDiff line numberDiff line change
@@ -7998,14 +7998,14 @@ __metadata:
79987998
linkType: hard
79997999

80008000
"mlly@npm:^1.0.0":
8001-
version: 1.0.0
8002-
resolution: "mlly@npm:1.0.0"
8001+
version: 1.1.0
8002+
resolution: "mlly@npm:1.1.0"
80038003
dependencies:
80048004
acorn: "npm:^8.8.1"
80058005
pathe: "npm:^1.0.0"
8006-
pkg-types: "npm:^1.0.0"
8007-
ufo: "npm:^1.0.0"
8008-
checksum: 654985e2a5c8ebdc651dce28d889d876838e94395a3c487c17c990c492d0dd97d18c2852261f25915170dcbe56907bce8d97390c44033318cd293f4c91a52bdf
8006+
pkg-types: "npm:^1.0.1"
8007+
ufo: "npm:^1.0.1"
8008+
checksum: 976a68112302c8bb9a466a792e2dfe2840ced8dff48a3665fcdac756a2535aca529c2b10188d97e5548613079ecc57bebb5259a76daa902f7cdfe6b82e27c91e
80098009
languageName: node
80108010
linkType: hard
80118011

@@ -8849,7 +8849,7 @@ __metadata:
88498849
languageName: node
88508850
linkType: hard
88518851

8852-
"pkg-types@npm:^1.0.0":
8852+
"pkg-types@npm:^1.0.0, pkg-types@npm:^1.0.1":
88538853
version: 1.0.1
88548854
resolution: "pkg-types@npm:1.0.1"
88558855
dependencies:
@@ -10622,7 +10622,7 @@ __metadata:
1062210622
languageName: node
1062310623
linkType: hard
1062410624

10625-
"ufo@npm:^1.0.0":
10625+
"ufo@npm:^1.0.0, ufo@npm:^1.0.1":
1062610626
version: 1.0.1
1062710627
resolution: "ufo@npm:1.0.1"
1062810628
checksum: d1de3b4cb0b5081d5333ae571a3dcc93752400e8dcc8d034043766aba09937d4159ce9a1a8c4fb9899ae365986b18a77fc97bcde1eae5facec5a965f8180faf0
@@ -11145,48 +11145,6 @@ __metadata:
1114511145
languageName: node
1114611146
linkType: hard
1114711147

11148-
"vitest@patch:vitest@npm%3A0.26.3#patches/vitest+0.26.3.dev.patch::locator=%40flex-development%2Fmlly%40workspace%3A.":
11149-
version: 0.26.3
11150-
resolution: "vitest@patch:vitest@npm%3A0.26.3#patches/vitest+0.26.3.dev.patch::version=0.26.3&hash=dfec30&locator=%40flex-development%2Fmlly%40workspace%3A."
11151-
dependencies:
11152-
"@types/chai": "npm:^4.3.4"
11153-
"@types/chai-subset": "npm:^1.3.3"
11154-
"@types/node": "npm:*"
11155-
acorn: "npm:^8.8.1"
11156-
acorn-walk: "npm:^8.2.0"
11157-
chai: "npm:^4.3.7"
11158-
debug: "npm:^4.3.4"
11159-
local-pkg: "npm:^0.4.2"
11160-
source-map: "npm:^0.6.1"
11161-
strip-literal: "npm:^1.0.0"
11162-
tinybench: "npm:^2.3.1"
11163-
tinypool: "npm:^0.3.0"
11164-
tinyspy: "npm:^1.0.2"
11165-
vite: "npm:^3.0.0 || ^4.0.0"
11166-
vite-node: "npm:0.26.3"
11167-
peerDependencies:
11168-
"@edge-runtime/vm": "*"
11169-
"@vitest/browser": "*"
11170-
"@vitest/ui": "*"
11171-
happy-dom: "*"
11172-
jsdom: "*"
11173-
peerDependenciesMeta:
11174-
"@edge-runtime/vm":
11175-
optional: true
11176-
"@vitest/browser":
11177-
optional: true
11178-
"@vitest/ui":
11179-
optional: true
11180-
happy-dom:
11181-
optional: true
11182-
jsdom:
11183-
optional: true
11184-
bin:
11185-
vitest: vitest.mjs
11186-
checksum: f32fa09234d053e17782a24a6001283acc3a50b9c764cfec6b7d39b0dac72f7f1839a4bd96c5ffa2de1becd97d8674a43c20cc01a82d2b90d1a8aedc9daa8524
11187-
languageName: node
11188-
linkType: hard
11189-
1119011148
"vscode-languageserver-textdocument@npm:^1.0.1, vscode-languageserver-textdocument@npm:^1.0.8":
1119111149
version: 1.0.8
1119211150
resolution: "vscode-languageserver-textdocument@npm:1.0.8"

0 commit comments

Comments
 (0)