diff --git a/CHANGELOG.md b/CHANGELOG.md index 05e7e21..7caeb11 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/buildchain/package.json b/buildchain/package.json index cbb58ed..7c530c0 100644 --- a/buildchain/package.json +++ b/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" }, diff --git a/buildchain/webpack-settings/app.settings.js b/buildchain/webpack-settings/app.settings.js index 53a7c09..7c23924 100644 --- a/buildchain/webpack-settings/app.settings.js +++ b/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/', diff --git a/cms/composer.json b/cms/composer.json index 85ef317..9f29f6a 100644 --- a/cms/composer.json +++ b/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", diff --git a/cms/config/project/project.yaml b/cms/config/project/project.yaml index 20e2b55..a8450a3 100644 --- a/cms/config/project/project.yaml +++ b/cms/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1605065696 +dateModified: 1615144400 email: fromEmail: andrew@nystudio107.com 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 diff --git a/composer.json b/composer.json index 509eb83..3f38e3a 100644 --- a/composer.json +++ b/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');\"", diff --git a/db-seed/project--2021-03-07-192059--v3.6.9.sql.gz b/db-seed/project--2021-03-07-192059--v3.6.9.sql.gz new file mode 100644 index 0000000..b8626c3 Binary files /dev/null and b/db-seed/project--2021-03-07-192059--v3.6.9.sql.gz differ diff --git a/db-seed/seed_db.sql.gz b/db-seed/seed_db.sql.gz deleted file mode 100644 index 859982c..0000000 Binary files a/db-seed/seed_db.sql.gz and /dev/null differ diff --git a/docker-config/mariadb/Dockerfile b/docker-config/mariadb/Dockerfile index d697eb4..787e7f0 100755 --- a/docker-config/mariadb/Dockerfile +++ b/docker-config/mariadb/Dockerfile @@ -1 +1 @@ -FROM yobasystems/alpine-mariadb:10.4.15 +FROM mariadb:10.5 diff --git a/src/js/app.ts b/src/js/app.ts index 27248fe..366a47f 100644 --- a/src/js/app.ts +++ b/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 diff --git a/src/vue/App.vue b/src/vue/App.vue index 3567f64..db81672 100644 --- a/src/vue/App.vue +++ b/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: () => ({ }),