Merge branch 'main' into develop

Princeton-CDH · Jan 30, 2024 · d953ff4 · d953ff4
2 parents 683762d + 6d507eb
commit d953ff4
Show file tree

Hide file tree

Showing 8 changed files with 16,307 additions and 21,993 deletions.
diff --git a/.github/workflows/sphinx_docs.yml b/.github/workflows/sphinx_docs.yml
@@ -17,14 +17,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
-      # Python version to use is stored in the .python-version file, which is the
-      # convention for pyenv: https://github.com/pyenv/pyenv
-      - name: Get Python version
-        run: echo "PYTHON_VERSION=$(cat .python-version)" >> $GITHUB_ENV
       - name: Setup Python
         uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
+        # uses .python-version to determine python version
 
       # We base the python cache on the hash of all requirements files, so that
       # if any change, the cache is invalidated.

diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -7,7 +7,6 @@ on:
     - cron: "0 16 * * 2"
 
 env:
-  NODE_VERSION: 16.15
   DB_NAME: ppa
   DB_USER: ppa
   DB_PASSWORD: ppa
@@ -20,7 +19,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
         with:
-          node-version: ${{ env.NODE_VERSION }}
+          node-version-file: package.json
       - uses: actions/cache@v4
         with:
           path: ~/.npm
@@ -69,16 +68,10 @@ jobs:
       - name: Copy solr configsets to solr home directory (Solr 8 only)
         run: "docker exec -d ${{ job.services.solr.id }} cp -r /opt/solr/server/solr/configsets /var/solr/data"
 
-      # NOTE: Python version to use is stored in the .python-version file, which is the
-      # convention for pyenv: https://github.com/pyenv/pyenv
-      - name: Get Python version
-        run: echo "PYTHON_VERSION=$(cat .python-version)" >> $GITHUB_ENV
-
       # use python version for current build
       - name: Setup Python
         uses: actions/setup-python@v5
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
+        # uses .python-version to determine python version
 
       - name: Cache pip
         uses: actions/cache@v4

diff --git a/README.rst b/README.rst
@@ -38,7 +38,7 @@ contains the most recent release, and work in progress will be on the **develop*
 Pull requests should be made against develop.
 
 
-Python 3.9 / Django 4.0 / Node 16.15 / Postgresql 13 / Solr 8
+Python 3.9 / Django 4.0 / Node 18.12 / Postgresql 13 / Solr 8
 
 
 Development instructions

diff --git a/jest.config.js b/jest.config.js
@@ -4,6 +4,7 @@ module.exports = {
     preset: 'ts-jest/presets/js-with-ts', // handle both js and ts
     rootDir: path.resolve(__dirname, 'srcmedia'),
     testRegex: '^.+\\.(test|spec)\\.tsx?$',
+    testEnvironment: "jsdom",
     moduleFileExtensions: ['js', 'jsx', 'ts', 'tsx', 'json', 'node'],
     coverageDirectory: '<rootDir>/coverage',
     collectCoverageFrom: [

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,53 +21,55 @@
         "build:semantic": "gulp --gulpfile sitemedia/semantic/gulpfile.js build"
     },
     "dependencies": {
-        "css-minimizer-webpack-plugin": "^4.0.0",
-        "fomantic-ui": "^2.8.8",
-        "parallax-js": "^3.1.0",
-        "rxjs": "^7.5.6"
-    },
-    "devDependencies": {
-        "@babel/core": "^7.14.2",
-        "@babel/preset-env": "^7.14.2",
+        "@babel/core": "^7.23.9",
+        "@babel/preset-env": "^7.23.9",
         "@types/jest": "^24.9.1",
-        "@types/jquery": "^3.5.5",
-        "@types/node": "^11.15.54",
-        "@types/semantic-ui": "^2.2.7",
-        "autoprefixer": "^10.2.5",
+        "@types/jquery": "^3.5.29",
+        "@types/node": "^20.11.6",
+        "@types/semantic-ui": "^2.2.9",
+        "autoprefixer": "^10.4.17",
         "babel-loader": "^8.2.2",
         "clean-webpack-plugin": "^1.0.1",
         "core-js": "^3.12.1",
-        "css-loader": "3.6.0",
+        "css-loader": "^6.9.1",
+        "css-minimizer-webpack-plugin": "^4.0.0",
+        "fomantic-ui": "^2.9.3",
         "gulp": "^4.0.2",
         "gulp-help": "^1.6.1",
+        "mini-css-extract-plugin": "^2.6.1",
+        "mkdirp": "^3.0.1",
+        "parallax-js": "^3.1.0",
+        "postcss": "^8.4.33",
+        "postcss-loader": "^8.0.0",
+        "request": "^2.88.2",
+        "rxjs": "^7.8.1",
+        "sass": "^1.70.0",
+        "sass-loader": "^14.0.0",
+        "source-map-loader": "^0.2.4",
+        "style-loader": "^0.23.1",
+        "ts-loader": "^9.3.1",
+        "typescript": "^5.3.3",
+        "webpack": "^5.90.0",
+        "webpack-bundle-tracker": "^3.0.1",
+        "webpack-cli": "^5.1.4",
+        "whatwg-fetch": "^3.6.2"
+    },
+    "devDependencies": {
         "jasmine-core": "^3.7.1",
         "jasmine-jquery": "^2.1.1",
-        "jest": "^26.6.3",
+        "jest": "^29.7.0",
+        "jest-environment-jsdom": "^29.7.0",
         "karma": "^6.3.2",
         "karma-chrome-launcher": "^2.2.0",
         "karma-firefox-launcher": "^1.3.0",
         "karma-jasmine": "^1.1.2",
         "karma-spec-reporter": "^0.0.32",
         "karma-webpack": "^5.0.0",
-        "mini-css-extract-plugin": "^2.6.1",
-        "pa11y-ci": "^3.0.1",
-        "postcss": "^8.2.15",
-        "postcss-loader": "^4.3.0",
-        "request": "^2.88.2",
-        "sass": "^1.54.4",
-        "sass-loader": "^13.0.2",
-        "source-map-loader": "^0.2.4",
-        "style-loader": "^0.23.1",
-        "ts-jest": "^26.5.6",
-        "ts-loader": "^9.3.1",
-        "typescript": "4.7",
-        "webpack": "^5.51.0",
-        "webpack-bundle-tracker": "<1",
-        "webpack-cli": "4.10",
-        "webpack-dev-server": "^3.11.2",
-        "whatwg-fetch": "^3.6.2"
+        "pa11y-ci": "^2.4.2",
+        "ts-jest": "^29.1.2",
+        "webpack-dev-server": "^4.15.1"
     },
     "volta": {
-        "node": "16.15.1"
+        "node": "18.12.1"
     }
 }
diff --git a/tsconfig.json b/tsconfig.json
@@ -14,8 +14,13 @@
             "dom", // assume DOM APIs are present
             "dom.iterable", // assume newer DOM APIs are present
         ],
+        "declaration": true
     },
     "include": [
         "srcmedia/"
+    ],
+    "exclude": [
+        "*.test.ts"
     ]
+
 }
diff --git a/webpack.config.js b/webpack.config.js
@@ -33,7 +33,7 @@ module.exports = env => ({
     module: {
         rules: [
             { // compile TypeScript to js
-                test: /\.tsx?$/,
+                test: /^(?!.*\.test\.ts$).*\.tsx?$/,
                 loader: 'ts-loader',
                 exclude: [
                     /node_modules/, // don't transpile dependencies