Skip to content

Commit 4cdf20f

Browse files
nextchamp-saqibnextchamp-saqib
authored
Merge branch 'develop' into remove-sass
2 parents 3a029b6 + a107db5 commit 4cdf20f

File tree

245 files changed

+101127
-2780
lines changed

Some content is hidden

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

245 files changed

+101127
-2780
lines changed

‎.github/workflows/lint.yml‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
name: Lint
2+
3+
on:
4+
pull_request:
5+
branches:
6+
- main
7+
- version-3
8+
- develop
9+
10+
jobs:
11+
commit-lint:
12+
name: Semantic Commits
13+
runs-on: ubuntu-latest
14+
steps:
15+
- uses: actions/checkout@v5
16+
with:
17+
fetch-depth: 200
18+
- uses: actions/setup-node@v5
19+
with:
20+
node-version: 24
21+
check-latest: true
22+
- name: Check commit titles
23+
run: |
24+
npm install @commitlint/cli @commitlint/config-conventional
25+
npx commitlint --verbose --from ${{ github.event.pull_request.base.sha }} --to ${{ github.event.pull_request.head.sha }}
26+
27+
linter:
28+
name: 'Frappe Linter'
29+
runs-on: ubuntu-latest
30+
if: github.event_name == 'pull_request'
31+
32+
steps:
33+
- uses: actions/checkout@v5
34+
with:
35+
fetch-depth: 0
36+
37+
- name: Set up Python 3.14
38+
uses: actions/setup-python@v5
39+
with:
40+
python-version: '3.14'
41+
42+
- name: Install and Run Pre-commit
43+
uses: pre-commit/action@v3.0.1
44+
with:
45+
extra_args: --from-ref ${{ github.event.pull_request.base.sha }} --to-ref ${{ github.event.pull_request.head.sha }}
46+
47+
- name: Download Semgrep rules
48+
run: git clone --depth 1 https://github.com/frappe/semgrep-rules.git frappe-semgrep-rules
49+
50+
- name: Download semgrep
51+
run: pip install semgrep
52+
53+
- name: Run Semgrep rules
54+
run: semgrep ci --config ./frappe-semgrep-rules/rules --config r/python.lang.correctness

‎.github/workflows/release.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: Generate Semantic Release
22
on:
33
push:
44
branches:
5-
- main
5+
- version-3
66

77
jobs:
88
release:
@@ -17,11 +17,11 @@ jobs:
1717
- name: Setup Node.js
1818
uses: actions/setup-node@v3
1919
with:
20-
node-version: 18
20+
node-version: 24
2121
- name: Setup dependencies
2222
run: |
2323
npm install @semantic-release/git @semantic-release/exec --no-save
2424
- name: Create Release
2525
env:
2626
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
27-
run: npx semantic-release
27+
run: npx semantic-release

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,3 +184,4 @@ pids
184184
*.seed
185185
*.pid.lock
186186
todo
187+
frontend/package-lock.json

‎.mergify.yml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
pull_request_rules:
2+
- name: Auto-close PRs on stable branch
3+
conditions:
4+
- and:
5+
- and:
6+
- author!=nextchamp-saqib
7+
- author!=shahzeelahmed
8+
- author!=frappe-pr-bot
9+
- author!=mergify[bot]
10+
- or:
11+
- base=main
12+
- base=version-3
13+
actions:
14+
close:
15+
comment:
16+
message: |
17+
@{{author}}, thanks for the contribution, but we do not accept pull requests on a stable branch. Please raise PR on develop branch.
18+
19+
- name: backport to version-3-hotfix
20+
conditions:
21+
- label="backport version-3-hotfix"
22+
actions:
23+
backport:
24+
branches:
25+
- version-3-hotfix
26+
assignees:
27+
- "{{ author }}"
28+
29+
- name: Auto-delete merged branches
30+
conditions:
31+
- merged
32+
actions:
33+
delete_head_branch:

