Skip to content

Commit 8757ec8

Browse files
committed
fix publishing issues
1 parent b30846e commit 8757ec8

10 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎.travis.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,37 +18,37 @@ script:
1818
sudo: false
1919
env:
2020
matrix:
21-
- 'TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb-base'
22-
- 'TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb'
23-
- 'TEST=true ESLINT=4 PACKAGE=eslint-config-airbnb-base'
24-
- 'TEST=true ESLINT=4 PACKAGE=eslint-config-airbnb'
21+
- 'TEST=true ESLINT=5 PACKAGE=eslint-config-dina-base'
22+
- 'TEST=true ESLINT=5 PACKAGE=eslint-config-dina'
23+
- 'TEST=true ESLINT=4 PACKAGE=eslint-config-dina-base'
24+
- 'TEST=true ESLINT=4 PACKAGE=eslint-config-dina'
2525
matrix:
2626
fast_finish: true
2727
include:
2828
- node_js: "lts/*"
29-
env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
29+
env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-dina-base
3030
- node_js: "lts/*"
31-
env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb
31+
env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-dina
3232
- node_js: "lts/*"
33-
env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb-base
33+
env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-dina-base
3434
- node_js: "lts/*"
35-
env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb
35+
env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-dina
3636
- node_js: "lts/*"
3737
env: LINT=true
3838
exclude:
3939
- node_js: "5"
40-
env: TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
40+
env: TEST=true ESLINT=5 PACKAGE=eslint-config-dina-base
4141
- node_js: "5"
42-
env: TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb
42+
env: TEST=true ESLINT=5 PACKAGE=eslint-config-dina
4343
- node_js: "4"
44-
env: TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
44+
env: TEST=true ESLINT=5 PACKAGE=eslint-config-dina-base
4545
- node_js: "4"
46-
env: TEST=true ESLINT=5 PACKAGE=eslint-config-airbnb
46+
env: TEST=true ESLINT=5 PACKAGE=eslint-config-dina
4747
allow_failures:
4848
- node_js: "9"
4949
- node_js: "7"
5050
- node_js: "5"
51-
- env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb-base
52-
- env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-airbnb
53-
- env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb-base
54-
- env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-airbnb
51+
- env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-dina-base
52+
- env: PREPUBLISH=true ESLINT=5 PACKAGE=eslint-config-dina
53+
- env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-dina-base
54+
- env: PREPUBLISH=true ESLINT=4 PACKAGE=eslint-config-dina
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"presets": ["dina"]
2+
"presets": ["airbnb"]
33
}

‎packages/eslint-config-dina-base/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-config-dina-base",
3-
"version": "13.1.0",
3+
"version": "1.0.0",
44
"description": "Digital Natives' base JS ESLint config, following our styleguide",
55
"main": "index.js",
66
"scripts": {

‎packages/eslint-config-dina-base/rules/imports.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ module.exports = {
152152
// Require modules with a single export to use a default export
153153
// https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/prefer-default-export.md
154154
'import/prefer-default-export': 'off',
155+
'import/no-named-export': 'off',
155156

156157
// Restrict which files can be imported in a given folder
157158
// https://github.com/benmosher/eslint-plugin-import/blob/master/docs/rules/no-restricted-paths.md
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
"presets": ["dina"]
2+
"presets": ["airbnb"]
33
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module.exports = {
2-
extends: ['eslint-config-airbnb-base'].map(require.resolve),
2+
extends: ['eslint-config-dina-base'].map(require.resolve),
33
rules: {},
44
};
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
module.exports = {
2-
extends: ['eslint-config-airbnb-base/legacy'].map(require.resolve),
2+
extends: ['eslint-config-dina-base/legacy'].map(require.resolve),
33
rules: {},
44
};

‎packages/eslint-config-dina/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "eslint-config-dina",
3-
"version": "17.1.0",
3+
"version": "1.0.0",
44
"description": "Digital Natives' ESLint config, following our styleguide",
55
"main": "index.js",
66
"scripts": {
@@ -55,7 +55,7 @@
5555
},
5656
"homepage": "https://github.com/digitalnatives/javascript",
5757
"dependencies": {
58-
"eslint-config-dina-base": "^13.1.0",
58+
"eslint-config-dina-base": "^1.0.0",
5959
"object.assign": "^4.1.0",
6060
"object.entries": "^1.0.4"
6161
},

‎packages/eslint-config-dina/rules/react-a11y.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,5 +206,7 @@ module.exports = {
206206
specialLink: ['to'],
207207
aspects: ['noHref', 'invalidHref', 'preferButton'],
208208
}],
209+
210+
'jsx-a11y/control-has-associated-label': 'off'
209211
},
210212
};

‎packages/eslint-config-dina/rules/react.js‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,10 +417,6 @@ module.exports = {
417417
// https://github.com/yannickcr/eslint-plugin-react/blob/843d71a432baf0f01f598d7cf1eea75ad6896e4b/docs/rules/jsx-one-expression-per-line.md
418418
'react/jsx-one-expression-per-line': ['error', { allow: 'single-child' }],
419419

420-
// Enforce consistent usage of destructuring assignment of props, state, and context
421-
// https://github.com/yannickcr/eslint-plugin-react/blob/843d71a432baf0f01f598d7cf1eea75ad6896e4b/docs/rules/destructuring-assignment.md
422-
'react/destructuring-assignment': ['error', 'always'],
423-
424420
// Prevent using this.state within a this.setState
425421
// https://github.com/yannickcr/eslint-plugin-react/blob/843d71a432baf0f01f598d7cf1eea75ad6896e4b/docs/rules/no-access-state-in-setstate.md
426422
'react/no-access-state-in-setstate': 'error',
@@ -452,6 +448,7 @@ module.exports = {
452448
// https://github.com/yannickcr/eslint-plugin-react/blob/157cc932be2cfaa56b3f5b45df6f6d4322a2f660/docs/rules/no-unsafe.md
453449
'react/no-unsafe': 'off',
454450
'react/destructuring-assignment': 'off',
451+
'react/jsx-fragments': 'off'
455452
},
456453

457454
settings: {

0 commit comments

Comments
 (0)