chore: giving a try with prettier-plugin-sort-imports

json-schema-form-element · Dec 27, 2023 · 27bf8e8 · 27bf8e8
1 parent e751828
commit 27bf8e8
Show file tree

Hide file tree

Showing 5 changed files with 434 additions and 55 deletions.
diff --git a/.prettierrc.yaml b/.prettierrc.yaml
@@ -6,3 +6,13 @@ overrides:
   - files: ['*.json', '*.yaml']
     options:
       useTabs: false
+
+plugins:
+  - '@trivago/prettier-plugin-sort-imports'
+
+# importOrder: ['^@core/(.*)$', '^@server/(.*)$', '^@ui/(.*)$', '^[./]']
+# TODO: better custom ordering
+importOrder: ['^lit(.*)$', '^@jsfe/(.*)$', '^@(.*)$', '^[./]']
+importOrderSeparation: true
+importOrderSortSpecifiers: true
+importOrderParserPlugins: ['typescript', 'decorators-legacy']
diff --git a/package.json b/package.json
@@ -26,6 +26,7 @@
   },
   "devDependencies": {
     "@custom-elements-manifest/analyzer": "^0.9.0",
+    "@trivago/prettier-plugin-sort-imports": "^4.3.0",
     "@types/eslint": "^8.44.8",
     "@types/node": "^20.10.1",
     "@typescript-eslint/eslint-plugin": "^6.13.1",

diff --git a/packages/material/src/widgets/submit.ts b/packages/material/src/widgets/submit.ts
@@ -8,7 +8,7 @@ export const submit: Widgets['submit'] = (options) => html`
 	<!--  -->
 	<div id=${options.id} class="theme-material widget-submit">
 		<md-filled-button type="submit"
-			>${options.submitButtonText ?? 'Submit'}</md-filled-button
+			>${options.label ?? 'Submit'}</md-filled-button
 		>
 	</div>
 `;
diff --git a/packages/spectrum/package.json b/packages/spectrum/package.json
@@ -54,19 +54,19 @@
   },
   "dependencies": {
     "@jsfe/form": "workspace:*",
-    "@jsfe/types": "workspace:*",
-    "@spectrum-web-components/button": "^0.40.0",
-    "@spectrum-web-components/help-text": "^0.40.0",
-    "@spectrum-web-components/radio": "^0.40.0",
-    "@spectrum-web-components/slider": "^0.40.0",
-    "@spectrum-web-components/switch": "^0.40.0"
+    "@jsfe/types": "workspace:*"
   },
   "devDependencies": {
     "@spectrum-web-components/styles": "^0.40.0",
     "sass": "^1.69.5",
     "typescript": "^5.3.2"
   },
   "peerDependencies": {
+    "@spectrum-web-components/button": "^0.40.0",
+    "@spectrum-web-components/help-text": "^0.40.0",
+    "@spectrum-web-components/radio": "^0.40.0",
+    "@spectrum-web-components/slider": "^0.40.0",
+    "@spectrum-web-components/switch": "^0.40.0",
     "@spectrum-web-components/field-label": "^0.39.1",
     "@spectrum-web-components/icon": "^0.39.1",
     "@spectrum-web-components/icons": "^0.39.1",