Skip to content

Commit

Permalink
Fixup linting
Browse files Browse the repository at this point in the history
  • Loading branch information
thobson committed Aug 15, 2024
1 parent 9b3322c commit 8337255
Show file tree
Hide file tree
Showing 101 changed files with 780 additions and 732 deletions.
2 changes: 0 additions & 2 deletions .eslintignore

This file was deleted.

88 changes: 0 additions & 88 deletions .eslintrc.cjs

This file was deleted.

1 change: 1 addition & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"importOrder": [
"^@passlock/shared/(.*)$",
"^@passlock/client/(.*)$",
"^@passlock/sveltekit/(.*)$",
"^[./]"
],
"importOrderSeparation": true,
Expand Down
7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,13 @@
"type": "module",
"scripts": {
"clean": "pnpm -r run clean",
"typecheck": "pnpm -r run typecheck",
"build": "pnpm -r run build",
"build:clean": "pnpm -r run build:clean",
"build:readme": "pnpm -r run build:readme",
"build:production": "pnpm -r run build:production",
"format": "pnpm -r run format",
"lint": "pnpm -r run lint",
"lint:fix": "pnpm -r run lint:fix",
"upgrade:deps": "ncu --peer -x effect -x @effect/* -x @passlock/* -u && pnpm -r run upgrade:deps",
"upgrade:pnpm": "corepack use pnpm@latest"
},
Expand Down
2 changes: 0 additions & 2 deletions packages/client/.eslintignore

This file was deleted.

38 changes: 0 additions & 38 deletions packages/client/.eslintrc.cjs

This file was deleted.

11 changes: 0 additions & 11 deletions packages/client/.prettierrc.json

This file was deleted.

5 changes: 4 additions & 1 deletion packages/client/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<!-- The pnpm script build:readme replaces the tokens in this file -->
<!--
The pnpm script build:readme replaces tokens
in README.template.md and outputs to README.md
-->
<div align="center">
<a href="https://github.com/passlock-dev/passlock">
<img src="https://github.com/passlock-dev/passkeys-frontend/assets/208345/53ee00d3-8e6c-49ea-b43c-3f901450c73b" alt="Passlock logo" width="80" height="80">
Expand Down
5 changes: 4 additions & 1 deletion packages/client/README.template.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
<!-- The pnpm script build:readme replaces the tokens in this file -->
<!--
The pnpm script build:readme replaces tokens
in README.template.md and outputs to README.md
-->
<div align="center">
<a href="#{GITHUB_REPO}#">
<img src="#{PASSLOCK_LOGO}#" alt="Passlock logo" width="80" height="80">
Expand Down
34 changes: 34 additions & 0 deletions packages/client/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
import eslint from '@eslint/js'
import eslintPluginPrettierRecommended from 'eslint-plugin-prettier/recommended'
import globals from 'globals'
import tseslint from 'typescript-eslint'

export default tseslint.config(
eslint.configs.recommended,
...tseslint.configs.strict,
eslintPluginPrettierRecommended,
{
languageOptions: {
ecmaVersion: 2021,
sourceType: 'module',
globals: {
...globals.browser,
},
},
files: ['**/*.ts', '**/*.js'],
ignores: ['/*', '!/src'],
rules: {
'@typescript-eslint/no-unused-vars': [
'error',
{
ignoreRestSiblings: true,
argsIgnorePattern: '^_',
varsIgnorePattern: '^_',
caughtErrorsIgnorePattern: '^_',
},
],
'@typescript-eslint/consistent-type-definitions': ['warn', 'type'],
'@typescript-eslint/consistent-type-imports': ['error'],
},
},
)
7 changes: 4 additions & 3 deletions packages/client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@
"build:clean": "pnpm run clean && pnpm run build",
"build:readme": "LATEST=${npm_package_version} tsx scripts/replace-readme-tokens.ts",
"replaceTokens": "LATEST=${npm_package_version} tsx scripts/replace-tokens.ts",
"build:production": "pnpm run replaceTokens && echo '' && publint",
"format": "prettier --write \"src/**/*.+(js|ts|json)\"",
"lint": "eslint --ext .ts src",
"build:production": "pnpm run build:clean && pnpm run replaceTokens && echo '' && publint",
"format": "prettier --write \"(src|scripts)/**/*.+(js|ts|json)\"",
"lint": "eslint ./src",
"lint:fix": "pnpm run lint --fix",
"prepublishOnly": "pnpm run build:production",
"upgrade:deps": "ncu --peer -x effect -x @effect/* -u"
Expand All @@ -80,6 +80,7 @@
"@vitest/ui": "^2.0.5",
"eslint": "^9.9.0",
"eslint-config-prettier": "^9.1.0",
"globals": "^15.9.0",
"jsdom": "^24.1.1",
"prettier": "^3.3.3",
"publint": "^0.2.9",
Expand Down
7 changes: 4 additions & 3 deletions packages/client/scripts/replace-readme-tokens.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { fileURLToPath } from 'node:url'

import { replaceReadmeTokens } from '@passlock/shared/scripts/replace-readme-tokens.js'

// see https://stackoverflow.com/a/60309682
if (process.argv[1] === fileURLToPath(import.meta.url)) {
console.log('Replacing packages/client tokens')
await replaceReadmeTokens(import.meta.url)
}
console.log('Replacing packages/client tokens')
await replaceReadmeTokens(import.meta.url)
}
11 changes: 6 additions & 5 deletions packages/client/scripts/replace-tokens.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { fileURLToPath } from 'node:url'
import { replaceReadmeTokens } from '@passlock/shared/scripts/replace-readme-tokens.js'

