[vue] clean up

Kamona-WD · Kamona-WD · commit cc841a201796 · 2022-03-07T11:46:53.000+02:00
diff --git a/README.md b/README.md
@@ -38,17 +38,6 @@ php artisan kui-fortify:install blade # This command will publish laravel/fortif
 
 # then
 npm install && npm run dev # or yarn && yarn dev
-
-# Laravel mix will compile successfully, but with 1 warning `Module not found: Error: Can't resolve '../../lang'`.
-# It will work but you can fix it by remove trycatch in `app.js` and import lang file like this:
-
-# laravel 9
-# resolve: (lang) => import(`../../lang/${lang}.json`),
-
-# laravel < 9
-# resolve: (lang) => import(`../lang/${lang}.json`),
-
-# Until we fix it.
 ```
 
 4. Configure your database.
diff --git a/src/Console/InstallCommand.php b/src/Console/InstallCommand.php
@@ -235,9 +235,11 @@ protected function installVue()
         );
 
         // Lang File
-        if ((new Filesystem)->exists(resource_path('lang'))) {
+        if ((new Filesystem)->exists(resource_path('lang'))) { // Laravel < 9
             copy(__DIR__ . '/../../stubs/vue/lang/ar.json', resource_path('lang/ar.json'));
-        } else if ((new Filesystem)->exists(base_path('lang'))) {
+            copy(__DIR__ . '/../../stubs/vue/lang/en.json', resource_path('lang/en.json'));
+        } else if ((new Filesystem)->exists(base_path('lang'))) { // Laravel 9
+            $this->replaceInFile('../lang', '../../lang', resource_path('js/app.js'));
             copy(__DIR__ . '/../../stubs/vue/lang/ar.json', base_path('lang/ar.json'));
         }
 
diff --git a/stubs/vue/lang/ar.json b/stubs/vue/lang/ar.json
@@ -1 +1,3 @@
-{}
+{
+  "Dashboard": "لوحة التحكم"
+}
diff --git a/stubs/vue/lang/en.json b/stubs/vue/lang/en.json
@@ -0,0 +1,3 @@
+{
+  "Dashboard": "Dashboard"
+}
diff --git a/stubs/vue/resources/js/app.js b/stubs/vue/resources/js/app.js
@@ -5,11 +5,6 @@ import { createInertiaApp } from '@inertiajs/inertia-vue3';
 import { InertiaProgress } from '@inertiajs/progress';
 import { i18nVue } from 'laravel-vue-i18n';
 import Toast from 'vue-toastification';
-import composer from '../../composer.json';
-
-const isLaravel9 = composer.require["laravel/framework"].startsWith("^9.")
-    ? true
-    : false;
 
 const appName =
     window.document.getElementsByTagName('title')[0]?.innerText || 'Laravel';
@@ -21,18 +16,7 @@ createInertiaApp({
         return createApp({ render: () => h(app, props) })
             .use(plugin)
             .use(i18nVue, {
-                // TODO: Use a real solution.
-                resolve: (lang) => {
-                    if (isLaravel9) {
-                        try {
-                            return import(`../../lang/${lang}.json`);
-                        } catch (error) {}
-                    } else {
-                        try {
-                            return import(`../lang/${lang}.json`);
-                        } catch (error) {}
-                    }
-                },
+                resolve: (lang) => import(`../lang/${lang}.json`),
             })
             .use(Toast, {
                 hideProgressBar: true,
diff --git a/stubs/vue/resources/views/app.blade.php b/stubs/vue/resources/views/app.blade.php
@@ -21,9 +21,5 @@
     </head>
     <body class="font-sans antialiased">
         @inertia 
-
-        @env ('local')
-            <script src="http://localhost:8080/js/bundle.js"></script>
-        @endenv
     </body>
 </html>

-Original file line number
+Diff line change
@@ @@ -1 +1,3 @@ @@
 -{}
 +{
 +  "Dashboard": "لوحة التحكم"
 +}
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+{`
	`2`	`+ "Dashboard": "Dashboard"`
	`3`	`+}`