Skip to content

Commit af072a1

Browse files
JoernBerkefeldJoernBerkefeld
committed
Merge branch 'develop' into refactor/copilot-features
# Conflicts: # src/devtools/index.ts # src/utils/sessionlogger.ts
2 parents f1a9801 + c40a980 commit af072a1

28 files changed

Lines changed: 1052 additions & 194 deletions

‎.eslintignore‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.eslintrc‎

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎.fork/.prettierrc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"useTabs": false,
3+
"tabWidth": 2,
4+
"printWidth": 40,
5+
"trailingComma": "none"
6+
}

‎.fork/custom-commands.json‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
[
2+
{
3+
"version": 1
4+
},
5+
{
6+
"action": {
7+
"type": "url",
8+
"url": "https://github.com/Accenture/sfmc-devtools-vscode/compare/main...${ref:short}?expand=1&template=pr_template_release.md"
9+
},
10+
"name": "Create PR/Release-PR to master branch",
11+
"refTargets": [
12+
"localbranch",
13+
"remotebranch"
14+
],
15+
"target": "ref"
16+
},
17+
{
18+
"action": {
19+
"type": "url",
20+
"url": "https://github.com/Accenture/sfmc-devtools-vscode/compare/develop...${ref:short}?expand=1"
21+
},
22+
"name": "Create PR/To develop branch",
23+
"refTargets": [
24+
"localbranch",
25+
"remotebranch"
26+
],
27+
"target": "ref"
28+
},
29+
{
30+
"action": {
31+
"type": "url",
32+
"url": "https://github.com/Accenture/sfmc-devtools-vscode/compare/hotfix...${ref:short}?expand=1"
33+
},
34+
"name": "Create PR/To hotfix branch",
35+
"refTargets": [
36+
"localbranch",
37+
"remotebranch"
38+
],
39+
"target": "ref"
40+
},
41+
{
42+
"action": {
43+
"script": "SKIP_HOOKS=1 git switch ${ref}",
44+
"showOutput": false,
45+
"type": "sh",
46+
"waitForExit": true
47+
},
48+
"name": "Skip Hooks/Checkout",
49+
"refTargets": ["localbranch"],
50+
"target": "ref"
51+
},
52+
{
53+
"action": {
54+
"script": "SKIP_HOOKS=1 git switch ${ref:short} && SKIP_HOOKS=2 git pull",
55+
"showOutput": false,
56+
"type": "sh",
57+
"waitForExit": true
58+
},
59+
"name": "Skip Hooks/Checkout & Pull",
60+
"refTargets": ["remotebranch"],
61+
"target": "ref"
62+
},
63+
{
64+
"name": "Skip Hooks/Commit",
65+
"refTargets": [
66+
"localbranch",
67+
"remotebranch"
68+
],
69+
"target": "ref",
70+
"ui": {
71+
"buttons": [
72+
{
73+
"action": {
74+
"args": "commit -n -m \"$1{text}\" -m \" $2{text}\"",
75+
"path": "${git}",
76+
"showOutput": false,
77+
"type": "process",
78+
"waitForExit": true
79+
},
80+
"title": "Commit without Hooks"
81+
},
82+
{
83+
"action": {
84+
"type": "cancel"
85+
},
86+
"title": "Cancel"
87+
}
88+
],
89+
"controls": [
90+
{
91+
"placeholder": "",
92+
"text": "",
93+
"textBoxType": "generic",
94+
"title": "Commit subject",
95+
"type": "textBox"
96+
},
97+
{
98+
"placeholder": "",
99+
"text": "",
100+
"textBoxType": "generic",
101+
"title": "Description",
102+
"type": "textBox"
103+
}
104+
],
105+
"description": "This will create a commit but not run pre-commit hooks",
106+
"title": "Commit skipping Hooks"
107+
}
108+
},
109+
{
110+
"action": {
111+
"script": "SKIP_HOOKS=4 git merge ${ref:short}",
112+
"showOutput": false,
113+
"type": "sh",
114+
"waitForExit": true
115+
},
116+
"name": "Skip Hooks/Merge into current branch",
117+
"refTargets": ["localbranch"],
118+
"target": "ref"
119+
},
120+
{
121+
"action": {
122+
"script": "SKIP_HOOKS=3 git pull",
123+
"showOutput": false,
124+
"type": "sh",
125+
"waitForExit": true
126+
},
127+
"name": "Skip Hooks/Pull",
128+
"refTargets": [
129+
"localbranch",
130+
"remotebranch"
131+
],
132+
"target": "ref"
133+
}
134+
]

