diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml index 30035ee2..3f42f80a 100644 --- a/.github/workflows/node.js.yml +++ b/.github/workflows/node.js.yml @@ -25,7 +25,6 @@ jobs: - run: wget -q -O factorio.tar.gz https://www.factorio.com/get-download/latest/headless/linux64 && tar -xf factorio.tar.gz && rm factorio.tar.gz - run: node packages/lib/build_mod --source-dir packages/slave/lua/clusterio_lib --output-dir temp/test/sharedMods - run: wget -q -O temp/test/sharedMods/subspace_storage_1.99.8.zip -L https://github.com/clusterio/subspace_storage/releases/download/1.99.6/subspace_storage_1.99.8.zip - - run: pnpm run -r --if-present build - name: Run tests if: ${{ matrix.node-version != '12.x' }} run: pnpm test diff --git a/Dockerfile b/Dockerfile index 8f991b32..71008b26 100644 --- a/Dockerfile +++ b/Dockerfile @@ -24,8 +24,6 @@ RUN pnpm install COPY --from=subspace_storage_builder /subspace_storage/dist/ /clusterio/sharedMods/ -# Build submodules (web UI, libraries, plugins etc) -RUN pnpm run -r --if-present build # Build Lua library mod RUN node packages/lib/build_mod --build --source-dir packages/slave/lua/clusterio_lib \ && mv dist/* sharedMods/ \ diff --git a/docs/contributing.md b/docs/contributing.md index 0d76e877..875542fe 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -50,10 +50,9 @@ Do not run `git pull upstream` it will mess thing up! ### Setting up the Development Environment The project is organized into several packages that are all tied together using pnpm's workspace feature. -In order to get the development environment up and running you will need to run the following commands: +In order to get the development environment up and running you will need to run the following command: pnpm install - pnpm run -r --if-present build This installs dependencies needed by tests and links the packages up so they work from the git work tree. To start a cluster from the repo you will first need to initialize it, this can be done using the installer: @@ -87,7 +86,7 @@ For web development on the master there are also the following flags: These options can be combined and multiple plugins can be actived for dev mode. Keep in mind if you're working on external plugins the `--dev-plugin` option is likely to only work if the plugin is placed inside the `external_plugins` directory and its dependencies are installed with pnpm as part of the clusterio repository workspace. -Note that webpack is configured to delete the web interface build when using these options, so you will have to run `pnpm run -r --if-present build` before you start the master without these flags again. +Note that webpack is configured to delete the web interface build when using these options, so you will have to run `pnpm run -r --if-present prepare` before you start the master without these flags again. ### Starting a Feature Branch diff --git a/packages/master/package.json b/packages/master/package.json index ca546de1..a2567471 100644 --- a/packages/master/package.json +++ b/packages/master/package.json @@ -6,7 +6,7 @@ "version": "2.0.0-alpha.12", "main": "master.js", "scripts": { - "build": "webpack-cli --env production", + "prepare": "webpack-cli --env production", "test": "echo \"Error: no test specified\" && exit 1" }, "bin": { diff --git a/plugins/global_chat/package.json b/plugins/global_chat/package.json index d624c6b9..d66ae2c5 100644 --- a/plugins/global_chat/package.json +++ b/plugins/global_chat/package.json @@ -7,7 +7,7 @@ "license": "MIT", "repository": "clusterio/clusterio", "scripts": { - "build": "webpack-cli --env production", + "prepare": "webpack-cli --env production", "test": "echo \"Error: run tests from root\" && exit 1" }, "bugs": { diff --git a/plugins/inventory_sync/package.json b/plugins/inventory_sync/package.json index f033f984..645c2b96 100644 --- a/plugins/inventory_sync/package.json +++ b/plugins/inventory_sync/package.json @@ -7,7 +7,7 @@ "license": "MIT", "repository": "clusterio/factorioClusterio", "scripts": { - "build": "webpack-cli --env production", + "prepare": "webpack-cli --env production", "test": "echo \"Error: run tests from root\" && exit 1" }, "bugs": { diff --git a/plugins/player_auth/package.json b/plugins/player_auth/package.json index fe547602..848d3bb4 100644 --- a/plugins/player_auth/package.json +++ b/plugins/player_auth/package.json @@ -7,7 +7,7 @@ "license": "MIT", "repository": "clusterio/clusterio", "scripts": { - "build": "webpack-cli --env production", + "prepare": "webpack-cli --env production", "test": "echo \"Error: run tests from root\" && exit 1" }, "bugs": { diff --git a/plugins/research_sync/package.json b/plugins/research_sync/package.json index 1af45fb1..584c21fa 100644 --- a/plugins/research_sync/package.json +++ b/plugins/research_sync/package.json @@ -7,7 +7,7 @@ "license": "MIT", "repository": "clusterio/clusterio", "scripts": { - "build": "webpack-cli --env production", + "prepare": "webpack-cli --env production", "test": "echo \"Error: run tests from root\" && exit 1" }, "bugs": { diff --git a/plugins/statistics_exporter/package.json b/plugins/statistics_exporter/package.json index c7259fc8..4587b548 100644 --- a/plugins/statistics_exporter/package.json +++ b/plugins/statistics_exporter/package.json @@ -7,7 +7,7 @@ "license": "MIT", "repository": "clusterio/clusterio", "scripts": { - "build": "webpack-cli --env production", + "prepare": "webpack-cli --env production", "test": "echo \"Error: run tests from root\" && exit 1" }, "bugs": { diff --git a/plugins/subspace_storage/package.json b/plugins/subspace_storage/package.json index 5713341f..64439461 100644 --- a/plugins/subspace_storage/package.json +++ b/plugins/subspace_storage/package.json @@ -7,7 +7,7 @@ "license": "MIT", "repository": "clusterio/clusterio", "scripts": { - "build": "webpack-cli --env production", + "prepare": "webpack-cli --env production", "test": "echo \"Error: run tests from root\" && exit 1" }, "bugs": {