Skip to content

Commit 141182a

Browse files
authored
Merge pull request #541 from citation-file-format/519-homogenize-imports
2 parents a6cf6ca + f92086c commit 141182a

26 files changed

Lines changed: 83 additions & 75 deletions

.eslintrc.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,16 @@ module.exports = {
103103
'import/no-unresolved': 'off',
104104
'import/no-extraneous-dependencies': 'off',
105105
'prefer-promise-reject-errors': 'off',
106+
'no-restricted-imports': ['error', {
107+
'patterns': ['.*']
108+
}],
109+
'sort-imports': ['error', {
110+
'ignoreCase': false,
111+
'ignoreDeclarationSort': false,
112+
'ignoreMemberSort': false,
113+
'memberSyntaxSortOrder': ['none', 'all', 'multiple', 'single'],
114+
'allowSeparatedGroups': false
115+
}],
106116

107117
// TypeScript
108118
quotes: ['warn', 'single', { avoidEscape: true }],

src/components/AuthorCardEditing.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,11 @@
187187
</template>
188188

189189
<script lang="ts">
190-
import { computed, defineComponent, onUpdated } from 'vue'
191-
import SchemaGuideLink from './SchemaGuideLink.vue'
192-
import { useValidation } from 'src/store/validation'
193190
import { byError, emailQueries, orcidQueries } from 'src/error-filtering'
191+
import { computed, defineComponent, onUpdated } from 'vue'
192+
import SchemaGuideLink from 'src/components/SchemaGuideLink.vue'
194193
import { useStepperErrors } from 'src/store/stepper-errors'
194+
import { useValidation } from 'src/store/validation'
195195
196196
export default defineComponent({
197197
name: 'AuthorCardEditing',

src/components/AuthorCardViewing.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@
4343
</template>
4444

4545
<script lang="ts">
46-
import { computed, defineComponent, onUpdated, PropType } from 'vue'
46+
import { PropType, computed, defineComponent, onUpdated } from 'vue'
47+
import { byError, emailQueries, orcidQueries } from 'src/error-filtering'
4748
import { AuthorType } from 'src/types'
4849
import { useStepperErrors } from 'src/store/stepper-errors'
4950
import { useValidation } from 'src/store/validation'
50-
import { byError, emailQueries, orcidQueries } from 'src/error-filtering'
5151
5252
export default defineComponent({
5353
name: 'AuthorCardViewing',

src/components/DownloadButton.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</template>
1313

1414
<script lang="ts">
15-
import { defineComponent, computed } from 'vue'
15+
import { computed, defineComponent } from 'vue'
1616
import { useCffstr } from 'src/store/cffstr'
1717
1818
const toDownloadUrl = (body: string) => {

src/components/IdentifierCardEditing.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@
8989
</template>
9090

9191
<script lang="ts">
92-
import { IdentifierTypeType } from '../types'
93-
import { computed, defineComponent, PropType } from 'vue'
94-
import SchemaGuideLink from 'src/components/SchemaGuideLink.vue'
92+
import { PropType, computed, defineComponent } from 'vue'
9593
import { byError, identifierValueQueries } from 'src/error-filtering'
94+
import { IdentifierTypeType } from 'src/types'
95+
import SchemaGuideLink from 'src/components/SchemaGuideLink.vue'
9696
import { useValidation } from 'src/store/validation'
9797
9898
export default defineComponent({

src/components/IdentifierCardViewing.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
</template>
4343

4444
<script lang="ts">
45-
import { computed, defineComponent, PropType } from 'vue'
45+
import { PropType, computed, defineComponent } from 'vue'
46+
import { byError, identifierValueQueries } from 'src/error-filtering'
4647
import { IdentifierType } from 'src/types'
4748
import { useValidation } from 'src/store/validation'
48-
import { byError, identifierValueQueries } from 'src/error-filtering'
4949
5050
export default defineComponent({
5151
name: 'IdentifierCardViewing',

src/components/Keyword.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@
4444
</template>
4545

4646
<script lang="ts">
47+
import { byError, keywordQueries } from 'src/error-filtering'
4748
import { computed, defineComponent } from 'vue'
4849
import { useValidation } from 'src/store/validation'
49-
import { byError, keywordQueries } from 'src/error-filtering'
5050
5151
export default defineComponent({
5252
name: 'Keyword',

src/components/LayoutStepper.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@
3030
</template>
3131

3232
<script lang="ts">
33-
import Header from 'components/Header.vue'
34-
import Preview from 'components/Preview.vue'
33+
import { computed, defineComponent } from 'vue'
3534
import DownloadButton from 'components/DownloadButton.vue'
3635
import Footer from 'components/Footer.vue'
37-
import { defineComponent, computed } from 'vue'
36+
import Header from 'components/Header.vue'
37+
import Preview from 'components/Preview.vue'
3838
import { useRoute } from 'vue-router'
3939
4040
export default defineComponent({

src/components/ScreenAbstract.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ import SchemaGuideLink from 'components/SchemaGuideLink.vue'
3939
import Stepper from 'components/Stepper.vue'
4040
import StepperActions from 'components/StepperActions.vue'
4141
import { defineComponent } from 'vue'
42-
import { useCff } from '../store/cff'
42+
import { useCff } from 'src/store/cff'
4343
4444
export default defineComponent({
4545
name: 'ScreenAbstract',

src/components/ScreenAuthors.vue

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,19 +75,19 @@
7575
</template>
7676

7777
<script lang="ts">
78+
import { authorsQueries, byError } from 'src/error-filtering'
7879
import { computed, defineComponent, nextTick, onUpdated, ref } from 'vue'
79-
import SchemaGuideLink from 'components/SchemaGuideLink.vue'
80-
import Stepper from 'components/Stepper.vue'
81-
import StepperActions from 'components/StepperActions.vue'
80+
import { moveDown, moveUp } from 'src/updown'
8281
import AuthorCardEditing from 'components/AuthorCardEditing.vue'
8382
import AuthorCardViewing from 'components/AuthorCardViewing.vue'
8483
import { AuthorType } from 'src/types'
85-
import { moveDown, moveUp } from '../updown'
84+
import SchemaGuideLink from 'components/SchemaGuideLink.vue'
85+
import Stepper from 'components/Stepper.vue'
86+
import StepperActions from 'components/StepperActions.vue'
87+
import { scrollToBottom } from 'src/scroll-to-bottom'
8688
import { useCff } from 'src/store/cff'
87-
import { scrollToBottom } from '../scroll-to-bottom'
88-
import { useValidation } from 'src/store/validation'
89-
import { byError, authorsQueries } from 'src/error-filtering'
9089
import { useStepperErrors } from 'src/store/stepper-errors'
90+
import { useValidation } from 'src/store/validation'
9191
9292
export default defineComponent({
9393
name: 'ScreenAuthors',

0 commit comments

Comments
 (0)