Babel config minor updates, change fonts loading, rename styles folde…

…r `partials` to `components`.
yurayarosh · May 18, 2021 · 8472d4f · 8472d4f
1 parent b7b3812
commit 8472d4f
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 29 deletions.
diff --git a/generators/app/index.js b/generators/app/index.js
@@ -27,21 +27,24 @@ module.exports = class extends Generator {
         yarn: true,
       })
     } else {
-      this.log(`Run ${chalk.blue('npm install')} or ${chalk.blue('yarn')} to install dependencies later.`)
+      this.log(
+        `Run ${chalk.blue('npm install')} or ${chalk.blue('yarn')} to install dependencies later.`
+      )
     }
   }
 
   end() {
     if (this.props.sprites.indexOf('sprite-svg') > -1) {
       this.log(
-        '\n'
-        + chalk.red('DON\'T FORGET')
-        + ' to install '
-        + chalk.blue('svg4everybody')
-        + ' or ' + chalk.blue('svg-use-it')
-        + ' otherwise IE will not show you svg sprite ¯\\_(ツ)_/¯'
-        + '\n'
-      );
+        '\n' +
+          chalk.red("DON'T FORGET") +
+          ' to install ' +
+          chalk.blue('svg4everybody') +
+          ' or ' +
+          chalk.blue('svg-use-it') +
+          ' otherwise IE will not show you svg sprite ¯\\_(ツ)_/¯' +
+          '\n'
+      )
     }
     this.log(chalk.green('Done!'))
   }

