Update packages (#301)

* update packages * update code for new packages * fix eslint config * fix eslint command; resolve eslint errors * resolve prettier warning * fix typo * update github ci * fix node cache path * upgrade node to v22 LTS * Update packages use params for analytics change (#302) * Update params with analytics_params * Use const now for url * minor formatting --------- Co-authored-by: Nathan Franklin <[email protected]>
TACC-Cloud · Jan 15, 2025 · bf19dda · bf19dda
1 parent a06303c
commit bf19dda
Show file tree

Hide file tree

Showing 31 changed files with 12,382 additions and 8,448 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -15,3 +15,6 @@ indent_size = 2
 [*.md]
 max_line_length = off
 trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -2,132 +2,113 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [main]
   pull_request:
-    branches: [ '**' ]
+    branches: ["**"]
 
 jobs:
   Angular-Unit-Tests:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup Node.js for use with actions
-      uses: actions/setup-node@v1
-      with:
-        node-version: 14.x
-
-    - uses: actions/cache@v1
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: npm ci
-      run: |
-        cd angular
-        touch src/environments/jwt.js
-        npm ci
-    - name: Unit Tests
-      run: |
-        cd angular
-        npm run test:ci
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js for use with actions
+        uses: actions/setup-node@v4
+        with:
+          node-version: 14
+          cache: npm
+          cache-dependency-path: angular/package-lock.json
+
+      - name: npm ci
+        working-directory: angular
+        run: |
+          touch src/environments/jwt.js
+          npm ci
+
+      - name: Unit Tests
+        working-directory: angular
+        run: npm run test:ci
 
   Angular-Linting:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup Node.js for use with actions
-      uses: actions/setup-node@v1
-      with:
-        node-version: 14.x
-
-    - uses: actions/cache@v1
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: npm ci
-      run: |
-        cd angular
-        npm ci
-    - name: Linting
-      run: |
-        cd angular
-        npm run lint
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js for use with actions
+        uses: actions/setup-node@v4
+        with:
+          node-version: 14
+          cache: npm
+          cache-dependency-path: angular/package-lock.json
+
+      - name: npm ci
+        working-directory: angular
+        run: npm ci
+
+      - name: Linting
+        working-directory: angular
+        run: npm run lint
+
   React-Unit-Tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - name: Setup Node.js for use with actions
-        uses: actions/setup-node@v1
-        with:
-          node-version: 20.10.x
+      - uses: actions/checkout@v4
 
-      - uses: actions/cache@v1
+      - name: Setup Node.js for use with actions
+        uses: actions/setup-node@v4
         with:
-          path: ~/.npm
-          key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-node-
+          node-version: 22
+          cache: npm
+          cache-dependency-path: react/package-lock.json
 
       - name: npm ci
-        run: |
-          cd react
-          npm ci
+        working-directory: react
+        run: npm ci
+
       - name: Unit Tests
+        working-directory: react
         run: |
-          cd react
           cp src/secret_local.example.ts src/secret_local.ts
           npm run test
+
   React-Linting:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup Node.js for use with actions
-      uses: actions/setup-node@v1
-      with:
-        node-version: 20.10.x
-
-    - uses: actions/cache@v1
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: npm ci
-      run: |
-        cd react
-        npm ci
-    - name: Linting
-      run: |
-        cd react
-        npm run lint
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js for use with actions
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: npm
+          cache-dependency-path: react/package-lock.json
+
+      - name: npm ci
+        working-directory: react
+        run: npm ci
+
+      - name: Linting
+        working-directory: react
+        run: npm run lint
+
   React-Build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup Node.js for use with actions
-      uses: actions/setup-node@v1
-      with:
-        node-version: 20.10.x
-
-    - uses: actions/cache@v1
-      with:
-        path: ~/.npm
-        key: ${{ runner.os }}-node-${{ hashFiles('**/package-lock.json') }}
-        restore-keys: |
-          ${{ runner.os }}-node-
-
-    - name: npm ci
-      run: |
-        cd react
-        npm ci
-    - name: Build
-      run: |
-        cd react
-        cp src/secret_local.example.ts src/secret_local.ts
-        npm run build
+      - uses: actions/checkout@v4
+
+      - name: Setup Node.js for use with actions
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+          cache: npm
+          cache-dependency-path: react/package-lock.json
+
+      - name: npm ci
+        working-directory: react
+        run: npm ci
+
+      - name: Build
+        working-directory: react
+        run: |
+          cp src/secret_local.example.ts src/secret_local.ts
+          npm run build
diff --git a/react/.eslintignore b/react/.eslintignore
diff --git a/react/.eslintrc.json b/react/.eslintrc.json
diff --git a/react/Dockerfile b/react/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:20.10.0-alpine3.18 as node
+FROM node:22-alpine AS node
 
 RUN mkdir /www
 COPY react /www
@@ -10,7 +10,7 @@ COPY react/src/secret_local.example.ts src/secret_local.ts
 RUN npm ci
 RUN npm run build
 
-FROM nginx:1.24-alpine
+FROM nginx:stable-alpine
 WORKDIR /
 COPY nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=node /www/dist/ /usr/share/nginx/html
diff --git a/react/eslint.config.mjs b/react/eslint.config.mjs
@@ -0,0 +1,53 @@
+import globals from 'globals';
+import eslint from '@eslint/js';
+import tseslint from 'typescript-eslint';
+import jsxA11y from 'eslint-plugin-jsx-a11y';
+import reactPlugin from 'eslint-plugin-react';
+import { fixupPluginRules } from '@eslint/compat';
+import eslintPluginReactHooks from 'eslint-plugin-react-hooks';
+import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended';
+
+export default tseslint.config([
+  {
+    ignores: ['**/dist/', '**/build/', '**/coverage/*'],
+  },
+  eslint.configs.recommended,
+  reactPlugin.configs.flat.recommended,
+  reactPlugin.configs.flat['jsx-runtime'],
+  jsxA11y.flatConfigs.recommended,
+  tseslint.configs.recommended,
+  eslintPluginPrettierRecommended,
+  {
+    files: ['**/*.ts', '**/*.tsx', '**/*.js', '**/*.jsx'],
+  },
+  {
+    plugins: {
+      'react-hooks': fixupPluginRules(eslintPluginReactHooks),
+    },
+
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+        ...globals.jest,
+        ...globals.node,
+      },
+
+      ecmaVersion: 'latest',
+      sourceType: 'module',
+    },
+
+    settings: {
+      react: {
+        version: 'detect',
+      },
+    },
+
+    rules: {
+      '@typescript-eslint/no-unused-vars': 'error',
+      '@typescript-eslint/no-explicit-any': 'off',
+      'react/jsx-uses-react': 'error',
+      'react/jsx-uses-vars': 'error',
+      ...eslintPluginReactHooks.configs.recommended.rules,
+    },
+  },
+]);
diff --git a/react/index.html b/react/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />