Skip to content

Commit

Permalink
Merge pull request #1175 from hirosystems/dev
Browse files Browse the repository at this point in the history
release-2023-03-30
  • Loading branch information
kyranjamie authored Apr 12, 2023
2 parents fdcaa44 + c75a36e commit 1133f93
Show file tree
Hide file tree
Showing 266 changed files with 3,619 additions and 3,717 deletions.
12 changes: 0 additions & 12 deletions .editorconfig

This file was deleted.

30 changes: 0 additions & 30 deletions .eslintignore

This file was deleted.

36 changes: 0 additions & 36 deletions .eslintrc.js

This file was deleted.

37 changes: 37 additions & 0 deletions .eslintrc.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
parser: '@typescript-eslint/parser'
extends:
- eslint:recommended
- plugin:@typescript-eslint/recommended
- plugin:react/recommended
- plugin:react-hooks/recommended
- plugin:jsx-a11y/recommended
- prettier
plugins:
- '@typescript-eslint'
- react
- react-hooks
- jsx-a11y

env:
browser: true
node: true
es2021: true
settings:
react:
version: detect
rules:
react/react-in-jsx-scope: off
react/prop-types: off
react/jsx-uses-react: off
react/jsx-uses-vars: error
'@typescript-eslint/explicit-module-boundary-types': off
'@typescript-eslint/no-unused-vars':
- error
- argsIgnorePattern: '^_'
varsIgnorePattern: '^_'
overrides:
- files: ['**/*.tsx']
rules:
react/jsx-filename-extension:
- error
- extensions: ['.tsx']
4 changes: 2 additions & 2 deletions .github/actions/check-version-lock/check-version-lock.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ function containsIllegalChar(input) {
const allPackages = [...Object.entries(dependencies), ...Object.entries(devDependencies)];

const illegalPackages = allPackages
.filter(([package, version]) => containsIllegalChar(version))
.map(([package, version]) => ({ package, version }));
.filter(([name, version]) => containsIllegalChar(version))
.map(([name, version]) => ({ name, version }));

if (illegalPackages.length > 0) {
core.setFailed(`
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/create-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ jobs:
yarn
yarn add -ED @actions/core
- name: Lint eslint
run: yarn lint:eslint
- name: Lint code
run: yarn check:lint

- name: Check exact versions
uses: ./.github/actions/check-version-lock
Expand Down Expand Up @@ -101,18 +101,18 @@ jobs:
- test

steps:
- uses: actions/checkout@v2
- name: Checkout
uses: actions/checkout@v3
with:
token: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}

# When successful, this job creates a version tag, triggering `publish-version.yml`
# When successful, this step creates a version tag, triggering `publish-version.yml`
- name: Semantic Release
uses: cycjimmy/semantic-release-action@v2.6.0
uses: cycjimmy/semantic-release-action@v3.2.0
id: semantic
if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN || secrets.GITHUB_TOKEN }}
SEMANTIC_RELEASE_PACKAGE: ${{ github.workflow }}
with:
extra_plugins: |
@semantic-release/changelog
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/debug-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:

steps:
- uses: lucasmotta/[email protected]
if: github.repository == 'hirosystems/stacks-wallet'
if: github.repository == 'hirosystems/desktop-wallet'
with:
header: '> _Building new release, please wait for the latest_&nbsp; <img src="https://user-images.githubusercontent.com/1618764/97873036-51dfb200-1d17-11eb-89f5-0a922dc3ac92.gif" width="12" />'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Expand Down Expand Up @@ -61,9 +61,9 @@ jobs:

- name: Import GPG key
id: import_gpg_key
uses: crazy-max/ghaction-import-gpg@v3
uses: crazy-max/ghaction-import-gpg@v5
with:
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}

- uses: actions/cache@v2
Expand Down Expand Up @@ -151,9 +151,9 @@ jobs:

- name: Import GPG key
id: import_gpg_key
uses: crazy-max/ghaction-import-gpg@v3
uses: crazy-max/ghaction-import-gpg@v5
with:
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}

- name: Generate binary shasums
Expand All @@ -178,13 +178,13 @@ jobs:

steps:
- uses: lucasmotta/[email protected]
if: (!contains(needs.*.result, 'failure')) && github.repository == 'hirosystems/stacks-wallet'
if: (!contains(needs.*.result, 'failure')) && github.repository == 'hirosystems/desktop-wallet'
with:
header: '> [Download the latest build](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- uses: lucasmotta/[email protected]
if: (contains(needs.*.result, 'failure')) && github.repository == 'hirosystems/stacks-wallet'
if: (contains(needs.*.result, 'failure')) && github.repository == 'hirosystems/desktop-wallet'
with:
header: '> _Build failed, [see here for details](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})_'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/publish-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,9 @@ jobs:

- name: Import GPG key
id: import_gpg_key
uses: crazy-max/ghaction-import-gpg@v3
uses: crazy-max/ghaction-import-gpg@v5
with:
gpg-private-key: ${{ secrets.GPG_PRIVATE_KEY }}
gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GPG_PASSPHRASE }}

- name: Prepare release notes
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ app/main.prod.js.LICENSE.txt
app/*main.prod.js
app/main.prod.js.map
app/renderer.prod.js
app/preload.js.LICENSE.txt
app/renderer.prod.js.map
app/style.css
app/style.css.map
Expand Down
1 change: 0 additions & 1 deletion .husky/.gitignore

This file was deleted.

30 changes: 0 additions & 30 deletions .husky/_/husky.sh

This file was deleted.

4 changes: 0 additions & 4 deletions .husky/commit-msg

This file was deleted.

2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
pnpm-lock.yaml
dll
13 changes: 13 additions & 0 deletions .prettierrc.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const defaultConfig = require('@stacks/prettier-config');

module.exports = {
...defaultConfig,
importOrder: [
'^react',
'<THIRD_PARTY_MODULES>',
'^@(api|assets|components|constants|crypto|hooks|modals|models|models|store|utils)/(.*)$',
'^[./]',
],
importOrderSeparation: true,
importOrderSortSpecifiers: true,
};
Loading

0 comments on commit 1133f93

Please sign in to comment.