diff --git a/packages/file-graph/package.json b/packages/file-graph/package.json index 0f763f1..b2fe306 100644 --- a/packages/file-graph/package.json +++ b/packages/file-graph/package.json @@ -1,12 +1,12 @@ { "name": "@linux-odyssey/file-graph", "version": "1.0.0", - "type": "module", + "type": "commonjs", "main": "dist/index.js", "types": "dist/index.d.ts", "license": "MIT", "scripts": { - "build": "tsc && node post-build-script.js", + "build": "tsc", "test": "yarn build && jest" } } diff --git a/packages/file-graph/src/file.test.ts b/packages/file-graph/tests/file.test.ts similarity index 92% rename from packages/file-graph/src/file.test.ts rename to packages/file-graph/tests/file.test.ts index 1637a96..c86291e 100644 --- a/packages/file-graph/src/file.test.ts +++ b/packages/file-graph/tests/file.test.ts @@ -1,6 +1,4 @@ -import { describe, expect, test } from '@jest/globals' - -import File from './file' +import File from '../src/file' describe('File', () => { let file diff --git a/packages/file-graph/src/fileGraph.test.js b/packages/file-graph/tests/fileGraph.test.js similarity index 97% rename from packages/file-graph/src/fileGraph.test.js rename to packages/file-graph/tests/fileGraph.test.js index 34c146b..b1966c3 100644 --- a/packages/file-graph/src/fileGraph.test.js +++ b/packages/file-graph/tests/fileGraph.test.js @@ -1,5 +1,5 @@ -import FileGraph from './fileGraph' -import FileNode from './fileNode' +import FileGraph from '../src/fileGraph' +import FileNode from '../src/fileNode' describe('FileGraph', () => { let root diff --git a/packages/file-graph/src/fileNode.test.js b/packages/file-graph/tests/fileNode.test.js similarity index 98% rename from packages/file-graph/src/fileNode.test.js rename to packages/file-graph/tests/fileNode.test.js index 6969996..2938845 100644 --- a/packages/file-graph/src/fileNode.test.js +++ b/packages/file-graph/tests/fileNode.test.js @@ -1,5 +1,5 @@ -import { DuplicateItemError, ParentNotExistsError } from './errors' -import FileNode from './fileNode' +import { DuplicateItemError, ParentNotExistsError } from '../src/errors' +import FileNode from '../src/fileNode' function createNodeFromFiles(files) { const node = new FileNode(files[0]) diff --git a/packages/file-graph/tsconfig.json b/packages/file-graph/tsconfig.json index c405157..70955d7 100644 --- a/packages/file-graph/tsconfig.json +++ b/packages/file-graph/tsconfig.json @@ -1,7 +1,7 @@ { "compilerOptions": { - "target": "ESNext", - "module": "ESNext", + "target": "ES5", + "module": "CommonJS", "moduleResolution": "node", "strict": true, "esModuleInterop": true, diff --git a/packages/models/package.json b/packages/models/package.json index 74077dd..18b96d2 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -1,10 +1,14 @@ { "name": "@linux-odyssey/models", - "type": "module", + "type": "commonjs", "version": "1.0.0", - "main": "index.js", + "main": "dist/index.js", + "types": "dist/index.d.ts", "license": "GPL", - "exports": "./index.js", + "exports": "./dist/index.js", + "scripts": { + "build": "tsc" + }, "dependencies": { "mongoose": "^8.0.3" } diff --git a/packages/models/command.js b/packages/models/src/command.js similarity index 100% rename from packages/models/command.js rename to packages/models/src/command.js diff --git a/packages/models/commandResponder.js b/packages/models/src/commandResponder.js similarity index 100% rename from packages/models/commandResponder.js rename to packages/models/src/commandResponder.js diff --git a/packages/models/condition.js b/packages/models/src/condition.js similarity index 100% rename from packages/models/condition.js rename to packages/models/src/condition.js diff --git a/packages/models/exception.js b/packages/models/src/exception.js similarity index 100% rename from packages/models/exception.js rename to packages/models/src/exception.js diff --git a/packages/models/globalException.js b/packages/models/src/globalException.js similarity index 100% rename from packages/models/globalException.js rename to packages/models/src/globalException.js diff --git a/packages/models/hint.js b/packages/models/src/hint.js similarity index 100% rename from packages/models/hint.js rename to packages/models/src/hint.js diff --git a/packages/models/index.js b/packages/models/src/index.js similarity index 100% rename from packages/models/index.js rename to packages/models/src/index.js diff --git a/packages/models/quest.js b/packages/models/src/quest.js similarity index 100% rename from packages/models/quest.js rename to packages/models/src/quest.js diff --git a/packages/models/requirement.js b/packages/models/src/requirement.js similarity index 100% rename from packages/models/requirement.js rename to packages/models/src/requirement.js diff --git a/packages/models/response.js b/packages/models/src/response.js similarity index 100% rename from packages/models/response.js rename to packages/models/src/response.js diff --git a/packages/models/session.js b/packages/models/src/session.js similarity index 100% rename from packages/models/session.js rename to packages/models/src/session.js diff --git a/packages/models/stage.js b/packages/models/src/stage.js similarity index 100% rename from packages/models/stage.js rename to packages/models/src/stage.js diff --git a/packages/models/stageException.js b/packages/models/src/stageException.js similarity index 100% rename from packages/models/stageException.js rename to packages/models/src/stageException.js diff --git a/packages/models/user.js b/packages/models/src/user.js similarity index 100% rename from packages/models/user.js rename to packages/models/src/user.js diff --git a/packages/models/userProfile.js b/packages/models/src/userProfile.js similarity index 100% rename from packages/models/userProfile.js rename to packages/models/src/userProfile.js diff --git a/packages/models/tsconfig.json b/packages/models/tsconfig.json new file mode 100644 index 0000000..70955d7 --- /dev/null +++ b/packages/models/tsconfig.json @@ -0,0 +1,15 @@ +{ + "compilerOptions": { + "target": "ES5", + "module": "CommonJS", + "moduleResolution": "node", + "strict": true, + "esModuleInterop": true, + "outDir": "./dist", + "declaration": true, + "sourceMap": true, + "allowJs": true + }, + "include": ["src"], + "exclude": ["node_modules", "dist"] +} diff --git a/server/package.json b/server/package.json index f882f53..156e0bb 100644 --- a/server/package.json +++ b/server/package.json @@ -2,7 +2,7 @@ "name": "server", "version": "0.0.0", "description": "Linux Odyssey Server", - "type": "module", + "type": "commonjs", "scripts": { "start": "node dist/index.js", "dev": "nodemon", diff --git a/server/tsconfig.json b/server/tsconfig.json index d9da509..b76b77d 100644 --- a/server/tsconfig.json +++ b/server/tsconfig.json @@ -1,8 +1,8 @@ { "compilerOptions": { - "target": "esnext", - "module": "NodeNext", - "moduleResolution": "nodenext", + "target": "ES5", + "module": "CommonJS", + "moduleResolution": "Node", "strict": true, "esModuleInterop": true, "outDir": "./dist",