From 40e4baeb5600088949f296c073fbd6792ce489be Mon Sep 17 00:00:00 2001 From: Luis Blanco Date: Tue, 3 Jan 2023 23:14:04 +0400 Subject: [PATCH] Fix exports --- conf/jest.json | 3 ++- utils.js | 4 +++- utils/action-version.js | 2 +- utils/index.js | 14 +++++++------- utils/utils.test.js | 6 +++--- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/conf/jest.json b/conf/jest.json index 31139a3..e15a835 100644 --- a/conf/jest.json +++ b/conf/jest.json @@ -1,9 +1,10 @@ { + "rootDir": "../", "moduleFileExtensions": [ "js" ], "testMatch": [ - "**/*.test.js" + "/**/*.test.js" ], "coverageDirectory": "doc/jest", "coverageReporters": [ diff --git a/utils.js b/utils.js index e5f268a..6e44069 100644 --- a/utils.js +++ b/utils.js @@ -1,3 +1,5 @@ 'use strict'; -module.exports = require('./utils'); +module.exports = { + ...require('./utils/index'), +}; diff --git a/utils/action-version.js b/utils/action-version.js index 81f4f10..ad3a3f4 100644 --- a/utils/action-version.js +++ b/utils/action-version.js @@ -2,5 +2,5 @@ module.exports = { - actionVersion: () => console.log(`version=${process.env.npm_package_version}`), + actionVersion: () => `version=${process.env.npm_package_version}`, }; diff --git a/utils/index.js b/utils/index.js index 208b408..0497cdb 100644 --- a/utils/index.js +++ b/utils/index.js @@ -2,11 +2,11 @@ module.exports = { - ...require('action-version'), - ...require('action-zip'), - ...require('cpbin'), - ...require('download'), - ...require('files'), - ...require('install'), - ...require('writable-buffer'), + ...require('./action-version'), + ...require('./action-zip'), + ...require('./cpbin'), + ...require('./download'), + ...require('./files'), + ...require('./install'), + ...require('./writable-buffer'), }; \ No newline at end of file diff --git a/utils/utils.test.js b/utils/utils.test.js index 57ba335..f72b727 100644 --- a/utils/utils.test.js +++ b/utils/utils.test.js @@ -12,7 +12,7 @@ describe('utils.js', () => { 'install', 'cpbin', 'download', 'read', 'write', 'copy', 'exists', 'mkdir', 'stat', 'isDir', 'isFile', 'dirUp', 'ensuredir', 'copysafe', 'readdir', 'subdirs', 'subfiles', 'traverse', 'copyall', - 'rmdir', 'rm', 'WritableBuffer', + 'rmdir', 'rm', 'WritableBuffer', 'actionVersion', 'actionZip', ]; methods.forEach((name) => { @@ -23,8 +23,8 @@ describe('utils.js', () => { describe('actionVersion', () => { it('logs package version', async () => { - const { stdout } = await exec('node -e "require(\'./utils\').actionVersion()"'); - expect(stdout).toBe(`version=${packageJson.version}`); + const { stdout } = await exec('node -p "require(\'./utils\').actionVersion()"'); + expect(stdout).toBe(`version=${packageJson.version}\n`); }); }); });