‎.releaserc‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,11 @@
11
{
22
"branches": [
3-
"main"
3+
"version-3"
44
],
55
"plugins": [
66
"@semantic-release/commit-analyzer",
77
{
8-
"preset": "angular",
9-
"releaseRules": [
10-
{
11-
"breaking": true,
12-
"release": false
13-
}
14-
]
8+
"preset": "conventionalcommits"
159
},
1610
[
1711
"@semantic-release/exec",

‎commitlint.config.cjs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
module.exports = {
2+
parserPreset: "conventional-changelog-conventionalcommits",
3+
rules: {
4+
"subject-empty": [2, "never"],
5+
"type-case": [2, "always", "lower-case"],
6+
"type-empty": [2, "never"],
7+
"type-enum": [
8+
2,
9+
"always",
10+
[
11+
"build",
12+
"chore",
13+
"ci",
14+
"docs",
15+
"feat",
16+
"fix",
17+
"perf",
18+
"refactor",
19+
"revert",
20+
"style",
21+
"test",
22+
"patch",
23+
"deprecate", // deprecation decision
24+
],
25+
],
26+
},
27+
};

‎crowdin.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
files:
2-
- source: /insgihts/locale/main.pot
2+
- source: /insights/locale/main.pot
33
translation: /insights/locale/%two_letters_code%.po
4-
pull_request_title: "chore: sync translations from crowdin"
4+
pull_request_title: 'chore: sync translations from crowdin'
55
pull_request_labels:
66
- translation
7-
commit_message: "chore: %language% translations"
8-
append_commit_message: false
7+
commit_message: 'chore: %language% translations'
8+
append_commit_message:

‎frontend/.prettierrc.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
"semi": false,
33
"singleQuote": true,
44
"useTabs": true,
5+
"tabWidth": 4,
56
"printWidth": 100,
6-
"vueIndentScriptAndStyle": false
7-
}
7+
"vueIndentScriptAndStyle": false,
8+
"trailingComma": "all"
9+
}

‎frontend/components.d.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ declare module 'vue' {
1010
export interface GlobalComponents {
1111
AppShell: typeof import('./src/components/AppShell.vue')['default']
1212
Attachment: typeof import('./src/components/Controls/Attachment.vue')['default']
13-
Autocomplete: typeof import('./src/components/Controls/Autocomplete.vue')['default']
1413
BaseChart: typeof import('./src/components/Charts/BaseChart.vue')['default']
1514
BasePage: typeof import('./src/components/BasePage.vue')['default']
1615
Breadcrumbs: typeof import('./src/components/Breadcrumbs.vue')['default']
@@ -50,7 +49,6 @@ declare module 'vue' {
5049
NewDialogWithTypes: typeof import('./src/components/NewDialogWithTypes.vue')['default']
5150
PageBreadcrumbs: typeof import('./src/components/PageBreadcrumbs.vue')['default']
5251
PageTitle: typeof import('./src/components/PageTitle.vue')['default']
53-
Popover: typeof import('./src/components/Popover.vue')['default']
5452
PublicShareDialog: typeof import('./src/components/PublicShareDialog.vue')['default']
5553
ResizeableInput: typeof import('./src/components/ResizeableInput.vue')['default']
5654
RouterLink: typeof import('vue-router')['RouterLink']

‎frontend/package.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"echarts": "^5.5.0",
3030
"es-toolkit": "^1.34.1",
3131
"feather-icons": "^4.28.0",
32-
"frappe-ui": "0.1.256",
32+
"frappe-ui": "0.1.261",
3333
"grid-layout-plus": "^1.0.2",
3434
"lucide-vue-next": "^0.484.0",
3535
"pinia": "^2.0.30",
@@ -51,13 +51,14 @@
5151
"eslint-plugin-vue": "^9.1.1",
5252
"patch-package": "^8.0.1",
5353
"postcss": "^8.4.14",
54-
"prettier": "2.8.4",
54+
"prettier": "3.1.0",
5555
"tailwindcss": "3.4.17",
5656
"typescript": "^5.5.2",
5757
"vite": "^4.4.6",
5858
"vue-tsc": "^2.0.21"
5959
},
6060
"resolutions": {
61-
"@iconify/utils": "^2.3.0"
61+
"@iconify/utils": "^2.3.0",
62+
"reka-ui": "2.5.0"
6263
}
6364
}

0 commit comments

Comments
 (0)