chore: jaspr upgraded to 0.17.0

siesdart · Jan 15, 2025 · c3b3caa · c3b3caa
1 parent 152bf46
commit c3b3caa
Show file tree

Hide file tree

Showing 23 changed files with 357 additions and 318 deletions.
diff --git a/apps/portfolio/analysis_options.yaml b/apps/portfolio/analysis_options.yaml
@@ -9,8 +9,11 @@ analyzer:
     - lib/**.imports.dart
     - lib/**.mapper.dart
     - lib/jaspr_options.dart
+  plugins:
+    - custom_lint
 
 linter:
   rules:
+    always_use_package_imports: false
     lines_longer_than_80_chars: false
     public_member_api_docs: false
diff --git a/apps/portfolio/lib/app.dart b/apps/portfolio/lib/app.dart
@@ -14,8 +14,7 @@ class App extends StatelessComponent with SyncProviderDependencies {
   const App({super.key});
 
   @override
-  // ignore: strict_raw_type
-  Iterable<SyncProvider> get preloadDependencies => [projectsProvider];
+  Iterable<SyncProvider<dynamic>> get preloadDependencies => [projectsProvider];
 
   @override
   Iterable<Component> build(BuildContext context) sync* {

diff --git a/apps/portfolio/lib/components/aside.dart b/apps/portfolio/lib/components/aside.dart
@@ -9,8 +9,7 @@ class Aside extends StatelessComponent with SyncProviderDependencies {
   const Aside({super.key});
 
   @override
-  // ignore: strict_raw_type
-  Iterable<SyncProvider> get preloadDependencies => [
+  Iterable<SyncProvider<dynamic>> get preloadDependencies => [
         introductionProvider,
         skillProvider,
         projectsProvider,
@@ -85,11 +84,7 @@ class Aside extends StatelessComponent with SyncProviderDependencies {
     return div(classes: 'flex items-center gap-1 lg:gap-2', [
       svg,
       if (href != null)
-        a(
-          [text(title)],
-          href: href,
-          target: Target.blank,
-        )
+        a(href: href, target: Target.blank, [text(title)])
       else
         span([text(title)]),
     ]);

diff --git a/apps/portfolio/lib/components/elements/section.dart b/apps/portfolio/lib/components/elements/section.dart
@@ -17,16 +17,13 @@ class Section extends StatelessComponent {
   @override
   Iterable<Component> build(BuildContext context) sync* {
     yield section(id: id, [
-      a(
-        [
-          h4(
-            classes:
-                'bg-[#13B9FD] font-medium text-lg text-white mb-4 px-4 py-2 rounded-2xl shadow-md lg:text-xl',
-            [text(title)],
-          ),
-        ],
-        href: '#$id',
-      ),
+      a(href: '#$id', [
+        h4(
+          classes:
+              'bg-[#13B9FD] font-medium text-lg text-white mb-4 px-4 py-2 rounded-2xl shadow-md lg:text-xl',
+          [text(title)],
+        ),
+      ]),
       if (child != null) div(classes: 'px-6', [child!]),
       if (children != null)
         ul(

diff --git a/apps/portfolio/lib/components/footer.dart b/apps/portfolio/lib/components/footer.dart
@@ -9,13 +9,13 @@ class Footer extends StatelessComponent {
       a(
         classes:
             'text-xs decoration-2 decoration-[#00BCD4] underline underline-offset-8 mx-auto lg:text-sm',
+        href: 'https://github.com/schultek/jaspr',
+        target: Target.blank,
         [
           text('본 홈페이지는 '),
           span(classes: 'font-bold', [text('Jaspr')]),
           text('를 사용해 제작되었습니다.'),
         ],
-        href: 'https://github.com/schultek/jaspr',
-        target: Target.blank,
       ),
     ]);
   }

diff --git a/apps/portfolio/lib/components/resume.dart b/apps/portfolio/lib/components/resume.dart
@@ -2,10 +2,8 @@ import 'package:common/common.dart';
 import 'package:common/component.dart';
 import 'package:jaspr/jaspr.dart';
 import 'package:resume/resume.dart';
-
-@Import.onWeb('dart:html', show: [#Blob, #Url, #window])
-// ignore: always_use_package_imports
-import 'resume.imports.dart';
+import 'package:universal_web/js_interop.dart';
+import 'package:universal_web/web.dart';
 
 @client
 class Resume extends StatelessComponent {
@@ -52,7 +50,12 @@ class Resume extends StatelessComponent {
 
   Future<void> _downloadPdf(Pdf pdf) async {
     final pdfData = await pdf.buildData();
-    final url = Url.createObjectUrl(Blob([pdfData], 'application/pdf'));
+    final url = URL.createObjectURL(
+      Blob(
+        [pdfData.buffer.toJS].toJS,
+        BlobPropertyBag(type: 'application/pdf'),
+      ),
+    );
     window.open(url, '_blank');
   }
 }
diff --git a/apps/portfolio/lib/components/resume.imports.dart b/apps/portfolio/lib/components/resume.imports.dart
diff --git a/apps/portfolio/lib/components/sections/introduction.dart b/apps/portfolio/lib/components/sections/introduction.dart
@@ -7,8 +7,8 @@ class Introduction extends StatelessComponent with SyncProviderDependencies {
   const Introduction({super.key});
 
   @override
-  // ignore: strict_raw_type
-  Iterable<SyncProvider> get preloadDependencies => [introductionProvider];
+  Iterable<SyncProvider<dynamic>> get preloadDependencies =>
+      [introductionProvider];
 
   @override
   Iterable<Component> build(BuildContext context) sync* {

diff --git a/apps/portfolio/lib/components/sections/project.dart b/apps/portfolio/lib/components/sections/project.dart
@@ -8,8 +8,7 @@ class Project extends StatelessComponent with SyncProviderDependencies {
   const Project({super.key});
 
   @override
-  // ignore: strict_raw_type
-  Iterable<SyncProvider> get preloadDependencies => [projectsProvider];
+  Iterable<SyncProvider<dynamic>> get preloadDependencies => [projectsProvider];
 
   @override
   Iterable<Component> build(BuildContext context) sync* {

diff --git a/apps/portfolio/lib/components/sections/skill.dart b/apps/portfolio/lib/components/sections/skill.dart
@@ -9,8 +9,7 @@ class Skill extends StatelessComponent with SyncProviderDependencies {
   const Skill({super.key});
 
   @override
-  // ignore: strict_raw_type
-  Iterable<SyncProvider> get preloadDependencies => [skillProvider];
+  Iterable<SyncProvider<dynamic>> get preloadDependencies => [skillProvider];
 
   @override
   Iterable<Component> build(BuildContext context) sync* {

diff --git a/apps/portfolio/lib/generated/imports/_stubs.dart b/apps/portfolio/lib/generated/imports/_stubs.dart
@@ -3,11 +3,6 @@
 
 // ignore_for_file: directives_ordering, non_constant_identifier_names
 
-dynamic Blob;
-dynamic Url;
-dynamic window;
-typedef BlobOrStubbed = dynamic;
-typedef UrlOrStubbed = dynamic;
 dynamic Directory;
 dynamic File;
 typedef DirectoryOrStubbed = dynamic;

diff --git a/apps/portfolio/lib/generated/imports/_web.dart b/apps/portfolio/lib/generated/imports/_web.dart
diff --git a/apps/portfolio/lib/pages/project_detail.dart b/apps/portfolio/lib/pages/project_detail.dart
@@ -34,14 +34,16 @@ class ProjectDetailPage extends StatelessComponent {
               classes: 'size-2 lg:size-3',
               styles: Styles.raw({'fill': '#${project.color}'}),
               viewBox: '0 0 16 16',
-              [circle([], cx: '8', cy: '8', r: '8')],
+              [circle(cx: '8', cy: '8', r: '8', [])],
             ),
             h4(
               classes: 'font-medium text-lg lg:text-xl',
               [text(project.title)],
             ),
             a(
               classes: project.repo == null ? 'pointer-events-none' : '',
+              href: 'https://github.com/${project.repo}',
+              target: Target.blank,
               [
                 svg(
                   classes:
@@ -50,8 +52,6 @@ class ProjectDetailPage extends StatelessComponent {
                   SvgIcons.github,
                 ),
               ],
-              href: 'https://github.com/${project.repo}',
-              target: Target.blank,
             ),
             if (project.repo != null)
               img(

diff --git a/apps/portfolio/lib/pages/project_list.dart b/apps/portfolio/lib/pages/project_list.dart
@@ -8,8 +8,7 @@ class ProjectListPage extends StatelessComponent with SyncProviderDependencies {
   const ProjectListPage({super.key});
 
   @override
-  // ignore: strict_raw_type
-  Iterable<SyncProvider> get preloadDependencies => [projectsProvider];
+  Iterable<SyncProvider<dynamic>> get preloadDependencies => [projectsProvider];
 
   @override
   Iterable<Component> build(BuildContext context) sync* {

diff --git a/apps/portfolio/lib/providers/content.dart b/apps/portfolio/lib/providers/content.dart
@@ -7,7 +7,6 @@ import 'package:path/path.dart' as p;
 import 'package:yaml/yaml.dart';
 
 @Import.onServer('dart:io', show: [#Directory, #File])
-// ignore: always_use_package_imports
 import 'content.imports.dart';
 
 final introductionProvider = SyncProvider<String>(

diff --git a/apps/portfolio/lib/providers/content.imports.dart b/apps/portfolio/lib/providers/content.imports.dart
@@ -1,5 +1,5 @@
 // GENERATED FILE, DO NOT MODIFY
 // Generated with jaspr_builder
 
-export '../generated/imports/_vm.dart' if (dart.library.html) '../generated/imports/_stubs.dart'
+export '../generated/imports/_vm.dart' if (dart.library.js_interop) '../generated/imports/_stubs.dart'
     show Directory, File, DirectoryOrStubbed, FileOrStubbed;