Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/ip-2.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Tbaut authored Jun 28, 2024
2 parents 5fbc499 + 6f5aae3 commit d1f5306
Show file tree
Hide file tree
Showing 7 changed files with 834 additions and 609 deletions.
28 changes: 0 additions & 28 deletions .eslintrc

This file was deleted.

62 changes: 62 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
import prettier from 'eslint-plugin-prettier'
import cypress from 'eslint-plugin-cypress'
import globals from 'globals'
import tsParser from '@typescript-eslint/parser'
import path from 'node:path'
import { fileURLToPath } from 'node:url'
import js from '@eslint/js'
import { FlatCompat } from '@eslint/eslintrc'

const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
})

export default [
{
ignores: [
'src/interfaces/**/*',
'**/types-and-hooks.tsx',
'src/gql/**/*',
'packages/**/dist/**/*',
'**/node_modules',
'**/public'
]
},
...compat.extends(
'eslint:recommended',
'plugin:@typescript-eslint/eslint-recommended',
'prettier',
'plugin:cypress/recommended'
),
{
plugins: {
prettier,
cypress
},

languageOptions: {
globals: {
...globals.browser
},

parser: tsParser,
ecmaVersion: 12,
sourceType: 'module',

parserOptions: {
tsconfigRootDir: './',
project: './tsconfig.json'
}
},

rules: {
trailingComma: 'off',
'object-curly-spacing': ['error', 'always'],
'prettier/prettier': 'error'
}
}
]
26 changes: 13 additions & 13 deletions packages/example/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,28 @@
"dev": "vite",
"build": "tsc && vite build",
"preview": "vite preview",
"start": "yarn vite serve --port 3333",
"start": "yarn vite serve --port 3333 --host 127.0.0.1",
"test": "cypress open",
"test:ci": "cypress run --browser chrome --headless",
"lint": "yarn eslint './{src, cypress}/**/*.{ts, tsx, js, jsx, json, yml, yaml}'",
"format": "yarn prettier --write .",
"format-check": "yarn prettier --check ."
},
"dependencies": {
"@polkadot/api": "^10.11.2",
"@polkadot/extension-dapp": "^0.46.6"
"@polkadot/api": "^12.0.2",
"@polkadot/extension-dapp": "^0.48.1"
},
"devDependencies": {
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"cypress": "^13.6.2",
"cypress-wait-until": "^2.0.1",
"eslint": "^8.55.0",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"cypress": "^13.12.0",
"cypress-wait-until": "^3.0.1",
"eslint": "^9.5.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-prettier": "^5.0.1",
"prettier": "^3.1.1",
"typescript": "^5.3.3",
"vite": "^5.0.0"
"eslint-plugin-cypress": "^3.3.0",
"eslint-plugin-prettier": "^5.1.3",
"prettier": "^3.3.2",
"typescript": "^5.5.2",
"vite": "^5.3.2"
}
}
11 changes: 0 additions & 11 deletions packages/plugin/.eslintrc

This file was deleted.

38 changes: 38 additions & 0 deletions packages/plugin/eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
import typescriptEslint from '@typescript-eslint/eslint-plugin'
import prettier from 'eslint-plugin-prettier'
import cypress from 'eslint-plugin-cypress'
import tsParser from '@typescript-eslint/parser'
import path from 'node:path'
import { fileURLToPath } from 'node:url'
import js from '@eslint/js'
import { FlatCompat } from '@eslint/eslintrc'

const __filename = fileURLToPath(import.meta.url)
const __dirname = path.dirname(__filename)
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
})

export default [
...compat.extends('eslint:recommended', 'plugin:@typescript-eslint/recommended'),
{
plugins: {
'@typescript-eslint': typescriptEslint,
prettier,
cypress
},

languageOptions: {
parser: tsParser
},

rules: {
'@typescript-eslint/no-namespace': 'off',
trailingComma: 'off',
'object-curly-spacing': ['error', 'always'],
'prettier/prettier': 'error'
}
}
]
22 changes: 11 additions & 11 deletions packages/plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@chainsafe/cypress-polkadot-wallet",
"version": "2.1.0",
"version": "2.2.0",
"keywords": [
"polkadot",
"wallet",
Expand Down Expand Up @@ -32,24 +32,24 @@
"cypress": ">=10"
},
"dependencies": {
"@polkadot/extension-inject": "^0.46.6",
"@polkadot/extension-inject": "^0.48.1",
"@polkadot/keyring": "^12.6.2",
"@polkadot/types": "^10.11.2",
"@polkadot/types": "^12.0.2",
"@polkadot/util-crypto": "^12.6.2"
},
"devDependencies": {
"@semantic-release/changelog": "^6.0.3",
"@semantic-release/git": "^10.0.1",
"@typescript-eslint/eslint-plugin": "^6.14.0",
"@typescript-eslint/parser": "^6.14.0",
"cypress": "^13.6.1",
"eslint": "^8.55.0",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"cypress": "^13.12.0",
"eslint": "^9.5.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-cypress": "^2.15.1",
"eslint-plugin-prettier": "^5.0.1",
"prettier": "^3.1.1",
"eslint-plugin-cypress": "^3.3.0",
"eslint-plugin-prettier": "^5.1.3",
"prettier": "^3.3.2",
"semantic-release-yarn": "^3.0.2",
"typescript": "^5.3.3"
"typescript": "^5.5.2"
},
"packageManager": "[email protected]"
}
Loading

0 comments on commit d1f5306

Please sign in to comment.