Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
166 changes: 86 additions & 80 deletions .fork/custom-commands.json
Original file line number Diff line number Diff line change
@@ -1,134 +1,140 @@
[
{
"version": 1
"version" : 2
},
{
"action": {
"type": "url",
"url": "https://github.com/Accenture/sfmc-devtools-vscode/compare/main...${ref:short}?expand=1&template=pr_template_release.md"
"action" : {
"type" : "url",
"url" : "https://github.com/Accenture/sfmc-devtools-vscode/compare/main...${ref:short}?expand=1&template=pr_template_release.md"
},
"name": "Create PR/Release-PR to master branch",
"refTargets": [
"name" : "Create PR/Release-PR to master branch",
"refTargets" : [
"localbranch",
"remotebranch"
],
"target": "ref"
"target" : "ref"
},
{
"action": {
"type": "url",
"url": "https://github.com/Accenture/sfmc-devtools-vscode/compare/develop...${ref:short}?expand=1"
"action" : {
"type" : "url",
"url" : "https://github.com/Accenture/sfmc-devtools-vscode/compare/develop...${ref:short}?expand=1"
},
"name": "Create PR/To develop branch",
"refTargets": [
"name" : "Create PR/To develop branch",
"refTargets" : [
"localbranch",
"remotebranch"
],
"target": "ref"
"target" : "ref"
},
{
"action": {
"type": "url",
"url": "https://github.com/Accenture/sfmc-devtools-vscode/compare/hotfix...${ref:short}?expand=1"
"action" : {
"type" : "url",
"url" : "https://github.com/Accenture/sfmc-devtools-vscode/compare/hotfix...${ref:short}?expand=1"
},
"name": "Create PR/To hotfix branch",
"refTargets": [
"name" : "Create PR/To hotfix branch",
"refTargets" : [
"localbranch",
"remotebranch"
],
"target": "ref"
"target" : "ref"
},
{
"action": {
"script": "SKIP_HOOKS=1 git switch ${ref}",
"showOutput": false,
"type": "sh",
"waitForExit": true
"action" : {
"script" : "SKIP_HOOKS=1 git switch ${ref}",
"showOutput" : false,
"type" : "sh",
"waitForExit" : true
},
"name": "Skip Hooks/Checkout",
"refTargets": ["localbranch"],
"target": "ref"
"name" : "Skip Hooks/Checkout",
"refTargets" : [
"localbranch"
],
"target" : "ref"
},
{
"action": {
"script": "SKIP_HOOKS=1 git switch ${ref:short} && SKIP_HOOKS=2 git pull",
"showOutput": false,
"type": "sh",
"waitForExit": true
"action" : {
"script" : "SKIP_HOOKS=1 git switch ${ref:short} && SKIP_HOOKS=2 git pull",
"showOutput" : false,
"type" : "sh",
"waitForExit" : true
},
"name": "Skip Hooks/Checkout & Pull",
"refTargets": ["remotebranch"],
"target": "ref"
"name" : "Skip Hooks/Checkout & Pull",
"refTargets" : [
"remotebranch"
],
"target" : "ref"
},
{
"name": "Skip Hooks/Commit",
"refTargets": [
"name" : "Skip Hooks/Commit",
"refTargets" : [
"localbranch",
"remotebranch"
],
"target": "ref",
"ui": {
"buttons": [
"target" : "ref",
"ui" : {
"buttons" : [
{
"action": {
"args": "commit -n -m \"$1{text}\" -m \" $2{text}\"",
"path": "${git}",
"showOutput": false,
"type": "process",
"waitForExit": true
"action" : {
"args" : "commit -n -m \"$1{text}\" -m \" $2{text}\"",
"path" : "${git}",
"showOutput" : false,
"type" : "process",
"waitForExit" : true
},
"title": "Commit without Hooks"
"title" : "Commit without Hooks"
},
{
"action": {
"type": "cancel"
"action" : {
"type" : "cancel"
},
"title": "Cancel"
"title" : "Cancel"
}
],
"controls": [
"controls" : [
{
"placeholder": "",
"text": "",
"textBoxType": "generic",
"title": "Commit subject",
"type": "textBox"
"placeholder" : "",
"text" : "",
"textBoxType" : "generic",
"title" : "Commit subject",
"type" : "textBox"
},
{
"placeholder": "",
"text": "",
"textBoxType": "generic",
"title": "Description",
"type": "textBox"
"placeholder" : "",
"text" : "",
"textBoxType" : "generic",
"title" : "Description",
"type" : "textBox"
}
],
"description": "This will create a commit but not run pre-commit hooks",
"title": "Commit skipping Hooks"
"description" : "This will create a commit but not run pre-commit hooks",
"title" : "Commit skipping Hooks"
}
},
{
"action": {
"script": "SKIP_HOOKS=4 git merge ${ref:short}",
"showOutput": false,
"type": "sh",
"waitForExit": true
"action" : {
"script" : "SKIP_HOOKS=4 git merge ${ref:short}",
"showOutput" : false,
"type" : "sh",
"waitForExit" : true
},
"name": "Skip Hooks/Merge into current branch",
"refTargets": ["localbranch"],
"target": "ref"
"name" : "Skip Hooks/Merge into current branch",
"refTargets" : [
"localbranch"
],
"target" : "ref"
},
{
"action": {
"script": "SKIP_HOOKS=3 git pull",
"showOutput": false,
"type": "sh",
"waitForExit": true
"action" : {
"script" : "SKIP_HOOKS=3 git pull",
"showOutput" : false,
"type" : "sh",
"waitForExit" : true
},
"name": "Skip Hooks/Pull",
"refTargets": [
"name" : "Skip Hooks/Pull",
"refTargets" : [
"localbranch",
"remotebranch"
],
"target": "ref"
"target" : "ref"
}
]
]
58 changes: 29 additions & 29 deletions .github/workflows/vsce-publish.yml
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages

# name: Publish NPM on Release
name: Publish to VSCode Marketplace on GitHub-Release

# on:
# release:
# types: [published]
on:
release:
types: [published]

# permissions:
# id-token: write # Required for OIDC
# contents: read
permissions:
id-token: write # Required for OIDC
contents: read

# jobs:
# build:
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v6
# - uses: actions/setup-node@v6
# with:
# node-version-file: ./package.json
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version-file: ./package.json

# - run: npm ci
# - run: npm test
- run: npm ci
- run: npm test

# publish-vsce:
# needs: build
# runs-on: ubuntu-latest
# steps:
# - uses: actions/checkout@v6
# - uses: actions/setup-node@v6
# with:
# node-version-file: ./package.json
# registry-url: https://registry.npmjs.org/
# - run: vsce publish
# env:
# VSCE_PAT: ${{ secrets.VSCE_PAT }}
publish-vsce:
needs: build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v6
- uses: actions/setup-node@v6
with:
node-version-file: ./package.json
registry-url: https://registry.npmjs.org/
- run: vsce publish
env:
VSCE_PAT: ${{ secrets.VSCE_PAT }}
14 changes: 14 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { defineConfig, globalIgnores } from "eslint/config";
import tseslint from "typescript-eslint";
import tsParser from "@typescript-eslint/parser";
import js from "@eslint/js";
import globals from "globals";

export default defineConfig([
js.configs.recommended,
Expand Down Expand Up @@ -32,5 +33,18 @@ export default defineConfig([
"@typescript-eslint/typedef": "error",
"@typescript-eslint/no-inferrable-types": "error"
}
},
{
files: ["*.js", "*.mjs"],
languageOptions: {
globals: {
...globals.nodeBuiltin,
Atomics: "readonly",
SharedArrayBuffer: "readonly"
},

ecmaVersion: 2022,
sourceType: "module"
}
}
]);
Loading
Loading