Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps-dev): bump prettier from 3.0.3 to 3.3.2 #834

Open
wants to merge 8 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
{
"extends": ["next", "next/core-web-vitals", "prettier", "eslint:recommended", "plugin:@typescript-eslint/recommended"],
"extends": [
"next",
"next/core-web-vitals",
"prettier",
"eslint:recommended",
"plugin:@typescript-eslint/recommended"
],
"plugins": ["prettier", "@typescript-eslint"],
"env": {
"jest": true,
Expand All @@ -9,7 +15,10 @@
"rules": {
"@next/next/no-page-custom-font": "off",
"prettier/prettier": ["error"],
"@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_" }],
"@typescript-eslint/no-unused-vars": [
"error",
{ "argsIgnorePattern": "^_" }
],
"@typescript-eslint/no-explicit-any": "error",
"@typescript-eslint/explicit-module-boundary-types": "off",
"no-console": "error"
Expand Down
44 changes: 22 additions & 22 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,33 +5,33 @@ name: Node.js CI

on:
push:
branches: [ "main" ]
branches: ["main"]
pull_request:
branches: [ "main" ]
branches: ["main"]

jobs:
build:
permissions: write-all
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version-file: .node-version
- run: npm ci
- run: npm run build
- run: npm test
- name: Fetch dependabot metadata
if: ${{github.actor == 'dependabot[bot]'}}
id: metadata
uses: dependabot/[email protected]
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs for minor and patch updates
if: ${{github.actor == 'dependabot[bot]' && steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
- uses: actions/checkout@v3
- name: Use Node.js
uses: actions/setup-node@v3
with:
node-version-file: .node-version
- run: npm ci
- run: npm run build
- run: npm test
- name: Fetch dependabot metadata
if: ${{github.actor == 'dependabot[bot]'}}
id: metadata
uses: dependabot/[email protected]
with:
github-token: "${{ secrets.GITHUB_TOKEN }}"
- name: Enable auto-merge for Dependabot PRs for minor and patch updates
if: ${{github.actor == 'dependabot[bot]' && steps.metadata.outputs.update-type == 'version-update:semver-patch' || steps.metadata.outputs.update-type == 'version-update:semver-minor'}}
run: gh pr merge --auto --squash "$PR_URL"
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ Track working time with focus on overtime statistics.

A lot of other apps are too sophisticated and contain too many features which make the UX cumbersome. This app was designed to focus on a very simple UX to achieve the daily tasks with as less clicks as possible.

| Default state | State with overtime |
|---|---|
| Default state | State with overtime |
| -------------------------------------- | ---------------------------------------- |
| ![default](docs/overtimer-default.png) | ![overtime](docs/overtimer-overtime.png) |

## Features

* Start/stop timer
* Start timer with setting start time when you're already working
* Show weekly and total overtime for last 8 weeks
* Export/import time logs in JSON format
* Daily backups after 17:00 when stopping the timer
* Limit timelogs to 8 full weeks
- Start/stop timer
- Start timer with setting start time when you're already working
- Show weekly and total overtime for last 8 weeks
- Export/import time logs in JSON format
- Daily backups after 17:00 when stopping the timer
- Limit timelogs to 8 full weeks

## Getting started

Expand Down
14 changes: 7 additions & 7 deletions jest.config.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
const nextJest = require('next/jest')
const nextJest = require("next/jest");

const createJestConfig = nextJest({
// Provide the path to your Next.js app to load next.config.js and .env files in your test environment
dir: './',
})
dir: "./",
});

// Add any custom config to be passed to Jest
const customJestConfig = {
setupFilesAfterEnv: ['<rootDir>/jest.setup.ts'],
testEnvironment: 'jest-environment-jsdom',
}
setupFilesAfterEnv: ["<rootDir>/jest.setup.ts"],
testEnvironment: "jest-environment-jsdom",
};

// createJestConfig is exported this way to ensure that next/jest can load the Next.js config which is async
module.exports = createJestConfig(customJestConfig)
module.exports = createJestConfig(customJestConfig);
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/basic-features/typescript for more information.
// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
12 changes: 7 additions & 5 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
const withPWA = require('next-pwa')
const { withSentryConfig } = require('@sentry/nextjs');
const withPWA = require("next-pwa");
const { withSentryConfig } = require("@sentry/nextjs");

const nextConfig = {
}
const nextConfig = {};

const configWithPwa = withPWA({
dest: 'public'
dest: "public",
})(nextConfig);

const SentryWebpackPluginOptions = {
Expand All @@ -16,6 +15,9 @@ const SentryWebpackPluginOptions = {
// urlPrefix, include, ignore

silent: true, // Suppresses all logs
eslint: {
ignoreDuringBuilds: true,
},
};

module.exports = withSentryConfig(configWithPwa, SentryWebpackPluginOptions);
98 changes: 71 additions & 27 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"jest": "29.7.0",
"jest-environment-jsdom": "29.7.0",
"npm-run-all": "4.1.5",
"prettier": "3.0.3",
"prettier": "3.3.2",
"start-server-and-test": "2.0.3",
"typescript": "5.5.3"
},
Expand Down
2 changes: 1 addition & 1 deletion sentry.client.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The config you add here will be used whenever a page is visited.
// https://docs.sentry.io/platforms/javascript/guides/nextjs/

import * as Sentry from '@sentry/nextjs';
import * as Sentry from "@sentry/nextjs";

const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;

Expand Down
2 changes: 1 addition & 1 deletion sentry.server.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// The config you add here will be used whenever the server handles a request.
// https://docs.sentry.io/platforms/javascript/guides/nextjs/

import * as Sentry from '@sentry/nextjs';
import * as Sentry from "@sentry/nextjs";

const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;

Expand Down
14 changes: 12 additions & 2 deletions styles/globals.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,18 @@ html,
body {
padding: 0;
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
font-family:
-apple-system,
BlinkMacSystemFont,
Segoe UI,
Roboto,
Oxygen,
Ubuntu,
Cantarell,
Fira Sans,
Droid Sans,
Helvetica Neue,
sans-serif;
background-color: #f9f9f9;
}

Expand Down
Loading
Loading