Skip to content

Commit

Permalink
feat: upgrade to node 18/latest of packages (#369)
Browse files Browse the repository at this point in the history
# Description of changes

Version updates! Also slightly updates next.config.js to new conventions
+ regenerates github api
  • Loading branch information
dgattey committed Dec 3, 2022
2 parents 35431ea + 995c835 commit 9766630
Show file tree
Hide file tree
Showing 9 changed files with 1,399 additions and 1,140 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/autochecks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
with:
fetch-depth: 0
- uses: actions/setup-node@v2
with:
node-version: 16
- uses: pnpm/[email protected]
- run: pnpm install
# Make sure types are generated before running the commmand
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ jobs:
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v2
with:
node-version: 16
- uses: pnpm/[email protected]
- run: pnpm install
- name: Release new repo version
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16.16.0
18.12.1
4 changes: 2 additions & 2 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
save-exact=true
auto-install-peers=true
use-node-version=16.16.0
node-version=16.16.0
use-node-version=18.12.1
node-version=18.12.1
engine-strict=true
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Hi :wave:! This is an overengineered way to show off my past projects/info about

## :beginner: Initial Setup

You need Node 16+ and pnpm 7+ installed. Run `pnpm install` to get started once you have those two installed.
You need Node 18+ and pnpm 7+ installed. Run `pnpm install` to get started once you have those two installed.

## :memo: Pull Requests

Expand Down
44 changes: 25 additions & 19 deletions next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,16 @@ const nextConfig = {
styledComponents: true,
},
images: {
domains: ['images.ctfassets.net', 'i.scdn.co'],
remotePatterns: [
{
protocol: 'https',
hostname: 'images.ctfassets.net',
},
{
protocol: 'https',
hostname: 'i.scdn.co',
},
],
},
// Unfortunately required for Prisma until it upgrades to undici@^5
webpack: (config, { isServer }) => {
Expand Down Expand Up @@ -39,26 +48,23 @@ const withNextBundleAnalyzer = require('@next/bundle-analyzer')({
enabled: process.env.ANALYZE === 'true',
});

const mainConfig = withNextBundleAnalyzer(nextConfig);

if (process.env.NODE_ENV === 'development') {
// Add silent sentry on develop and make sure it's always a dry run
module.exports = withNextBundleAnalyzer(
withSentryConfig(nextConfig, {
...SENTRY_ARGS,
hideSourceMaps: false,
silent: true,
dryRun: true,
}),
);
module.exports = withSentryConfig(mainConfig, {
...SENTRY_ARGS,
silent: true,
dryRun: true,
});
} else {
// For prod, dry run if it's running locally/appears local
module.exports = withNextBundleAnalyzer(
withSentryConfig(nextConfig, {
...SENTRY_ARGS,
hideSourceMaps: true,
dryRun:
// If not deployed on a real branch or the db url points to something local, we know we're running a production build locally
'vX.Y.Z'.includes(process.env.NEXT_PUBLIC_APP_VERSION) ||
process.env?.DATABASE_URL?.includes('127.0.0.1'),
}),
);
module.exports = withSentryConfig(mainConfig, {
...SENTRY_ARGS,
hideSourceMaps: true,
dryRun:
// If not deployed on a real branch or the db url points to something local, we know we're running a production build locally
'vX.Y.Z'.includes(process.env.NEXT_PUBLIC_APP_VERSION) ||
process.env?.DATABASE_URL?.includes('127.0.0.1'),
});
}
57 changes: 29 additions & 28 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,74 +27,75 @@
"webhooks:list": "pnpm -s webhooks list",
"webhooks:delete": "pnpm -s webhooks delete",
"version:fetch": "node --require tsm scripts/getVersion.ts",
"postinstall": "prisma generate",
"clean": "rm -r .next"
},
"dependencies": {
"@contentful/rich-text-react-renderer": "15.12.1",
"@contentful/rich-text-types": "15.14.1",
"@contentful/rich-text-react-renderer": "15.16.2",
"@contentful/rich-text-types": "16.0.2",
"@dg": "link:./src",
"@fortawesome/fontawesome-svg-core": "6.2.1",
"@fortawesome/free-brands-svg-icons": "6.2.1",
"@fortawesome/free-solid-svg-icons": "6.2.1",
"@fortawesome/react-fontawesome": "0.2.0",
"@next/bundle-analyzer": "13.0.4",
"@next/bundle-analyzer": "13.0.6",
"@picocss/pico": "1.5.6",
"@prisma/client": "4.3.1",
"@sentry/integrations": "7.20.0",
"@sentry/nextjs": "7.20.0",
"@prisma/client": "4.7.1",
"@sentry/integrations": "7.23.0",
"@sentry/nextjs": "7.23.0",
"animate-css-grid": "1.4.3",
"cmd-ts": "0.11.0",
"dotenv": "16.0.3",
"eslint-config-dg": "link:./eslint-plugin-dg",
"eslint-plugin-dg": "link:./eslint-plugin-dg",
"graphql": "16.6.0",
"graphql-request": "5.0.0",
"lucide-react": "0.101.0",
"lucide-react": "0.103.0",
"mapbox-gl": "2.11.0",
"next": "13.0.4",
"next": "13.0.6",
"node-fetch": "3.3.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-intersection-observer": "9.4.1",
"react-is": "18.2.0",
"react-map-gl": "7.0.19",
"react-map-gl": "7.0.20",
"sharp": "0.31.2",
"styled-components": "5.3.6",
"swr": "1.3.0",
"webpack": "5.75.0"
},
"devDependencies": {
"@graphql-codegen/cli": "2.12.0",
"@graphql-codegen/near-operation-file-preset": "2.4.1",
"@graphql-codegen/typescript": "2.7.3",
"@graphql-codegen/typescript-operations": "2.5.3",
"@semantic-release/changelog": "6.0.1",
"@sentry/cli": "2.9.0",
"@sentry/types": "7.20.0",
"@types/mapbox-gl": "2.7.5",
"@types/node": "18.11.9",
"@types/react": "18.0.25",
"@graphql-codegen/cli": "2.15.0",
"@graphql-codegen/near-operation-file-preset": "2.4.4",
"@graphql-codegen/typescript": "2.8.3",
"@graphql-codegen/typescript-operations": "2.5.8",
"@semantic-release/changelog": "6.0.2",
"@sentry/cli": "2.10.0",
"@sentry/types": "7.23.0",
"@types/mapbox-gl": "2.7.9",
"@types/node": "18.11.10",
"@types/react": "18.0.26",
"@types/react-dom": "18.0.9",
"@types/styled-components": "5.1.26",
"@typescript-eslint/eslint-plugin": "5.36.2",
"@typescript-eslint/parser": "5.36.2",
"eslint": "8.27.0",
"@typescript-eslint/eslint-plugin": "5.45.0",
"@typescript-eslint/parser": "5.45.0",
"eslint": "8.29.0",
"eslint-config-airbnb": "19.0.4",
"eslint-config-airbnb-typescript": "17.0.0",
"eslint-config-next": "13.0.4",
"eslint-config-next": "13.0.6",
"eslint-config-prettier": "8.5.0",
"eslint-import-resolver-typescript": "3.5.2",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-react": "7.31.10",
"eslint-plugin-react": "7.31.11",
"eslint-plugin-react-hooks": "4.6.0",
"husky": "8.0.2",
"lint-staged": "13.0.3",
"lint-staged": "13.0.4",
"postcss": "8.4.19",
"postcss-syntax": "0.36.2",
"prettier": "2.7.1",
"prisma": "4.3.1",
"prettier": "2.8.0",
"prisma": "4.7.1",
"semantic-release": "19.0.5",
"tsm": "2.2.2",
"tsm": "2.3.0",
"typescript": "4.9.3"
},
"engines": {
Expand Down
Loading

0 comments on commit 9766630

Please sign in to comment.