Merge branch 'master' of https://github.com/topcoder-platform/platform-ui

Author: brooketopcoder

.circleci/config.yml

@@ -28,7 +28,7 @@ install_dependency: &install_dependency
 install_deploysuite: &install_deploysuite
     name: Installation of install_deploysuite.
     command: |
-      git clone --branch v1.4.11 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
+      git clone --branch v1.4.12 https://github.com/topcoder-platform/tc-deploy-scripts ../buildscript
       cp ./../buildscript/master_deploy.sh .
       cp ./../buildscript/buildenv.sh .
       cp ./../buildscript/awsconfiguration.sh .
@@ -41,10 +41,10 @@ save_cache_settings: &save_cache_settings
     paths:
       - node_modules
 
-running_yarn_tslint: &running_yarn_tslint
-    name: Running Yarn tslint
+running_yarn_eslint: &running_yarn_eslint
+    name: Running Yarn eslint
     command: |
-      yarn add tslint -g
+      yarn add eslint -g
       yarn lint
 
 running_yarn_build: &running_yarn_build
@@ -81,7 +81,7 @@ lint_steps: &lint_steps
     # Initialization.
     - checkout
     - setup_remote_docker
-    - run: *running_yarn_tslint
+    - run: *running_yarn_eslint
 
 build_steps: &build_steps
     # Initialization.
@@ -129,21 +129,21 @@ deploy_steps: &deploy_steps
           ./master_deploy.sh -d CFRONT -e $DEPLOY_ENV -c $ENABLE_CACHE
 
 jobs:
-  lint-dev:
-    <<: *defaults
-    environment:
-      DEPLOY_ENV: "DEV"
-      LOGICAL_ENV: "dev"
-      APPNAME: "platform-ui-mvp"
-    steps: *lint_steps
-
-  lint-prod:
-    <<: *defaults
-    environment:
-      DEPLOY_ENV: "PROD"
-      LOGICAL_ENV: "prod"
-      APPNAME: "platform-ui-mvp"
-    steps: *lint_steps
+  # lint-dev:
+  #   <<: *defaults
+  #   environment:
+  #     DEPLOY_ENV: "DEV"
+  #     LOGICAL_ENV: "dev"
+  #     APPNAME: "platform-ui-mvp"
+  #   steps: *lint_steps
+
+  # lint-prod:
+  #   <<: *defaults
+  #   environment:
+  #     DEPLOY_ENV: "PROD"
+  #     LOGICAL_ENV: "prod"
+  #     APPNAME: "platform-ui-mvp"
+  #   steps: *lint_steps
 
   build-dev:
     <<: *defaults
@@ -175,7 +175,7 @@ jobs:
     environment:
       DEPLOY_ENV: "DEV"
       LOGICAL_ENV: "dev"
-      ENABLE_CACHE: false
+      ENABLE_CACHE: true
       APPNAME: "platform-ui-mvp"
     steps: *deploy_steps
 
@@ -192,19 +192,19 @@ workflows:
   version: 2
   build:
     jobs:
-      - lint-dev:
-          context : org-global
-          filters:
-            branches:
-              ignore:
-                - master
-
-      - lint-prod:
-          context : org-global
-          filters:
-            branches:
-              only:
-                - master
+      # - lint-dev:
+      #     context : org-global
+      #     filters:
+      #       branches:
+      #         ignore:
+      #           - master
+
+      # - lint-prod:
+      #     context : org-global
+      #     filters:
+      #       branches:
+      #         only:
+      #           - master
 
       - build-dev:
           context : org-global

.gitignore

@@ -29,4 +29,3 @@ yarn-error.log*
 
 # Editors
 .editorconfig
-.prettierrc

README.md

