Merge branch 'master' of https://github.com/chasegiunta/craft-vue

Author: chasegiunta

.env.example

@@ -4,26 +4,17 @@ ENVIRONMENT="dev"
 # The secure key Craft will use for hashing and encrypting data
 SECURITY_KEY=""
 
-# The database driver that will be used ('mysql' or 'pgsql')
-DB_DRIVER="mysql"
-
-# The database server name or IP address (usually this is 'localhost' or '127.0.0.1')
-DB_SERVER="localhost"
+# The Data Source Name (“DSN”) that tells Craft how to connect to the database
+DB_DSN=""
 
 # The database username to connect with
 DB_USER="root"
 
 # The database password to connect with
 DB_PASSWORD=""
 
-# The name of the database to select
-DB_DATABASE=""
-
 # The database schema that will be used (PostgreSQL only)
 DB_SCHEMA="public"
 
 # The prefix that should be added to generated table names (only necessary if multiple things are sharing the same database)
 DB_TABLE_PREFIX=""
-
-# The port to connect to the database with. Will default to 5432 for PostgreSQL and 3306 for MySQL.
-DB_PORT=""

composer.json

@@ -20,8 +20,8 @@
     "issues": "https://github.com/chasegiunta/craft-vue-tailwind/issues"
   },
   "require": {
-    "craftcms/cms": "^3.0.0",
-    "vlucas/phpdotenv": "^2.4.0",
+    "craftcms/cms": "^3.4.0",
+    "vlucas/phpdotenv": "^3.4.0",
     "nystudio107/craft-twigpack": "^1.1"
   },
   "autoload": {

composer.json.default

@@ -1,7 +1,7 @@
 {
   "require": {
-    "craftcms/cms": "^3.0.0",
-    "vlucas/phpdotenv": "^2.4.0"
+    "craftcms/cms": "^3.4.0",
+    "vlucas/phpdotenv": "^3.4.0"
   },
   "autoload": {
     "psr-4": {

config/db.php

@@ -9,12 +9,9 @@
  */
 
 return [
-    'driver' => getenv('DB_DRIVER'),
-    'server' => getenv('DB_SERVER'),
+    'dsn' => getenv('DB_DSN'),
     'user' => getenv('DB_USER'),
     'password' => getenv('DB_PASSWORD'),
-    'database' => getenv('DB_DATABASE'),
     'schema' => getenv('DB_SCHEMA'),
     'tablePrefix' => getenv('DB_TABLE_PREFIX'),
-    'port' => getenv('DB_PORT')
 ];

craft

@@ -13,7 +13,7 @@ require_once CRAFT_VENDOR_PATH.'/autoload.php';
 
 // Load dotenv?
 if (class_exists('Dotenv\Dotenv') && file_exists(CRAFT_BASE_PATH.'/.env')) {
-    (new Dotenv\Dotenv(CRAFT_BASE_PATH))->load();
+    Dotenv\Dotenv::create(CRAFT_BASE_PATH)->load();
 }
 
 // Load and run Craft

package.json

@@ -13,14 +13,14 @@
     "vue": "^2.6.0"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^3.8.0",
-    "@vue/cli-service": "^3.8.0",
+    "@vue/cli-plugin-babel": "^4.0.0",
+    "@vue/cli-service": "^4.0.0",
     "filemanager-webpack-plugin": "^2.0.5",
     "glob-all": "^3.1.0",
     "purgecss-webpack-plugin": "^1.5.0",
     "purgecss-whitelister": "^2.1.0",
     "vue-template-compiler": "^2.6.0",
-    "webpack-manifest-plugin": "^2.0.4"
+    "webpack-manifest-plugin": "^2.1.4"
   },
   "postcss": {
     "plugins": {

src/components/HelloWorld.vue

@@ -23,7 +23,7 @@
         <span class="text-green-400">{{ info.environment }}</span> (passed in as
         prop)<br />
 
-        <span class="text-white">DB Name: </span>
+        <span class="text-white">DSN Settings: </span>
         <span class="text-green-400"><slot></slot></span> (passed in through
         slot)
       </code>
@@ -37,9 +37,9 @@ export default {
   props: ["info"],
   data() {
     return {
-      msg: "Hello World"
+      msg: "Hello World",
     };
-  }
+  },
 };
 </script>
 
@@ -52,4 +52,4 @@ h1,
 h2 {
   font-weight: normal;
 }
-</style>
+</style>

templates/index.twig

@@ -18,7 +18,7 @@
     } %}
 
     <hello-world :info="{{ info|json_encode }}">
-      {{ getenv('DB_DATABASE') }}
+      {{ getenv('DB_DSN') }}
     </hello-world>
   </div>
 

web/index.php

@@ -12,7 +12,7 @@
 
 // Load dotenv?
 if (class_exists('Dotenv\Dotenv') && file_exists(CRAFT_BASE_PATH.'/.env')) {
-    (new Dotenv\Dotenv(CRAFT_BASE_PATH))->load();
+    Dotenv\Dotenv::create(CRAFT_BASE_PATH)->load();
 }
 
 // Load and run Craft