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

chore: update deps #336

Merged
merged 4 commits into from
Sep 14, 2023
Merged
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: 10 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,23 @@
module.exports = {
extends: ['plugin:@stencil-community/recommended', '@stacks/eslint-config'],
extends: [
'plugin:@typescript-eslint/recommended-type-checked',
'plugin:@stencil-community/recommended',
'@stacks/eslint-config',
],
plugins: ['react', 'react-hooks'],
root: true,
parserOptions: {
project: ['./tsconfig.json'],
project: true,
tsconfigRootDir: __dirname,
},
root: true,
rules: {
// todo: remove these rules if fixed
'@stencil-community/ban-exported-const-enums': 'off',
'@stencil-community/own-methods-must-be-private': 'off',
'@stencil-community/required-jsdoc': 'off',
'@stencil-community/strict-boolean-conditions': 'off',
'@typescript-eslint/ban-types': 'off',
'@typescript-eslint/no-redundant-type-constituents': 'off',
'@typescript-eslint/no-unsafe-argument': 'off',
'@typescript-eslint/no-unsafe-assignment': 'off',
'@typescript-eslint/no-unsafe-call': 'off',
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,6 @@ jobs:
cache: "yarn"
- name: Install monorepo deps
run: yarn --frozen-lockfile
- name: Bootstrap
run: yarn lerna bootstrap
- name: Setup .npmrc
env:
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
Expand Down
3 changes: 1 addition & 2 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,5 @@
"version": {
"message": "chore(release): publish %s"
}
},
"useWorkspaces": true
}
}
36 changes: 17 additions & 19 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@
"name": "root",
"private": true,
"workspaces": [
"packages/*"
"packages/**"
],
"prettier": "@stacks/prettier-config",
"scripts": {
"bootstrap": "lerna exec --parallel 'yarn'",
"build": "lerna run build",
"build:connect": "lerna run build --scope @stacks/connect",
"build:connect-ui": "lerna run build --scope @stacks/connect-ui",
Expand All @@ -25,28 +24,27 @@
},
"devDependencies": {
"@changesets/changelog-github": "^0.4.8",
"@changesets/cli": "^2.14.1",
"@commitlint/cli": "^17.4.4",
"@commitlint/config-conventional": "^17.4.4",
"@janniks/typedoc-theme-stacks": "^1.2.3",
"@stacks/eslint-config": "^1.3.0-alpha.1",
"@changesets/cli": "^2.26.2",
"@commitlint/cli": "^17.7.1",
"@commitlint/config-conventional": "^17.7.0",
"@stacks/eslint-config": "^2.0.0",
"@stacks/prettier-config": "^0.0.10",
"@stencil-community/eslint-plugin": "^0.5.0",
"concurrently": "^7.6.0",
"eslint": "^8.33.0",
"eslint-import-resolver-typescript": "^3.5.3",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-react": "^7.32.2",
"concurrently": "^8.2.1",
"eslint": "^8.49.0",
"eslint-import-resolver-typescript": "^3.6.0",
"eslint-plugin-import": "^2.28.1",
"eslint-plugin-prettier": "^5.0.0",
"eslint-plugin-react": "^7.33.2",
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-unused-imports": "^2.0.0",
"eslint-plugin-unused-imports": "^3.0.0",
"husky": "^8.0.3",
"lerna": "^6.6.1",
"prettier": "^2.8.3",
"lerna": "^7.3.0",
"prettier": "^3.0.3",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"tsup": "^6.6.3",
"typedoc": "^0.23.20",
"typescript": "^4.8.4"
"tsup": "^7.2.0",
"typedoc": "^0.25.1",
"typescript": "^5.2.2"
}
}
5 changes: 4 additions & 1 deletion packages/connect-react/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@
"jsx": "react"
},
"include": ["src"],
"references": [{ "path": "../connect" }]
"references": [{ "path": "../connect" }],
"typedocOptions": {
"entryPoints": ["src/index.ts"]
}
}
1 change: 0 additions & 1 deletion packages/connect-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
"@stencil/core": "^2.17.1"
},
"devDependencies": {
"@stacks/prettier-config": "^0.0.10",
"@stencil/sass": "^1.5.2",
"@types/node": "^14.6.0",
"puppeteer": "^9.0.0"
Expand Down
5 changes: 2 additions & 3 deletions packages/connect-ui/src/components.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
* It contains typing information for all components that exist in this project.
*/
import { HTMLStencilElement, JSXBase } from "@stencil/core/internal";
import { AuthOptions } from "@stacks/connect/types/auth";
export namespace Components {
interface ConnectModal {
"authOptions": AuthOptions;
"authOptions": any;
}
}
declare global {
Expand All @@ -24,7 +23,7 @@ declare global {
}
declare namespace LocalJSX {
interface ConnectModal {
"authOptions"?: AuthOptions;
"authOptions"?: any;
}
interface IntrinsicElements {
"connect-modal": ConnectModal;
Expand Down
4 changes: 1 addition & 3 deletions packages/connect-ui/src/components/modal/modal.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
// eslint-disable-next-line unused-imports/no-unused-imports
import { Component, h, Prop, State, Element } from '@stencil/core';
import CloseIcon from './assets/close-icon.svg';
import HiroWalletLogo from './assets/hiro-wallet-logo.svg';
import XverseWalletLogo from './assets/xverse-wallet-logo.svg';
import type { AuthOptions } from '@stacks/connect/types/auth';
import { getBrowser, getPlatform } from './utils';

const CHROME_BROWSER_URL = 'https://www.google.com/chrome/';
Expand All @@ -25,7 +23,7 @@ const XVERSE_CHROME_STORE_URL =
shadow: true,
})
export class Modal {
@Prop() authOptions: AuthOptions;
@Prop() authOptions: any; // AuthOptions (would lead to circular dependency)

@State() hasOpenedInstall: boolean;

Expand Down
6 changes: 3 additions & 3 deletions packages/connect-ui/src/components/modal/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

## Properties

| Property | Attribute | Description | Type | Default |
| ------------- | --------- | ----------- | ------------- | ----------- |
| `authOptions` | -- | | `AuthOptions` | `undefined` |
| Property | Attribute | Description | Type | Default |
| ------------- | -------------- | ----------- | ----- | ----------- |
| `authOptions` | `auth-options` | | `any` | `undefined` |


----------------------------------------------
Expand Down
5 changes: 4 additions & 1 deletion packages/connect-ui/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,8 @@
"jsx": "react",
"jsxFactory": "h"
},
"include": ["src"]
"include": ["src"],
"typedocOptions": {
"entryPoints": ["src/index.ts"]
}
}
5 changes: 4 additions & 1 deletion packages/connect/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,8 @@
"outDir": "./dist/types",
"rootDir": "./src"
},
"include": ["src"]
"include": ["src"],
"typedocOptions": {
"entryPoints": ["src/index.ts"]
}
}
3 changes: 1 addition & 2 deletions tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
"name": "Stacks Connect",
"entryPointStrategy": "packages",
"entryPoints": ["packages/*"],
"out": "docs",
"theme": "stacks"
"out": "docs"
}
}
Loading
Loading