Skip to content

Commit e08f9e6

Browse files
committed
[optimize] merge GitHub actions of main & other branches
[optimize] upgrade to Node.js 22, KoAJAX 3.1 & other latest Upstream packages [fix] Template Name texts
1 parent f181e41 commit e08f9e6

File tree

12 files changed

+1657
-1609
lines changed

12 files changed

+1657
-1609
lines changed

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
NEXT_PUBLIC_SITE_NAME=Next-Bootstrap.ts
1+
NEXT_PUBLIC_SITE_NAME=Next-Bootstrap-ts
22
NEXT_PUBLIC_SITE_SUMMARY=React project scaffold based on TypeScript, Next.js, Bootstrap & Workbox.
33

44
NEXT_PUBLIC_SENTRY_DSN =

.github/workflows/main.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: CI & CD
22
on:
33
push:
44
branches:
5-
- main
5+
- '*'
66
jobs:
77
Build-and-Deploy:
88
env:
@@ -25,4 +25,4 @@ jobs:
2525
vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
2626
vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID }}
2727
working-directory: ./
28-
vercel-args: --prod
28+
vercel-args: ${{ github.ref == 'refs/heads/main' && '--prod' || '' }}

.github/workflows/pull-request.yml

Lines changed: 0 additions & 27 deletions
This file was deleted.

