Skip to content

Commit cb42a17

Browse files
lounsbroughlounsbrough
authored
Bring app into 2026 (#309)
* bring app into 2026 * update all deps * fix some scss things and update branch name * update github action shas and setup pnpm * specify package manager * allow cypress binary download * allowCypressEnv false
1 parent 2abba0a commit cb42a17

116 files changed

Lines changed: 3221 additions & 9937 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/acceptance-tests.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,27 @@ name: Acceptance Tests
22

33
on:
44
pull_request:
5-
branches: [ 'master' ]
5+
branches: [ 'main' ]
66

77
jobs:
88
acceptance-tests:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v3
12+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
13+
14+
- name: Setup pnpm
15+
uses: pnpm/action-setup@41ff72655975bd51cab0327fa583b6e92b6d3061 # v4
16+
17+
- name: Setup Node
18+
uses: actions/setup-node@49933ea5288caeca8642d1e84afbd3f7d6820020 # v4
19+
with:
20+
node-version-file: '.nvmrc'
21+
cache: 'pnpm'
1322

1423
- name: Cypress run
15-
uses: cypress-io/github-action@v5
24+
uses: cypress-io/github-action@f9ffb60bba0c743f8c78dfed96873e8fdb2af34c # v7.1.4
1625
with:
1726
browser: chrome
18-
start: yarn start
27+
install-command: pnpm install
28+
start: pnpm start

‎.github/workflows/auto-merge-dependabot-updates.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
steps:
1414
- name: Dependabot metadata
1515
id: dependabot-metadata
16-
uses: dependabot/fetch-metadata@v1.3.3
16+
uses: dependabot/fetch-metadata@605e039bf3a1b6595b0074dcc00db2c8825ee8a5 # v1.3.3
1717
with:
1818
github-token: "${{ secrets.DEPENDABOT_AUTO_MERGE_GITHUB_TOKEN }}"
1919
- name: Approve Minor

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: "CodeQL"
22

33
on:
44
push:
5-
branches: [ "master" ]
5+
branches: [ "main" ]
66
pull_request:
7-
branches: [ "master" ]
7+
branches: [ "main" ]
88
schedule:
99
- cron: '29 10 * * 2'
1010

@@ -24,15 +24,15 @@ jobs:
2424

2525
steps:
2626
- name: Checkout repository
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@34e114876b0b11c390a56381ad16ebd13914f8d5 # v4
2828

2929
- name: Initialize CodeQL
30-
uses: github/codeql-action/init@v2
30+
uses: github/codeql-action/init@45580472a5bb82c4681c4ac726cfdb60060c2ee1 # v3
3131
with:
3232
languages: ${{ matrix.language }}
33-
33+
3434
- name: Autobuild
35-
uses: github/codeql-action/autobuild@v2
35+
uses: github/codeql-action/autobuild@45580472a5bb82c4681c4ac726cfdb60060c2ee1 # v3
3636

3737
- name: Perform CodeQL Analysis
38-
uses: github/codeql-action/analyze@v2
38+
uses: github/codeql-action/analyze@45580472a5bb82c4681c4ac726cfdb60060c2ee1 # v3

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
16
1+
24

‎cypress.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
const { defineConfig } = require("cypress");
22

33
module.exports = defineConfig({
4+
allowCypressEnv: false,
45
e2e: {
56
baseUrl: 'http://localhost:3000'
67
},

‎index.html‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
4+
<head>
5+
<meta charset="utf-8" />
6+
<link rel="shortcut icon" href="/favicon.ico" />
7+
<meta name="viewport" content="width=device-width, initial-scale=1" />
8+
<meta name="theme-color" content="#000000" />
9+
<meta name="description" content="CODENOUGH LLC" />
10+
<link rel="apple-touch-icon" href="logo192.png" />
11+
<!--
12+
manifest.json provides metadata used when your web app is installed on a
13+
user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
14+
-->
15+
<link rel="manifest" href="/manifest.json" />
16+
<title>CODENOUGH LLC</title>
17+
</head>
18+
19+
<body>
20+
<noscript>You need to enable JavaScript to run this app.</noscript>
21+
<div id="root"></div>
22+
<script type="module" src="/src/index.jsx"></script>
23+
</body>
24+
25+
</html>

‎package.json‎

Lines changed: 26 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,43 @@
22
"name": "codenough",
33
"version": "0.1.0",
44
"private": true,
5+
"packageManager": "pnpm@10.30.3",
56
"dependencies": {
6-
"@fortawesome/fontawesome-svg-core": "^6.5.2",
7-
"@fortawesome/free-solid-svg-icons": "^6.5.2",
8-
"@fortawesome/react-fontawesome": "^0.2.0",
9-
"bootstrap": "^5.3.3",
7+
"@fortawesome/fontawesome-svg-core": "^7.2.0",
8+
"@fortawesome/free-solid-svg-icons": "^7.2.0",
9+
"@fortawesome/react-fontawesome": "^3.2.0",
10+
"bootstrap": "^5.3.8",
1011
"matercolors": "^2.3.0",
1112
"moment": "^2.30.1",
12-
"netlify-identity-widget": "^1.9.2",
13+
"netlify-identity-widget": "^2.0.3",
1314
"react": "^18.3.1",
1415
"react-device-detect": "^2.2.3",
1516
"react-dom": "^18.3.1",
1617
"react-helmet": "^6.1.0",
17-
"react-router-dom": "^6.23.0",
18-
"react-scripts": "^5.0.1",
19-
"react-signature-pad-wrapper": "^3.4.0",
20-
"react-unity-webgl": "^9.5.2",
21-
"reactstrap": "^9.2.2",
22-
"sass": "^1.76.0",
23-
"short-unique-id": "^4.4.4",
24-
"socket.io-client": "^4.7.5"
18+
"react-router-dom": "^7.13.1",
19+
"react-signature-pad-wrapper": "^4.3.2",
20+
"react-unity-webgl": "^10.1.6",
21+
"reactstrap": "^9.2.3",
22+
"sass": "^1.97.3",
23+
"short-unique-id": "^5.3.2",
24+
"socket.io-client": "^4.8.3"
2525
},
2626
"scripts": {
27-
"start": "react-scripts start",
28-
"dev": "REACT_APP_LOCAL_RUN=true react-scripts start",
29-
"build": "GENERATE_SOURCEMAP=false react-scripts build",
30-
"test": "react-scripts test",
31-
"eject": "react-scripts eject",
27+
"start": "vite",
28+
"dev": "VITE_LOCAL_RUN=true vite",
29+
"build": "vite build",
30+
"preview": "vite preview",
3231
"cypress:open": "cypress open"
3332
},
34-
"eslintConfig": {
35-
"extends": "react-app"
33+
"devDependencies": {
34+
"@vitejs/plugin-react": "^5.1.4",
35+
"cypress": "^15.11.0",
36+
"vite": "^7.3.1"
3637
},
37-
"browserslist": {
38-
"production": [
39-
">0.2%",
40-
"not dead",
41-
"not op_mini all"
42-
],
43-
"development": [
44-
"last 1 chrome version",
45-
"last 1 firefox version",
46-
"last 1 safari version"
38+
"pnpm": {
39+
"onlyBuiltDependencies": [
40+
"cypress",
41+
"esbuild"
4742
]
48-
},
49-
"devDependencies": {
50-
"cypress": "^12.17.4"
5143
}
52-
}
44+
}

0 commit comments

Comments
 (0)