@@ -190,10 +190,12 @@ Each [Tool](#tools) can have its own setup requirements. Please see each tool's
 | `yarn start:<dev>`    | Serve dev mode build with dev's personal config |
 | `yarn build`          | Build dev mode build with the default config and outputs static files in /builds |
 | `yarn build:prod`     | Build prod mode build with the prod config and outputs static files in /builds |
-| `yarn lint`           | Run tslint against ts/x files and outputs report |
-| `yarn lint:fix`       | Run tslint against ts/x files, fixes auto-fixable issues, and  outputs report |
-| `yarn eslint`         | Run eslint against js/x files and outputs report |
-| `yarn eslint:fix`     | Run eslint against js/x files, fixes auto-fixable issues, and  outputs report |
+| `yarn lint:ts`        | Run eslint against ts/x files and outputs report |
+| `yarn lint:ts:fix`    | Run eslint against ts/x files, fixes auto-fixable issues, and  outputs report |
+| `yarn lint:js`        | Run eslint against js/x files and outputs report |
+| `yarn lint:js:fix`    | Run eslint against js/x files, fixes auto-fixable issues, and  outputs report |
+| `yarn lint`           | Run eslint against js/x and ts/x files and outputs report |
+| `yarn lint:fix`       | Run eslint against js/x and ts/x files, fixes auto-fixable issues, and  outputs report |
 | `yarn test`           | Run unit tests, watching for changes and re-running per your specifications |             
 | `yarn test:no-watch`  | Run unit tests once, without watching for changes or re-running |
 | `yarn cy:run`         | Run e2e tests once in local command with the site is running    |
@@ -370,11 +372,11 @@ The PlatformRoute model has several useful options:
 ## Linting
 
 ### Rules
-While [TSLint](https://palantir.github.io/tslint/) is technically deprecated in favor of [Typescript ESLint](https://typescript-eslint.io/), TSLint is still far better at linting Typescript files than ESLint. So, for the time being, TSLint will be the primary linter, but ESLint remains configured for JS/X files.
 
-The following command will install TSLint globally:
+Javascript rules: [src/.eslintrc.js](src/.eslintrc.js)
+
+Typescript rules: [src-ts/.eslintrc.js](src-ts/.eslintrc.js)
 
->% yarn global add tslint typescript 
 
 ### Command Line
 
@@ -386,9 +388,7 @@ The following command will install TSLint globally:
 
 >% yarn lint:fix
 
-OR
-
->% yarn eslint:fix
+See the [yarn commmands](#yarn-commands) for further options.
 
 ### VS Code
 
@@ -411,16 +411,16 @@ The most useful feature is to automatically apply all lint rules any time you sa
         ...
         "editor.formatOnSave": true,
         "editor.codeActionsOnSave": {
-            "source.fixAll.tslint": true,
+            "source.fixAll.eslint": true,
         },
     }
     ```
 
-#### TSLint Plugin
+#### ESLint Plugin
 
 Created by Microsoft, this plugin will allow you to see lint errors in the Problems panel.
 
->**WARNING:** Other lint plugins can interfere with TSLint, so it is recommended that you uninstall/disable all other lint plugins (e.g. ESLint, Prettier, etc).
+>**WARNING:** Other lint plugins can interfere with ESLint, so it is recommended that you uninstall/disable all other lint plugins (e.g. TSLint, Prettier, etc).
 
 ## Styling
 

cypress.config.ts

@@ -1,4 +1,3 @@
-// tslint:disable-next-line: no-submodule-imports This is the way cypress does it
 import task from '@cypress/code-coverage/task'
 import { defineConfig } from 'cypress'
 

package.json

@@ -1,18 +1,18 @@
 {
     "name": "@topcoder-platform/platform-ui",
-    "version": "2.2",
+    "version": "2.3",
     "private": true,
     "scripts": {
         "dev": "yarn react-app-rewired start",
         "start": "sh start-ssl.sh",
         "start:brooke": "sudo sh start-ssl-brooke.sh",
         "build": "yarn react-app-rewired build",
-        "lint": "tslint 'src-ts/**/*.{ts,tsx}' && eslint 'src*/**/*.{js,jsx,ts,tsx}'",
-        "lint:fix": "tslint 'src-ts/**/*.{ts,tsx}' --fix && eslint 'src*/**/*.{js,jsx,ts,tsx}' --fix",
-        "tslint": "tslint 'src-ts/**/*.{ts,tsx}'",
-        "tslint:fix": "tslint 'src-ts/**/*.{ts,tsx}' --fix",
-        "eslint": "eslint 'src/**/*.{js,jsx}'",
-        "eslint:fix": "eslint 'src/**/*.{js,jsx}' --fix",
+        "lint:ts": "eslint -c ./src-ts/.eslintrc.js 'src-ts/**/*.{ts,tsx}'",
+        "lint:ts:fix": "eslint -c ./src-ts/.eslintrc.js 'src-ts/**/*.{ts,tsx}' --fix",
+        "lint:js": "eslint -c ./src/.eslintrc.js 'src/**/*.{js,jsx}'",
+        "lint:js:fix": "eslint -c ./src/.eslintrc.js 'src/**/*.{js,jsx}' --fix",
+        "lint": "npm run lint:js && npm run lint:ts",
+        "lint:fix": "npm run lint:js:fix && npm run lint:ts:fix",
         "test": "react-scripts test --watchAll",
         "test:no-watch": "react-scripts test --watchAll=false --passWithNoTests",
         "cy:run": "cypress run --reporter junit",
@@ -23,6 +23,8 @@
     "dependencies": {
         "@datadog/browser-logs": "^4.21.2",
         "@heroicons/react": "^1.0.6",
+        "@stripe/react-stripe-js": "1.13.0",
+        "@stripe/stripe-js": "1.41.0",
         "apexcharts": "^3.36.0",
         "axios": "^1.1.2",
         "browser-cookies": "^1.2.0",
@@ -78,8 +80,6 @@
         "@babel/preset-typescript": "^7.18.6",
         "@babel/runtime": "^7.19.4",
         "@cypress/code-coverage": "^3.10.0",
-        "@stripe/react-stripe-js": "1.13.0",
-        "@stripe/stripe-js": "1.41.0",
         "@testing-library/jest-dom": "^5.16.5",
         "@testing-library/react": "^13.4.0",
         "@testing-library/user-event": "^14.4.3",
@@ -102,6 +102,8 @@
         "@types/segment-analytics": "^0.0.34",
         "@types/systemjs": "^6.1.1",
         "@types/uuid": "^8.3.4",
+        "@typescript-eslint/eslint-plugin": "^5.30.6",
+        "@typescript-eslint/parser": "^5.30.6",
         "@wdio/junit-reporter": "^7.25.1",
         "autoprefixer": "^10.4.12",
         "babel-eslint": "^11.0.0-beta.2",
@@ -114,11 +116,17 @@
         "cross-env": "^7.0.3",
         "cypress": "^10.10.0",
         "eslint": "^8.25.0",
-        "eslint-config-prettier": "^8.5.0",
+        "eslint-config-airbnb": "^19.0.4",
         "eslint-config-react-app": "^7.0.1",
         "eslint-config-react-important-stuff": "^3.0.0",
+        "eslint-import-resolver-typescript": "^3.2.5",
         "eslint-plugin-cypress": "^2.12.1",
-        "eslint-plugin-prettier": "^4.2.1",
+        "eslint-plugin-import": "^2.25.3",
+        "eslint-plugin-jsx-a11y": "^6.5.1",
+        "eslint-plugin-no-null": "^1.0.2",
+        "eslint-plugin-ordered-imports": "^0.6.0",
+        "eslint-plugin-react": "^7.28.0",
+        "eslint-plugin-react-hooks": "^4.3.0",
         "file-loader": "^6.2.0",
         "husky": "^8.0.1",
         "identity-obj-proxy": "^3.0.0",
@@ -127,17 +135,17 @@
         "jest-cli": "^29.2.0",
         "lint-staged": "^13.0.3",
         "nyc": "^15.1.0",
-        "postcss-loader": "^7.0.1",
-        "postcss-scss": "^4.0.5",
-        "prettier": "^2.7.1",
+        "postcss-loader": "^4.0.4",
+        "postcss-scss": "^3.0.2",
         "pretty-quick": "^3.1.3",
         "resolve-url-loader": "^5.0.0",
         "sass-loader": "^13.1.0",
         "serve": "^14.0.1",
         "start-server-and-test": "^1.14.0",
         "style-loader": "^3.3.1",
         "systemjs-webpack-interop": "^2.3.7",
-        "tslint": "^6.1.3",
+        "typed-scss-modules": "^7.0.1",
+        "webpack": "^4.41.2",
         "webpack-cli": "^4.10.0",
         "webpack-config-single-spa-react": "^4.0.3",
         "webpack-dev-server": "^4.11.1",