From 890e148827c37e1ece7897bfb97d0561babe6b62 Mon Sep 17 00:00:00 2001 From: Adam Marcinkowski Date: Tue, 19 Oct 2021 10:38:53 +0200 Subject: [PATCH] chore: upgrade eslint config and fix issues (#29) --- example/.eslintrc.js | 5 +--- example/components/Logo.vue | 2 +- example/package.json | 2 +- example/yarn.lock | 8 ++--- packages/nuxt-typo3-ce/package.json | 2 +- packages/nuxt-typo3-ce/src/App.vue | 4 +-- .../src/components/CeBullets/CeBullets.vue | 2 +- .../components/CeDynamic/CeDynamic.spec.js | 2 +- .../src/components/CeDynamic/CeDynamic.vue | 2 +- .../components/CeRenderer/CeRenderer.data.ts | 4 +-- .../components/CeRenderer/CeRenderer.spec.js | 8 ++--- .../components/CeShortcut/CeShortcut.spec.js | 2 +- .../components/CeUploads/CeUploads.spec.js | 6 ++-- packages/nuxt-typo3-theme/package.json | 2 +- .../src/components/CeDiv/CeDiv.vue | 4 +-- .../src/components/CeGallery/CeGallery.vue | 2 +- .../components/CeMenuPages/CeMenuPages.vue | 30 +++++++++---------- .../src/components/CeText/CeText.data.ts | 2 +- .../components/CeUploads/CeUploads.spec.js | 2 +- .../UiBreadcrumbsList/UiBreadcrumbsList.vue | 2 +- .../src/components/UiButton/UiButton.vue | 2 +- .../components/UiErrorPage/UiErrorPage.vue | 2 +- .../components/UiFilesList/UiFilesList.vue | 4 +-- .../src/components/UiFrame/UiFrame.spec.js | 4 +-- .../UiGrid/UiContainer/UiContainer.vue | 4 +-- .../src/components/UiGrid/UiRow/UiRow.vue | 4 +-- .../src/components/UiGrid/shared/_grid.scss | 4 +-- .../src/components/UiHero/UiHero.vue | 2 +- .../src/components/UiLayer/UiLayer.vue | 2 +- .../src/components/UiLayout/UiLayout.vue | 2 +- .../components/UiLinksList/UiLinksList.vue | 5 ++-- .../src/components/UiNavbar/UiNavbar.vue | 2 +- .../UiNavigationLanguage.vue | 2 +- .../UiNews/UiNewsDetail/UiNewsDetail.data.ts | 4 +-- .../UiNews/UiNewsElement/UiNewsElement.vue | 6 ++-- .../UiNews/UiNewsImage/UiNewsImage.vue | 2 +- .../UiNews/UiNewsList/UiNewsList.vue | 2 +- .../components/UiPagination/UiPagination.vue | 10 +++---- packages/nuxt-typo3-theme/src/nuxt/module.ts | 1 - .../nuxt-typo3-theme/src/styles/core.scss | 2 +- .../nuxt-typo3-theme/src/styles/utils.scss | 10 +++---- yarn.lock | 9 +++--- 42 files changed, 87 insertions(+), 91 deletions(-) diff --git a/example/.eslintrc.js b/example/.eslintrc.js index 151f483..bc982cf 100644 --- a/example/.eslintrc.js +++ b/example/.eslintrc.js @@ -4,9 +4,6 @@ module.exports = { browser: true, node: true }, - rules: { - 'prettierx/options': ['error', { semi: false }] - }, - extends: ['macopedia/vue'] + extends: ['macopedia/nuxt'] // add your custom rules here } diff --git a/example/components/Logo.vue b/example/components/Logo.vue index 6978456..179281b 100644 --- a/example/components/Logo.vue +++ b/example/components/Logo.vue @@ -1,3 +1,3 @@ diff --git a/example/package.json b/example/package.json index a5d0167..84ad8a4 100644 --- a/example/package.json +++ b/example/package.json @@ -22,7 +22,7 @@ "@nuxtjs/stylelint-module": "^3.1.0", "babel-eslint": "^10.0.1", "eslint": "^7.20.0", - "eslint-config-macopedia": "^0.2.0", + "eslint-config-macopedia": "^0.2.0-alpha.1", "eslint-plugin-nuxt": ">=0.4.2", "sass": "^1.42.1", "sass-loader": "10", diff --git a/example/yarn.lock b/example/yarn.lock index 4855c3e..c4957ff 100644 --- a/example/yarn.lock +++ b/example/yarn.lock @@ -4965,10 +4965,10 @@ eslint-config-airbnb-base@^14.2.1: object.assign "^4.1.2" object.entries "^1.1.2" -eslint-config-macopedia@^0.2.0: - version "0.2.0" - resolved "https://registry.yarnpkg.com/eslint-config-macopedia/-/eslint-config-macopedia-0.2.0.tgz#7ec68c8b677f55c41001c575702a1603924de193" - integrity sha512-Wa2gHBCbVwG6C2wCNm2/i70bnMXMmk7pAyB7ldCBAYOGxd4cFzu3QpwjKZCsF3X7lmSbXOjjmjLslRwetPe5qg== +eslint-config-macopedia@^0.2.0-alpha.1: + version "0.2.0-alpha.1" + resolved "https://registry.yarnpkg.com/eslint-config-macopedia/-/eslint-config-macopedia-0.2.0-alpha.1.tgz#3879d5631aaaa062d64df6b5c26d385563f70abb" + integrity sha512-azY25FN0OfbZArZ2xMYKGQD6HCQlvLqMd849ARwBsOzqQUpOYmd7X6Lj0+Ro70OqrkfWsgga3ZX0JzzZMBXbRQ== dependencies: "@nuxtjs/eslint-config" "^5.0.0" "@nuxtjs/eslint-config-typescript" "^5.0.0" diff --git a/packages/nuxt-typo3-ce/package.json b/packages/nuxt-typo3-ce/package.json index edb77a3..f55bc62 100644 --- a/packages/nuxt-typo3-ce/package.json +++ b/packages/nuxt-typo3-ce/package.json @@ -34,7 +34,7 @@ "babel-loader": "^8.1.0", "babel-plugin-transform-require-context": "^0.1.1", "eslint": "^7.10.0", - "eslint-config-macopedia": "^0.1.0", + "eslint-config-macopedia": "^0.2.0-alpha.1", "flush-promises": "^1.0.2", "fork-ts-checker-webpack-plugin": "^5.2.0", "nuxt-typo3": "^0.9.3", diff --git a/packages/nuxt-typo3-ce/src/App.vue b/packages/nuxt-typo3-ce/src/App.vue index b70c339..79e1ecc 100644 --- a/packages/nuxt-typo3-ce/src/App.vue +++ b/packages/nuxt-typo3-ce/src/App.vue @@ -14,10 +14,10 @@ export default { diff --git a/packages/nuxt-typo3-ce/src/components/CeBullets/CeBullets.vue b/packages/nuxt-typo3-ce/src/components/CeBullets/CeBullets.vue index d89bb5b..938beed 100644 --- a/packages/nuxt-typo3-ce/src/components/CeBullets/CeBullets.vue +++ b/packages/nuxt-typo3-ce/src/components/CeBullets/CeBullets.vue @@ -36,7 +36,7 @@ export default defineComponent({ bulletsType: { type: Number, default: 0 - }, + } }, setup (props: CeSharedProps) { const sharedProps = getSharedProps(props) diff --git a/packages/nuxt-typo3-ce/src/components/CeDynamic/CeDynamic.spec.js b/packages/nuxt-typo3-ce/src/components/CeDynamic/CeDynamic.spec.js index b2a23e2..8af7652 100644 --- a/packages/nuxt-typo3-ce/src/components/CeDynamic/CeDynamic.spec.js +++ b/packages/nuxt-typo3-ce/src/components/CeDynamic/CeDynamic.spec.js @@ -6,7 +6,7 @@ import CeDynamic from './CeDynamic.vue' const CeTextMock = { name: 'CeText', props: ['id', 'header', 'bodytext'], - template: `

{{header}}

{{bodytext}}
` + template: '

{{header}}

{{bodytext}}
' } describe('CeDynamic', () => { diff --git a/packages/nuxt-typo3-ce/src/components/CeDynamic/CeDynamic.vue b/packages/nuxt-typo3-ce/src/components/CeDynamic/CeDynamic.vue index dd2225a..1b10239 100644 --- a/packages/nuxt-typo3-ce/src/components/CeDynamic/CeDynamic.vue +++ b/packages/nuxt-typo3-ce/src/components/CeDynamic/CeDynamic.vue @@ -47,7 +47,7 @@ export default defineComponent({ this.$root.$options.components && !this.$root.$options.components[componentName] ) { - componentName = `CeDefault` + componentName = 'CeDefault' } return createElement(componentName, { diff --git a/packages/nuxt-typo3-ce/src/components/CeRenderer/CeRenderer.data.ts b/packages/nuxt-typo3-ce/src/components/CeRenderer/CeRenderer.data.ts index c3ca510..b7e8a44 100644 --- a/packages/nuxt-typo3-ce/src/components/CeRenderer/CeRenderer.data.ts +++ b/packages/nuxt-typo3-ce/src/components/CeRenderer/CeRenderer.data.ts @@ -63,9 +63,9 @@ export const CeRendererMockData = { padding: 0 }, rows: { - '1': { + 1: { columns: { - '1': { + 1: { publicUrl: 'https://image.jpg', properties: { title: null, diff --git a/packages/nuxt-typo3-ce/src/components/CeRenderer/CeRenderer.spec.js b/packages/nuxt-typo3-ce/src/components/CeRenderer/CeRenderer.spec.js index 8732dd6..03a8135 100644 --- a/packages/nuxt-typo3-ce/src/components/CeRenderer/CeRenderer.spec.js +++ b/packages/nuxt-typo3-ce/src/components/CeRenderer/CeRenderer.spec.js @@ -7,7 +7,7 @@ import CeDynamic from '../CeDynamic' // Mock CeDynamic const CeDynamicMock = { props: ['data', 'type', 'index'], - template: `
{{JSON.stringify($props)}}
` + template: '
{{JSON.stringify($props)}}
' } // Mock CeFrame @@ -17,7 +17,7 @@ const CeFrameMock = { const CeDefault = { props: ['data', 'type', 'index'], - template: `
{{JSON.stringify($props)}}
` + template: '
{{JSON.stringify($props)}}
' } describe('CeRenderer with mocked components', () => { @@ -29,7 +29,7 @@ describe('CeRenderer with mocked components', () => { const wrappedRenderer = { inheritAttrs: false, components: { CeRenderer }, - template: `
` + template: '
' } const prepareFrame = { @@ -83,7 +83,7 @@ describe('CeRenderer with true components', () => { const wrappedRenderer = { inheritAttrs: false, components: { CeRenderer }, - template: `
` + template: '
' } const prepareFrame = { diff --git a/packages/nuxt-typo3-ce/src/components/CeShortcut/CeShortcut.spec.js b/packages/nuxt-typo3-ce/src/components/CeShortcut/CeShortcut.spec.js index e2ad100..b3ec3a5 100644 --- a/packages/nuxt-typo3-ce/src/components/CeShortcut/CeShortcut.spec.js +++ b/packages/nuxt-typo3-ce/src/components/CeShortcut/CeShortcut.spec.js @@ -6,7 +6,7 @@ import CeRenderer from '../CeRenderer' // Mock CeDynamic const CeDynamicMock = { props: ['data', 'type', 'index'], - template: `
{{JSON.stringify($props)}}
` + template: '
{{JSON.stringify($props)}}
' } // Mock CeFrame diff --git a/packages/nuxt-typo3-ce/src/components/CeUploads/CeUploads.spec.js b/packages/nuxt-typo3-ce/src/components/CeUploads/CeUploads.spec.js index defa686..7ab25b0 100644 --- a/packages/nuxt-typo3-ce/src/components/CeUploads/CeUploads.spec.js +++ b/packages/nuxt-typo3-ce/src/components/CeUploads/CeUploads.spec.js @@ -4,11 +4,11 @@ import { mockData } from './CeUploads.data' import CeUploads from './CeUploads.vue' const CeHeaderMock = Vue.component('CeHeader', { - template: `
hello
` + template: '
hello
' }) const NavLinkMock = Vue.component('NavLink', { - template: `
` + template: '
' }) const CeMediaFileMock = Vue.component('CeMediaFile', { @@ -18,7 +18,7 @@ const CeMediaFileMock = Vue.component('CeMediaFile', { required: true } }, - template: `` + template: '' }) describe('CeUploads', () => { diff --git a/packages/nuxt-typo3-theme/package.json b/packages/nuxt-typo3-theme/package.json index ca73dfd..cdc5de9 100644 --- a/packages/nuxt-typo3-theme/package.json +++ b/packages/nuxt-typo3-theme/package.json @@ -59,7 +59,7 @@ "babel-plugin-transform-require-context": "^0.1.1", "cross-env": "^7.0.3", "eslint": "^7.10.0", - "eslint-config-macopedia": "^0.1.0", + "eslint-config-macopedia": "^0.2.0-alpha.1", "eslint-plugin-vuejs-accessibility": "^0.6.1", "flush-promises": "^1.0.2", "fork-ts-checker-webpack-plugin": "^5.2.0", diff --git a/packages/nuxt-typo3-theme/src/components/CeDiv/CeDiv.vue b/packages/nuxt-typo3-theme/src/components/CeDiv/CeDiv.vue index 6de8a2e..13679e2 100644 --- a/packages/nuxt-typo3-theme/src/components/CeDiv/CeDiv.vue +++ b/packages/nuxt-typo3-theme/src/components/CeDiv/CeDiv.vue @@ -32,10 +32,10 @@ $divider-color-layout-1: $palette-gallery; } .ce-div { - height: 1px; display: block; - border: none; + height: 1px; background: var(--color-divider); + border: none; &--layout-1 { background: var(--color-divider-layout-1); diff --git a/packages/nuxt-typo3-theme/src/components/CeGallery/CeGallery.vue b/packages/nuxt-typo3-theme/src/components/CeGallery/CeGallery.vue index 121cfda..f92d0f7 100644 --- a/packages/nuxt-typo3-theme/src/components/CeGallery/CeGallery.vue +++ b/packages/nuxt-typo3-theme/src/components/CeGallery/CeGallery.vue @@ -167,8 +167,8 @@ export default CeGalleryTheme as typeof CeGallery & typeof CeGalleryTheme } figcaption { - font-weight: var(--font-weight-medium); margin-bottom: var(--space-3); + font-weight: var(--font-weight-medium); text-align: left; } } diff --git a/packages/nuxt-typo3-theme/src/components/CeMenuPages/CeMenuPages.vue b/packages/nuxt-typo3-theme/src/components/CeMenuPages/CeMenuPages.vue index 71e9004..fe1ed45 100644 --- a/packages/nuxt-typo3-theme/src/components/CeMenuPages/CeMenuPages.vue +++ b/packages/nuxt-typo3-theme/src/components/CeMenuPages/CeMenuPages.vue @@ -29,8 +29,8 @@ $color-menu-pages: $palette-mercury; .ce-menu-pages { ul { - background: var(--color-menu-pages); font-size: var(--font-size-lg); + background: var(--color-menu-pages); @include media-query(md) { display: flex; @@ -38,20 +38,20 @@ $color-menu-pages: $palette-mercury; } li { - padding: var(--space-4) var(--space-4); position: relative; + padding: var(--space-4) var(--space-4); ul { top: 100%; + display: none; min-width: 100%; - border-top: 1px solid var(--color-bg-secondary); margin-top: var(--space-4); margin-bottom: -1.6rem; - display: none; + border-top: 1px solid var(--color-bg-secondary); @include media-query(md) { - margin-top: 0; position: absolute; + margin-top: 0; } li { @@ -74,38 +74,38 @@ $color-menu-pages: $palette-mercury; margin-right: 1rem; &::after { - content: ''; position: absolute; top: 50%; - transform: translateY(-50%); display: block; - background-size: cover; margin-top: 0.1rem; + background-size: cover; + transform: translateY(-50%); + content: ''; } } &[target='_blank']::after { - background-image: url('../../assets/icons/externalLink.svg'); + right: -1.8rem; width: 1rem; height: 1rem; - right: -1.8rem; + background-image: url('../../assets/icons/externalLink.svg'); } &.has-children::after { - background-image: url('../../assets/icons/chevron.svg'); + right: -2.5rem; width: 1.7rem; height: 1.1rem; - right: -2.5rem; + background-image: url('../../assets/icons/chevron.svg'); } } &::before { position: static; - content: '\25CF'; + margin-right: 1em; + color: currentColor; font-size: 0.5em; vertical-align: middle; - color: currentColor; - margin-right: 1em; + content: '\25CF'; } } } diff --git a/packages/nuxt-typo3-theme/src/components/CeText/CeText.data.ts b/packages/nuxt-typo3-theme/src/components/CeText/CeText.data.ts index 86bd097..751817d 100644 --- a/packages/nuxt-typo3-theme/src/components/CeText/CeText.data.ts +++ b/packages/nuxt-typo3-theme/src/components/CeText/CeText.data.ts @@ -3,6 +3,6 @@ export const mockData = { subheader: 'Subheader', headerLayout: 3, bodytext: `

Lorem ipsum Unta Dolor sit amet. Sapiente minima veritatis consequuntur perspiciatis. Consectetur adipisicing elit. Sapiente minima veritatis consequuntur perspiciatis.

- + ` } diff --git a/packages/nuxt-typo3-theme/src/components/CeUploads/CeUploads.spec.js b/packages/nuxt-typo3-theme/src/components/CeUploads/CeUploads.spec.js index bbd845a..8f7b327 100644 --- a/packages/nuxt-typo3-theme/src/components/CeUploads/CeUploads.spec.js +++ b/packages/nuxt-typo3-theme/src/components/CeUploads/CeUploads.spec.js @@ -5,7 +5,7 @@ import { mockData } from './CeUploads.data' import CeUploads from './CeUploads.vue' Vue.use(VueCompositionApi) const CeHeaderMock = Vue.component('CeHeader', { - template: `
hello
` + template: '
hello
' }) describe('CeUploads', () => { diff --git a/packages/nuxt-typo3-theme/src/components/UiBreadcrumbsList/UiBreadcrumbsList.vue b/packages/nuxt-typo3-theme/src/components/UiBreadcrumbsList/UiBreadcrumbsList.vue index 7c483fd..37ea1f6 100644 --- a/packages/nuxt-typo3-theme/src/components/UiBreadcrumbsList/UiBreadcrumbsList.vue +++ b/packages/nuxt-typo3-theme/src/components/UiBreadcrumbsList/UiBreadcrumbsList.vue @@ -38,9 +38,9 @@ export default defineComponent({ diff --git a/packages/nuxt-typo3-theme/src/components/UiLayout/UiLayout.vue b/packages/nuxt-typo3-theme/src/components/UiLayout/UiLayout.vue index 6002776..3fed5c1 100644 --- a/packages/nuxt-typo3-theme/src/components/UiLayout/UiLayout.vue +++ b/packages/nuxt-typo3-theme/src/components/UiLayout/UiLayout.vue @@ -18,9 +18,9 @@ export default defineComponent({ diff --git a/packages/nuxt-typo3-theme/src/components/UiNews/UiNewsList/UiNewsList.vue b/packages/nuxt-typo3-theme/src/components/UiNews/UiNewsList/UiNewsList.vue index 075a330..f822d24 100644 --- a/packages/nuxt-typo3-theme/src/components/UiNews/UiNewsList/UiNewsList.vue +++ b/packages/nuxt-typo3-theme/src/components/UiNews/UiNewsList/UiNewsList.vue @@ -33,10 +33,10 @@ export default defineComponent({