Skip to content

Commit

Permalink
Merge branch 'main' of github.com:guardian/commercial-core into main
Browse files Browse the repository at this point in the history
  • Loading branch information
ioanna0 committed Feb 3, 2021
2 parents e67ed3c + 6c2531b commit 27b9b90
Show file tree
Hide file tree
Showing 29 changed files with 1,648 additions and 1,795 deletions.
14 changes: 11 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,20 +1,28 @@
; This file is for unifying the coding style for different editors and IDEs
; See editorconfig.org
# based on https://github.com/guardian/configs/blob/main/.editorconfig

; top-most EditorConfig file
root = true

[*]
# For [accessibility reasons](https://alexandersandberg.com/tabs-for-accessibility/)
indent_style = tab
indent_size = 4
end_of_line = lf
charset = utf-8
trim_trailing_whitespace = true
insert_final_newline = true

[package.json]
# `npm` autoformats `package.json` every time you install a new dependency.
indent_size = 2

# Because `yml`
[*.yml]
indent_style = space
indent_size = 4
indent_size = 2

[*.md]
# Using tabs to indent pre-formatted code in markdown makes the spacing too extreme
# when rendered on GitHub, so we revert back to spaces here.
indent_style = space
indent_size = 4
62 changes: 0 additions & 62 deletions .eslintrc

This file was deleted.

11 changes: 11 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"root": true,
"env": {
"jest": true,
"browser": true,
"node": true
},
"extends": ["@guardian/eslint-config-typescript"],
"globals": { "googletag": "readonly" },
"ignorePatterns": ["dist", "coverage", "src/__vendor"]
}
16 changes: 8 additions & 8 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@

version: 2
updates:
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'weekly'
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'weekly'
- package-ecosystem: 'npm'
directory: '/'
schedule:
interval: 'weekly'
- package-ecosystem: 'github-actions'
directory: '/'
schedule:
interval: 'weekly'
22 changes: 11 additions & 11 deletions .github/workflows/CD.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: 'Lint PR'
on:
pull_request_target:
types:
- opened
- edited
- synchronize
pull_request_target:
types:
- opened
- edited
- synchronize

jobs:
semantic-release:
runs-on: ubuntu-latest
steps:
- uses: amannn/action-semantic-pull-request@v1.2.0
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
semantic-release:
runs-on: ubuntu-latest
steps:
- uses: amannn/action-semantic-pull-request@v3.2.3
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
Loading

0 comments on commit 27b9b90

Please sign in to comment.