Dump update

.gitignore

@@ -5,3 +5,4 @@ theme.js
 theme.min.js
 config.json
 assets/css/pre-build
+assets/js/libs

.prettierignore

@@ -0,0 +1,3 @@
+app.js
+theme.min.css
+theme.min.js

.prettierrc

@@ -0,0 +1,10 @@
+{
+	"useTabs": true,
+	"tabWidth": 4,
+	"trailingComma": "all",
+	"singleQuote": true,
+	"printWidth": 100,
+	"semi": true,
+	"arrowParens": "always",
+	"endOfLine": "lf"
+}

Gruntfile.js

@@ -1,5 +1,5 @@
 const findUsedJsFiles = (grunt) => {
-	const file = grunt.file.read('snippets/js.liquid', 'utf8');
+	const file = grunt.file.read('snippets/js-modules.liquid', 'utf8');
 	const regex = /'([0-9a-zA-Z\-_\.]*.js)' \| asset_url/gm;
 
 	let jsFiles = [];
@@ -31,7 +31,6 @@ const findUsedJsLibs = (grunt) => {
 };
 
 module.exports = function (grunt) {
-
 	let shopifyConfig = grunt.file.readJSON('config.json', 'utf8');
 
 	grunt.initConfig({
@@ -41,8 +40,8 @@ module.exports = function (grunt) {
 		pkg: grunt.file.readJSON('package.json'),
 		install: {
 			options: {
-				env: ['default', 'staging', 'production']
-			}
+				env: ['default', 'staging', 'production'],
+			},
 		},
 		shopify: {
 			options: {
@@ -58,15 +57,15 @@ module.exports = function (grunt) {
 					'locales/*',
 					'sections/*',
 					'snippets/*',
-					'templates/*'
-				]
-			}
-		}
+					'templates/*',
+				],
+			},
+		},
 	});
 
 	const tasks = grunt.file.expand({ filter: 'isFile', cwd: 'tasks' }, ['*']);
 