‎.github/PULL_REQUEST_TEMPLATE/pr_template_release.md‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# Release details
2+
3+
## Checklist
4+
5+
### Before merge
6+
7+
- [ ] Wiki updated with info in ticket listed under **Documentation**
8+
- [ ] ran `npm run prepare-release` (which runs `npm audit fix`, `npm run lint-ts`, `npm run lint:fix`, `git add`, `git commit`)
9+
- [ ] pushed potential changes made by prepare-release
10+
11+
### After merge
12+
13+
- [ ] merged all dependabot PRs that target main branch
14+
- [ ] ran `npm run version:major/minor/patch`
15+
- [ ] pushed version-prep commits
16+
- [ ] merged main branch into develop branch
17+
- [ ] closed GitHub milestone
18+
- [ ] created [new GitHub Release](https://github.com/Accenture/sfmc-devtools/releases/new)
19+
20+
## Documentation
21+
22+
... insert updated documentation here ...
23+
24+
## Issues
25+
26+
- closes #1234567

‎.github/dependabot.yml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,18 @@
55

66
version: 2
77
updates:
8-
- package-ecosystem: 'npm' # See documentation for possible values
9-
directory: '/' # Location of package manifests
10-
schedule:
11-
interval: 'monthly'
12-
target-branch: 'develop'
13-
labels:
14-
- 'dependencies'
8+
- package-ecosystem: "npm" # See documentation for possible values
9+
directory: "/" # Location of package manifests
10+
schedule:
11+
interval: "weekly"
12+
target-branch: "develop"
13+
labels:
14+
- "dependencies"
15+
- package-ecosystem: "github-actions"
16+
directory: "/"
17+
schedule:
18+
interval: "weekly"
19+
target-branch: "main"
20+
labels:
21+
- "dependencies"
22+
- "github-action"

‎.github/workflows/close_issues_on_merge.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: Close issues related to a merged pull request based on master branch.
2+
3+
on:
4+
pull_request:
5+
types: [closed]
6+
branches:
7+
- develop
8+
- hotfix
9+
10+
jobs:
11+
closeIssueOnPrMergeTrigger:
12+
permissions:
13+
contents: read
14+
pull-requests: read
15+
issues: write
16+
17+
runs-on: ubuntu-latest
18+
19+
steps:
20+
- name: Closes issues related to a merged pull request.
21+
uses: ldez/gha-mjolnir@v1.5.0
22+
env:
23+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

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

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# Custom tests for mcdev
2+
#
3+
name: "Code Testing"
4+
5+
on:
6+
push:
7+
branches: [main, develop, hotfix]
8+
pull_request:
9+
# The branches below must be a subset of the branches above
10+
branches: [main, develop, hotfix]
11+
12+
jobs:
13+
lintandTesting:
14+
runs-on: ubuntu-latest
15+
strategy:
16+
fail-fast: false
17+
matrix:
18+
node: [24]
19+
name: lint & test w/ node v${{ matrix.node }}
20+
permissions:
21+
actions: read
22+
contents: read
23+
security-events: write
24+
25+
steps:
26+
- name: Checkout repository
27+
uses: actions/checkout@v6
28+
29+
- name: Setup node
30+
uses: actions/setup-node@v6
31+
with:
32+
node-version: ${{ matrix.node }}
33+
registry-url: https://registry.npmjs.org/
34+
35+
- run: npm ci --ignore-scripts
36+
37+
- run: npm run lint

‎.github/workflows/pr-labeler.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: PR Labeler
22
on:
3-
pull_request:
4-
types: [opened]
3+
pull_request:
4+
types: [opened]
55

66
permissions:
77
contents: read
@@ -13,7 +13,7 @@ jobs:
1313
pull-requests: write # for TimonVS/pr-labeler-action to add labels in PR
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: TimonVS/pr-labeler-action@v4
16+
- uses: TimonVS/pr-labeler-action@v5
1717
with:
1818
repo-token: ${{ secrets.GITHUB_TOKEN }}
1919
configuration-path: .github/pr-labeler.yml # optional, .github/pr-labeler.yml is the default value

‎.github/workflows/vsce-publish.yml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
2+
# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
3+
4+
# name: Publish NPM on Release
5+
6+
# on:
7+
# release:
8+
# types: [published]
9+
10+
# permissions:
11+
# id-token: write # Required for OIDC
12+
# contents: read
13+
14+
# jobs:
15+
# build:
16+
# runs-on: ubuntu-latest
17+
# steps:
18+
# - uses: actions/checkout@v6
19+
# - uses: actions/setup-node@v6
20+
# with:
21+
# node-version-file: ./package.json
22+
23+
# - run: npm ci
24+
# - run: npm test
25+
26+
# publish-vsce:
27+
# needs: build
28+
# runs-on: ubuntu-latest
29+
# steps:
30+
# - uses: actions/checkout@v6
31+
# - uses: actions/setup-node@v6
32+
# with:
33+
# node-version-file: ./package.json
34+
# registry-url: https://registry.npmjs.org/
35+
# - run: vsce publish
36+
# env:
37+
# VSCE_PAT: ${{ secrets.VSCE_PAT }}

0 commit comments

Comments
 (0)