Merge branch 'develop' of https://github.com/Kong/insomnia into reque…

…st-group-descriptions

.editorconfig

@@ -5,3 +5,4 @@ indent_size = 2
 insert_final_newline = true
 trim_trailing_whitespace = true
 end_of_line = lf
+quote_type = single

.eslintignore

@@ -8,13 +8,12 @@ screenshots/
 **/.cache/
 **/coverage/
 **/node_modules/
-**/webpack/
 **/bin/
 **/__fixtures__/
+**/fixtures
 **/__snapshots__/
-**/flow-typed/
 **/dist/
 **/.cache/
 **/svgr/
 **/storybook-static/
-*.md
+*.md

.eslintrc.js

@@ -0,0 +1,113 @@
+/** @type { import('eslint').Linter.Config } */
+module.exports = {
+  parser: '@typescript-eslint/parser',
+  parserOptions: {
+    project: [
+      './tsconfig.eslint.json',
+      './packages/*/tsconfig.json',
+      './plugins/*/tsconfig.json',
+    ],
+    tsconfigRootDir: __dirname,
+    ecmaFeatures: {
+      jsx: true,
+    },
+  },
+  extends: [
+    'plugin:@typescript-eslint/eslint-recommended',
+    'plugin:@typescript-eslint/recommended',
+    'semistandard',
+    'plugin:react/recommended',
+    'plugin:react-hooks/recommended',
+  ],
+  plugins: [
+    '@typescript-eslint',
+    'react',
+    'jest',
+    'html',
+    'json',
+    'filenames',
+    'react-hooks',
+  ],
+  globals: {
+    __DEV__: true,
+    fail: true,
+    NodeJS: true,
+    HTMLDivElement: true,
+    HTMLElement: true,
+    HTMLInputElement: true,
+    HTMLSelectElement: true,
+    JSX: true,
+  },
+  env: {
+    browser: true,
+    commonjs: true,
+    es6: true,
+    'jest/globals': true,
+    node: true,
+  },
+  overrides: [
+    {
+      files: ['*.js'],
+      rules: {
+        '@typescript-eslint/no-var-requires': 'off',
+      },
+    },
+  ],
+  rules: {
+    'comma-dangle': ['error', 'always-multiline'],
+    'object-curly-spacing': ['error', 'always'],
+    'space-in-parens': 'error',
+    'array-bracket-spacing': 'error',
+    'comma-spacing': 'error',
+    indent: ['error', 2, { SwitchCase: 1 }],
+    'no-var': 'error',
+    'no-async-promise-executor': 'off',
+    'no-case-declarations': 'off',
+    'no-prototype-builtins': 'off',
+    'no-duplicate-imports': 'off',
+    'react/jsx-uses-react': 'error',
+    'react/jsx-uses-vars': 'error',
+    'react/prop-types': 'off',
+    'react-hooks/rules-of-hooks': 'error',
+    'react-hooks/exhaustive-deps': 'error',
+    camelcase: ['error', { allow: ['__export_format', '__export_date', '__export_source'] }],
+    'space-before-function-paren': [
+      'error',
+      {
+        anonymous: 'never',
+        named: 'never',
+        asyncArrow: 'always',
+      },
+    ],
+    'filenames/match-exported': [
+      'error',
+      'kebab',
+    ],
+    '@typescript-eslint/explicit-module-boundary-types': 'off',
+    'no-unused-vars': 'off',
+    '@typescript-eslint/no-unused-vars': ['error', { ignoreRestSiblings: true }],
+    '@typescript-eslint/ban-types': 'off',
+    '@typescript-eslint/no-empty-function': 'off',
+    '@typescript-eslint/no-namespace': ['error', { allowDeclarations: true }],
+    'spaced-comment': ['error', 'always', {
+      exceptions: ['/', '*', '-', '* '], // for ASCII art :)
+      markers: [
+        '/', // for TypeScript directives, doxygen, vsdoc, etc. (which use `///`)
+        '?', // for Quokka
+      ],
+    }],
+    '@typescript-eslint/array-type': ['error', { default: 'array', readonly: 'array' }],
+    '@typescript-eslint/consistent-type-definitions': ['error', 'interface'],
+    quotes: 'off',
+    '@typescript-eslint/quotes': ['error', 'single', { avoidEscape: true }],
+    'no-use-before-define': 'off',
+    '@typescript-eslint/no-use-before-define': 'error',
+    'no-redeclare': 'off',
+    '@typescript-eslint/no-redeclare': 'error',
+    semi: ['error', 'always'],
+    'react/no-find-dom-node': 'off',
+    'react/no-unescaped-entities': 'off', // TSCONVERSION
+    'react/jsx-first-prop-new-line': ['error', 'multiline'],
+    'react/jsx-max-props-per-line': ['error', { maximum: 1, when: 'multiline' }],
+  },
+};

.github/workflows/publish.yml

@@ -8,9 +8,24 @@ on:
         required: true
 
 jobs:
+  extract_channel:
+    name: Extract the release channel
+    runs-on: ubuntu-latest
+    steps:
+      - name: Extract release channel from tag
+        id: extract
+        run: |
+          if [[ ${{ github.event.inputs.tag }} =~ ^core@[0-9]{4}\.[0-9]+\.[0-9]+$ ]]; then
+            echo ::set-output name=channel::stable
+          fi
+    outputs:
+      channel: ${{ steps.extract.outputs.channel }}
+
   apt_repository:
     name: Publish to apt repository
     runs-on: ubuntu-latest
+    needs: extract_channel
+    if: needs.extract_channel.outputs.channel == 'stable'
 
     steps:
     - name: Download .deb from GitHub release

.github/workflows/release-core.yml

@@ -14,58 +14,108 @@ env:
   NPM_CONFIG_RUNTIME: electron
 
 jobs:
+  test:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: true
+      matrix:
+        os: [ macos-latest, windows-latest, ubuntu-latest ]
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v1
+      - name: Read Node version from .nvmrc
+        run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
+        id: nvm
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+      - name: Bootstrap packages
+        run: npm run bootstrap
+      - name: Run tests
+        run: npm test
+  npm:
+    needs: [ test ]
+    name: npm
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout branch
+        uses: actions/checkout@v1
+      - name: Read Node version from .nvmrc
+        run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
+        id: nvm
+      - uses: actions/setup-node@v1
+        with:
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+      - name: Bootstrap packages
+        run: npm run bootstrap
+      - name: Release NPM packages
+        run: |
+          npm config set //registry.npmjs.org/:_authToken ${NPM_TOKEN}
+          npm run release
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN}}
   Windows:
+    needs: [ npm ]
     name: Windows
     runs-on: windows-2016
     steps:
-      - uses: actions/checkout@v1
+      - name: Checkout branch
+        uses: actions/checkout@v1
       - name: Read Node version from .nvmrc
         run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
         id: nvm
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ steps.nvm.outputs.NVMRC }}
-      - run: npm run bootstrap
-      - run: npm run test:pre-release
-      - run: npm run app-release
+      - name: Bootstrap packages
+        run: npm run bootstrap
+      - name: Release app
+        run: npm run app-release
         env:
           CSC_LINK: ${{ secrets.CORE_WINDOWS_CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.CORE_WINDOWS_CSC_KEY_PASSWORD }}
   Mac:
+    needs: [ npm ]
     name: Mac
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v1
+      - name: Checkout branch
+        uses: actions/checkout@v1
       - name: Read Node version from .nvmrc
         run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
         id: nvm
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ steps.nvm.outputs.NVMRC }}
-      - run: npm run bootstrap
-      - run: npm run test:pre-release
-      - run: npm run app-release
+      - name: Bootstrap packages
+        run: npm run bootstrap
+      - name: Release app
+        run: npm run app-release
         env:
           APPLE_ID: ${{ secrets.DESIGNER_APPLE_ID }}
           APPLE_ID_PASSWORD: ${{ secrets.DESIGNER_APPLE_ID_PASSWORD }}
           CSC_LINK: ${{ secrets.DESIGNER_MAC_CSC_LINK }}
           CSC_KEY_PASSWORD: ${{ secrets.DESIGNER_MAC_CSC_KEY_PASSWORD }}
   Linux:
+    needs: [ npm ]
     name: Linux
     runs-on: ubuntu-latest
     steps:
-      - run: |
+      - name: Install Snapcraft
+        run: |
           sudo snap install snapcraft --classic
           echo "${{ secrets.SNAPCRAFT_LOGIN_FILE }}" > snapcraft.txt && snapcraft login --with snapcraft.txt
-      - uses: actions/checkout@v1
+      - name: Checkout branch
+        uses: actions/checkout@v1
       - name: Read Node version from .nvmrc
         run: echo "##[set-output name=NVMRC;]$(cat .nvmrc)"
         id: nvm
       - uses: actions/setup-node@v1
         with:
           node-version: ${{ steps.nvm.outputs.NVMRC }}
-      - run: npm run bootstrap
-      - run: npm run test:pre-release
-      - run: npm run app-release
+      - name: Bootstrap packages
+        run: npm run bootstrap
+      - name: Release app
+        run: npm run app-release
         env:
           BUILD_TARGETS: AppImage,deb,tar.gz,rpm,snap

.github/workflows/test.yml

@@ -28,6 +28,8 @@ jobs:
           node-version: ${{ steps.nvm.outputs.NVMRC }}
       - name: Bootstrap packages
         run: npm run bootstrap
+      - name: Lint
+        run: npm run lint
       - name: Run tests
         run: npm test
       - name: Build for smoke tests

.gitignore

@@ -29,3 +29,5 @@ graphql.config.json
 .graphqlconfig
 schema.graphql
 packages/insomnia-smoke-test/screenshots
+*.tsbuildinfo
+dist