wisnia74 · wisnia74 · Nov 12, 2022 · Nov 12, 2022 · Nov 12, 2022 · Nov 12, 2022
diff --git a/.editorconfig b/.editorconfig
@@ -1,5 +1,4 @@
 root = true
 
 [*]
-charset = utf-8
-end_of_line = lf
+charset = utf-8
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -28,8 +28,14 @@
       }
     ],
     "prettier/prettier": "error",
-    "@typescript-eslint/explicit-function-return-type": ["error"],
-    "@typescript-eslint/consistent-type-imports": ["error"]
+    "@typescript-eslint/explicit-function-return-type": "error",
+    "@typescript-eslint/consistent-type-imports": "error",
+    "import/order": [
+      "error",
+      {
+        "groups": ["builtin", "index", "sibling", "parent", "internal", "external", "object", "type"]
+      }
+    ]
   },
   "overrides": [
     {
@@ -39,9 +45,15 @@
       }
     },
     {
-      "files": ["rollup.*.ts", "gulpfile.ts", "gulp/**/*.ts", "config/**/*.ts"],
+      "files": ["rollup.*.ts", "config/**/*.ts", "script/**/*.ts"],
+      "rules": {
+        "import/no-extraneous-dependencies": "off"
+      }
+    },
+    {
+      "files": ["script/**/*.ts"],
       "rules": {
-        "import/no-extraneous-dependencies": 0
+        "no-console": "off"
       }
     },
     {

diff --git a/.github/workflows/node.js.yml b/.github/workflows/node.js.yml
@@ -11,7 +11,7 @@ jobs:
     strategy:
       matrix:
         os-type: ['ubuntu-latest', 'windows-latest', 'macos-latest']
-        node-version: [18.x]
+        node-version: [18.12.1]
 
     runs-on: ${{ matrix.os-type }}
 
@@ -29,8 +29,11 @@ jobs:
       - name: Install dependencies
         run: npm ci
 
+      - name: Run lint
+        run: npm run lint
+
       - name: Run build
-        run: npm run build --if-present
+        run: npm run build
 
       - name: Run tests
-        run: npm test
+        run: npm run test:ci
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+.vscode/
+
 # API declaration file
 lib/openrct2.d.ts
 

diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -1,10 +1,14 @@
 #!/usr/bin/env sh
 . "$(dirname -- "$0")/_/husky.sh"
 
+if [ -t 2 ]; then
+  exec >/dev/tty 2>&1
+fi
+
 export FORCE_COLOR=1
 
 echo "Running husky pre-commit hook..."
 
-npm run lint
+npm run lint -- --fix
 
 echo "All good, commiting!"
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1,5 +1,6 @@
 {
   "singleQuote": true,
   "quoteProps": "consistent",
-  "printWidth": 120
+  "printWidth": 120,
+  "endOfLine": "auto"
 }
diff --git a/README.md b/README.md
@@ -24,7 +24,6 @@ This template repository comes with:
 - [Rollup](https://rollupjs.org)
 - [ESLint](https://eslint.org/)
 - [Jest](https://jestjs.io/)
-- [gulp](https://gulpjs.com/)
 
 ## Installation
 
@@ -42,12 +41,17 @@ This template repository comes with:
 
 ```json
 {
-  "OPENRCT2_PATH": "PATH_TO_OPENRCT2"
+  "OPENRCT2_FOLDER_PATH": "PATH_TO_OPENRCT2",
+  "OPENRCT2_MS_DOS_EXECUTABLE_PATH": "PATH_TO_MS_DOS_OPERCT2_EXECUTABLE"
 }
 ```
 
-- replace `PATH_TO_OPENRCT2` with correct path to OpenRCT2 folder on your PC (usually `C:\Users\<USER>\Documents\OpenRCT2` or `C:\Program Files\OpenRCT2`)
-- make sure to use either escaped backslashes (`\\`) or forward slashes (`/`) in the path you're pasting
+- replace:
+  - **(required)** `PATH_TO_OPENRCT2` with correct path to OpenRCT2 folder on your PC (usually `C:\Users\<USER>\Documents\OpenRCT2` or `C:\Program Files\OpenRCT2`)
+  - _(optional)_ `OPENRCT2_MS_DOS_EXECUTABLE_PATH` with correct path to `openrct2.com` MS-DOS executable, located inside OpenRCT2 `bin` folder
+    - useful only for Windows users, **remove this variable from the config otherwise**
+    - if you populate this variable, upon running `npm start`, the script will launch Rollup in watch mode and OpenRCT2 (yes, it will launch the actual game), piping their outputs to the same terminal
+- make sure to use either escaped backslashes (`\\`) or forward slashes (`/`) in all the paths you're pasting to JSON config file
 
 6. Run `nvm use && npm install && npm run init`
 

diff --git a/config/dev.json b/config/dev.json
@@ -0,0 +1 @@
+{}
diff --git a/config/index.ts b/config/index.ts
@@ -1,4 +1,4 @@
-import config from 'config';
 import EnvConfig from './Env';
+import config from 'config';
 
 export default new EnvConfig({ ...config, NODE_ENV: process.env.NODE_ENV });
diff --git a/config/prod.json b/config/prod.json
@@ -0,0 +1 @@
+{}
diff --git a/gulp/build/build.ts b/gulp/build/build.ts
diff --git a/gulp/build/buildWatch.ts b/gulp/build/buildWatch.ts
diff --git a/gulp/build/index.ts b/gulp/build/index.ts
diff --git a/gulp/index.ts b/gulp/index.ts
diff --git a/gulp/init/index.ts b/gulp/init/index.ts
diff --git a/gulp/init/init.ts b/gulp/init/init.ts
diff --git a/gulp/lint/index.ts b/gulp/lint/index.ts
diff --git a/gulp/lint/lint.ts b/gulp/lint/lint.ts
diff --git a/gulp/lint/lintFix.ts b/gulp/lint/lintFix.ts
diff --git a/gulp/test/index.ts b/gulp/test/index.ts
diff --git a/gulp/test/test.ts b/gulp/test/test.ts
diff --git a/gulp/test/testCoverage.ts b/gulp/test/testCoverage.ts
diff --git a/gulp/test/testWatch.ts b/gulp/test/testWatch.ts
diff --git a/gulpfile.ts b/gulpfile.ts
diff --git a/jest.config.json b/jest.config.json
@@ -1,4 +1,5 @@
 {
+  "reporters": ["jest-progress-bar-reporter"],
   "projects": [
     {
       "preset": "ts-jest",