Skip to content

Commit

Permalink
[optimize] merge GitHub actions of main & other branches
Browse files Browse the repository at this point in the history
[optimize] upgrade to Node.js 22, KoAJAX 3.1 & other latest Upstream packages
[fix] Template Name texts
  • Loading branch information
TechQuery committed Jan 18, 2025
1 parent f181e41 commit e08f9e6
Show file tree
Hide file tree
Showing 12 changed files with 1,657 additions and 1,609 deletions.
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
NEXT_PUBLIC_SITE_NAME=Next-Bootstrap.ts
NEXT_PUBLIC_SITE_NAME=Next-Bootstrap-ts
NEXT_PUBLIC_SITE_SUMMARY=React project scaffold based on TypeScript, Next.js, Bootstrap & Workbox.

NEXT_PUBLIC_SENTRY_DSN =
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI & CD
on:
push:
branches:
- main
- '*'
jobs:
Build-and-Deploy:
env:
Expand All @@ -25,4 +25,4 @@ jobs:
vercel-org-id: ${{ secrets.VERCEL_ORG_ID }}
vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID }}
working-directory: ./
vercel-args: --prod
vercel-args: ${{ github.ref == 'refs/heads/main' && '--prod' || '' }}
27 changes: 0 additions & 27 deletions .github/workflows/pull-request.yml

This file was deleted.

3 changes: 2 additions & 1 deletion .vscode/extensions.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
"rangav.vscode-thunder-client",
"eamodio.gitlens",
"github.vscode-pull-request-github",
"github.vscode-github-actions"
"github.vscode-github-actions",
"GitHub.copilot"
]
}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:20-slim AS base
FROM node:22-slim AS base
RUN apt-get update && \
apt-get install ca-certificates curl libjemalloc-dev -y --no-install-recommends && \
rm -rf /var/lib/apt/lists/*
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Next-Bootstrap.ts
# Next-Bootstrap-ts

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

Expand Down
1 change: 0 additions & 1 deletion eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ export default tsEslint.config(
{
plugins: {
'@typescript-eslint': tsEslint.plugin,
// @ts-expect-error https://github.com/jsx-eslint/eslint-plugin-react/issues/3699
react: fixupPluginRules(reactPlugin),
'simple-import-sort': simpleImportSortPlugin,
},
Expand Down
2 changes: 2 additions & 0 deletions models/Base.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import 'core-js/full/array/from-async';

import { HTTPClient } from 'koajax';
import { githubClient, RepositoryModel } from 'mobx-github';

Expand Down
2 changes: 1 addition & 1 deletion next-env.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
/// <reference types="next/image-types/global" />

// NOTE: This file should not be edited
// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
55 changes: 28 additions & 27 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"description": "React project scaffold based on TypeScript, Next.js, Bootstrap & Workbox.",
"private": true,
"engines": {
"node": ">=20"
"node": ">=22"
},
"dependencies": {
"@editorjs/code": "^2.9.3",
Expand All @@ -13,69 +13,70 @@
"@editorjs/image": "^2.10.1",
"@editorjs/link": "^2.6.2",
"@editorjs/list": "^2.0.2",
"@editorjs/paragraph": "^2.11.6",
"@editorjs/quote": "~2.7.4",
"@editorjs/paragraph": "^2.11.7",
"@editorjs/quote": "~2.7.6",
"@mdx-js/loader": "^3.1.0",
"@mdx-js/react": "^3.1.0",
"@next/mdx": "^15.0.3",
"@sentry/nextjs": "^8.41.0",
"@next/mdx": "^15.1.5",
"@sentry/nextjs": "^8.50.0",
"copy-webpack-plugin": "^12.0.2",
"core-js": "^3.40.0",
"editorjs-html": "^3.4.3",
"idea-react": "^2.0.0-rc.8",
"koajax": "^3.0.3",
"koajax": "^3.1.1",
"less": "^4.2.1",
"less-loader": "^12.2.0",
"lodash": "^4.17.21",
"mobx": "^6.13.5",
"mobx-github": "^0.3.5",
"mobx-i18n": "^0.6.0",
"mobx-react": "^9.1.1",
"mobx-react": "^9.2.0",
"mobx-restful": "^2.0.0",
"mobx-restful-table": "^2.0.0",
"next": "^15.0.3",
"mobx-restful-table": "^2.0.1",
"next": "^15.1.5",
"next-pwa": "~5.6.0",
"next-ssr-middleware": "^0.8.9",
"next-with-less": "^3.0.1",
"prismjs": "^1.29.0",
"react": "^18.3.1",
"react-bootstrap": "^2.10.6",
"react-bootstrap": "^2.10.7",
"react-bootstrap-editor": "^2.0.4",
"react-dom": "^18.3.1",
"react-editor-js": "^2.1.0",
"remark-frontmatter": "^5.0.0",
"remark-gfm": "^4.0.0",
"remark-mdx-frontmatter": "^5.0.0",
"undici": "^7.0.0",
"undici": "^7.2.3",
"web-utility": "^4.4.2",
"webpack": "^5.96.1"
"webpack": "^5.97.1"
},
"devDependencies": {
"@babel/plugin-proposal-decorators": "^7.25.9",
"@babel/plugin-transform-typescript": "^7.25.9",
"@babel/preset-react": "^7.25.9",
"@eslint/compat": "^1.2.3",
"@babel/plugin-transform-typescript": "^7.26.5",
"@babel/preset-react": "^7.26.3",
"@eslint/compat": "^1.2.5",
"@eslint/eslintrc": "^3.2.0",
"@eslint/js": "^9.15.0",
"@eslint/js": "^9.18.0",
"@softonus/prettier-plugin-duplicate-remover": "^1.1.2",
"@types/eslint-config-prettier": "^6.11.3",
"@types/eslint__eslintrc": "^2.1.2",
"@types/eslint__js": "^8.42.3",
"@types/lodash": "^4.17.13",
"@types/lodash": "^4.17.14",
"@types/next-pwa": "^5.6.9",
"@types/node": "^20.17.8",
"@types/react": "^18.3.12",
"eslint": "^9.15.0",
"eslint-config-next": "^15.0.3",
"@types/node": "^22.10.7",
"@types/react": "^18.3.18",
"eslint": "^9.18.0",
"eslint-config-next": "^15.1.5",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-react": "^7.37.2",
"eslint-plugin-react": "^7.37.4",
"eslint-plugin-simple-import-sort": "^12.1.1",
"globals": "^15.12.0",
"globals": "^15.14.0",
"husky": "^9.1.7",
"lint-staged": "^15.2.10",
"prettier": "^3.4.1",
"lint-staged": "^15.4.1",
"prettier": "^3.4.2",
"prettier-plugin-css-order": "^2.1.2",
"typescript": "~5.7.2",
"typescript-eslint": "^8.16.0"
"typescript": "~5.7.3",
"typescript-eslint": "^8.20.0"
},
"resolutions": {
"next": "$next"
Expand Down
Loading

1 comment on commit e08f9e6

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Deploy preview for next-bootstrap-ts ready!

✅ Preview
https://next-bootstrap-m7g2besdc-stevending1sts-projects.vercel.app

Built with commit e08f9e6.
This pull request is being automatically deployed with vercel-action

Please sign in to comment.