import { replaceCodeTokens } from '@passlock/shared/scripts/replace-code-tokens.js'
import { replaceReadmeTokens } from '@passlock/shared/scripts/replace-readme-tokens.js'

// see https://stackoverflow.com/a/60309682
if (process.argv[1] === fileURLToPath(import.meta.url)) {
console.log('Replacing packages/client tokens')
await replaceReadmeTokens(import.meta.url)
await replaceCodeTokens(import.meta.url)
}
console.log('Replacing packages/client tokens')
await replaceReadmeTokens(import.meta.url)
await replaceCodeTokens(import.meta.url)
}
6 changes: 4 additions & 2 deletions packages/client/src/authentication/authenticate.fixture.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
import { Effect as E, Layer as L, Option as O } from 'effect'

import {
OptionsRes,
VerificationReq,
VerificationRes,
} from '@passlock/shared/dist/rpc/authentication.js'
import { IsExistingUserRes, VerifyEmailRes } from '@passlock/shared/dist/rpc/user.js'
import type { AuthenticationCredential } from '@passlock/shared/dist/schema/passkey.js'
import { Effect as E, Layer as L, Option as O } from 'effect'
import { AuthenticationClient } from '../rpc/authentication.js'

import * as Fixtures from '../test/fixtures.js'
import { AuthenticationClient } from '../rpc/authentication.js'
import { type AuthenticationRequest, GetCredential } from './authenticate.js'

export const session = 'session'
Expand Down
3 changes: 2 additions & 1 deletion packages/client/src/authentication/authenticate.test.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { Effect as E, Layer as L, Layer, LogLevel, Logger, Option as O, pipe } from 'effect'
import { describe, expect, test, vi } from 'vitest'
import { mock } from 'vitest-mock-extended'

import * as Fixture from './authenticate.fixture.js'
import { AuthenticationClient } from '../rpc/authentication.js'
import { StorageService } from '../storage/storage.js'
import * as Fixture from './authenticate.fixture.js'
import { AuthenticateServiceLive, AuthenticationService, GetCredential } from './authenticate.js'

describe('authenticate should', () => {
Expand Down
4 changes: 3 additions & 1 deletion packages/client/src/authentication/authenticate.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ import {
type CredentialRequestOptionsJSON,
parseRequestOptionsFromJSON,
} from '@github/webauthn-json/browser-ponyfill'
import { Context, Effect as E, Layer, flow, pipe } from 'effect'

import { InternalBrowserError, type NotSupported } from '@passlock/shared/dist/error/error.js'
import {
type OptionsErrors,
Expand All @@ -14,7 +16,7 @@ import {
} from '@passlock/shared/dist/rpc/authentication.js'
import type { AuthenticationCredential } from '@passlock/shared/dist/schema/passkey.js'
import type { Principal } from '@passlock/shared/dist/schema/principal.js'
import { Context, Effect as E, Layer, flow, pipe } from 'effect'

import { Capabilities } from '../capabilities/capabilities.js'
import { AuthenticationClient } from '../rpc/authentication.js'
import { StorageService } from '../storage/storage.js'
Expand Down
3 changes: 2 additions & 1 deletion packages/client/src/capabilities/capabilities.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/**
* Test if the browser supports passkeys, conditional UI etc
*/
import { NotSupported } from '@passlock/shared/dist/error/error.js'
import { Context, Effect as E, Layer, identity, pipe } from 'effect'

import { NotSupported } from '@passlock/shared/dist/error/error.js'

/* Service */

export class Capabilities extends Context.Tag('@services/Capabilities')<
Expand Down
4 changes: 3 additions & 1 deletion packages/client/src/connection/connection.fixture.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { ConnectRes } from '@passlock/shared/dist/rpc/connection.js'
import { Effect as E, Layer as L } from 'effect'

import { ConnectRes } from '@passlock/shared/dist/rpc/connection.js'

import { ConnectionClient } from '../rpc/connection.js'

export const preConnectRes = new ConnectRes({ warmed: true })
Expand Down
3 changes: 2 additions & 1 deletion packages/client/src/connection/connection.test.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { Effect as E, Layer as L, Layer, LogLevel, Logger, pipe } from 'effect'
import { describe, expect, test } from 'vitest'
import { mock } from 'vitest-mock-extended'

import * as Fixture from './connection.fixture.js'
import { Dispatcher } from '../rpc/client.js'
import { RpcConfig } from '../rpc/config.js'
import { ConnectionClient } from '../rpc/connection.js'
import * as Fixture from './connection.fixture.js'
import { ConnectionService, ConnectionServiceLive } from './connection.js'

describe('preConnect should', () => {
Expand Down
1 change: 1 addition & 0 deletions packages/client/src/connection/connection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* Hits the rpc endpoint to warm up a lambda
*/
import { Context, Effect as E, Layer, flow, pipe } from 'effect'

import { Dispatcher } from '../rpc/client.js'
import type { RpcConfig } from '../rpc/config.js'
import { ConnectionClient } from '../rpc/connection.js'
Expand Down
Loading

0 comments on commit 8337255

Please sign in to comment.