Skip to content

Commit

Permalink
chore: upgrade packages
Browse files Browse the repository at this point in the history
  • Loading branch information
khmm12 committed Oct 14, 2023
1 parent 159fb98 commit 26c4e69
Show file tree
Hide file tree
Showing 32 changed files with 3,042 additions and 2,598 deletions.
18 changes: 8 additions & 10 deletions .eslintrc.cjs
Original file line number Diff line number Diff line change
@@ -1,8 +1,16 @@
// @ts-check

/** @type {import('eslint').Linter.Config} */
module.exports = {
extends: ['standard', 'standard-with-typescript', 'plugin:prettier/recommended'],
env: {
webextensions: true,
},
parserOptions: {
project: ['./tsconfig.json', './tsconfig.node.json'],
sourceType: 'module',
createDefaultProgram: true,
},
rules: {
'import/order': [
'error',
Expand All @@ -28,14 +36,4 @@ module.exports = {
},
],
},
overrides: [
{
files: ['*.ts', '*.tsx'],
parserOptions: {
project: './tsconfig.json',
sourceType: 'module',
createDefaultProgram: true,
},
},
],
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
diff --git a/package.json b/package.json
index 3c5122c7e057c4cb2e94805576b56e2133e22ac2..77f28686d5fbee199b7a2cdbf4d640ed4b2cbd9b 100644
index a7ceedf3e5e1bc6b9977bafe6e3c98ed424ee1f8..ca55bc7b5d913f10583dba961e153eaf2c9a5a0e 100644
--- a/package.json
+++ b/package.json
@@ -15,6 +15,11 @@
Expand Down
555 changes: 278 additions & 277 deletions .yarn/releases/yarn-3.5.0.cjs → .yarn/releases/yarn-3.6.4.cjs

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion .yarn/sdks/eslint/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "eslint",
"version": "8.35.0-sdk",
"version": "8.51.0-sdk",
"main": "./lib/api.js",
"type": "commonjs"
}
6 changes: 3 additions & 3 deletions .yarn/sdks/prettier/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ const absRequire = createRequire(absPnpApiPath);

if (existsSync(absPnpApiPath)) {
if (!process.versions.pnp) {
// Setup the environment to be able to require prettier/index.js
// Setup the environment to be able to require prettier
require(absPnpApiPath).setup();
}
}

// Defer to the real prettier/index.js your application uses
module.exports = absRequire(`prettier/index.js`);
// Defer to the real prettier your application uses
module.exports = absRequire(`prettier`);
2 changes: 1 addition & 1 deletion .yarn/sdks/prettier/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "prettier",
"version": "2.8.4-sdk",
"version": "3.0.3-sdk",
"main": "./index.js",
"type": "commonjs"
}
2 changes: 2 additions & 0 deletions .yarn/sdks/typescript/lib/tsserver.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ const moduleWrapper = tsserver => {
str = `zip:${str}`;
} break;
}
} else {
str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
}
}

Expand Down
2 changes: 2 additions & 0 deletions .yarn/sdks/typescript/lib/tsserverlibrary.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,8 @@ const moduleWrapper = tsserver => {
str = `zip:${str}`;
} break;
}
} else {
str = str.replace(/^\/?/, process.platform === `win32` ? `` : `/`);
}
}

Expand Down
2 changes: 1 addition & 1 deletion .yarn/sdks/typescript/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "typescript",
"version": "4.9.5-sdk",
"version": "5.2.2-sdk",
"main": "./lib/typescript.js",
"type": "commonjs"
}
2 changes: 1 addition & 1 deletion .yarnrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"

