Skip to content

Commit b7d7a01

Browse files
grv-saini-20grv-saini-20
committed
fix: merge conflicts
2 parents 62a2c23 + 80e2ade commit b7d7a01

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+1420
-1063
lines changed

‎.github/workflows/check-code.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: "Check Code"
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- "dev"
8+
- "main"
9+
10+
jobs:
11+
lint:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Setup Node.js
17+
uses: actions/setup-node@v4
18+
with:
19+
node-version: 22.x
20+
21+
- name: Install Dependencies
22+
run: |
23+
echo "installing pnpm"
24+
npm install -g pnpm
25+
echo "installing deps for packages"
26+
pnpm i
27+
28+
- name: Check Code
29+
run: pnpm check

‎.github/workflows/check-format.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: "Check Format"
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- "dev"
8+
- "main"
9+
10+
jobs:
11+
lint:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Setup Node.js
17+
uses: actions/setup-node@v4
18+
with:
19+
node-version: 22.x
20+
21+
- name: Install Dependencies
22+
run: |
23+
echo "installing pnpm"
24+
npm install -g pnpm
25+
echo "installing deps for packages"
26+
pnpm i
27+
28+
- name: Check Format
29+
run: pnpm check-format

‎.github/workflows/check-lint.yml‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
name: "Check Lint"
2+
3+
on:
4+
pull_request:
5+
push:
6+
branches:
7+
- "dev"
8+
- "main"
9+
10+
jobs:
11+
lint:
12+
runs-on: ubuntu-latest
13+
steps:
14+
- uses: actions/checkout@v4
15+
16+
- name: Setup Node.js
17+
uses: actions/setup-node@v4
18+
with:
19+
node-version: 22.x
20+
21+
- name: Install Dependencies
22+
run: |
23+
echo "installing pnpm"
24+
npm install -g pnpm
25+
echo "installing deps for packages"
26+
pnpm i
27+
28+
- name: Check Lint
29+
run: pnpm check-lint

‎.node-version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
22.13.1
1+
22.x

‎.vscode/settings.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"eslint.workingDirectories": [
3-
{
4-
"mode": "auto"
5-
}
6-
]
2+
"eslint.workingDirectories": [
3+
{
4+
"mode": "auto"
5+
}
6+
]
77
}

‎infrastructure/eid-wallet/.storybook/main.ts‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
import type { StorybookConfig } from '@storybook/sveltekit'
2-
import { join, dirname } from 'path'
1+
import type { StorybookConfig } from "@storybook/sveltekit";
2+
import { join, dirname } from "path";
33

44
function getAbsolutePath(value: string): any {
5-
return dirname(require.resolve(join(value, 'package.json')))
5+
return dirname(require.resolve(join(value, "package.json")));
66
}
77

88
const config: StorybookConfig = {
9-
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|ts)'],
10-
addons: [
11-
getAbsolutePath('@storybook/addon-essentials'),
12-
getAbsolutePath('@chromatic-com/storybook'),
13-
getAbsolutePath('@storybook/experimental-addon-test'),
14-
],
15-
framework: {
16-
name: '@storybook/sveltekit',
17-
options: {},
18-
},
9+
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|ts)"],
10+
addons: [
11+
getAbsolutePath("@storybook/addon-essentials"),
12+
getAbsolutePath("@chromatic-com/storybook"),
13+
getAbsolutePath("@storybook/experimental-addon-test"),
14+
],
15+
framework: {
16+
name: "@storybook/sveltekit",
17+
options: {},
18+
},
1919

20-
staticDirs: ['../static'],
21-
}
22-
export default config
20+
staticDirs: ["../static"],
21+
};
22+
export default config;

‎infrastructure/eid-wallet/.storybook/preview.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ const preview: Preview = {
1212
},
1313
};
1414

15-
export default preview;
15+
export default preview;

‎infrastructure/eid-wallet/.storybook/vitest.setup.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { beforeAll } from 'vitest';
2-
import { setProjectAnnotations } from '@storybook/sveltekit';
3-
import * as projectAnnotations from './preview';
1+
import { beforeAll } from "vitest";
2+
import { setProjectAnnotations } from "@storybook/sveltekit";
3+
import * as projectAnnotations from "./preview";
44

55
// This is an important step to apply the right configuration when testing your stories.
66
// More info at: https://storybook.js.org/docs/api/portable-stories/portable-stories-vitest#setprojectannotations
77
const project = setProjectAnnotations([projectAnnotations]);
88

9-
beforeAll(project.beforeAll);
9+
beforeAll(project.beforeAll);

‎infrastructure/eid-wallet/.vscode/extensions.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"recommendations": [
3-
"svelte.svelte-vscode",
4-
"tauri-apps.tauri-vscode",
5-
"rust-lang.rust-analyzer"
6-
]
2+
"recommendations": [
3+
"svelte.svelte-vscode",
4+
"tauri-apps.tauri-vscode",
5+
"rust-lang.rust-analyzer"
6+
]
77
}

‎infrastructure/eid-wallet/.vscode/settings.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"svelte.enable-ts-plugin": true
2+
"svelte.enable-ts-plugin": true
33
}

0 commit comments

Comments
 (0)