Small refactoring

magesuite · Jul 3, 2019 · 7355c9e · 7355c9e
1 parent 9bf37b2
commit 7355c9e
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 801 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 config.js
+build.js
 
 # Created by https://www.gitignore.io/api/osx,node,windows,visualstudiocode
 # Edit at https://www.gitignore.io/?templates=osx,node,windows,visualstudiocode

diff --git a/README.md b/README.md
@@ -63,7 +63,7 @@ modules: [
     {
         name: 'foo/bar',
         create: true,
-        exclude: ['requirejs/require'],
+        exclude: ['bundles/common'],
         include: ['foo/bar/baz'],
     },
 ];
@@ -77,7 +77,7 @@ modules: [
         Promise.resolve({
             name: 'foo/bar',
             create: true,
-            exclude: ['requirejs/require'],
+            exclude: ['bundles/common'],
             include: ['foo/bar/baz'],
         }),
 ];

diff --git a/build.js b/build.js
diff --git a/cli.js b/cli.js
@@ -48,7 +48,7 @@ if (program.generate) {
     }
 
     try {
-        require('./lib/optimize')(program.config, program.dir);
+        require('./lib/bundle')(program.config, program.dir);
     } catch (error) {
         console.error(error);
         process.exit(1);

diff --git a/config.sample.js b/config.sample.js
@@ -1,5 +1,5 @@
 const category = require('magepack/lib/module/category');
-const checkout = require('magepack/lib/module/checkout');
+// const checkout = require('magepack/lib/module/checkout');
 const cms = require('magepack/lib/module/cms');
 const customer = require('magepack/lib/module/customer');
 const pdp = require('magepack/lib/module/pdp');
@@ -18,36 +18,36 @@ module.exports = {
         browser =>
             category(browser, {
                 url: `${baseUrl}/women/tops-women/jackets-women.html`,
-                excludeRegExp: /^\.|amazon|smile|klarna/i,
-            }),
-        browser =>
-            checkout(browser, {
-                url: {
-                    product: `${baseUrl}/overnight-duffle.html`,
-                    cart: `${baseUrl}/checkout/cart/`,
-                    checkout: `${baseUrl}/checkout/`,
-                },
-                excludeRegExp: /^\.|amazon|smile|klarna/i,
+                excludeRegExp: /^\.|amazon|smile|klarna|Magento_Checkout\/js\/view\/minicart/i,
             }),
+        // browser =>
+        //     checkout(browser, {
+        //         url: {
+        //             product: `${baseUrl}/overnight-duffle.html`,
+        //             cart: `${baseUrl}/checkout/cart/`,
+        //             checkout: `${baseUrl}/checkout/`,
+        //         },
+        //         excludeRegExp: /^\.|amazon|smile|klarna/i,
+        //     }),
         browser =>
             cms(browser, {
                 url: baseUrl,
-                excludeRegExp: /^\.|amazon|smile|klarna/i,
+                excludeRegExp: /^\.|amazon|smile|klarna|Magento_Checkout\/js\/view\/minicart/i,
             }),
         browser =>
             customer(browser, {
                 url: `${baseUrl}/customer/account/login/`,
                 email: '[email protected]',
                 password: 'Testing123',
-                excludeRegExp: /^\.|amazon|smile|klarna/i,
+                excludeRegExp: /^\.|amazon|smile|klarna|Magento_Checkout\/js\/view\/minicart/i,
             }),
         browser =>
             pdp(browser, {
                 url: [
                     `${baseUrl}/olivia-1-4-zip-light-jacket.html`,
                     `${baseUrl}/overnight-duffle.html`,
                 ],
-                excludeRegExp: /^\.|amazon|smile|klarna/i,
+                excludeRegExp: /^\.|amazon|smile|klarna|Magento_Checkout\/js\/view\/minicart/i,
             }),
     ],
 };
diff --git a/lib/baseConfig.js b/lib/baseConfig.js
@@ -1,6 +1,6 @@
 module.exports = {
     optimize: 'uglify2',
-    inlineText: true,
+    inlineText: false,
     logLevel: 2,
     preserveLicenseComments: false,
     deps: [],

diff --git a/lib/optimize.js → lib/bundle.js b/lib/optimize.js → lib/bundle.js
@@ -52,8 +52,8 @@ module.exports = async (configPath, dirPath) => {
 
             await fs.appendFile(fileName, contents);
 
-            console.log('Removing temporary directory for static files...');
-            await fs.remove(baseUrl);
+            // console.log('Removing temporary directory for static files...');
+            // await fs.remove(baseUrl);
 
             console.log('Finished optimized bundling.');
         },

diff --git a/lib/dependencies/collect.js b/lib/dependencies/collect.js
@@ -10,7 +10,10 @@ module.exports = (page, excludeRegExp = /^\./) =>
                                 window.require.s.contexts._.defined
                             ).filter(
                                 dependency =>
-                                    dependency.indexOf('mixins!') !== 0
+                                    dependency.indexOf('mixins!') === -1 &&
+                                    dependency.indexOf('text!') === -1 &&
+                                    dependency !== 'text' &&
+                                    dependency !== 'mage/gallery/gallery'
                             );
 
                             resolve(dependencies);

diff --git a/lib/generate.js b/lib/generate.js
@@ -58,6 +58,6 @@ module.exports = async (outputPath, userConfigPath) => {
 
     fs.outputFile(
         path.resolve(outputPath),
-        `module.exports = ${stringify(buildConfig)}`
+        `module.exports = ${stringify(buildConfig, { indent: '  ' })}`
     );
 };