yarnPath: .yarn/releases/yarn-3.5.0.cjs
yarnPath: .yarn/releases/yarn-3.6.4.cjs
2 changes: 1 addition & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<meta name="viewport" content="minimum-scale=1, initial-scale=1, width=device-width, shrink-to-fit=no" />
<title data-localize="new_tab_title">New tab</title>
<title data-l="new_tab_title">New tab</title>
<link rel="icon" href="/favicon.svg" type="image/svg+xml" />
<link
rel="preload"
Expand Down
70 changes: 35 additions & 35 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
"name": "minimal-chrome-tab",
"version": "1.0.0",
"license": "MIT",
"packageManager": "yarn@3.5.0",
"packageManager": "yarn@3.6.4",
"type": "module",
"engine": {
"node": "^16 || ^18"
},
"scripts": {
"dev": "vite",
"build": "NODE_ENV=production vite build",
"build": "vite build",
"test": "run-p --aggregate-output lint typecheck \"unit-tests --run --silent\"",
"unit-tests": "vitest",
"lint": "eslint --ext .js,.ts,.tsx src",
Expand All @@ -22,50 +22,50 @@
"*.css"
],
"dependencies": {
"@felte/solid": "^1.2.7",
"@linaria/core": "^4.2.8",
"date-fns": "^2.29.3",
"focus-trap": "^7.4.0",
"@felte/solid": "^1.2.11",
"@linaria/core": "^5.0.2",
"date-fns": "^2.30.0",
"focus-trap": "^7.5.4",
"polished": "^4.2.2",
"remeda": "^1.12.0",
"solid-js": "1.7.3",
"solid-transition-group": "0.2.2"
"remeda": "^1.27.1",
"solid-js": "1.8.1",
"solid-transition-group": "0.2.3"
},
"devDependencies": {
"@linaria/vite": "^4.2.9",
"@solidjs/testing-library": "0.7.0",
"@testing-library/dom": "9.2.0",
"@testing-library/jest-dom": "^5.16.5",
"@testing-library/user-event": "^14.4.3",
"@types/chrome": "^0.0.228",
"@types/node": "^18.15.11",
"@types/testing-library__jest-dom": "^5.14.5",
"@linaria/vite": "^5.0.3",
"@solidjs/router": "^0.8.3",
"@solidjs/testing-library": "0.8.4",
"@testing-library/dom": "9.3.3",
"@testing-library/jest-dom": "^6.1.4",
"@testing-library/user-event": "^14.5.1",
"@types/chrome": "^0.0.246",
"@types/node": "^18.18.5",
"@types/testing-library__user-event": "^4.2.0",
"@typescript-eslint/eslint-plugin": "^5.57.1",
"@typescript-eslint/parser": "^5.57.1",
"@vitest/coverage-c8": "^0.30.0",
"@typescript-eslint/eslint-plugin": "^6.7.5",
"@typescript-eslint/parser": "^6.7.5",
"@vitest/coverage-v8": "^0.34.6",
"browserslist-to-esbuild": "^1.2.0",
"eslint": "^8.38.0",
"eslint-config-prettier": "^8.8.0",
"eslint-config-standard": "^17.0.0",
"eslint-config-standard-with-typescript": "^34.0.1",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-n": "^15.7.0",
"eslint-plugin-prettier": "^4.2.1",
"eslint": "^8.51.0",
"eslint-config-prettier": "^9.0.0",
"eslint-config-standard": "^17.1.0",
"eslint-config-standard-with-typescript": "^39.1.1",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-n": "^16.2.0",
"eslint-plugin-prettier": "^5.0.1",
"eslint-plugin-promise": "^6.1.1",
"jsdom": "^21.1.1",
"jsdom": "^22.1.0",
"mq-polyfill": "^1.1.8",
"npm-run-all": "^4.1.5",
"prettier": "^2.8.7",
"prettier": "^3.0.3",
"stylis": "^3",
"typescript": "^5.0.4",
"vite": "^4.2.1",
"typescript": "^5.2.2",
"vite": "^4.4.11",
"vite-plugin-html": "^3.2.0",
"vite-plugin-solid": "^2.7.0",
"vite-plugin-static-copy": "^0.13.1",
"vitest": "^0.30.0"
"vite-plugin-solid": "2.7.0",
"vite-plugin-static-copy": "^0.17.0",
"vitest": "^0.34.6"
},
"resolutions": {
"[email protected].2": "patch:solid-transition-group@npm%3A0.2.2#./.yarn/patches/solid-transition-group-npm-0.2.2-a3612433c4.patch"
"[email protected].3": "patch:solid-transition-group@npm%3A0.2.3#./.yarn/patches/solid-transition-group-npm-0.2.3-b5c9fbd0f8.patch"
}
}
8 changes: 6 additions & 2 deletions src/components/Modal/styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ export const dialog = css`
.overlay-enter-to > & {
transform: scale(1);
opacity: 1;
transition: transform 0.15s ease-out, opacity 0.15s ease-out;
transition:
transform 0.15s ease-out,
opacity 0.15s ease-out;
}
.overlay-exit-active > & {
Expand All @@ -77,7 +79,9 @@ export const dialog = css`
.overlay-exit-to > & {
transform: scale(0.6);
opacity: 0.3;
transition: transform 0.15s ease-in, opacity 0.15s ease-in;
transition:
transform 0.15s ease-in,
opacity 0.15s ease-in;
}
`

Expand Down
2 changes: 1 addition & 1 deletion src/components/SettingsDialog/SettingsDialog.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ describe('SettingsDialog', () => {
expect(settings()).toEqual(
expect.objectContaining({
birthDate,
})
}),
)
expect(handleSaved).toBeCalled()
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ export default function SettingsForm(props: SettingsFormProps): JSX.Element {
(initialValues) => {
setInitialValues(initialValues)
if (!isDirty()) reset()
}
)
},
),
)

const ids = createUniqueIds(['birthDate'])
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ describe('milestones.birthDate', () => {

it('is present when birthDate is provided', () => {
const milestones = renderHook(() =>
createTimeMilestones({ currentDateTime: new Date(), birthDate: new Date('1970-01-01') })
createTimeMilestones({ currentDateTime: new Date(), birthDate: new Date('1970-01-01') }),
).result

expect(milestones).to.haveOwnProperty('birthDate').which.a('number')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface CreateMilestonesConfig {

export default function createTimeMilestones(config: CreateMilestonesConfig): TimeMilestones {
const getBirthDateMilestone = createMemo((): time.GetMilestone | null =>
config.birthDate != null ? time.getBirthDayMilestone(config.birthDate) : null
config.birthDate != null ? time.getBirthDayMilestone(config.birthDate) : null,
)

return asGetters({
Expand Down
2 changes: 1 addition & 1 deletion src/components/TimeMilestones/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export default function TimeMilestones(): JSX.Element {
asGetters({
currentDateTime,
birthDate,
})
}),
)

return (
Expand Down
6 changes: 3 additions & 3 deletions src/components/TimeMilestones/utils.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ describe('getMonthMilestone', () => {
D.setDate(day),
D.setHours(hours),
D.setMinutes(minutes),
D.setSeconds(seconds)
D.setSeconds(seconds),
)

expect(getMonthMilestone(currentDateTime)).toBe(expected)
Expand All @@ -50,7 +50,7 @@ describe('getWeekMilestone', () => {
D.setDay(dayOfWeek),
D.setHours(hours),
D.setMinutes(minutes),
D.setSeconds(seconds)
D.setSeconds(seconds),
)

expect(getWeekMilestone(currentDateTime)).toBe(expected)
Expand All @@ -70,7 +70,7 @@ describe('getYearMilestone', () => {
D.setDate(day),
D.setHours(hours),
D.setMinutes(minutes),
D.setSeconds(seconds)
D.setSeconds(seconds),
)

expect(getYearMilestone(currentDateTime)).toBe(expected)
Expand Down
5 changes: 3 additions & 2 deletions src/hooks/createCurrentDateTime.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,12 @@ import { createSignal } from 'solid-js'
import createCurrentDateTime, { EveryMinute, EverySecond } from './createCurrentDateTime'
import useTabActive from './useTabActive'

vi.mock('@/hooks/useTabActive')
vi.mock('./useTabActive')

beforeEach(() => {
vi.useFakeTimers()
vi.restoreAllMocks()
vi.mocked(useTabActive).mockReturnValue(() => true)
})

afterEach(() => {
Expand All @@ -27,7 +28,7 @@ describe('createCurrentDateTime', () => {
const [currentDateTime, setIsActive] = renderHook(() => {
const [isActive, setIsActive] = renderHook(() => createSignal(true)).result

vi.mocked(useTabActive).mockImplementation(() => isActive)
vi.mocked(useTabActive).mockReturnValue(isActive)
return [createCurrentDateTime({ update: EverySecond }), setIsActive] as const
}).result

Expand Down
12 changes: 6 additions & 6 deletions src/hooks/createSubscription.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ describe('createSubscription', () => {
const { value, trigger } = renderHook(() =>
createContainer({
getCurrentValue: () => currentValue,
})
}),
).result

trigger(() => {
Expand All @@ -49,7 +49,7 @@ describe('createSubscription', () => {
createContainer({
getCurrentValue: () => currentValue,
identity: () => true,
})
}),
).result

const onUpdate = vi.fn()
Expand Down Expand Up @@ -79,7 +79,7 @@ describe('createSubscription', () => {
const { getCurrentValue } = renderHook(() =>
createContainer({
getCurrentValue: () => dep(),
})
}),
).result

setDep(2)
Expand All @@ -93,7 +93,7 @@ describe('createSubscription', () => {
const { subscribe } = renderHook(() =>
createContainer({
getCurrentValue: () => dep(),
})
}),
).result

setDep(2)
Expand All @@ -110,7 +110,7 @@ describe('createSubscription', () => {
subscribe() {
dep()
},
})
}),
).result

setDep(2)
Expand All @@ -125,7 +125,7 @@ describe('createSubscription', () => {
subscribe() {
dep()
},
})
}),
).result

setDep(2)
Expand Down
Loading

0 comments on commit 26c4e69

Please sign in to comment.