.vscode/extensions.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
"rangav.vscode-thunder-client",
1515
"eamodio.gitlens",
1616
"github.vscode-pull-request-github",
17-
"github.vscode-github-actions"
17+
"github.vscode-github-actions",
18+
"GitHub.copilot"
1819
]
1920
}

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20-slim AS base
1+
FROM node:22-slim AS base
22
RUN apt-get update && \
33
apt-get install ca-certificates curl libjemalloc-dev -y --no-install-recommends && \
44
rm -rf /var/lib/apt/lists/*

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Next-Bootstrap.ts
1+
# Next-Bootstrap-ts
22

33
[React][1] project scaffold based on [TypeScript][2], [Next.js][3], [Bootstrap][4] & [Workbox][5]. And this project bootstrapped with [`create-next-app`][6].
44

eslint.config.mjs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ export default tsEslint.config(
1717
{
1818
plugins: {
1919
'@typescript-eslint': tsEslint.plugin,
20-
// @ts-expect-error https://github.com/jsx-eslint/eslint-plugin-react/issues/3699
2120
react: fixupPluginRules(reactPlugin),
2221
'simple-import-sort': simpleImportSortPlugin,
2322
},

models/Base.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import 'core-js/full/array/from-async';
2+
13
import { HTTPClient } from 'koajax';
24
import { githubClient, RepositoryModel } from 'mobx-github';
35

next-env.d.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
/// <reference types="next/image-types/global" />
33

44
// NOTE: This file should not be edited
5-
// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
5+
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

package.json

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"description": "React project scaffold based on TypeScript, Next.js, Bootstrap & Workbox.",
55
"private": true,
66
"engines": {
7-
"node": ">=20"
7+
"node": ">=22"
88
},
99
"dependencies": {
1010
"@editorjs/code": "^2.9.3",
@@ -13,69 +13,70 @@
1313
"@editorjs/image": "^2.10.1",
1414
"@editorjs/link": "^2.6.2",
1515
"@editorjs/list": "^2.0.2",
16-
"@editorjs/paragraph": "^2.11.6",
17-
"@editorjs/quote": "~2.7.4",
16+
"@editorjs/paragraph": "^2.11.7",
17+
"@editorjs/quote": "~2.7.6",
1818
"@mdx-js/loader": "^3.1.0",
1919
"@mdx-js/react": "^3.1.0",
20-
"@next/mdx": "^15.0.3",
21-
"@sentry/nextjs": "^8.41.0",
20+
"@next/mdx": "^15.1.5",
21+
"@sentry/nextjs": "^8.50.0",
2222
"copy-webpack-plugin": "^12.0.2",
23+
"core-js": "^3.40.0",
2324
"editorjs-html": "^3.4.3",
2425
"idea-react": "^2.0.0-rc.8",
25-
"koajax": "^3.0.3",
26+
"koajax": "^3.1.1",
2627
"less": "^4.2.1",
2728
"less-loader": "^12.2.0",
2829
"lodash": "^4.17.21",
2930
"mobx": "^6.13.5",
3031
"mobx-github": "^0.3.5",
3132
"mobx-i18n": "^0.6.0",
32-
"mobx-react": "^9.1.1",
33+
"mobx-react": "^9.2.0",
3334
"mobx-restful": "^2.0.0",
34-
"mobx-restful-table": "^2.0.0",
35-
"next": "^15.0.3",
35+
"mobx-restful-table": "^2.0.1",
36+
"next": "^15.1.5",
3637
"next-pwa": "~5.6.0",
3738
"next-ssr-middleware": "^0.8.9",
3839
"next-with-less": "^3.0.1",
3940
"prismjs": "^1.29.0",
4041
"react": "^18.3.1",
41-
"react-bootstrap": "^2.10.6",
42+
"react-bootstrap": "^2.10.7",
4243
"react-bootstrap-editor": "^2.0.4",
4344
"react-dom": "^18.3.1",
4445
"react-editor-js": "^2.1.0",
4546
"remark-frontmatter": "^5.0.0",
4647
"remark-gfm": "^4.0.0",
4748
"remark-mdx-frontmatter": "^5.0.0",
48-
"undici": "^7.0.0",
49+
"undici": "^7.2.3",
4950
"web-utility": "^4.4.2",
50-
"webpack": "^5.96.1"
51+
"webpack": "^5.97.1"
5152
},
5253
"devDependencies": {
5354
"@babel/plugin-proposal-decorators": "^7.25.9",
54-
"@babel/plugin-transform-typescript": "^7.25.9",
55-
"@babel/preset-react": "^7.25.9",
56-
"@eslint/compat": "^1.2.3",
55+
"@babel/plugin-transform-typescript": "^7.26.5",
56+
"@babel/preset-react": "^7.26.3",
57+
"@eslint/compat": "^1.2.5",
5758
"@eslint/eslintrc": "^3.2.0",
58-
"@eslint/js": "^9.15.0",
59+
"@eslint/js": "^9.18.0",
5960
"@softonus/prettier-plugin-duplicate-remover": "^1.1.2",
6061
"@types/eslint-config-prettier": "^6.11.3",
6162
"@types/eslint__eslintrc": "^2.1.2",
6263
"@types/eslint__js": "^8.42.3",
63-
"@types/lodash": "^4.17.13",
64+
"@types/lodash": "^4.17.14",
6465
"@types/next-pwa": "^5.6.9",
65-
"@types/node": "^20.17.8",
66-
"@types/react": "^18.3.12",
67-
"eslint": "^9.15.0",
68-
"eslint-config-next": "^15.0.3",
66+
"@types/node": "^22.10.7",
67+
"@types/react": "^18.3.18",
68+
"eslint": "^9.18.0",
69+
"eslint-config-next": "^15.1.5",
6970
"eslint-config-prettier": "^9.1.0",
70-
"eslint-plugin-react": "^7.37.2",
71+
"eslint-plugin-react": "^7.37.4",
7172
"eslint-plugin-simple-import-sort": "^12.1.1",
72-
"globals": "^15.12.0",
73+
"globals": "^15.14.0",
7374
"husky": "^9.1.7",
74-
"lint-staged": "^15.2.10",
75-
"prettier": "^3.4.1",
75+
"lint-staged": "^15.4.1",
76+
"prettier": "^3.4.2",
7677
"prettier-plugin-css-order": "^2.1.2",
77-
"typescript": "~5.7.2",
78-
"typescript-eslint": "^8.16.0"
78+
"typescript": "~5.7.3",
79+
"typescript-eslint": "^8.20.0"
7980
},
8081
"resolutions": {
8182
"next": "$next"

0 commit comments

Comments
 (0)