-	tasks.forEach(task => {
+	tasks.forEach((task) => {
 		require(`./tasks/${task}`)(grunt);
 	});
 
@@ -79,22 +78,24 @@ module.exports = function (grunt) {
 	grunt.loadNpmTasks('grunt-contrib-jshint');
 	grunt.loadNpmTasks('grunt-contrib-watch');
 	grunt.loadNpmTasks('grunt-contrib-clean');
+	grunt.loadNpmTasks('grunt-csso');
 	grunt.loadNpmTasks('grunt-babel');
-	grunt.loadNpmTasks('grunt-purgecss');
 	grunt.loadNpmTasks('grunt-csso');
+	grunt.loadNpmTasks('grunt-env');
 	grunt.loadNpmTasks('grunt-complexity');
+	grunt.loadNpmTasks('grunt-prettier');
 
-	grunt.registerTask('dev-js', ['complexity', 'jshint']);
+	grunt.registerTask('dev-js', ['complexity', 'prettier', 'jshint']);
 	grunt.registerTask('dev', ['dev-js']);
 
 	grunt.registerTask('js', ['dev-js', 'clean:js', 'libs', 'concat:js', 'babel', 'headers:js']);
-	grunt.registerTask('css', ['clean:css','postcss', 'concat:css', 'purgecss', 'csso', 'headers:css']);
-	grunt.registerTask('build', ['css', 'js']);
+	grunt.registerTask('css', ['clean:css', 'postcss', 'csso', 'headers:css']);
+	grunt.registerTask('build', ['env:build', 'css', 'js']);
 
 	grunt.registerTask('deploy', ['build', 'shopify:deploy']);
 	grunt.registerTask('deploy:staging', ['build', 'shopify:deploy:staging']);
 	grunt.registerTask('deploy:prod', ['build', 'shopify:deploy:production']);
 	grunt.registerTask('init', ['install', 'deploy']);
 
-	grunt.registerTask('default', ['watch']);
+	grunt.registerTask('default', ['env:dev', 'watch']);
 };

assets/css/base/fonts.css

@@ -1,9 +1,7 @@
-
 @font-face {
 	font-family: 'Font Name';
-	src: local('?'),
-		url("/assets/fonts/file-name.woff2") format('woff2'),
-		url("/assets/fonts/file-name.woff") format('woff');
+	src: local('?'), url('/assets/fonts/file-name.woff2') format('woff2'),
+		url('/assets/fonts/file-name.woff') format('woff');
 	font-weight: 400;
 	font-style: normal;
 	font-display: fallback;

assets/css/base/site.css

@@ -1,33 +1,43 @@
 ::selection {
-	@apply bg-main-reverse;
-	@apply text-main-reverse;
+	@apply bg-black;
+	@apply text-white;
 }
 ::-moz-selection {
-	@apply bg-main-reverse;
-	@apply text-main-reverse;
+	@apply bg-black;
+	@apply text-white;
+}
+
+@media screen and (prefers-reduced-motion: reduce), (update: slow) {
+	*,
+	*::before,
+	*::after {
+		animation-duration: 0.001ms !important;
+		animation-iteration-count: 1 !important;
+		transition-duration: 0.001ms !important;
+		scroll-behavior: auto !important;
+	}
 }
 
 html {
 	--unit-root: 1;
 	--security-root: 60;
 	--fluid-breakpoint-root: 1560;
-	--perimeter-root: calc(
-		var(--fluid-breakpoint-root) - var(--security-root) * 2
-	);
-	--unit-in-vw: calc(
-		var(--unit-root) * 100 / var(--fluid-breakpoint-root) * 1vw
-	);
+	--perimeter-root: calc(var(--fluid-breakpoint-root) - var(--security-root) * 2);
+	--unit-in-vw: calc(var(--unit-root) * 100 / var(--fluid-breakpoint-root) * 1vw);
 	--unit-in-px: calc(var(--unit-root) * 1px);
 
 	--ease-out-expo: cubic-bezier(0.19, 1, 0.22, 1);
+	--ease-out-quad: cubic-bezier(0.5, 1, 0.89, 1);
 
 	font-size: calc(var(--unit-in-vw) * 3);
-	scroll-behavior: smooth;
+
+	-webkit-font-smoothing: antialiased;
+	-webkit-tap-highlight-color: transparent;
 }
 
 body {
-	@apply text-current;
-	@apply font-sans;
+	@apply text-40;
+	@apply font-base;
 }
 
 /* Tablet */

assets/css/main.css

@@ -8,6 +8,3 @@
 
 /* Utils */
 @import 'tailwind/utilities.css';
-
-/* Admin */
-@import 'lib/admin.css';

assets/js/modules/add-to-cart.js

@@ -1,24 +1,27 @@
 /**
-* add-to-cart
-* @author Deux Huit Huit
-*/
+ * add-to-cart
+ * @author Deux Huit Huit
+ */
 (function ($, undefined) {
-
 	'use strict';
 
 	var scope = $('body');
 
 	var sels = {
 		btn: '.js-add-to-cart',
-		qte: '.js-add-to-cart-qte'
+		qte: '.js-add-to-cart-qte',
 	};
 
 	var onVariantSelected = function (variant) {
 		var btn = scope.find(sels.btn);
 		btn.attr('data-id', variant.id);
 		btn.prop('disabled', !variant.available);
 		scope.find(sels.qte).val(1);
-		btn.text(!!variant.available ? btn.attr('data-available-text') : btn.attr('data-out-of-stock-text')); // jshint ignore:line
+		btn.text(
+			!!variant.available
+				? btn.attr('data-available-text')
+				: btn.attr('data-out-of-stock-text'),
+		); // jshint ignore:line
 	};
 
 	var onClick = function (event) {
@@ -52,7 +55,7 @@
 			},
 			complete: function () {
 				t.removeClass('is-loading');
-			}
+			},
 		});
 
 		return false;
@@ -65,12 +68,11 @@
 	App.register(function () {
 		return {
 			app: {
-				init: init
+				init: init,
 			},
 			variant: {
-				selected: onVariantSelected
-			}
+				selected: onVariantSelected,
+			},
 		};
 	});
-
 })(jQuery);

