Skip to content

Commit edb0940

Browse files
authored
Merge branch 'npmx-dev:main' into main
2 parents d345aee + 7aede3f commit edb0940

10 files changed

Lines changed: 10 additions & 5 deletions

File tree

.github/workflows/ci.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ on:
1111
branches:
1212
- main
1313

14+
# cancel in-progress runs on new commits to same PR (gitub.event.number)
15+
concurrency:
16+
group: ${{ github.workflow }}-${{ github.event.number || github.sha }}
17+
cancel-in-progress: true
18+
1419
permissions:
1520
contents: read
1621

app/components/BuildEnvironment.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ const buildInfo = useAppConfig().buildInfo
1313
:class="footer ? 'mt-4 justify-start' : 'mb-8 justify-center'"
1414
style="animation-delay: 0.05s"
1515
>
16-
<i18n-t keypath="built_at">
16+
<i18n-t keypath="built_at" scope="global">
1717
<NuxtTime :datetime="buildInfo.time" :locale="locale" relative />
1818
</i18n-t>
1919
<span>&middot;</span>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { describe, expect, it } from 'vitest'
2-
import type { NpmPackage, NpmSearchResponse } from '../../shared/types'
2+
import type { NpmPackage, NpmSearchResponse } from '../../../../shared/types'
33

44
describe('npm registry types', () => {
55
it('should correctly type a package response', () => {
File renamed without changes.
File renamed without changes.

test/unit/package-analysis.spec.ts renamed to test/unit/shared/utils/package-analysis.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
getCreateShortName,
88
getTypesPackageName,
99
hasBuiltInTypes,
10-
} from '../../shared/utils/package-analysis'
10+
} from '../../../../shared/utils/package-analysis'
1111

1212
describe('detectModuleFormat', () => {
1313
it('detects ESM from type: module', () => {

test/unit/parse-package-param.spec.ts renamed to test/unit/shared/utils/parse-package-param.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { describe, expect, it } from 'vitest'
2-
import { parsePackageParam } from '../../shared/utils/parse-package-param'
2+
import { parsePackageParam } from '../../../../shared/utils/parse-package-param'
33

44
describe('parsePackageParam', () => {
55
describe('unscoped packages', () => {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
SEVERITY_TEXT_COLORS,
55
SEVERITY_BADGE_COLORS,
66
getHighestSeverity,
7-
} from '../../shared/utils/severity'
7+
} from '../../../../shared/utils/severity'
88

99
describe('severity utils', () => {
1010
describe('SEVERITY_COLORS', () => {

0 commit comments

Comments
 (0)