Merge pull request #8 from EgorDinamit/webpack

More fixes, now with tgui and webpack ver

tgui/.eslintrc-harder.yml

@@ -1,43 +1,15 @@
 rules:
   ## Enforce a maximum cyclomatic complexity allowed in a program
-  # complexity: [warn, { max: 25 }]
+  complexity: [error, { max: 25 }]
   ## Enforce consistent brace style for blocks
-  # brace-style: [warn, stroustrup, { allowSingleLine: false }]
+  brace-style: [error, stroustrup, { allowSingleLine: false }]
   ## Enforce the consistent use of either backticks, double, or single quotes
-  # quotes: [warn, single, {
-  #   avoidEscape: true,
-  #   allowTemplateLiterals: true,
-  # }]
-  # react/jsx-closing-bracket-location: [warn, {
-  #   selfClosing: after-props,
-  #   nonEmpty: after-props,
-  # }]
-  # react/display-name: warn
-
-  ## Radar
-  ## ------------------------------------------------------
-  # radar/cognitive-complexity: warn
-  radar/max-switch-cases: warn
-  radar/no-all-duplicated-branches: warn
-  radar/no-collapsible-if: warn
-  radar/no-collection-size-mischeck: warn
-  radar/no-duplicate-string: warn
-  radar/no-duplicated-branches: warn
-  radar/no-element-overwrite: warn
-  radar/no-extra-arguments: warn
-  radar/no-identical-conditions: warn
-  radar/no-identical-expressions: warn
-  radar/no-identical-functions: warn
-  radar/no-inverted-boolean-check: warn
-  radar/no-one-iteration-loop: warn
-  radar/no-redundant-boolean: warn
-  radar/no-redundant-jump: warn
-  radar/no-same-line-conditional: warn
-  radar/no-small-switch: warn
-  radar/no-unused-collection: warn
-  radar/no-use-of-empty-return-value: warn
-  radar/no-useless-catch: warn
-  radar/prefer-immediate-return: warn
-  radar/prefer-object-literal: warn
-  radar/prefer-single-boolean-return: warn
-  radar/prefer-while: warn
+  quotes: [error, single, {
+    avoidEscape: true,
+    allowTemplateLiterals: true,
+  }]
+  react/jsx-closing-bracket-location: [error, {
+    selfClosing: after-props,
+    nonEmpty: after-props,
+  }]
+  react/display-name: error

tgui/.eslintrc.yml

@@ -1,16 +1,16 @@
-root: true
-parser: '@typescript-eslint/parser'
+parser: '@babel/eslint-parser'
 parserOptions:
-  ecmaVersion: 2020
+  ecmaVersion: 2019
   sourceType: module
   ecmaFeatures:
     jsx: true
 env:
   es6: true
   browser: true
   node: true
+globals:
+  Byond: readonly
 plugins:
-  - radar
   - react
 settings:
   react:
@@ -19,6 +19,7 @@ rules:
 
   ## Possible Errors
   ## ----------------------------------------
+
   ## Enforce “for” loop update clause moving the counter in the right
   ## direction.
   # for-direction: error
@@ -278,8 +279,7 @@ rules:
   no-shadow-restricted-names: error
   ## Disallow the use of undeclared variables unless mentioned
   ## in /*global*/ comments
-  ## NOTE: Pointless when TypeScript can check for this
-  # no-undef: error
+  no-undef: error
   ## Disallow initializing variables to undefined
   no-undef-init: error
   ## Disallow the use of undefined as an identifier
@@ -507,7 +507,7 @@ rules:
   ## Require braces around arrow function bodies
   # arrow-body-style: error
   ## Require parentheses around arrow function arguments
-  # arrow-parens: [error, as-needed]
+  arrow-parens: [error, as-needed]
   ## Enforce consistent spacing before and after the arrow in arrow functions
   arrow-spacing: [error, { before: true, after: true }]
   ## Require super() calls in constructors

tgui/.gitignore

@@ -10,7 +10,6 @@ package-lock.json
 !/.yarn/plugins
 !/.yarn/sdks
 !/.yarn/versions
-!/.yarn/lock.yml
 
 ## Build artifacts
 /public/.tmp/**/*

tgui/.yarn/sdks/eslint/bin/eslint.js

@@ -2,7 +2,7 @@
 
 const {existsSync} = require(`fs`);
 const {createRequire, createRequireFromPath} = require(`module`);
-const {resolve} = require(`path`);
+const {resolve, dirname} = require(`path`);
 
 const relPnpApiPath = "../../../../.pnp.js";
 

tgui/.yarn/sdks/eslint/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint",
-  "version": "7.21.0-pnpify",
+  "version": "7.4.0-pnpify",
   "main": "./lib/api.js",
   "type": "commonjs"
 }

tgui/.yarnrc.yml

@@ -1,17 +1,21 @@
 enableScripts: false
 
 logFilters:
+  ## DISABLED_BUILD_SCRIPTS
   - code: YN0004
     level: discard
+  ## INCOMPATIBLE_OS - fsevents junk
   - code: YN0062
     level: discard
 
 plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
+  - path: .yarn/plugins/@yarnpkg/plugin-workspace-tools.cjs
+    spec: "@yarnpkg/plugin-workspace-tools"
 
 preferAggregateCacheInfo: true
 
 preferInteractive: true
 
-yarnPath: .yarn/releases/yarn-2.4.1.cjs
+yarnPath: .yarn/releases/yarn-2.4.0.cjs

tgui/README.md

@@ -87,7 +87,6 @@ Run `.\bin\tgui.bat` with any of the options listed below.
 doing development on IE8).
 - `bin/tgui --lint` - Show problems with the code.
 - `bin/tgui --fix` - Auto-fix problems with the code.
-- `bin/tgui --test` - Run tests.
 - `bin/tgui --analyze` - Run a bundle analyzer.
 - `bin/tgui --clean` - Clean up project repo.
 - `bin/tgui [webpack options]` - Build the project with custom webpack