Skip to content
This repository has been archived by the owner on Mar 31, 2021. It is now read-only.

Commit

Permalink
fix: upgrade to Foundry 4
Browse files Browse the repository at this point in the history
  • Loading branch information
connor-baer committed Dec 2, 2020
1 parent 334e765 commit 0964ba0
Show file tree
Hide file tree
Showing 8 changed files with 527 additions and 548 deletions.
14 changes: 14 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -1 +1,15 @@
node_modules/
build/
dist/
.next/
.out/
static/
public/
coverage/
__coverage__/
__reports__/
/*.config.js
/*rc.js
plopfile.js

template/src/.eslintrc.js
20 changes: 20 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
/**
* Copyright 2020, SumUp Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/

module.exports = require('@sumup/foundry/eslint')(
{
language: 'JavaScript',
Expand All @@ -6,6 +21,11 @@ module.exports = require('@sumup/foundry/eslint')(
openSource: true,
},
{
settings: {
jest: {
version: 26,
},
},
rules: {
'react/jsx-uses-react': 'off',
'react/react-in-jsx-scope': 'off',
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
npm install -g yarn
yarn --pure-lockfile
- name: Lint
run: yarn lint
run: yarn lint:ci

licences:
runs-on: ubuntu-latest
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
node_modules/
package.json
2 changes: 1 addition & 1 deletion .releaserc.js
Original file line number Diff line number Diff line change
@@ -1 +1 @@
module.exports = require('@sumup/foundry/semantic-release').modules;
module.exports = require('@sumup/foundry/semantic-release')({ publish: true });
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,16 @@
"description": "Creates a ready for development React app using create-react-app.",
"repository": "github:sumup/create-sumup-react-app",
"scripts": {
"lint": "foundry run eslint \"./**/*.js\"",
"release": "semantic-release",
"check:licenses": "license-checker --production --summary --failOn=GPLv3"
"lint": "foundry run eslint . --ext .js,.jsx,.ts,.tsx",
"lint:fix": "yarn lint --fix",
"lint:ci": "yarn lint --format junit -o __reports__/eslint-results.xml",
"check:licenses": "license-checker --production --summary --failOn=GPLv3",
"release": "semantic-release"
},
"author": "Felix Jung <[email protected]>",
"license": "Apache-2.0",
"dependencies": {
"@sumup/foundry": "^2.2.0"
"@sumup/foundry": "^4.0.0-canary"
},
"devDependencies": {
"license-checker": "^25.0.1"
Expand Down
8 changes: 5 additions & 3 deletions template.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,20 @@
"@sumup/circuit-ui": "^2.2.5",
"@sumup/collector": "^1.0.4",
"@sumup/design-tokens": "^2.1.0",
"@sumup/foundry": "^4.0.0-canary.1",
"@sumup/icons": "^1.3.1",
"@sumup/intl": "^1.1.3",
"@emotion/core": "^10.1.1",
"emotion-theming": "^10.0.0",
"@emotion/styled": "^10.0.0",
"web-vitals": "^1.0.1"
},
"devDependencies": {
"@sumup/foundry": "^4.0.0-canary",
"jest-axe": "^3.1.1",
"jest-emotion": "^10.0.27",
"jest-watch-typeahead": "^0.6.1",
"@testing-library/react": "^11.2.2",
"@testing-library/jest-dom": "^5.11.6",
"web-vitals": "^1.0.1"
"@testing-library/jest-dom": "^5.11.6"
},
"scripts": {
"postinstall": "yarn run foundry init"
Expand Down
Loading

0 comments on commit 0964ba0

Please sign in to comment.