assets/js/modules/cart-count.js

@@ -1,15 +1,14 @@
 /**
-* cart-count
-* @author Deux Huit Huit
-*/
+ * cart-count
+ * @author Deux Huit Huit
+ */
 (function ($, undefined) {
-
 	'use strict';
 
 	var scope = $('body');
 
 	var sels = {
-		item: '.js-cart-count'
+		item: '.js-cart-count',
 	};
 
 	var onCartUpdate = function (cart) {
@@ -19,9 +18,8 @@
 	App.register(function () {
 		return {
 			cart: {
-				update: onCartUpdate
-			}
+				update: onCartUpdate,
+			},
 		};
 	});
-
 })(jQuery);

assets/js/modules/cart-update-qte.js

@@ -1,16 +1,15 @@
 /**
-* cart-update-qte
-* @author Deux Huit Huit
-*/
+ * cart-update-qte
+ * @author Deux Huit Huit
+ */
 (function ($, undefined) {
-
 	'use strict';
 
 	var scope = $('body');
 
 	var sels = {
 		qte: '.js-cart-qte',
-		btn: '.js-cart-qte-btn'
+		btn: '.js-cart-qte-btn',
 	};
 
 	var REQUEST_DELAY = 200;
@@ -23,11 +22,11 @@
 			dataType: 'json',
 			data: {
 				id: id,
-				quantity: qte
+				quantity: qte,
 			},
 			success: function (cart) {
 				App.notify('cart.forceUpdate', cart);
-			}
+			},
 		});
 	};
 
@@ -62,9 +61,8 @@
 	App.register(function () {
 		return {
 			app: {
-				init: init
-			}
+				init: init,
+			},
 		};
 	});
-
 })(jQuery);

assets/js/modules/cart-update.js

@@ -1,9 +1,8 @@
 /**
-* cart-update
-* @author Deux Huit Huit
-*/
+ * cart-update
+ * @author Deux Huit Huit
+ */
 (function ($, undefined) {
-
 	'use strict';
 
 	var scope = $('body');
@@ -14,7 +13,7 @@
 		itemTotal: '.js-cart-item-total',
 		discount: '.js-cart-discounts',
 		discountCtn: '.js-cart-discounts-ctn',
-		qte: '.js-cart-qte'
+		qte: '.js-cart-qte',
 	};
 
 	var formatMoney = function (money) {
@@ -31,7 +30,12 @@
 	};
 
 	var onCartUpdate = function (cart) {
-		if (!cart.items.length && window.location.pathname === '/cart' && !!scope.find(sels.item).length) { // jshint ignore:line
+		if (
+			!cart.items.length &&
+			window.location.pathname === '/cart' &&
+			!!scope.find(sels.item).length
+		) {
+			// jshint ignore:line
 			window.location.reload();
 			return;
 		}
@@ -80,9 +84,8 @@
 	App.register(function () {
 		return {
 			cart: {
-				update: onCartUpdate
-			}
+				update: onCartUpdate,
+			},
 		};
 	});
-
 })(jQuery);

assets/js/modules/cart.js

@@ -1,9 +1,8 @@
 /**
-* cart
-* @author Deux Huit Huit
-*/
+ * cart
+ * @author Deux Huit Huit
+ */
 (function ($, undefined) {
-
 	'use strict';
 
 	var fetchCart = function () {
@@ -13,7 +12,7 @@
 			dataType: 'json',
 			success: function (cart) {
 				App.notify('cart.update', cart);
-			}
+			},
 		});
 	};
 
@@ -32,13 +31,12 @@
 	App.register(function () {
 		return {
 			app: {
-				init: init
+				init: init,
 			},
 			cart: {
 				itemAdded: onItemAdded,
-				forceUpdate: onForceUpdate
-			}
+				forceUpdate: onForceUpdate,
+			},
 		};
 	});
-
 })(jQuery);