Merge branch 'release/2.4.26' into craft-webpack

CHANGELOG.md

@@ -1,5 +1,14 @@
 # nystudio107/craft Change Log
 
+## 2.4.26 - 2021.03.07
+### Changed
+* Use aliases for import paths
+* Remove version, require, autoload, and config from the project `composer.json`
+* Use Tailwind CSS `^2.0.3`
+* Use official MariaDB images
+* Use `craftcms/cms` version `^3.6.7`
+* Updated db-seed & Project Config to match `craftcms/cms` version `^3.6.7`
+
 ## 2.4.25 - 2021.02.09
 ### Added
 * Use PHP 8.0 Alpine images for the prod & dev containers

buildchain/package.json

@@ -38,7 +38,7 @@
     "core-js": "^3.0.0",
     "lazysizes": "^5.2.2",
     "regenerator-runtime": "^0.13.2",
-    "tailwindcss": "^1.8.12",
+    "tailwindcss": "^2.0.3",
     "vue": "^3.0.0",
     "vue-confetti": "^2.0.8"
   },

buildchain/webpack-settings/app.settings.js

@@ -2,27 +2,29 @@
 
 // node modules
 require('dotenv').config();
+const path = require('path');
 
 // settings
 module.exports = {
     alias: {
+        '@': path.resolve('../src'),
     },
     copyright: 'Example Company, Inc.',
     entry: {
         'app': [
-            '../src/js/app.ts',
-            '../src/css/app-base.pcss',
-            '../src/css/app-components.pcss',
-            '../src/css/app-utilities.pcss',
+            '@/js/app.ts',
+            '@/css/app-base.pcss',
+            '@/css/app-components.pcss',
+            '@/css/app-utilities.pcss',
         ],
         'lazysizes-wrapper': [
-            '../src/js/utils/lazysizes-wrapper.ts',
+            '@/js/utils/lazysizes-wrapper.ts',
         ],
     },
     extensions: ['.ts', '.js', '.vue', '.json'],
     name: 'Example Project',
     paths: {
-        dist: '../../cms/web/dist/',
+        dist: path.resolve('../cms/web/dist/'),
     },
     urls: {
         criticalCss: 'http://example.test/',

cms/composer.json

@@ -1,6 +1,6 @@
 {
   "require": {
-    "craftcms/cms": "^3.5.15.1",
+    "craftcms/cms": "^3.6.9",
     "vlucas/phpdotenv": "^3.4.0",
     "yiisoft/yii2-redis": "^2.0.6",
     "nystudio107/craft-imageoptimize": "^1.0.0",

cms/config/project/project.yaml

@@ -1,4 +1,4 @@
-dateModified: 1605065696
+dateModified: 1615144400
 email:
   fromEmail: [email protected]
   fromName: Craft
@@ -96,7 +96,7 @@ system:
   live: true
   name: Project
   retryDuration: 60
-  schemaVersion: 3.5.13
+  schemaVersion: 3.6.6
   timeZone: America/New_York
 users:
   allowPublicRegistration: false

composer.json

@@ -1,7 +1,6 @@
 {
   "name": "craftcms/craft",
-  "description": "nystudio107 Craft 3.4 CMS scaffolding project",
-  "version": "2.4.25",
+  "description": "nystudio107 Craft 3 CMS scaffolding project",
   "keywords": [
     "craft",
     "cms",
@@ -19,22 +18,6 @@
     "docs": "https://craftcms.com/docs",
     "rss": "https://craftcms.com/changelog.rss"
   },
-  "require": {
-    "craftcms/cms": "^3.5.15.1",
-    "vlucas/phpdotenv": "^3.4.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "modules\\sitemodule\\": "modules/sitemodule/src/"
-    }
-  },
-  "config": {
-    "optimize-autoloader": true,
-    "sort-packages": true,
-    "platform": {
-      "php":  "7.2.5"
-    }
-  },
   "scripts": {
     "post-create-project-cmd": [
       "@php -r \"copy('./cms/example.env', './cms/.env');\"",

docker-config/mariadb/Dockerfile

@@ -1 +1 @@
-FROM yobasystems/alpine-mariadb:10.4.15
+FROM mariadb:10.5

src/js/app.ts

@@ -1,4 +1,4 @@
-import App from '../vue/App.vue';
+import App from '@/vue/App.vue';
 import { createApp } from 'vue';
 
 // App main

src/vue/App.vue

@@ -8,7 +8,7 @@ import {defineAsyncComponent, defineComponent } from 'vue';
 
 export default defineComponent({
   components: {
-    'confetti': defineAsyncComponent(() => import(/* webpackChunkName: "confetti" */ '../vue/Confetti.vue')),
+    'confetti': defineAsyncComponent(() => import(/* webpackChunkName: "confetti" */ '@/vue/Confetti.vue')),
   },
   data: () => ({
   }),