Skip to content

Commit

Permalink
[4.0.5] Fix deps issue with Contentlayer and opentelemetry (#317)
Browse files Browse the repository at this point in the history
* Dependency upgrades. Fix deps issue with Contentlayer and opentelemetry.

* Add resolutions field for Yarn.
  • Loading branch information
colinhemphill authored Jul 11, 2023
1 parent 55049a4 commit 2d3371c
Show file tree
Hide file tree
Showing 3 changed files with 55 additions and 17 deletions.
10 changes: 10 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [4.0.5] - 2023-07-11

### Changed

- Dependency upgrades

### Fixed

- Temporarily added dependency overrides to address the [existing issue](https://github.com/contentlayerdev/contentlayer/issues/506) with Contentlayer

## [4.0.4] - 2023-06-04

### Changed
Expand Down
53 changes: 41 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "next-resume-generator",
"version": "4.0.4",
"version": "4.0.5",
"author": {
"name": "Colin Hemphill",
"email": "colin@colinhemphill.com",
Expand Down Expand Up @@ -35,35 +35,64 @@
"@radix-ui/colors": "1.0.0",
"@react-pdf/renderer": "3.1.12",
"class-variance-authority": "0.6.1",
"contentlayer": "0.3.3",
"next": "13.4.7",
"next-contentlayer": "0.3.3",
"contentlayer": "0.3.4",
"next": "13.4.9",
"next-contentlayer": "0.3.4",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-pdf-html": "1.1.18",
"tailwind-merge": "1.13.2"
},
"devDependencies": {
"@testing-library/react": "14.0.0",
"@types/node": "20.3.2",
"@types/node": "20.4.1",
"@types/react": "18.2.14",
"@vitejs/plugin-react": "4.0.1",
"@vitest/coverage-c8": "0.32.2",
"@vitejs/plugin-react": "4.0.3",
"@vitest/coverage-c8": "0.33.0",
"autoprefixer": "10.4.14",
"eslint": "8.43.0",
"eslint-config-next": "13.4.7",
"eslint": "8.44.0",
"eslint-config-next": "13.4.9",
"eslint-config-prettier": "8.8.0",
"husky": "8.0.3",
"jsdom": "22.1.0",
"lint-staged": "13.2.3",
"postcss": "8.4.24",
"prettier": "3.0.0",
"postcss": "8.4.25",
"prettier": "2.8.8",
"prettier-plugin-tailwindcss": "0.3.0",
"tailwindcss": "3.3.2",
"typescript": "5.1.6",
"vite-tsconfig-paths": "4.2.0",
"vitest": "0.32.2",
"vitest": "0.33.0",
"webpack": "5.88.1",
"windy-radix-palette": "0.6.1"
},
"pnpm": {
"overrides": {
"@opentelemetry/api": "1.4.1",
"@opentelemetry/core": "1.13.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.39.1",
"@opentelemetry/resources": "1.13.0",
"@opentelemetry/sdk-trace-base": "1.13.0",
"@opentelemetry/sdk-trace-node": "1.13.0",
"@opentelemetry/semantic-conventions": "1.13.0"
}
},
"overrides": {
"@opentelemetry/api": "1.4.1",
"@opentelemetry/core": "1.13.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.39.1",
"@opentelemetry/resources": "1.13.0",
"@opentelemetry/sdk-trace-base": "1.13.0",
"@opentelemetry/sdk-trace-node": "1.13.0",
"@opentelemetry/semantic-conventions": "1.13.0"
},
"resolutions": {
"@opentelemetry/api": "1.4.1",
"@opentelemetry/core": "1.13.0",
"@opentelemetry/exporter-trace-otlp-grpc": "0.39.1",
"@opentelemetry/resources": "1.13.0",
"@opentelemetry/sdk-trace-base": "1.13.0",
"@opentelemetry/sdk-trace-node": "1.13.0",
"@opentelemetry/semantic-conventions": "1.13.0"
}
}
9 changes: 4 additions & 5 deletions src/app/sitemap.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import { headers } from 'next/headers';
import { protocol, vercelURL } from 'src/helpers/env';
import { MetadataRoute } from 'next';
import { vercelURL } from 'src/helpers/env';

export default async function sitemap() {
const host = headers().get('host');
const baseURL = `${protocol}://${host || vercelURL}`;
const baseURL = `https://${vercelURL}`;

export default function sitemap(): MetadataRoute.Sitemap {
return [
{
url: baseURL,
Expand Down

1 comment on commit 2d3371c

@vercel
Copy link

@vercel vercel bot commented on 2d3371c Jul 11, 2023

Choose a reason for hiding this comment

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

Please sign in to comment.