Skip to content

Commit

Permalink
[Upstream] Update to Python 3.11.2, Node 18.14.2, Inferno 8, Typescri…
Browse files Browse the repository at this point in the history
…pt 4.9, Yarn 3.4 (#2544)
  • Loading branch information
Bobbanz1 authored Nov 10, 2023
1 parent 0d9619f commit ae344ff
Show file tree
Hide file tree
Showing 41 changed files with 4,430 additions and 2,999 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/compile_changelogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Python setup
uses: actions/setup-python@v1
with:
python-version: "3.9"
python-version: "3.11"
- name: Install depends
run: |
python -m pip install --upgrade pip
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/continuous_integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Python setup
uses: actions/setup-python@v1
with:
python-version: "3.9"
python-version: "3.11"
- name: Setup cache
id: cache-spacemandmm
uses: actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/make_changelogs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Python setup
uses: actions/setup-python@v1
with:
python-version: "3.9"
python-version: "3.11"
- name: Install depends
run: |
python -m pip install --upgrade pip
Expand Down
6 changes: 3 additions & 3 deletions dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ export RUST_VERSION=1.54.0
export RUST_G_VERSION=0.4.7.1

#node version
export NODE_VERSION=14
export NODE_VERSION_PRECISE=14.16.1
export NODE_VERSION=18
export NODE_VERSION_PRECISE=18.14.2

# SpacemanDMM git tag
export SPACEMAN_DMM_VERSION=suite-1.7.1
Expand All @@ -24,4 +24,4 @@ export SPACEMAN_DMM_VERSION=suite-1.7.1
export AUXMOS_VERSION=2.2.2

# Python version for mapmerge and other tools
export PYTHON_VERSION=3.9.10
export PYTHON_VERSION=3.11.2
50 changes: 25 additions & 25 deletions tgui/.eslintrc-sonar.yml
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
rules:
# radar/cognitive-complexity: error
radar/max-switch-cases: error
radar/no-all-duplicated-branches: error
radar/no-collapsible-if: error
radar/no-collection-size-mischeck: error
radar/no-duplicate-string: error
radar/no-duplicated-branches: error
radar/no-element-overwrite: error
radar/no-extra-arguments: error
radar/no-identical-conditions: error
radar/no-identical-expressions: error
radar/no-identical-functions: error
radar/no-inverted-boolean-check: error
radar/no-one-iteration-loop: error
radar/no-redundant-boolean: error
radar/no-redundant-jump: error
radar/no-same-line-conditional: error
radar/no-small-switch: error
radar/no-unused-collection: error
radar/no-use-of-empty-return-value: error
radar/no-useless-catch: error
radar/prefer-immediate-return: error
radar/prefer-object-literal: error
radar/prefer-single-boolean-return: error
radar/prefer-while: error
# sonarjs/cognitive-complexity: error
sonarjs/max-switch-cases: error
sonarjs/no-all-duplicated-branches: error
sonarjs/no-collapsible-if: error
sonarjs/no-collection-size-mischeck: error
sonarjs/no-duplicate-string: error
sonarjs/no-duplicated-branches: error
sonarjs/no-element-overwrite: error
sonarjs/no-extra-arguments: error
sonarjs/no-identical-conditions: error
sonarjs/no-identical-expressions: error
sonarjs/no-identical-functions: error
sonarjs/no-inverted-boolean-check: error
sonarjs/no-one-iteration-loop: error
sonarjs/no-redundant-boolean: error
sonarjs/no-redundant-jump: error
sonarjs/no-same-line-conditional: error
sonarjs/no-small-switch: error
sonarjs/no-unused-collection: error
sonarjs/no-use-of-empty-return-value: error
sonarjs/no-useless-catch: error
sonarjs/prefer-immediate-return: error
sonarjs/prefer-object-literal: error
sonarjs/prefer-single-boolean-return: error
sonarjs/prefer-while: error
17 changes: 11 additions & 6 deletions tgui/.eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ env:
globals:
Byond: readonly
plugins:
- radar
- sonarjs
- react
settings:
react:
Expand Down Expand Up @@ -315,7 +315,8 @@ rules:
imports: always-multiline,
exports: always-multiline,
functions: only-multiline, ## Optional on functions
}]
}
]
## Enforce consistent spacing before and after commas
comma-spacing: [error, { before: false, after: true }]
## Enforce consistent comma style
Expand Down Expand Up @@ -377,7 +378,8 @@ rules:
ignoreUrls: true,
ignoreRegExpLiterals: true,
ignoreStrings: true,
}]
}
]
## Enforce a maximum number of lines per file
# max-lines: error
## Enforce a maximum number of line of code in a function
Expand Down Expand Up @@ -486,7 +488,8 @@ rules:
anonymous: always,
named: never,
asyncArrow: always,
}]
}
]
## Enforce consistent spacing inside parentheses
space-in-parens: [error, never]
## Require spacing around infix operators
Expand Down Expand Up @@ -690,7 +693,8 @@ rules:
## NOTE: Not really sure about enforcing this one
selfClosing: false,
nonEmpty: after-props,
}]
}
]
## Validate closing tag location in JSX (fixable)
react/jsx-closing-tag-location: error
## Enforce or disallow newlines inside of curly braces in JSX attributes and
Expand All @@ -710,7 +714,8 @@ rules:
## Validate JSX indentation (fixable)
react/jsx-indent: [error, 2, {
checkAttributes: true,
}]
}
]
## Validate props indentation in JSX (fixable)
react/jsx-indent-props: [error, 2]
## Validate JSX has key prop when in array or iterator
Expand Down
768 changes: 0 additions & 768 deletions tgui/.yarn/releases/yarn-3.1.1.cjs

This file was deleted.

873 changes: 873 additions & 0 deletions tgui/.yarn/releases/yarn-3.4.1.cjs

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions tgui/.yarn/sdks/eslint/bin/eslint.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);

const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
Expand Down
10 changes: 5 additions & 5 deletions tgui/.yarn/sdks/eslint/lib/api.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);

const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require eslint/lib/api.js
// Setup the environment to be able to require eslint
require(absPnpApiPath).setup();
}
}

// Defer to the real eslint/lib/api.js your application uses
module.exports = absRequire(`eslint/lib/api.js`);
// Defer to the real eslint your application uses
module.exports = absRequire(`eslint`);
2 changes: 1 addition & 1 deletion tgui/.yarn/sdks/eslint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint",
"version": "7.32.0-sdk",
"version": "8.35.0-sdk",
"main": "./lib/api.js",
"type": "commonjs"
}
4 changes: 2 additions & 2 deletions tgui/.yarn/sdks/typescript/bin/tsc
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);

const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
Expand Down
4 changes: 2 additions & 2 deletions tgui/.yarn/sdks/typescript/bin/tsserver
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);

const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
Expand Down
4 changes: 2 additions & 2 deletions tgui/.yarn/sdks/typescript/lib/tsc.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/env node

const {existsSync} = require(`fs`);
const {createRequire, createRequireFromPath} = require(`module`);
const {createRequire} = require(`module`);
const {resolve} = require(`path`);

const relPnpApiPath = "../../../../.pnp.cjs";

const absPnpApiPath = resolve(__dirname, relPnpApiPath);
const absRequire = (createRequire || createRequireFromPath)(absPnpApiPath);
const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
Expand Down
Loading

0 comments on commit ae344ff

Please sign in to comment.