diff --git a/.gitignore b/.gitignore index ab129b03..1ae60152 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ dist/ node_modules/ package-lock.json +pnpm-lock.yaml .vscode diff --git a/.npmrc b/.npmrc new file mode 100644 index 00000000..1bad8c08 --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +auto-install-peers=false diff --git a/exp_commands/package.json b/exp_commands/package.json index 8b9f70f5..46bc760d 100644 --- a/exp_commands/package.json +++ b/exp_commands/package.json @@ -1,10 +1,10 @@ { - "name": "@explosivegaming/commands", - "version": "0.0.1", - "description": "Clusterio module for command handling", + "name": "@expcluster/lib_commands", + "version": "0.1.0", + "description": "Clusterio plugin providing a Lua command processing library.", "author": "Cooldude2606 ", "license": "MIT", - "repository": "explosivegaming/clustorio-exp-commands", + "repository": "explosivegaming/ExpCluster", "main": "dist/node/index.js", "scripts": { "prepare": "tsc --build" @@ -13,14 +13,15 @@ "node": ">=18" }, "peerDependencies": { - "@clusterio/lib": "workspace:*" + "@clusterio/lib": "^2.0.0-alpha.19" }, "devDependencies": { - "@clusterio/lib": "workspace:*", + "@clusterio/lib": "2.0.0-alpha.19", "@types/node": "^20.14.9", "typescript": "^5.5.3" }, "dependencies": { + "@expcluster/lib_util": "workspace:*", "@sinclair/typebox": "^0.30.4" }, "publishConfig": { diff --git a/exp_groups/package.json b/exp_groups/package.json index 49bf50ce..8227ca74 100644 --- a/exp_groups/package.json +++ b/exp_groups/package.json @@ -1,6 +1,7 @@ { - "name": "exp_groups", - "version": "0.1.0", + "name": "@expcluster/permission_groups", + "private": true, + "version": "0.0.0", "description": "Example Description. Package. Change me in package.json", "main": "dist/node/index.js", "scripts": { @@ -10,21 +11,20 @@ "node": ">=18" }, "peerDependencies": { - "@clusterio/lib": "workspace:*" + "@clusterio/lib": "^2.0.0-alpha.19" }, "devDependencies": { - "@clusterio/lib": "workspace:*", - "@clusterio/web_ui": "workspace:*", - "@types/fs-extra": "^11.0.1", + "typescript": "^5.5.3", "@types/node": "^20.4.5", "@types/react": "^18.2.21", "antd": "^5.13.0", "react": "^18.2.0", "react-dom": "^18.2.0", - "typescript": "^5.5.3", "webpack": "^5.88.2", "webpack-cli": "^5.1.4", - "webpack-merge": "^5.9.0" + "webpack-merge": "^5.9.0", + "@clusterio/web_ui": "^2.0.0-alpha.19", + "@clusterio/lib": "^2.0.0-alpha.19" }, "dependencies": { "@sinclair/typebox": "^0.30.4", diff --git a/exp_groups/tsconfig.browser.json b/exp_groups/tsconfig.browser.json index c567ba51..1e3889e7 100644 --- a/exp_groups/tsconfig.browser.json +++ b/exp_groups/tsconfig.browser.json @@ -1,8 +1,4 @@ { - "extends": "../../../tsconfig.browser.json", - "references": [ - { "path": "../../../packages/lib/tsconfig.browser.json" }, - { "path": "../../../packages/web_ui/tsconfig.browser.json" }, - ], + "extends": "../tsconfig.browser.json", "include": [ "web/**/*.tsx", "web/**/*.ts", "messages.ts", "package.json" ], } diff --git a/exp_groups/tsconfig.node.json b/exp_groups/tsconfig.node.json index bfcdb73d..3218f2e7 100644 --- a/exp_groups/tsconfig.node.json +++ b/exp_groups/tsconfig.node.json @@ -1,8 +1,5 @@ { - "extends": "../../../tsconfig.node.json", - "references": [ - { "path": "../../../packages/lib/tsconfig.node.json" }, - ], + "extends": "../tsconfig.node.json", "include": ["./**/*.ts"], "exclude": ["test/*", "./dist/*"], } diff --git a/exp_legacy/package.json b/exp_legacy/package.json index f8c1bf15..b44413d3 100644 --- a/exp_legacy/package.json +++ b/exp_legacy/package.json @@ -1,7 +1,10 @@ { - "name": "exp_legacy", + "name": "@expcluster/legacy", "version": "0.1.0", - "description": "Example Description. Package. Change me in package.json", + "description": "Clusterio plugin implementing the legacy v6 scenario updated for factorio 2.0", + "author": "Cooldude2606 ", + "license": "MIT", + "repository": "explosivegaming/ExpCluster", "main": "dist/node/index.js", "scripts": { "prepare": "tsc --build" @@ -10,14 +13,16 @@ "node": ">=18" }, "peerDependencies": { - "@clusterio/lib": "workspace:*" + "@clusterio/lib": "^2.0.0-alpha.19" }, "devDependencies": { "typescript": "^5.5.3", "@types/node": "^20.4.5", - "@clusterio/lib": "workspace:*" + "@clusterio/lib": "^2.0.0-alpha.19" }, "dependencies": { + "@expcluster/lib_commands": "workspace:*", + "@expcluster/lib_util": "workspace:*", "@sinclair/typebox": "^0.30.4" }, "publishConfig": { diff --git a/exp_scenario/package.json b/exp_scenario/package.json index 01583929..00112927 100644 --- a/exp_scenario/package.json +++ b/exp_scenario/package.json @@ -1,7 +1,10 @@ { - "name": "exp_scenario", + "name": "@expcluster/scenario", "version": "0.1.0", - "description": "Example Description. Package. Change me in package.json", + "description": "Clusterio plugin implementing the Explosive Gaming scenario.", + "author": "Cooldude2606 ", + "license": "MIT", + "repository": "explosivegaming/ExpCluster", "main": "dist/node/index.js", "scripts": { "prepare": "tsc --build && webpack-cli --env production" @@ -10,7 +13,7 @@ "node": ">=18" }, "peerDependencies": { - "@clusterio/lib": "workspace:*" + "@clusterio/lib": "^2.0.0-alpha.19" }, "devDependencies": { "typescript": "^5.5.3", @@ -22,10 +25,12 @@ "webpack": "^5.88.2", "webpack-cli": "^5.1.4", "webpack-merge": "^5.9.0", - "@clusterio/web_ui": "workspace:*", - "@clusterio/lib": "workspace:*" + "@clusterio/web_ui": "^2.0.0-alpha.19", + "@clusterio/lib": "^2.0.0-alpha.19" }, "dependencies": { + "@expcluster/lib_commands": "workspace:*", + "@expcluster/lib_util": "workspace:*", "@sinclair/typebox": "^0.30.4" }, "publishConfig": { diff --git a/exp_util/package.json b/exp_util/package.json index 66fb35b2..3e6ec017 100644 --- a/exp_util/package.json +++ b/exp_util/package.json @@ -1,10 +1,10 @@ { - "name": "@explosivegaming/util", - "version": "0.0.1", - "description": "Clusterio module for Lua overrides and compatibility utils", + "name": "@expcluster/lib_util", + "version": "0.1.0", + "description": "Clusterio plugin providing Lua libraries and other utilities.", "author": "Cooldude2606 ", "license": "MIT", - "repository": "explosivegaming/clustorio-exp-util", + "repository": "explosivegaming/ExpCluster", "main": "dist/node/index.js", "scripts": { "prepare": "tsc --build" @@ -13,10 +13,10 @@ "node": ">=18" }, "peerDependencies": { - "@clusterio/lib": "workspace:*" + "@clusterio/lib": "^2.0.0-alpha.19" }, "devDependencies": { - "@clusterio/lib": "workspace:*", + "@clusterio/lib": "^2.0.0-alpha.19", "@types/node": "^20.14.9", "typescript": "^5.5.3" }, diff --git a/package.json b/package.json new file mode 100644 index 00000000..f2c9d2d9 --- /dev/null +++ b/package.json @@ -0,0 +1,12 @@ +{ + "name": "root", + "private": true, + "files": [], + "scripts": { + "build": "tsc --build", + "watch": "tsc --build --watch" + }, + "devDependencies": { + "typescript": "^5.5.3" + } +} \ No newline at end of file diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml new file mode 100644 index 00000000..6551af89 --- /dev/null +++ b/pnpm-workspace.yaml @@ -0,0 +1,2 @@ +packages: + - "*" \ No newline at end of file diff --git a/tsconfig.base.json b/tsconfig.base.json new file mode 100644 index 00000000..dd597d2d --- /dev/null +++ b/tsconfig.base.json @@ -0,0 +1,13 @@ +{ + "compilerOptions": { + "composite": true, + "declaration": true, + "declarationMap": true, + "incremental": true, + "sourceMap": true, + "strict": true, + "esModuleInterop": true, + "resolveJsonModule": true, + "skipLibCheck": true, + }, +} diff --git a/tsconfig.browser.json b/tsconfig.browser.json index 5f8112bb..3a095ab3 100644 --- a/tsconfig.browser.json +++ b/tsconfig.browser.json @@ -1,7 +1,12 @@ { - "extends": "../../tsconfig.browser.json", - "references": [ - { "path": "../../packages/lib/tsconfig.browser.json" }, - { "path": "../../packages/web_ui/tsconfig.browser.json" }, - ] + "extends": "./tsconfig.base.json", + "compilerOptions": { + "lib": ["dom", "es2023"], + "module": "es2022", + "moduleResolution": "bundler", + "target": "es2022", + "jsx": "react-jsx", + "noEmitOnError": true, + "outDir": "${configDir}/dist/browser", + }, } \ No newline at end of file diff --git a/tsconfig.json b/tsconfig.json new file mode 100644 index 00000000..754a5810 --- /dev/null +++ b/tsconfig.json @@ -0,0 +1,10 @@ +{ + "files": [], + "references": [ + { "path": "./exp_commands/" }, + { "path": "./exp_groups/" }, + { "path": "./exp_legacy/" }, + { "path": "./exp_scenario/" }, + { "path": "./exp_util/" }, + ], +} diff --git a/tsconfig.node.json b/tsconfig.node.json index 65641bad..a2e84c8b 100644 --- a/tsconfig.node.json +++ b/tsconfig.node.json @@ -1,6 +1,11 @@ { - "extends": "../../tsconfig.node.json", - "references": [ - { "path": "../../packages/lib/tsconfig.node.json" }, - ], + "extends": "./tsconfig.base.json", + "compilerOptions": { + "lib": ["es2023"], + "module": "node16", + "moduleResolution": "node16", + "target": "es2022", + "forceConsistentCasingInFileNames": true, + "outDir": "${configDir}/dist/node", + }, } \ No newline at end of file