Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into feat/multi-isc-chains
Browse files Browse the repository at this point in the history
  • Loading branch information
Tuditi committed Apr 12, 2024
2 parents 19750fc + cd77257 commit f40abb6
Show file tree
Hide file tree
Showing 357 changed files with 2,312 additions and 2,039 deletions.
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
patches/

# Desktop (packages/desktop)
packages/desktop/electron-builder-config.js
packages/desktop/out/
packages/desktop/public/
packages/desktop/electron/lib/keychain.js
Expand Down
18 changes: 11 additions & 7 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,8 @@ const typescriptEslintRules = {
'@typescript-eslint/no-unsafe-return': 'off', // OFF b/c used in Svelte components for UI logic
'@typescript-eslint/no-unsafe-argument': 'off', // OFF b/c ESlint resolves types of the absolute imports as any
'@typescript-eslint/unused-export-let': 'off', // OFF b/c used in Svelte components for UI logic
'@typescript-eslint/no-unused-vars': 'error',
'@typescript-eslint/no-unused-vars': ['error', { varsIgnorePattern: '^_', argsIgnorePattern: '^_' }],

'@typescript-eslint/no-var-requires': 'error',
'@typescript-eslint/prefer-regexp-exec': 'error',
'@typescript-eslint/restrict-plus-operands': 'off', // OFF b/c not entirely accurate despite proper typings
Expand All @@ -98,9 +99,9 @@ const svelteRules = {
}

const svelteSettings = {
'svelte3/typescript': () => require('typescript'),
'svelte3/ignore-styles': () => true,
'svelte3/ignore-warnings': () => false,
'svelte/typescript': () => require('typescript'),
'svelte/ignore-styles': () => true,
'svelte/ignore-warnings': () => false,
}

module.exports = {
Expand All @@ -109,7 +110,7 @@ module.exports = {
es6: true,
node: true,
},
extends: ['eslint:recommended'],
extends: ['eslint:recommended', 'plugin:svelte/recommended'],
overrides: [
{
files: ['**/*.ts', '**/*.svelte'],
Expand All @@ -125,14 +126,17 @@ module.exports = {
project: './tsconfig.lint.json',
tsconfigRootDir: './',
},
plugins: ['@typescript-eslint', 'svelte3'],
plugins: ['@typescript-eslint'],
rules: linterRules,
settings: svelteSettings,
},
{
files: '**/*.svelte',
processor: 'svelte3/svelte3',
parser: 'svelte-eslint-parser',
settings: svelteSettings,
parserOptions: {
parser: '@typescript-eslint/parser'
},
rules: {
...linterRules,
...svelteRules,
Expand Down
28 changes: 16 additions & 12 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
name: Build Test

on:
schedule:
# 12:00AM (UTC) Sunday
- cron: '0 0 * * SUN'
workflow_dispatch:
schedule:
# 12:00AM (UTC) Sunday
- cron: '0 0 * * SUN'
workflow_dispatch:

jobs:
trigger-build:
name: Build (Trigger) - ${{ inputs.os }}
uses: ./.github/workflows/reusable_build.yml
if: ${{ always() }}
with:
os: ubuntu-20.04
stage: prod
secrets: inherit
trigger-build:
name: Build (Trigger) - ${{ inputs.os }}
uses: ./.github/workflows/reusable_build.yml
if: ${{ always() }}
strategy:
matrix:
os: [ubuntu-20.04, windows-2022, macos-11]
fail-fast: true
with:
os: ${{ matrix.os }}
stage: prod
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/ci.lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.x

- name: Set up .npmrc file to use GitHub Packages
run: |
Expand All @@ -38,7 +38,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.x

- name: Set up .npmrc file to use GitHub Packages
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.x

- name: Set up .npmrc file to use GitHub Packages
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.ts.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version: 18.x
node-version: 20.x

- name: Set up .npmrc file to use GitHub Packages
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/reusable_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
- name: Setup NodeJS
uses: actions/setup-node@v1
with:
node-version: 18.19.1
node-version: 20.x

# Used to read the `binding.gyp` file from `@iota/sdk`
- name: Set up Python 3.10
Expand Down
Loading

0 comments on commit f40abb6

Please sign in to comment.