Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
ma-zal committed Oct 9, 2024
2 parents acbb6c1 + dd3fb15 commit b1285e1
Show file tree
Hide file tree
Showing 19 changed files with 1,980 additions and 1,135 deletions.
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

62 changes: 0 additions & 62 deletions .eslintrc.json

This file was deleted.

3 changes: 3 additions & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# The header of Codeowners is autogenerated from https://github.com/integromat/mono. Don’t edit code before END-AUTOGENERATED-SECTION!
* @integromat/apps-platform
### END-AUTOGENERATED-SECTION
50 changes: 50 additions & 0 deletions .github/workflows/validate-pr.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
######
# This file is autogenerated from https://github.com/integromat/mono/blob/master/libs/github-resources/src/repositories/vscode-apps-sdk.ts. Do not edit manually!!!
######

name: PR
on:
pull_request:
types:
- opened
- reopened
- synchronize
- labeled
- unlabeled
- edited
merge_group:

# run only latest workflow, cancel other runs of this workflow
concurrency:
group: validate-pr-${{ github.ref }}
cancel-in-progress: true

env:
FORCE_COLOR: '1'

jobs:
validate-pr:
name: Validate PR
runs-on: ubuntu-latest
permissions:
id-token: write
issues: write
pull-requests: write
contents: read
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
GITHUB_TOKEN: ${{ github.token }}
steps:
- uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938 # v4.2.0
if: github.event_name != 'merge_group'

- name: Setup Node.js
if: github.event_name != 'merge_group'
uses: actions/setup-node@0a44ba7841725637a19e28fa30b79a866c81b0a6 # v4.0.4
with:
registry-url: https://registry.npmjs.org
node-version: '>=20.0'

- name: Validate PR
if: github.event_name != 'merge_group'
run: npx @integromat/actions-toolkit validate-pr
2 changes: 1 addition & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"label": "Check for all ESLint problems in *.ts",
"command": "eslint",
"type": "shell",
"args": ["-c", "./.eslintrc.json", "${workspaceRoot}/src/**/*.ts"],
"args": ["-c", "./eslint.config.mjs", "${workspaceRoot}/src/**/*.ts"],
"options": {
"cwd": "${workspaceRoot}",
},
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Change Log
==========

2.1.0 [2024-10-09]
------------------

- Fixed the IML spead operator`"{{...}}": "{{something}}"` highlighting.
- Improved wizard of new module: Added questions for connection and alternative connection.
- Added the in-editor validation of `makecomapp.json` project file.
- Fixed the issue `"options.maxOutputLength" is out of range` occured during ZIP import.

2.0.0 [2024-07-02]
--------------------

Expand Down
9 changes: 9 additions & 0 deletions debug.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Setup
# 1. Add 'code' to $PATH
# 2. chmod +x debug.sh

# Compile code
npm run compile

# Run Visual Code with compiled extension (no installation needed)
code --disable-extensions --extensionDevelopmentPath=$(pwd)
68 changes: 68 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
import globals from 'globals';
import eslint from '@eslint/js';
import tseslint from 'typescript-eslint';
import stylistic from '@stylistic/eslint-plugin';
import eslintConfigPrettier from 'eslint-config-prettier';

export default [
{
files: ['src/**/*.{js,mjs,cjs,ts}'],
ignores: ['syntaxes/imljson-language-features/**'],
},
eslint.configs.recommended,
{
languageOptions: {
ecmaVersion: 'latest',
globals: {
...globals.node,
}
},
plugins: {
'@stylistic': stylistic,
},
rules: {
"@stylistic/semi": [2, "always"],
"no-unused-vars": ["error", { "argsIgnorePattern": "^_", "caughtErrorsIgnorePattern": "^_" }], // Add ignoring the `_paramName`
},
},
...tseslint.config({
files: ['src/**/*.ts', 'src/**/*.tsx'],
extends: [
...tseslint.configs.recommended,
...tseslint.configs.strict,
...tseslint.configs.stylistic,
],
rules: {
"@typescript-eslint/no-unused-vars": ["error", { "argsIgnorePattern": "^_", "caughtErrorsIgnorePattern": "^_" }], // Add ignoring the `_paramName`
"@stylistic/max-len": ["warn", 120, { "ignoreStrings": true, "ignoreComments": true, "ignoreTemplateLiterals": true }], // Line width 80 -> 120
"no-tabs": "off", // This project uses tabs instead of spaces as default.
"quote-props": ["error", "as-needed"],
// "object-curly-spacing" is not aligned in Google with Typescript default used style
"object-curly-spacing": ["error", "always", { "objectsInObjects": true }],
"require-jsdoc": "off",
"valid-jsdoc":"off",
"quotes": ["error", "single", { "avoidEscape": true }], // Allow to used double-quotes if inner string has single-quote.
"block-spacing": ["error", "always"], // Rollback from Google style to ESLint default.
"padded-blocks": "off", // Allow to start and end block ith blank lines.
"no-multi-spaces": ["error", { "ignoreEOLComments": true }], // Ignore multiple spaces before comments that occur at the end of lines
"operator-linebreak": ["error", "after", { "overrides": { "?": "before", ":": "before" } }], // Align with Prettier
"@typescript-eslint/no-explicit-any": "off", // Used on many places in vscode extension. :(
"camelcase": ["error", { "allow": ["^testsOnly_"] }],
},
}),
...tseslint.config({
files: ['src/**/*.js'],
languageOptions: {
globals: {
...globals.mocha,
},
},
rules: {
"indent": ["error", "tab", {
"FunctionDeclaration": { "body": 1, "parameters": 1 },
"SwitchCase": 1
}],
},
}),
eslintConfigPrettier,
];
Loading

0 comments on commit b1285e1

Please sign in to comment.