diff --git a/generators/app/prompts.js b/generators/app/prompts.js
@@ -8,7 +8,7 @@ module.exports = [
   {
     type: 'input',
     name: 'author',
-    message: 'Input project author'
+    message: 'Input project author',
   },
   {
     type: 'input',

diff --git a/generators/app/templates/package.json b/generators/app/templates/package.json
@@ -63,12 +63,7 @@
   "babel": {
     "plugins": [
       "@babel/plugin-transform-runtime",
-      [
-        "@babel/plugin-proposal-class-properties",
-        {
-          "loose": true
-        }
-      ]
+      "@babel/plugin-proposal-class-properties"
     ],
     "presets": [
       [

diff --git a/generators/app/templates/src/js/components/LazyLoader/LazyLoader.js b/generators/app/templates/src/js/components/LazyLoader/LazyLoader.js
@@ -101,11 +101,7 @@ export default class LazyLoader {
   loadFonts() {
     const PATH_TO_FONTS_CSS = '/css'
 
-    if (supportsWoff2) {
-      loadCSS(`${PATH_TO_FONTS_CSS}/data-woff2.css`)
-    } else {
-      loadCSS(`${PATH_TO_FONTS_CSS}/data-woff.css`)
-    }
+    if (!supportsWoff2) loadCSS(`${PATH_TO_FONTS_CSS}/data-woff.css`)
   }
 
   update() {

diff --git a/generators/app/templates/src/js/components/LazyLoader/setLazy.js b/generators/app/templates/src/js/components/LazyLoader/setLazy.js
@@ -4,7 +4,7 @@ export default async app => {
   const element = document.querySelector(`.${classNames.lazy}`)
   if (!element) return
 
-  const { default: LazyLoader } = import(/* webpackChunkName: "LazyLoader" */ './LazyLoader')
+  const { default: LazyLoader } = await import(/* webpackChunkName: "LazyLoader" */ './LazyLoader')
   app.lazyLoader = new LazyLoader()
   app.lazyLoader.init()
 }
diff --git a/generators/app/templates/src/sass/app.sass b/generators/app/templates/src/sass/app.sass
@@ -6,5 +6,5 @@
 @import fonts
 @import typo
 @import common
-@import partials/all
+@import components/all
 @import modificators
diff --git a/...app/templates/src/sass/partials/_all.sass → ...p/templates/src/sass/components/_all.sass b/...app/templates/src/sass/partials/_all.sass → ...p/templates/src/sass/components/_all.sass
diff --git a/...plates/src/sass/partials/_animations.sass → ...ates/src/sass/components/_animations.sass b/...plates/src/sass/partials/_animations.sass → ...ates/src/sass/components/_animations.sass
diff --git a/.../templates/src/sass/partials/_footer.sass → ...emplates/src/sass/components/_footer.sass b/.../templates/src/sass/partials/_footer.sass → ...emplates/src/sass/components/_footer.sass
diff --git a/.../templates/src/sass/partials/_header.sass → ...emplates/src/sass/components/_header.sass b/.../templates/src/sass/partials/_header.sass → ...emplates/src/sass/components/_header.sass
diff --git a/...app/templates/src/sass/partials/_out.sass → ...p/templates/src/sass/components/_out.sass b/...app/templates/src/sass/partials/_out.sass → ...p/templates/src/sass/components/_out.sass
diff --git a/generators/app/templates/src/scss/app.scss b/generators/app/templates/src/scss/app.scss
@@ -6,5 +6,5 @@
 @import 'fonts';
 @import 'typo';
 @import 'common';
-@import 'partials/all';
+@import 'components/all';
 @import 'modificators';
diff --git a/...app/templates/src/scss/partials/_all.scss → ...p/templates/src/scss/components/_all.scss b/...app/templates/src/scss/partials/_all.scss → ...p/templates/src/scss/components/_all.scss
diff --git a/...plates/src/scss/partials/_animations.scss → ...ates/src/scss/components/_animations.scss b/...plates/src/scss/partials/_animations.scss → ...ates/src/scss/components/_animations.scss
diff --git a/.../templates/src/scss/partials/_footer.scss → ...emplates/src/scss/components/_footer.scss b/.../templates/src/scss/partials/_footer.scss → ...emplates/src/scss/components/_footer.scss
diff --git a/.../templates/src/scss/partials/_header.scss → ...emplates/src/scss/components/_header.scss b/.../templates/src/scss/partials/_header.scss → ...emplates/src/scss/components/_header.scss
diff --git a/...app/templates/src/scss/partials/_out.scss → ...p/templates/src/scss/components/_out.scss b/...app/templates/src/scss/partials/_out.scss → ...p/templates/src/scss/components/_out.scss
diff --git a/generators/app/templates/src/templates/layouts/_default.html b/generators/app/templates/src/templates/layouts/_default.html
@@ -11,8 +11,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="theme-color" content="#fff">
     <meta name="format-detection" content="telephone=no">
-    <link rel="preload" href="fonts/proximanova-regular-webfont.woff2" as="font" type="font/woff2" crossorigin>
-    <link rel="stylesheet" media="all" href="css/app.css">
+    <link rel="preload" href="fonts/proximanova-regular-webfont.woff2" as="font" type="font/woff2" crossorigin="anonymous">
+    <link rel="stylesheet" media="all" href="/css/data-woff2.css">
+    <link rel="stylesheet" media="all" href="/css/app.css">
   </head>
   <body {% if bodyClass %}class="{{ bodyClass }}"{% endif %}>
     <!-- BEGIN content -->
@@ -27,7 +28,7 @@
     </div>
     <!-- END content -->
     <!-- BEGIN scripts -->
-    <script id="app-script" src="js/app.js"></script>
+    <script id="app-script" src="/js/app.js"></script>
     <!-- END scripts -->
   </body>
 </html>
diff --git a/generators/app/writing.js b/generators/app/writing.js
@@ -1,14 +1,14 @@
 const { join } = require('path')
 const mkdirp = require('mkdirp')
 
-module.exports = function() {
+module.exports = function () {
   const { props, fs } = this
   const destPath = this.destinationPath()
 
   const HAS_PREVIEW = props.preview
   const HAS_PNG = props.sprites.indexOf('png') !== -1
   const HAS_SVG = props.sprites.indexOf('sprite-svg') !== -1
-  const HAS_SVG_INLINE = props.sprites.indexOf('inline-svg') !== -1  
+  const HAS_SVG_INLINE = props.sprites.indexOf('inline-svg') !== -1
   const HAS_SASS = props.css === 'sass'
   const HAS_SCSS = props.css === 'scss'
   const HAS_CSS_GRID = props.cssGrid

diff --git a/package.json b/package.json
@@ -20,6 +20,13 @@
   "bugs": {
     "url": "https://github.com/yurayarosh/generator-front-starter-kit/issues"
   },
+  "prettier": {
+    "singleQuote": true,
+    "semi": false,
+    "trailingComma": "es5",
+    "printWidth": 100,
+    "arrowParens": "avoid"
+  },
   "dependencies": {
     "chalk": "^3.0.0",
     "mkdirp": "^1.0.3",