cnpmcore 1.5.0 → 1.7.1

package/dist/app/common/adapter/binary/NodePreGypBinary.js

@@ -5,6 +5,7 @@ const AbstractBinary_1 = require("./AbstractBinary");
 class NodePreGypBinary extends AbstractBinary_1.AbstractBinary {
     // https://github.com/mapbox/node-pre-gyp
     async fetch(dir) {
+        var _a, _b;
         if (!this.dirItems) {
             this.dirItems = {};
             const pkgUrl = `https://registry.npmjs.com/${this.binaryConfig.category}`;
@@ -32,6 +33,9 @@ class NodePreGypBinary extends AbstractBinary_1.AbstractBinary {
                 let currentDir = this.dirItems['/'];
                 let versionPrefix = '';
                 const remotePath = pkgVersion.binary.remote_path;
+                const napiVersions = (_a = pkgVersion.binary.napi_versions) !== null && _a !== void 0 ? _a : [];
+                if (((_b = this.binaryConfig.options) === null || _b === void 0 ? void 0 : _b.requiredNapiVersions) && napiVersions.length === 0)
+                    continue;
                 if (remotePath === null || remotePath === void 0 ? void 0 : remotePath.includes('{version}')) {
                     const dirName = remotePath.includes('v{version}') ? `v${version}` : version;
                     versionPrefix = `/${dirName}`;
@@ -102,6 +106,42 @@ class NodePreGypBinary extends AbstractBinary_1.AbstractBinary {
                         }
                     }
                 }
+                else if (binaryFile.includes('{platform}-{arch}-{node_napi_label}-{libc}') && napiVersions.length > 0) {
+                    // https://skia-canvas.s3.us-east-1.amazonaws.com/v0.9.30/darwin-arm64-napi-v6-unknown.tar.gz
+                    // https://github.com/samizdatco/skia-canvas/blob/2a75801d7cce3b4e4e6ad015a173daefaa8465e6/package.json#L48
+                    // "binary": {
+                    //   "module_name": "index",
+                    //   "module_path": "./lib/v{napi_build_version}",
+                    //   "remote_path": "./v{version}",
+                    //   "package_name": "{platform}-{arch}-{node_napi_label}-{libc}.tar.gz",
+                    //   "host": "https://skia-canvas.s3.us-east-1.amazonaws.com",
+                    //   "napi_versions": [
+                    //     6
+                    //   ]
+                    // },
+                    for (const platform of nodePlatforms) {
+                        const archs = nodeArchs[platform];
+                        const libcs = nodeLibcs[platform];
+                        for (const arch of archs) {
+                            for (const libc of libcs) {
+                                for (const napiVersion of napiVersions) {
+                                    const name = binaryFile.replace('{platform}', platform)
+                                        .replace('{arch}', arch)
+                                        .replace('{node_napi_label}', `napi-v${napiVersion}`)
+                                        .replace('{libc}', libc);
+                                    currentDir.push({
+                                        name,
+                                        date,
+                                        size: '-',
+                                        isDir: false,
+                                        url: `${this.binaryConfig.distUrl}${versionPrefix}/${name}`,
+                                        ignoreDownloadStatuses: [404, 403],
+                                    });
+                                }
+                            }
+                        }
+                    }
+                }
                 else if (binaryFile.includes('{platform}') && binaryFile.includes('{arch}')) {
                     // https://github.com/grpc/grpc-node/blob/master/packages/grpc-tools/package.json#L29
                     // "binary": {
@@ -133,4 +173,4 @@ class NodePreGypBinary extends AbstractBinary_1.AbstractBinary {
     }
 }
 exports.NodePreGypBinary = NodePreGypBinary;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTm9kZVByZUd5cEJpbmFyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9jb21tb24vYWRhcHRlci9iaW5hcnkvTm9kZVByZUd5cEJpbmFyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxxREFBMkU7QUFFM0UsTUFBYSxnQkFBaUIsU0FBUSwrQkFBYztJQUtsRCx5Q0FBeUM7SUFDekMsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFXO1FBQ3JCLElBQUksQ0FBQyxJQUFJLENBQUMsUUFBUSxFQUFFO1lBQ2xCLElBQUksQ0FBQyxRQUFRLEdBQUcsRUFBRSxDQUFDO1lBQ25CLE1BQU0sTUFBTSxHQUFHLDhCQUE4QixJQUFJLENBQUMsWUFBWSxDQUFDLFFBQVEsRUFBRSxDQUFDO1lBQzFFLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUM1QyxJQUFJLENBQUMsUUFBUSxHQUFHLEVBQUUsQ0FBQztZQUNuQixJQUFJLENBQUMsUUFBUSxDQUFDLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQztZQUN4QixNQUFNLGVBQWUsR0FBRyxNQUFNLElBQUksQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO1lBQ3pELE1BQU0sYUFBYSxHQUFHLElBQUksQ0FBQyxpQkFBaUIsRUFBRSxDQUFDO1lBQy9DLE1BQU0sU0FBUyxHQUFHLElBQUksQ0FBQyxhQUFhLEVBQUUsQ0FBQztZQUN2QyxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDdkMsS0FBSyxNQUFNLE9BQU8sSUFBSSxJQUFJLENBQUMsUUFBUSxFQUFFO2dCQUNuQyxNQUFNLElBQUksR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUNoQyxNQUFNLFVBQVUsR0FBRyxJQUFJLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDO2dCQUMxQyxJQUFJLENBQUMsVUFB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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiTm9kZVByZUd5cEJpbmFyeS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL2FwcC9jb21tb24vYWRhcHRlci9iaW5hcnkvTm9kZVByZUd5cEJpbmFyeS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSxxREFBMkU7QUFFM0UsTUFBYSxnQkFBaUIsU0FBUSwrQkFBYztJQUtsRCx5Q0FBeUM7SUFDekMsS0FBSyxDQUFDLEtBQUssQ0FBQyxHQUFXOztRQUNyQixJQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsRUFBRTtZQUNsQixJQUFJLENBQUMsUUFBUSxHQUFHLEVBQUUsQ0FBQztZQUNuQixNQUFNLE1BQU0sR0FBRyw4QkFBOEIsSUFBSSxDQUFDLFlBQVksQ0FBQyxRQUFRLEVBQUUsQ0FBQztZQUMxRSxNQUFNLElBQUksR0FBRyxNQUFNLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDNUMsSUFBSSxDQUFDLFFBQVEsR0FBRyxFQUFFLENBQUM7WUFDbkIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLENBQUM7WUFDeEIsTUFBTSxlQUFlLEdBQUcsTUFBTSxJQUFJLENBQUMsbUJBQW1CLEVBQUUsQ0FBQztZQUN6RCxNQUFNLGFBQWEsR0FBRyxJQUFJLENBQUMsaUJBQWlCLEVBQUUsQ0FBQztZQUMvQyxNQUFNLFNBQVMsR0FBRyxJQUFJLENBQUMsYUFBYSxFQUFFLENBQUM7WUFDdkMsTUFBTSxTQUFTLEdBQUcsSUFBSSxDQUFDLGFBQWEsRUFBRSxDQUFDO1lBQ3ZDLEtBQUssTUFBTSxPQUFPLElBQUksSUFBSSxDQUFDLFFBQVEsRUFBRTtnQkFDbkMsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDaEMsTUFBTSxVQUFVLEdBQUcsSUFBSSxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQztnQkFDMUMsSUFBSSxDQUFDLFVB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

package/dist/app/port/controller/package/ShowPackageController.js

@@ -22,7 +22,7 @@ let ShowPackageController = class ShowPackageController extends AbstractControll
         const isFullManifests = ctx.accepts(['json', abbreviatedMetaType]) !== abbreviatedMetaType;
         // handle cache
         const cacheEtag = await this.cacheService.getPackageEtag(fullname, isFullManifests);
-        if (cacheEtag) {
+        if (!isSync && cacheEtag) {
             let requestEtag = ctx.request.get('if-none-match');
             if (requestEtag.startsWith('W/')) {
                 requestEtag = requestEtag.substring(2);
@@ -96,4 +96,4 @@ ShowPackageController = __decorate([
     (0, tegg_1.HTTPController)()
 ], ShowPackageController);
 exports.ShowPackageController = ShowPackageController;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hvd1BhY2thZ2VDb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vYXBwL3BvcnQvY29udHJvbGxlci9wYWNrYWdlL1Nob3dQYWNrYWdlQ29udHJvbGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FRcUI7QUFDckIsOERBQTJEO0FBQzNELDZEQUFtRjtBQUNuRix1REFBK0Q7QUFLL0QsSUFBYSxxQkFBcUIsR0FBbEMsTUFBYSxxQkFBc0IsU0FBUSx1Q0FBa0I7SUFZM0QsS0FBSyxDQUFDLElBQUksQ0FBWSxHQUFlLEVBQWUsUUFBZ0I7UUFDbEUsTUFBTSxDQUFFLEtBQUssRUFBRSxJQUFJLENBQUUsR0FBRyxJQUFBLDZCQUFlLEVBQUMsUUFBUSxDQUFDLENBQUM7UUFDbEQsTUFBTSxNQUFNLEdBQUcsSUFBQSw4QkFBbUIsRUFBQyxHQUFHLENBQUMsQ0FBQztRQUN4QyxNQUFNLG1CQUFtQixHQUFHLHFDQUFxQyxDQUFDO1FBQ2xFLE1BQU0sZUFBZSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBRSxNQUFNLEVBQUUsbUJBQW1CLENBQUUsQ0FBQyxLQUFLLG1CQUFtQixDQUFDO1FBQzdGLGVBQWU7UUFDZixNQUFNLFNBQVMsR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLFFBQVEsRUFBRSxlQUFlLENBQUMsQ0FBQztRQUNwRixJQUFJLFNBQVMsRUFBRTtZQUNiLElBQUksV0FBVyxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxDQUFDO1lBQ25ELElBQUksV0FBVyxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsRUFBRTtnQkFDaEMsV0FBVyxHQUFHLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQUM7YUFDeEM7WUFDRCxJQUFJLFdBQVcsS0FBSyxTQUFTLEVBQUU7Z0JBQzdCLHNDQUFzQztnQkFD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
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiU2hvd1BhY2thZ2VDb250cm9sbGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vLi4vYXBwL3BvcnQvY29udHJvbGxlci9wYWNrYWdlL1Nob3dQYWNrYWdlQ29udHJvbGxlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxzQ0FRcUI7QUFDckIsOERBQTJEO0FBQzNELDZEQUFtRjtBQUNuRix1REFBK0Q7QUFLL0QsSUFBYSxxQkFBcUIsR0FBbEMsTUFBYSxxQkFBc0IsU0FBUSx1Q0FBa0I7SUFZM0QsS0FBSyxDQUFDLElBQUksQ0FBWSxHQUFlLEVBQWUsUUFBZ0I7UUFDbEUsTUFBTSxDQUFFLEtBQUssRUFBRSxJQUFJLENBQUUsR0FBRyxJQUFBLDZCQUFlLEVBQUMsUUFBUSxDQUFDLENBQUM7UUFDbEQsTUFBTSxNQUFNLEdBQUcsSUFBQSw4QkFBbUIsRUFBQyxHQUFHLENBQUMsQ0FBQztRQUN4QyxNQUFNLG1CQUFtQixHQUFHLHFDQUFxQyxDQUFDO1FBQ2xFLE1BQU0sZUFBZSxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUMsQ0FBRSxNQUFNLEVBQUUsbUJBQW1CLENBQUUsQ0FBQyxLQUFLLG1CQUFtQixDQUFDO1FBQzdGLGVBQWU7UUFDZixNQUFNLFNBQVMsR0FBRyxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsY0FBYyxDQUFDLFFBQVEsRUFBRSxlQUFlLENBQUMsQ0FBQztRQUNwRixJQUFJLENBQUMsTUFBTSxJQUFJLFNBQVMsRUFBRTtZQUN4QixJQUFJLFdBQVcsR0FBRyxHQUFHLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxlQUFlLENBQUMsQ0FBQztZQUNuRCxJQUFJLFdBQVcsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLEVBQUU7Z0JBQ2hDLFdBQVcsR0FBRyxXQUFXLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDO2FBQ3hDO1lBQ0QsSUFBSSxXQUFXLEtBQUssU0FBUyxFQUFFO2dC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

package/dist/app/repository/PackageRepository.js

@@ -98,15 +98,15 @@ let PackageRepository = class PackageRepository extends AbstractRepository_1.Abs
         return userModels.map(user => ModelConvertor_1.ModelConvertor.convertModelToEntity(user, User_2.User));
     }
     async replacePackageMaintainers(packageId, userIds) {
-        await Maintainer_1.Maintainer.transaction(async () => {
+        await Maintainer_1.Maintainer.transaction(async ({ connection }) => {
             // delete exists
             // const removeCount = await MaintainerModel.remove({ packageId }, true, { transaction });
-            const removeCount = await Maintainer_1.Maintainer.remove({ packageId });
+            const removeCount = await Maintainer_1.Maintainer.remove({ packageId }, true, { connection });
             this.logger.info('[PackageRepository:replacePackageMaintainers:remove] %d rows, packageId: %s', removeCount, packageId);
             // add news
             for (const userId of userIds) {
                 // const model = await MaintainerModel.create({ packageId, userId }, transaction);
-                const model = await Maintainer_1.Maintainer.create({ packageId, userId });
+                const model = await Maintainer_1.Maintainer.create({ packageId, userId }, { connection });
                 this.logger.info('[PackageRepository:replacePackageMaintainers:new] id: %s, packageId: %s, userId: %s', model.id, model.packageId, model.userId);
             }
         });
@@ -291,4 +291,4 @@ PackageRepository = __decorate([
     })
 ], PackageRepository);
 exports.PackageRepository = PackageRepository;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"PackageRepository.js","sourceRoot":"","sources":["../../../app/repository/PackageRepository.ts"],"names":[],"mappings":"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"}

package/dist/config/binaries.d.ts

@@ -29,6 +29,7 @@ export declare type BinaryTaskConfig = {
         };
         maxPage?: number;
         npmPackageName?: string;
+        requiredNapiVersions?: boolean;
     };
     disable?: boolean;
 };

package/dist/config/binaries.js

@@ -109,6 +109,16 @@ const binaries = {
         repo: 'grpc/grpc-node',
         distUrl: 'https://node-precompiled-binaries.grpc.io',
     },
+    'skia-canvas': {
+        category: 'skia-canvas',
+        description: 'A canvas environment for Node',
+        syncer: SyncerClass.NodePreGypBinary,
+        repo: 'samizdatco/skia-canvas',
+        distUrl: 'https://skia-canvas.s3.us-east-1.amazonaws.com',
+        options: {
+            requiredNapiVersions: true,
+        },
+    },
     nodegit: {
         category: 'nodegit',
         description: 'Native Node bindings to Git.',
@@ -805,13 +815,13 @@ const binaries = {
         repo: 'microsoft/playwright',
         distUrl: 'https://github.com/microsoft/playwright/releases',
     },
-    'skia-canvas': {
-        category: 'skia-canvas',
-        description: 'A canvas environment for Node',
-        syncer: SyncerClass.BucketBinary,
-        repo: 'samizdatco/skia-canvas',
-        distUrl: 'https://skia-canvas.s3.us-east-1.amazonaws.com/',
+    nydus: {
+        category: 'nydus',
+        description: 'the Dragonfly image service, providing fast, secure and easy access to container images.',
+        syncer: SyncerClass.GithubBinary,
+        repo: 'dragonflyoss/image-service',
+        distUrl: 'https://github.com/dragonflyoss/image-service/releases',
     },
 };
 exports.default = binaries;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"binaries.js","sourceRoot":"","sources":["../../config/binaries.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"binaries.js","sourceRoot":"","sources":["../../config/binaries.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cnpmcore",
-  "version": "1.5.0",
+  "version": "1.7.1",
   "description": "npm core",
   "files": [
     "dist/**/*"
@@ -75,8 +75,8 @@
     "@eggjs/tegg-config": "^1.0.0",
     "@eggjs/tegg-controller-plugin": "^1.0.5",
     "@eggjs/tegg-eventbus-plugin": "^1.0.5",
-    "@eggjs/tegg-orm-decorator": "^1.0.1",
-    "@eggjs/tegg-orm-plugin": "^1.0.5",
+    "@eggjs/tegg-orm-decorator": "^1.3.1",
+    "@eggjs/tegg-orm-plugin": "^2.0.0",
     "@eggjs/tegg-plugin": "^1.0.5",
     "@eggjs/tsconfig": "^1.0.0",
     "@node-rs/crc32": "^1.2.2",
@@ -93,7 +93,7 @@
     "egg-typebox-validate": "^2.0.0",
     "fs-cnpm": "^2.4.0",
     "ioredis": "^4.28.3",
-    "leoric": "^1.15.0",
+    "leoric": "^2.6.2",
     "lodash": "^4.17.21",
     "mysql": "^2.18.1",
     "mysql2": "^2.3.0",

package/History.md

@@ -1,58 +0,0 @@
-
-1.5.0 / 2022-07-09
-==================
-
-**features**
-  * [[`b15b10c`](http://github.com/cnpm/cnpmcore/commit/b15b10c5c6cfb32bcc2b1d94434cdd16871ae565)] - feat(mirror): add skia-canvas mirror (#258) (Beace <<beaceshimin@gmail.com>>)
-
-**others**
-  * [[`2bd6ed0`](http://github.com/cnpm/cnpmcore/commit/2bd6ed0e5dace1d8840c342ecf4c86e8973dc6b7)] - 👌 IMPROVE: use tegg@1.2.0 (fengmk2 <<fengmk2@gmail.com>>)
-
-1.4.0 / 2022-06-28
-==================
-
-**features**
-  * [[`57da0a3`](http://github.com/cnpm/cnpmcore/commit/57da0a3c7e56d6613b57391948949ffea24ec058)] - feat: add configuration enableNopmClientAndVersionCheck (laibao101 <<369632567@qq.com>>)
-
-**others**
-  * [[`bf62932`](http://github.com/cnpm/cnpmcore/commit/bf62932f2e5224de6e34b873bf690a6e887b94b0)] - 🤖 TEST: Fix unstable test cases on OSS env (#254) (fengmk2 <<fengmk2@gmail.com>>)
-
-1.3.2 / 2022-06-27
-==================
-
-**fixes**
-  * [[`c63159d`](http://github.com/cnpm/cnpmcore/commit/c63159d8df804fe711b664606fe42be42010eb38)] - fix: valid npm client with correct pattern (#252) (TZ | 天猪 <<atian25@qq.com>>)
-
-**others**
-  * [[`d578baf`](http://github.com/cnpm/cnpmcore/commit/d578bafff07a0f9d4dd75393492cffc7f5d2660b)] - 🐛 FIX: Ignore exists seq on changes worker (#253) (fengmk2 <<fengmk2@gmail.com>>)
-
-1.3.1 / 2022-06-24
-==================
-
-**fixes**
-  * [[`4ea0ef6`](http://github.com/cnpm/cnpmcore/commit/4ea0ef63b7af9fd4dcc247c2c2ac8e4d579f941a)] - fix: query changes with order by id asc (#251) (killa <<killa123@126.com>>)
-
-1.3.0 / 2022-06-24
-==================
-
-**features**
-  * [[`0948a71`](http://github.com/cnpm/cnpmcore/commit/0948a71a40ac4897d129ef56830665dc028f07c7)] - feat: read enableChangesStream when sync changes stream (#250) (killa <<killa123@126.com>>)
-
-1.2.0 / 2022-06-20
-==================
-
-**others**
-  * [[`c0d8b52`](http://github.com/cnpm/cnpmcore/commit/c0d8b52ea09736ac11b0ef780aec781d172fb94c)] - refactor: move CacheAdapter to ContextProto (#249) (killa <<killa123@126.com>>)
-
-1.1.0 / 2022-06-20
-==================
-
-**features**
-  * [[`66b411e`](http://github.com/cnpm/cnpmcore/commit/66b411ea5bf6192dc9509df408525078e7128a27)] - feat: add type for exports (#248) (killa <<killa123@126.com>>)
-
-1.0.0 / 2022-06-17
-==================
-
-**others**
-  * [[`5cadbf4`](http://github.com/cnpm/cnpmcore/commit/5cadbf4b22bee7d85cd14526f5d6c6e2cd3a2e4b)] - refactor: add infra module (#245) (killa <<killa123@126.com>>),fatal: No names found, cannot describe anything.
-