-Asset compression with Gulp (Now commented, uncomment on production frontend/co…

…nfig/main.php and re-compress)

-Asset compression with Gulp (Now commented, uncomment on production frontend/co…
…nfig/main.php and re-compress)
Alexey Boroda
1 parent e3b0a3cb
Showing 9 changed files with 171 additions and 17 deletions Show diff stats
common/config/main.php
console/config/bootstrap.php
frontend/assets/AppAsset.php
frontend/config/assets-prod.php
frontend/config/main.php
tools/gulp/assets-config.php
tools/gulp/gulpfile.js
tools/gulp/node_modules/.gitignore
tools/gulp/package.json
@@ -3,14 +3,6 @@
         'language'      => 'ru',
         'vendorPath' => dirname(dirname(__DIR__)) . '/vendor',
         'components' => [
-            'assetManager' => [
-                'bundles' => [
-                    'yii\web\JqueryAsset' =>[
-                        'jsOptions' =>  ['position' => \yii\web\View::POS_HEAD]
-                    ]
-                ],
-            ],
-            
             'sms' => [
                 'class' => 'common\components\SmsSender',
             ],
 <?php
-Yii::setAlias('@uploadDir', dirname(dirname(__DIR__)) . '/storage/sync');
-Yii::setAlias('@uploadFileProducts', 'products.csv');
-Yii::setAlias('@uploadFilePrices', 'file_1.csv');
-Yii::setAlias('@uploadFilePricesAway', 'price_product_away.csv');
-Yii::setAlias('@uploadFilePricesDuplicate', 'price_duplicate.csv');
-Yii::setAlias('@uploadFilePricesNoVariant', 'price_no_variant.csv');
-
-Yii::setAlias('@productsDir', '@frontend/web/images/products');
 \ No newline at end of file
+    Yii::setAlias('@uploadDir', dirname(dirname(__DIR__)) . '/storage/sync');
+    Yii::setAlias('@uploadFileProducts', 'products.csv');
+    Yii::setAlias('@uploadFilePrices', 'file_1.csv');
+    Yii::setAlias('@uploadFilePricesAway', 'price_product_away.csv');
+    Yii::setAlias('@uploadFilePricesDuplicate', 'price_duplicate.csv');
+    Yii::setAlias('@uploadFilePricesNoVariant', 'price_no_variant.csv');
+    Yii::setAlias('@web', dirname(dirname(__DIR__)) . '/frontend/web');
+    Yii::setAlias('@webroot', dirname(dirname(__DIR__)) . '/frontend');
+    Yii::setAlias('@productsDir', '@frontend/web/images/products');
 \ No newline at end of file
@@ -16,7 +16,7 @@ class AppAsset extends AssetBundle
         'css/fonts.css',
     ];
     public $js = [
-        'js/npm.js',
+//        'js/npm.js',
         'js/script.js',
     ];
     public $depends = [
+<?php
+/**
+ * This file is generated by the "yii asset" command.
+ * DO NOT MODIFY THIS FILE DIRECTLY.
+ * @version 2016-10-12 09:43:55
+ */
+return [
+    'all' => [
+        'class' => 'yii\\web\\AssetBundle',
+        'basePath' => '@webroot/assets',
+        'baseUrl' => '@web/assets',
+        'js' => [
+            'all-f246a0d9c24e97837891e00a6176e80b.js',
+        ],
+        'css' => [
+            'all-132788b2bdfb3ef7abdc19ec90671f19.css',
+        ],
+    ],
+    'yii\\web\\JqueryAsset' => [
+        'sourcePath' => null,
+        'js' => [],
+        'css' => [],
+        'depends' => [
+            'all',
+        ],
+    ],
+    'yii\\web\\YiiAsset' => [
+        'sourcePath' => null,
+        'js' => [],
+        'css' => [],
+        'depends' => [
+            'yii\\web\\JqueryAsset',
+            'all',
+        ],
+    ],
+    'yii\\bootstrap\\BootstrapAsset' => [
+        'sourcePath' => null,
+        'js' => [],
+        'css' => [],
+        'depends' => [
+            'all',
+        ],
+    ],
+    'yii\\bootstrap\\BootstrapPluginAsset' => [
+        'sourcePath' => null,
+        'js' => [],
+        'css' => [],
+        'depends' => [
+            'yii\\web\\JqueryAsset',
+            'yii\\bootstrap\\BootstrapAsset',
+            'all',
+        ],
+    ],
+    'yii\\bootstrap\\BootstrapThemeAsset' => [
+        'sourcePath' => null,
+        'js' => [],
+        'css' => [],
+        'depends' => [
+            'yii\\bootstrap\\BootstrapAsset',
+            'all',
+        ],
+    ],
+    'frontend\\assets\\AppAsset' => [
+        'sourcePath' => null,
+        'js' => [],
+        'css' => [],
+        'depends' => [
+            'yii\\web\\YiiAsset',
+            'yii\\bootstrap\\BootstrapPluginAsset',
+            'yii\\bootstrap\\BootstrapThemeAsset',
+            'all',
+        ],
+    ],
+];
 \ No newline at end of file
@@ -12,6 +12,12 @@ return [
     'bootstrap' => ['log'],
     'controllerNamespace' => 'frontend\controllers',
     'components' => [
+        'assetManager' => [
+//            'bundles' => require(__DIR__  . '/' . 'assets-prod.php'),
+            'bundles' => [
+                'frontend\assets\AppAsset',
+            ],
+        ],
         'request' => [
             'baseUrl' => '',
             'cookieValidationKey' => 'ndahjhjjidasuidrqeswuiuirqw89',
+<?php
+/*
+Yii command:
+yii asset tools/gulp/assets-config.php config/assets-prod.php
+*/
+
+Yii::setAlias('@webroot', dirname(dirname(__DIR__)) . '/frontend/web');
+Yii::setAlias('@web', '/');
+
+return [
+    'jsCompressor' => 'gulp compress-js --gulpfile tools/gulp/gulpfile.js --src {from} --dist {to}',
+    'cssCompressor' => 'gulp compress-css --gulpfile tools/gulp/gulpfile.js --src {from} --dist {to}',
+    'bundles' => [
+        'frontend\assets\AppAsset',
+    ],
+    'targets' => [
+        'all' => [
+            'class' => 'yii\web\AssetBundle',
+            'basePath' => '@webroot/assets',
+            'baseUrl' => '@web/assets',
+            'js' => 'all-{hash}.js',
+            'css' => 'all-{hash}.css',
+            'depends' => [
+            ],
+        ],
+    ],
+    // Asset manager configuration:
+    'assetManager' => [
+        'basePath' => '@webroot/assets',
+        'baseUrl' => '@web/assets',
+    ],
+];
+var gulp = require('gulp');
+var uglify = require('gulp-uglify');
+var cssMin = require('gulp-css');
+
+
+// Need because of `yii console`
+var rename = require('gulp-rename');
+var minimist = require('minimist');
+var options = minimist(process.argv.slice(2), { string: 'src', string: 'dist' });
+var destDir = options.dist.substring(0, options.dist.lastIndexOf("/")); 
+var destFile = options.dist.replace(/^.*[\\\/]/, '');
+
+
+// Use `compress-js` task for JavaScript files 
+gulp.task('compress-js', function() {
+  gulp.src(options.src)
+    .pipe(uglify())
+	
+	.pipe(rename(destFile))
+    .pipe(gulp.dest(destDir))
+});
+
+// Use `compress-css` task for CSS files
+gulp.task('compress-css', function() {
+  gulp.src(options.src)
+    .pipe(cssMin())
+	
+	.pipe(rename(destFile))
+    .pipe(gulp.dest(destDir))
+});
 \ No newline at end of file
+*
+!.gitignore
+{
+  "name": "yii2-gulp",
+  "version": "1.0.0",
+  "description": "Yii2 Gulp",
+  "keywords": [
+    "tools"
+  ],
+  "author": "Darko Lukic",
+  "license": "ISC",
+  "dependencies": {
+    "gulp": "*",
+	"gulp-uglify": "*",
+	"minimist": "*",
+	"gulp-rename": "*",
+	"gulp-css": "*"
+  }
+}