From 9f4ac4d1242c30269d6671c42f381891f71c4728 Mon Sep 17 00:00:00 2001
From: Ignace Maes <contact@ignacemaes.com>
Date: Wed, 21 Aug 2024 20:21:55 +0200
Subject: [PATCH] use import.meta.glob for assets in app dir

---
 {public => app/assets}/images/ember.svg      |   0
 {public => app/assets}/images/embroider.svg  |   0
 {public => app/assets}/images/glimmer-ts.svg |   0
 {public => app/assets}/images/glint.png      | Bin
 {public => app/assets}/images/tailwind.svg   |   0
 {public => app/assets}/images/typescript.svg |   0
 {public => app/assets}/images/vite.svg       |   0
 {public => app/assets}/images/volar.svg      |   0
 {public => app/assets}/images/warp-drive.svg |   0
 app/helpers/import-asset.ts                  |  10 ++++
 app/templates/about.gts                      |  20 ++++---
 package.json                                 |   6 +-
 pnpm-lock.yaml                               |  59 ++++---------------
 tsconfig.json                                |   3 +-
 14 files changed, 37 insertions(+), 61 deletions(-)
 rename {public => app/assets}/images/ember.svg (100%)
 rename {public => app/assets}/images/embroider.svg (100%)
 rename {public => app/assets}/images/glimmer-ts.svg (100%)
 rename {public => app/assets}/images/glint.png (100%)
 rename {public => app/assets}/images/tailwind.svg (100%)
 rename {public => app/assets}/images/typescript.svg (100%)
 rename {public => app/assets}/images/vite.svg (100%)
 rename {public => app/assets}/images/volar.svg (100%)
 rename {public => app/assets}/images/warp-drive.svg (100%)
 create mode 100644 app/helpers/import-asset.ts

diff --git a/public/images/ember.svg b/app/assets/images/ember.svg
similarity index 100%
rename from public/images/ember.svg
rename to app/assets/images/ember.svg
diff --git a/public/images/embroider.svg b/app/assets/images/embroider.svg
similarity index 100%
rename from public/images/embroider.svg
rename to app/assets/images/embroider.svg
diff --git a/public/images/glimmer-ts.svg b/app/assets/images/glimmer-ts.svg
similarity index 100%
rename from public/images/glimmer-ts.svg
rename to app/assets/images/glimmer-ts.svg
diff --git a/public/images/glint.png b/app/assets/images/glint.png
similarity index 100%
rename from public/images/glint.png
rename to app/assets/images/glint.png
diff --git a/public/images/tailwind.svg b/app/assets/images/tailwind.svg
similarity index 100%
rename from public/images/tailwind.svg
rename to app/assets/images/tailwind.svg
diff --git a/public/images/typescript.svg b/app/assets/images/typescript.svg
similarity index 100%
rename from public/images/typescript.svg
rename to app/assets/images/typescript.svg
diff --git a/public/images/vite.svg b/app/assets/images/vite.svg
similarity index 100%
rename from public/images/vite.svg
rename to app/assets/images/vite.svg
diff --git a/public/images/volar.svg b/app/assets/images/volar.svg
similarity index 100%
rename from public/images/volar.svg
rename to app/assets/images/volar.svg
diff --git a/public/images/warp-drive.svg b/app/assets/images/warp-drive.svg
similarity index 100%
rename from public/images/warp-drive.svg
rename to app/assets/images/warp-drive.svg
diff --git a/app/helpers/import-asset.ts b/app/helpers/import-asset.ts
new file mode 100644
index 0000000..3c284c2
--- /dev/null
+++ b/app/helpers/import-asset.ts
@@ -0,0 +1,10 @@
+const images = import.meta.glob('../assets/images/*.(svg|png)', {
+  eager: true,
+});
+
+export default function importAsset(assetName: string): string {
+  const imagePath = images[`../assets/images/${assetName}`] as
+    | { default: string }
+    | undefined;
+  return imagePath?.default ?? '';
+}
diff --git a/app/templates/about.gts b/app/templates/about.gts
index 3a8d911..f89b71a 100644
--- a/app/templates/about.gts
+++ b/app/templates/about.gts
@@ -3,6 +3,8 @@ import { RouteTemplate } from 'ember-polaris-pokedex/utils/ember-route-template'
 import Component from '@glimmer/component';
 import HomeButton from 'ember-polaris-pokedex/components/home-button';
 
