From 1263194db3a1c63d1e5f0140d81b0dcd4e5bdbdd Mon Sep 17 00:00:00 2001 From: suha jin <89185836+djm07073@users.noreply.github.com> Date: Mon, 2 Dec 2024 15:51:25 +0900 Subject: [PATCH] fix: build without src dir --- eslint.config.mjs | 9 +++++++++ jest.config.js | 5 ----- package-lock.json | 4 ++-- package.json | 4 ++-- src/builder.ts | 6 +++--- src/index.ts | 2 +- src/lib/utils.ts | 7 ++++++- src/lib/vm.ts | 2 +- test/build.spec.ts | 2 +- test/create.spec.ts | 2 +- test/script.spec.ts | 2 +- test/test.spec.ts | 2 +- tsconfig.eslint.json | 5 +++++ tsconfig.json | 17 ++++++++++++----- 14 files changed, 45 insertions(+), 24 deletions(-) create mode 100644 tsconfig.eslint.json diff --git a/eslint.config.mjs b/eslint.config.mjs index bd11e78..9bbf9d7 100644 --- a/eslint.config.mjs +++ b/eslint.config.mjs @@ -23,4 +23,13 @@ export default tseslint.config( { ignores: ['dist/**/*', '**/*.config.mjs', '**/*.config.js'], }, + { + files: ['test/**/*.ts'], + languageOptions: { + parserOptions: { + project: ['./tsconfig.eslint.json'], + }, + }, + }, + ) \ No newline at end of file diff --git a/jest.config.js b/jest.config.js index 54d549e..d401c28 100644 --- a/jest.config.js +++ b/jest.config.js @@ -2,9 +2,4 @@ module.exports = { testEnvironment: 'node', preset: 'ts-jest', roots: ['/test'], - moduleNameMapper: { - '^builder': '/src/builder.ts', - '^types$': '/src/types', - '^lib$': '/src/lib', - } } diff --git a/package-lock.json b/package-lock.json index b7ddb6c..af37f06 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@initia/builder.js", - "version": "0.2.2", + "version": "0.2.5", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "@initia/builder.js", - "version": "0.2.2", + "version": "0.2.5", "license": "MIT", "dependencies": { "@eleccookie/ffi-napi": "^0.0.1", diff --git a/package.json b/package.json index 8f87c44..69a7029 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@initia/builder.js", - "version": "0.2.4", + "version": "0.2.5", "description": "The JavaScript Move Builder for Initia", "license": "MIT", "author": "Initia Foundation", @@ -20,7 +20,7 @@ "main": "dist/index.js", "typings": "dist/index.d.ts", "files": [ - "dist/src", + "dist", "library" ], "engines": { diff --git a/src/builder.ts b/src/builder.ts index 7b1c3c7..dc45011 100644 --- a/src/builder.ts +++ b/src/builder.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/unbound-method */ import ref from '@eleccookie/ref-napi' -import path = require('path') +import * as path from 'path' import { readFile } from 'fs/promises' -import { handleResponse, createRawErrMsg, libcompiler, libmovevm } from 'lib' +import { handleResponse, createRawErrMsg, libcompiler, libmovevm } from './lib' import { ByteSliceViewType, FFIResult, @@ -11,7 +11,7 @@ import { compilerPayloadBcsType, testOptBcsType, TestOptions, -} from 'types' +} from './types' export class MoveBuilder { private readonly packagePath: string diff --git a/src/index.ts b/src/index.ts index 9973dbb..884dfd6 100644 --- a/src/index.ts +++ b/src/index.ts @@ -1,2 +1,2 @@ -export { FFIResult, BuildOptions, TestOptions } from 'types' +export { FFIResult, BuildOptions, TestOptions } from './types' export * from './builder' diff --git a/src/lib/utils.ts b/src/lib/utils.ts index ff98d6d..7d131d6 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -1,5 +1,10 @@ import ref from '@eleccookie/ref-napi' -import { UnmanagedVectorType, FFIResult, MethodType, ErrMsgStruct } from 'types' +import { + UnmanagedVectorType, + FFIResult, + MethodType, + ErrMsgStruct, +} from '../types' import { Buffer } from 'buffer' /** diff --git a/src/lib/vm.ts b/src/lib/vm.ts index bb2882b..0b0e26c 100644 --- a/src/lib/vm.ts +++ b/src/lib/vm.ts @@ -5,7 +5,7 @@ import { UnmanagedVectorPtr, ByteSliceViewType, UnmanagedVectorType, -} from 'types' +} from '../types' let compilerName: string let movevmName: string diff --git a/test/build.spec.ts b/test/build.spec.ts index 8b84f70..cc4c10b 100644 --- a/test/build.spec.ts +++ b/test/build.spec.ts @@ -1,6 +1,6 @@ import path from 'path' import { readFile } from 'fs/promises' -import { MoveBuilder } from 'builder' +import { MoveBuilder } from '../src/builder' describe('build move package', () => { const contractDir = path.resolve(__dirname, 'contract/dummy') diff --git a/test/create.spec.ts b/test/create.spec.ts index 07c9f28..332a540 100644 --- a/test/create.spec.ts +++ b/test/create.spec.ts @@ -1,5 +1,5 @@ import path from 'path' -import { MoveBuilder } from 'builder' +import { MoveBuilder } from '../src/builder' describe('create and clean new move package', () => { const contractDir = path.resolve(__dirname, 'contract/new') diff --git a/test/script.spec.ts b/test/script.spec.ts index 05ca4d7..c6bcc84 100644 --- a/test/script.spec.ts +++ b/test/script.spec.ts @@ -1,6 +1,6 @@ import path from 'path' import { readFile } from 'fs/promises' -import { MoveBuilder } from 'builder' +import { MoveBuilder } from '../src/builder' describe('build script and decode', () => { const contractDir = path.resolve(__dirname, 'contract/script') diff --git a/test/test.spec.ts b/test/test.spec.ts index 8e481bb..1dcf8dc 100644 --- a/test/test.spec.ts +++ b/test/test.spec.ts @@ -1,5 +1,5 @@ import path from 'path' -import { MoveBuilder } from 'builder' +import { MoveBuilder } from '../src/builder' describe('test move package', () => { const contractDir = path.resolve(__dirname, 'contract/simple') diff --git a/tsconfig.eslint.json b/tsconfig.eslint.json new file mode 100644 index 0000000..6ed6b87 --- /dev/null +++ b/tsconfig.eslint.json @@ -0,0 +1,5 @@ +{ + "extends": "./tsconfig.json", + "include": ["src", "test/**/*.ts"], + "exclude": ["node_modules"] +} \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json index 5049ceb..3893de9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -12,12 +12,19 @@ "skipLibCheck": true, "strictNullChecks": true, "sourceMap": true, - "baseUrl": "src", - "sourceRoot": "src", - "outDir": "dist", + "outDir": "./dist", + "rootDir": "src", + "baseUrl": "./", "typeRoots": [ "src/types", "node_modules/@types" - ] - } + ], + "paths": { + "lib": ["lib/index"], + "types": ["types/index"], + "*": ["*"] + }, + }, + "include": ["src"], + "exclude": ["node_modules","test"] } \ No newline at end of file