Skip to content

Commit 0a64698

Browse files
authored
refactor: use tegg v4 (#765)
1 parent 069afb9 commit 0a64698

File tree

291 files changed

+1642
-1347
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

291 files changed

+1642
-1347
lines changed

.oxlintrc.json

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"plugins": ["import"],
3+
"rules": {
4+
"import/no-cycle": "error"
5+
}
6+
}

app.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
11
import path from 'node:path';
22
import { readFile } from 'node:fs/promises';
3-
import { Application } from 'egg';
4-
import { ChangesStreamService } from './app/core/service/ChangesStreamService';
3+
import { Application, ILifecycleBoot } from 'egg';
4+
import { ChangesStreamService } from './app/core/service/ChangesStreamService.js';
55

66
declare module 'egg' {
77
interface Application {
88
binaryHTML: string;
99
}
1010
}
1111

12-
export default class CnpmcoreAppHook {
12+
export default class CnpmcoreAppHook implements ILifecycleBoot {
1313
private readonly app: Application;
1414

1515
constructor(app: Application) {
1616
this.app = app;
1717
this.app.binaryHTML = '';
1818
}
1919

20-
async configWillLoad() {
20+
configWillLoad() {
2121
const app = this.app;
2222
// https://github.com/eggjs/tegg/blob/master/plugin/orm/app.ts#L37
2323
// store query sql to log

app/common/FileUtil.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import url from 'node:url';
66
import { randomBytes } from 'node:crypto';
77
import { EggContextHttpClient, HttpClientResponse } from 'egg';
88
import mime from 'mime-types';
9-
import dayjs from './dayjs';
9+
import dayjs from './dayjs.js';
1010

1111
interface DownloadToTempfileOptionalConfig {
1212
retries?: number,

app/common/PackageUtil.ts

+7-6
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,9 @@ import { createReadStream } from 'node:fs';
22
import { Readable } from 'node:stream';
33
import { pipeline } from 'node:stream/promises';
44
import * as ssri from 'ssri';
5+
// @ts-expect-error type error
56
import tar from '@fengmk2/tar';
6-
import { AuthorType, PackageJSONType } from '../repository/PackageRepository';
7+
import type { AuthorType, PackageJSONType } from '../repository/PackageRepository.js';
78

89

910
// /@cnpm%2ffoo
@@ -12,7 +13,7 @@ import { AuthorType, PackageJSONType } from '../repository/PackageRepository';
1213
// /foo
1314
// name max length is 214 chars
1415
// https://www.npmjs.com/package/path-to-regexp#custom-matching-parameters
15-
export const FULLNAME_REG_STRING = '@[^/]{1,220}\/[^/]{1,220}|@[^%]+\%2[fF][^/]{1,220}|[^@/]{1,220}';
16+
export const FULLNAME_REG_STRING = '@[^/]{1,220}/[^/]{1,220}|@[^%]+%2[fF][^/]{1,220}|[^@/]{1,220}';
1617

1718
export function getScopeAndName(fullname: string): string[] {
1819
if (fullname.startsWith('@')) {
@@ -86,7 +87,7 @@ export async function hasShrinkWrapInTgz(contentOrFile: Uint8Array | string): Pr
8687
const parser = tar.t({
8788
// options.strict 默认为 false,会忽略 Recoverable errors,例如 tar 解析失败
8889
// 详见 https://github.com/isaacs/node-tar#warnings-and-errors
89-
onentry(entry) {
90+
onentry(entry: any) {
9091
if (entry.path === 'package/npm-shrinkwrap.json') {
9192
hasShrinkWrap = true;
9293
abortController.abort();
@@ -122,16 +123,16 @@ export async function extractPackageJSON(tarballBytes: Buffer): Promise<PackageJ
122123
return new Promise((resolve, reject) => {
123124
Readable.from(tarballBytes)
124125
.pipe(tar.t({
125-
filter: name => name === 'package/package.json',
126-
onentry: async entry => {
126+
filter: (name: string) => name === 'package/package.json',
127+
onentry: async (entry: any) => {
127128
const chunks: Buffer[] = [];
128129
for await (const chunk of entry) {
129130
chunks.push(chunk);
130131
}
131132
try {
132133
const data = Buffer.concat(chunks);
133134
return resolve(JSON.parse(data.toString()));
134-
} catch (err) {
135+
} catch {
135136
reject(new Error('Error parsing package.json'));
136137
}
137138
},

app/common/adapter/BugVersionStore.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { AccessLevel, SingletonProto } from '@eggjs/tegg';
2-
import { BugVersion } from '../../core/entity/BugVersion';
2+
import { BugVersion } from '../../core/entity/BugVersion.js';
33

44
@SingletonProto({
55
accessLevel: AccessLevel.PUBLIC,

app/common/adapter/NFSAdapter.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import {
77
} from '@eggjs/tegg';
88
import { Pointcut } from '@eggjs/tegg/aop';
99
import { EggLogger } from 'egg';
10-
import { AsyncTimer } from '../aop/AsyncTimer';
11-
import { NFSClient } from '../typing';
10+
import { AsyncTimer } from '../aop/AsyncTimer.js';
11+
import { NFSClient } from '../typing.js';
1212

1313
const INSTANCE_NAME = 'nfsAdapter';
1414

app/common/adapter/NPMRegistry.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import {
1111
HttpClientRequestOptions,
1212
HttpClientResponse,
1313
} from 'egg';
14-
import { PackageManifestType } from '../../repository/PackageRepository';
15-
import { isTimeoutError } from '../ErrorUtil';
14+
import { PackageManifestType } from '../../repository/PackageRepository.js';
15+
import { isTimeoutError } from '../ErrorUtil.js';
1616

1717
type HttpMethod = HttpClientRequestOptions['method'];
1818

app/common/adapter/binary/AbstractBinary.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ImplDecorator, Inject, QualifierImplDecoratorUtil } from '@eggjs/tegg';
2-
import { BinaryType } from '../../enum/Binary';
32
import { EggHttpClient, EggLogger } from 'egg';
4-
import { BinaryName, BinaryTaskConfig } from '../../../../config/binaries';
3+
import { BinaryType } from '../../enum/Binary.js';
4+
import { BinaryName, BinaryTaskConfig } from '../../../../config/binaries.js';
55

66
export type BinaryItem = {
77
name: string;

app/common/adapter/binary/ApiBinary.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary';
21
import { Inject, SingletonProto } from '@eggjs/tegg';
3-
import { BinaryType } from '../../enum/Binary';
42
import { EggAppConfig } from 'egg';
3+
import { BinaryType } from '../../enum/Binary.js';
4+
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary.js';
55

66
@SingletonProto()
77
@BinaryAdapter(BinaryType.Api)

app/common/adapter/binary/BucketBinary.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { SingletonProto } from '@eggjs/tegg';
2-
import { BinaryType } from '../../enum/Binary';
3-
import binaries, { BinaryName, BinaryTaskConfig } from '../../../../config/binaries';
41
import path from 'node:path';
5-
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary';
2+
import { SingletonProto } from '@eggjs/tegg';
3+
import { BinaryType } from '../../enum/Binary.js';
4+
import binaries, { BinaryName, BinaryTaskConfig } from '../../../../config/binaries.js';
5+
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary.js';
66

77
@SingletonProto()
88
@BinaryAdapter(BinaryType.Bucket)

app/common/adapter/binary/ChromeForTestingBinary.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { basename } from 'node:path';
22
import { SingletonProto } from '@eggjs/tegg';
3-
import { BinaryType } from '../../enum/Binary';
4-
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary';
3+
import { BinaryType } from '../../enum/Binary.js';
4+
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary.js';
55

66
@SingletonProto()
77
@BinaryAdapter(BinaryType.ChromeForTesting)

app/common/adapter/binary/CypressBinary.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { SingletonProto } from '@eggjs/tegg';
2-
import { BinaryType } from '../../enum/Binary';
3-
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary';
2+
import { BinaryType } from '../../enum/Binary.js';
3+
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary.js';
44

55
@SingletonProto()
66
@BinaryAdapter(BinaryType.Cypress)

app/common/adapter/binary/EdgedriverBinary.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import path from 'node:path';
22
import { SingletonProto } from '@eggjs/tegg';
33
import {
44
AbstractBinary, FetchResult, BinaryItem, BinaryAdapter,
5-
} from './AbstractBinary';
6-
import { BinaryType } from '../../enum/Binary';
5+
} from './AbstractBinary.js';
6+
import { BinaryType } from '../../enum/Binary.js';
77

88
@SingletonProto()
99
@BinaryAdapter(BinaryType.Edgedriver)
@@ -175,7 +175,7 @@ export class EdgedriverBinary extends AbstractBinary {
175175
#parseItems(xml: string): BinaryItem[] {
176176
const items: BinaryItem[] = [];
177177
// <Blob><Name>124.0.2478.97/edgedriver_arm64.zip</Name><Url>https://msedgewebdriverstorage.blob.core.windows.net/edgewebdriver/124.0.2478.97/edgedriver_arm64.zip</Url><Properties><Last-Modified>Fri, 10 May 2024 18:35:44 GMT</Last-Modified><Etag>0x8DC712000713C13</Etag><Content-Length>9191362</Content-Length><Content-Type>application/octet-stream</Content-Type><Content-Encoding /><Content-Language /><Content-MD5>1tjPTf5JU6KKB06Qf1JOGw==</Content-MD5><Cache-Control /><BlobType>BlockBlob</BlobType><LeaseStatus>unlocked</LeaseStatus></Properties></Blob>
178-
const fileRe = /<Blob><Name>([^<]+?)<\/Name><Url>([^<]+?)<\/Url><Properties><Last\-Modified>([^<]+?)<\/Last\-Modified><Etag>(?:[^<]+?)<\/Etag><Content\-Length>(\d+)<\/Content\-Length>/g;
178+
const fileRe = /<Blob><Name>([^<]+?)<\/Name><Url>([^<]+?)<\/Url><Properties><Last-Modified>([^<]+?)<\/Last-Modified><Etag>(?:[^<]+?)<\/Etag><Content-Length>(\d+)<\/Content-Length>/g;
179179
const matchItems = xml.matchAll(fileRe);
180180
for (const m of matchItems) {
181181
const fullname = m[1].trim();

app/common/adapter/binary/ElectronBinary.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { SingletonProto } from '@eggjs/tegg';
2-
import { BinaryType } from '../../enum/Binary';
3-
import binaries, { BinaryName } from '../../../../config/binaries';
4-
import { BinaryAdapter, BinaryItem, FetchResult } from './AbstractBinary';
5-
import { GithubBinary } from './GithubBinary';
2+
import binaries, { BinaryName } from '../../../../config/binaries.js';
3+
import { BinaryType } from '../../enum/Binary.js';
4+
import { BinaryAdapter, BinaryItem, FetchResult } from './AbstractBinary.js';
5+
import { GithubBinary } from './GithubBinary.js';
66

77
@SingletonProto()
88
@BinaryAdapter(BinaryType.Electron)

app/common/adapter/binary/GithubBinary.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { SingletonProto } from '@eggjs/tegg';
2-
import { BinaryType } from '../../enum/Binary';
3-
import binaries, { BinaryName, BinaryTaskConfig } from '../../../../config/binaries';
4-
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary';
2+
import binaries, { BinaryName, BinaryTaskConfig } from '../../../../config/binaries.js';
3+
import { BinaryType } from '../../enum/Binary.js';
4+
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary.js';
55

66
@SingletonProto()
77
@BinaryAdapter(BinaryType.GitHub)

app/common/adapter/binary/ImageminBinary.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { SingletonProto } from '@eggjs/tegg';
2-
import { BinaryType } from '../../enum/Binary';
3-
import binaries, { BinaryName } from '../../../../config/binaries';
4-
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary';
2+
import binaries, { BinaryName } from '../../../../config/binaries.js';
3+
import { BinaryType } from '../../enum/Binary.js';
4+
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary.js';
55

66
@SingletonProto()
77
@BinaryAdapter(BinaryType.Imagemin)

app/common/adapter/binary/NodeBinary.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { basename } from 'node:path';
22
import { SingletonProto } from '@eggjs/tegg';
3-
import { BinaryType } from '../../enum/Binary';
4-
import binaries, { BinaryName } from '../../../../config/binaries';
5-
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary';
3+
import { BinaryType } from '../../enum/Binary.js';
4+
import binaries, { BinaryName } from '../../../../config/binaries.js';
5+
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary.js';
66

77
@SingletonProto()
88
@BinaryAdapter(BinaryType.Node)
@@ -30,7 +30,7 @@ export class NodeBinary extends AbstractBinary {
3030
// <a href="/dist/v18.15.0/SHASUMS256.txt.asc">SHASUMS256.txt.asc</a> 04-Nov-2024 17:29 3.7 KB
3131
// <a href="/dist/v18.15.0/SHASUMS256.txt.sig">SHASUMS256.txt.sig</a> 04-Nov-2024 17:29 310 B
3232
// <a href="/dist/v18.15.0/SHASUMS256.txt">SHASUMS256.txt</a> 04-Nov-2024 17:29 3.2 KB
33-
const re = /<a href="([^\"]+?)"[^>]*?>[^<]+?<\/a>\s+?((?:[\w\-]+? \w{2}\:\d{2})|\-)\s+?([\d\.\-\s\w]+)/ig;
33+
const re = /<a href="([^"]+?)"[^>]*?>[^<]+?<\/a>\s+?((?:[\w-]+? \w{2}:\d{2})|-)\s+?([\d.\-\s\w]+)/ig;
3434
const matchs = html.matchAll(re);
3535
const items: BinaryItem[] = [];
3636
for (const m of matchs) {

app/common/adapter/binary/NodePreGypBinary.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { SingletonProto } from '@eggjs/tegg';
2-
import { BinaryType } from '../../enum/Binary';
3-
import binaries, { BinaryName } from '../../../../config/binaries';
41
import { join } from 'node:path';
5-
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary';
2+
import { SingletonProto } from '@eggjs/tegg';
3+
import binaries, { BinaryName } from '../../../../config/binaries.js';
4+
import { BinaryType } from '../../enum/Binary.js';
5+
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary.js';
66

77
@SingletonProto()
88
@BinaryAdapter(BinaryType.NodePreGyp)

app/common/adapter/binary/NwjsBinary.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { SingletonProto } from '@eggjs/tegg';
2-
import { BinaryType } from '../../enum/Binary';
3-
import binaries from '../../../../config/binaries';
4-
import { FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary';
5-
import { BucketBinary } from './BucketBinary';
2+
import binaries from '../../../../config/binaries.js';
3+
import { BinaryType } from '../../enum/Binary.js';
4+
import { FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary.js';
5+
import { BucketBinary } from './BucketBinary.js';
66

77
@SingletonProto()
88
@BinaryAdapter(BinaryType.Nwjs)

app/common/adapter/binary/PlaywrightBinary.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
2-
import { AbstractBinary, BinaryAdapter, BinaryItem, FetchResult } from './AbstractBinary';
31
import util from 'node:util';
42
import path from 'node:path';
53
import { SingletonProto } from '@eggjs/tegg';
6-
import { BinaryType } from '../../enum/Binary';
4+
import { BinaryType } from '../../enum/Binary.js';
5+
import { AbstractBinary, BinaryAdapter, BinaryItem, FetchResult } from './AbstractBinary.js';
76

87
const PACKAGE_URL = 'https://registry.npmjs.com/playwright-core';
98
const DOWNLOAD_HOST = 'https://playwright.azureedge.net/';

app/common/adapter/binary/PrismaBinary.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import path from 'node:path';
22
import { SingletonProto } from '@eggjs/tegg';
3-
import { BinaryType } from '../../enum/Binary';
4-
import binaries, { BinaryName } from '../../../../config/binaries';
5-
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary';
3+
import { BinaryType } from '../../enum/Binary.js';
4+
import binaries, { BinaryName } from '../../../../config/binaries.js';
5+
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary.js';
66

77
@SingletonProto()
88
@BinaryAdapter(BinaryType.Prisma)

app/common/adapter/binary/PuppeteerBinary.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { SingletonProto } from '@eggjs/tegg';
2-
import { BinaryType } from '../../enum/Binary';
3-
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary';
2+
import { BinaryType } from '../../enum/Binary.js';
3+
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary.js';
44

55
@SingletonProto()
66
@BinaryAdapter(BinaryType.Puppeteer)
@@ -37,7 +37,7 @@ export class PuppeteerBinary extends AbstractBinary {
3737
// };
3838
const unpkgURL = 'https://unpkg.com/puppeteer-core@latest/lib/cjs/puppeteer/revisions.js';
3939
const text = await this.requestXml(unpkgURL);
40-
const m = /chromium:\s+\'(\d+)\'\,/.exec(text);
40+
const m = /chromium:\s+'(\d+)',/.exec(text);
4141
if (m && !chromiumRevisions.has(m[1])) {
4242
chromiumRevisions.set(m[1], new Date().toISOString());
4343
}

app/common/adapter/binary/SqlcipherBinary.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { SingletonProto } from '@eggjs/tegg';
2-
import { BinaryType } from '../../enum/Binary';
3-
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary';
2+
import { BinaryType } from '../../enum/Binary.js';
3+
import { AbstractBinary, FetchResult, BinaryItem, BinaryAdapter } from './AbstractBinary.js';
44

55
@SingletonProto()
66
@BinaryAdapter(BinaryType.Sqlcipher)

app/common/adapter/changesStream/AbstractChangesStream.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import {
33
Inject,
44
QualifierImplDecoratorUtil,
55
} from '@eggjs/tegg';
6-
import { RegistryType } from '../../../common/enum/Registry';
7-
import { Registry } from '../../../core/entity/Registry';
6+
import { RegistryType } from '../../../common/enum/Registry.js';
7+
import { Registry } from '../../../core/entity/Registry.js';
88
import {
99
EggHttpClient,
1010
EggLogger,

app/common/adapter/changesStream/CnpmcoreChangesStream.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { SingletonProto } from '@eggjs/tegg';
2-
import { RegistryType } from '../../../common/enum/Registry';
3-
import { Registry } from '../../../core/entity/Registry';
42
import { E500 } from 'egg-errors';
5-
import { AbstractChangeStream, RegistryChangesStream } from './AbstractChangesStream';
3+
import { RegistryType } from '../../../common/enum/Registry.js';
4+
import { Registry } from '../../../core/entity/Registry.js';
5+
import { AbstractChangeStream, RegistryChangesStream } from './AbstractChangesStream.js';
66

77
@SingletonProto()
88
@RegistryChangesStream(RegistryType.Cnpmcore)

app/common/adapter/changesStream/CnpmjsorgChangesStream.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { SingletonProto } from '@eggjs/tegg';
2-
import { RegistryType } from '../../../common/enum/Registry';
3-
import { Registry } from '../../../core/entity/Registry';
42
import { E500 } from 'egg-errors';
5-
import { AbstractChangeStream, RegistryChangesStream } from './AbstractChangesStream';
3+
import { RegistryType } from '../../../common/enum/Registry.js';
4+
import { Registry } from '../../../core/entity/Registry.js';
5+
import { AbstractChangeStream, RegistryChangesStream } from './AbstractChangesStream.js';
66

77
const MAX_LIMIT = 10000;
88

app/common/adapter/changesStream/NpmChangesStream.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import { SingletonProto } from '@eggjs/tegg';
22
import { E500 } from 'egg-errors';
3-
import { RegistryType } from '../../../common/enum/Registry';
4-
import { Registry } from '../../../core/entity/Registry';
5-
import { AbstractChangeStream, ChangesStreamChange, RegistryChangesStream } from './AbstractChangesStream';
3+
import { RegistryType } from '../../../common/enum/Registry.js';
4+
import { Registry } from '../../../core/entity/Registry.js';
5+
import { AbstractChangeStream, ChangesStreamChange, RegistryChangesStream } from './AbstractChangesStream.js';
66

77
@SingletonProto()
88
@RegistryChangesStream(RegistryType.Npm)

app/common/dayjs.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import dayjs from 'dayjs';
2-
import customParseFormat from 'dayjs/plugin/customParseFormat';
2+
import customParseFormat from 'dayjs/plugin/customParseFormat.js';
33
dayjs.extend(customParseFormat);
44

55
export default dayjs;

app/common/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"name": "cnpmcore-common",
33
"eggModule": {
44
"name": "cnpmcoreCommon"
5-
}
5+
},
6+
"type": "module"
67
}

app/common/typing.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { Readable } from 'node:stream';
22
import { IncomingHttpHeaders } from 'node:http';
33
import { EggContext } from '@eggjs/tegg';
44
import { estypes } from '@elastic/elasticsearch';
5-
import { CnpmcoreConfig } from '../port/config';
5+
import { CnpmcoreConfig } from '../port/config.js';
66

77
export interface UploadResult {
88
key: string;

0 commit comments

Comments
 (0)