+import importAsset from 'ember-polaris-pokedex/helpers/import-asset';
+
 @RouteTemplate
 export default class ApplicationTemplate extends Component {
   <template>
@@ -113,47 +115,47 @@ export default class ApplicationTemplate extends Component {
 
       <div class='mt-16 grid grid-cols-3 gap-8 md:grid-cols-6 lg:grid-cols-9'>
         <img
-          src='/images/ember.svg'
+          src={{importAsset 'ember.svg'}}
           alt='ember'
           class='h-full w-full drop-shadow-md'
         />
         <img
-          src='/images/embroider.svg'
+          src={{importAsset 'embroider.svg'}}
           alt='embroider'
           class='h-full w-full drop-shadow-md'
         />
         <img
-          src='/images/vite.svg'
+          src={{importAsset 'vite.svg'}}
           alt='vite'
           class='h-full w-full drop-shadow-md'
         />
         <img
-          src='/images/volar.svg'
+          src={{importAsset 'volar.svg'}}
           alt='volar'
           class='h-full w-full drop-shadow-md'
         />
         <img
-          src='/images/glint.png'
+          src={{importAsset 'glint.png'}}
           alt='glint'
           class='h-full w-full drop-shadow-md'
         />
         <img
-          src='/images/typescript.svg'
+          src={{importAsset 'typescript.svg'}}
           alt='typescript'
           class='h-full w-full drop-shadow-md'
         />
         <img
-          src='/images/warp-drive.svg'
+          src={{importAsset 'warp-drive.svg'}}
           alt='Warp Drive'
           class='h-full w-full drop-shadow-md'
         />
         <img
-          src='/images/glimmer-ts.svg'
+          src={{importAsset 'glimmer-ts.svg'}}
           alt='Glimmer TS'
           class='h-full w-full drop-shadow-md'
         />
         <img
-          src='/images/tailwind.svg'
+          src={{importAsset 'tailwind.svg'}}
           alt='TailwindCSS'
           class='h-full w-full drop-shadow-md'
         />
diff --git a/package.json b/package.json
index 0c46b9b..cda8510 100644
--- a/package.json
+++ b/package.json
@@ -27,6 +27,8 @@
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
+    "@babel/eslint-parser": "^7.24.7",
+    "@babel/plugin-proposal-decorators": "^7.24.7",
     "@ember-data-types/adapter": "5.4.0-alpha.98",
     "@ember-data-types/graph": "5.4.0-alpha.98",
     "@ember-data-types/json-api": "5.4.0-alpha.98",
@@ -38,8 +40,6 @@
     "@ember-data-types/serializer": "5.4.0-alpha.98",
     "@ember-data-types/store": "5.4.0-alpha.98",
     "@ember-data-types/tracking": "5.4.0-alpha.98",
-    "@babel/eslint-parser": "^7.24.7",
-    "@babel/plugin-proposal-decorators": "^7.24.7",
     "@ember/optional-features": "^2.1.0",
     "@ember/string": "^3.1.1",
     "@ember/test-helpers": "^3.3.0",
@@ -54,6 +54,7 @@
     "@glint/environment-ember-loose": "1.4.1-unstable.01b8deb",
     "@glint/environment-ember-template-imports": "1.4.1-unstable.01b8deb",
     "@glint/template": "1.4.1-unstable.01b8deb",
+    "@rollup/plugin-babel": "^6.0.4",
     "@tsconfig/ember": "^3.0.8",
     "@types/dom-view-transitions": "^1.0.5",
     "@types/qunit": "^2.19.10",
@@ -62,7 +63,6 @@
     "@typescript-eslint/parser": "^8.1.0",
     "@warp-drive-types/core-types": "0.0.0-alpha.84",
     "autoprefixer": "^10.0.2",
-    "@rollup/plugin-babel": "^6.0.4",
     "concurrently": "^8.2.2",
     "ember-auto-import": "^2.7.4",
     "ember-cli": "~5.10.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c1245d9..fb44e93 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -6777,10 +6777,10 @@ packages:
       terser:
         optional: true
 
-  volar-service-typescript@0.0.59:
-    resolution: {integrity: sha512-VCOpfiu+lUo5lapWLB5L5vmQGtwzmNWn5MueV915eku7blpphmE+Z7hCNcL1NApn7AetXWhiblv8ZhmUx/dGIA==}
+  volar-service-typescript@0.0.61:
+    resolution: {integrity: sha512-4kRHxVbW7wFBHZWRU6yWxTgiKETBDIJNwmJUAWeP0mHaKpnDGj/astdRFKqGFRYVeEYl45lcUPhdJyrzanjsdQ==}
     peerDependencies:
-      '@volar/language-service': ~2.4.0-alpha.12
+      '@volar/language-service': ~2.4.0
     peerDependenciesMeta:
       '@volar/language-service':
         optional: true
@@ -8711,7 +8711,7 @@ snapshots:
       silent-error: 1.1.1
       typescript: 5.5.4
       uuid: 8.3.2
-      volar-service-typescript: 0.0.59(@volar/language-service@2.4.0-alpha.16)
+      volar-service-typescript: 0.0.61(@volar/language-service@2.4.0-alpha.16)
       vscode-languageserver-textdocument: 1.0.12
       vscode-uri: 3.0.8
       yargs: 17.7.2
@@ -8963,35 +8963,14 @@ snapshots:
       '@types/ember__utils': 3.16.8
       '@types/rsvp': 4.0.9
 
-  '@types/ember@4.0.11':
-    dependencies:
-      '@types/ember__application': 4.0.11(@babel/core@7.25.2)
-      '@types/ember__array': 4.0.10(@babel/core@7.25.2)
-      '@types/ember__component': 4.0.22(@babel/core@7.25.2)
-      '@types/ember__controller': 4.0.12(@babel/core@7.25.2)
-      '@types/ember__debug': 4.0.8(@babel/core@7.25.2)
-      '@types/ember__engine': 4.0.11(@babel/core@7.25.2)
-      '@types/ember__error': 4.0.6
-      '@types/ember__object': 4.0.12(@babel/core@7.25.2)
-      '@types/ember__polyfills': 4.0.6
-      '@types/ember__routing': 4.0.22(@babel/core@7.25.2)
-      '@types/ember__runloop': 4.0.10
-      '@types/ember__service': 4.0.9(@babel/core@7.25.2)
-      '@types/ember__string': 3.16.3
-      '@types/ember__template': 4.0.7
-      '@types/ember__test': 4.0.6(@babel/core@7.25.2)
-      '@types/ember__utils': 4.0.7
-      '@types/rsvp': 4.0.9
-    optional: true
-
   '@types/ember@4.0.11(@babel/core@7.25.2)':
     dependencies:
       '@types/ember__application': 4.0.11(@babel/core@7.25.2)
       '@types/ember__array': 4.0.10(@babel/core@7.25.2)
       '@types/ember__component': 4.0.22(@babel/core@7.25.2)
       '@types/ember__controller': 4.0.12(@babel/core@7.25.2)
-      '@types/ember__debug': 4.0.8(@babel/core@7.25.2)
-      '@types/ember__engine': 4.0.11(@babel/core@7.25.2)
+      '@types/ember__debug': 4.0.8
+      '@types/ember__engine': 4.0.11
       '@types/ember__error': 4.0.6
       '@types/ember__object': 4.0.12(@babel/core@7.25.2)
       '@types/ember__polyfills': 4.0.6
@@ -9017,8 +8996,8 @@ snapshots:
   '@types/ember__application@4.0.11(@babel/core@7.25.2)':
     dependencies:
       '@glimmer/component': 1.1.2(@babel/core@7.25.2)
-      '@types/ember': 4.0.11
-      '@types/ember__engine': 4.0.11(@babel/core@7.25.2)
+      '@types/ember': 4.0.11(@babel/core@7.25.2)
+      '@types/ember__engine': 4.0.11
       '@types/ember__object': 4.0.12(@babel/core@7.25.2)
       '@types/ember__owner': 4.0.9
       '@types/ember__routing': 4.0.22(@babel/core@7.25.2)
@@ -9071,26 +9050,20 @@ snapshots:
       '@types/ember__engine': 3.16.9
       '@types/ember__object': 3.12.13
 
-  '@types/ember__debug@4.0.8(@babel/core@7.25.2)':
+  '@types/ember__debug@4.0.8':
     dependencies:
       '@types/ember__object': 4.0.12(@babel/core@7.25.2)
       '@types/ember__owner': 4.0.9
-    transitivePeerDependencies:
-      - '@babel/core'
-      - supports-color
     optional: true
 
   '@types/ember__engine@3.16.9':
     dependencies:
       '@types/ember__object': 3.12.13
 
-  '@types/ember__engine@4.0.11(@babel/core@7.25.2)':
+  '@types/ember__engine@4.0.11':
     dependencies:
       '@types/ember__object': 4.0.12(@babel/core@7.25.2)
       '@types/ember__owner': 4.0.9
-    transitivePeerDependencies:
-      - '@babel/core'
-      - supports-color
     optional: true
 
   '@types/ember__error@3.16.6': {}
@@ -9158,11 +9131,6 @@ snapshots:
 
   '@types/ember__runloop@3.16.10': {}
 
-  '@types/ember__runloop@4.0.10':
-    dependencies:
-      '@types/ember': 4.0.11
-    optional: true
-
   '@types/ember__runloop@4.0.10(@babel/core@7.25.2)':
     dependencies:
       '@types/ember': 4.0.11(@babel/core@7.25.2)
@@ -9211,11 +9179,6 @@ snapshots:
 
   '@types/ember__utils@3.16.8': {}
 
-  '@types/ember__utils@4.0.7':
-    dependencies:
-      '@types/ember': 4.0.11
-    optional: true
-
   '@types/ember__utils@4.0.7(@babel/core@7.25.2)':
     dependencies:
       '@types/ember': 4.0.11(@babel/core@7.25.2)
@@ -15049,7 +15012,7 @@ snapshots:
       fsevents: 2.3.3
       terser: 5.31.6
 
-  volar-service-typescript@0.0.59(@volar/language-service@2.4.0-alpha.16):
+  volar-service-typescript@0.0.61(@volar/language-service@2.4.0-alpha.16):
     dependencies:
       path-browserify: 1.0.1
       semver: 7.6.3
diff --git a/tsconfig.json b/tsconfig.json
index d6fe921..8d47f8a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -32,7 +32,8 @@
       "./node_modules/@warp-drive/ember/unstable-preview-types",
       "./node_modules/ember-data-types/unstable-preview-types",
       "./node_modules/@types/dom-view-transitions",
-      "ember-source/types"
+      "ember-source/types",
+      "vite/client"
     ]
   },
   "glint": {