npm - @videinfra/static-website-builder - Versions diffs - 2.0.3 → 2.0.4 - Mend

@videinfra/static-website-builder 2.0.3 → 2.0.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (122) hide show

package/.prettierrc +11 -11
package/CHANGELOG.md +214 -214
package/README.md +102 -102
package/bin/builder.js +40 -40
package/eslint.config.js +39 -39
package/gulpfile.js +63 -63
package/init/default/config/config.js +44 -44
package/init/default/src/html/data/global.js +9 -9
package/init/default/src/javascripts/_entries.js +14 -14
package/init/index.js +63 -63
package/init/test/.env +6 -6
package/init/test/.env.local +3 -3
package/init/test/config/config.js +71 -71
package/init/test/src/html/404.twig +12 -12
package/init/test/src/html/data/global.js +10 -10
package/init/test/src/html/env.twig +21 -21
package/init/test/src/html/layouts/base.twig +1 -1
package/init/test/src/html/other.twig +9 -9
package/init/test/src/html/preposition.twig +4 -4
package/init/test/src/javascripts/_entries-alt.js +10 -10
package/init/test/src/javascripts/_entries.js +19 -19
package/init/test/src/javascripts/common.js +13 -13
package/init/test/src/javascripts/main.js +8 -8
package/init/test/src/javascripts/something.ts +9 -9
package/init/test/src/stylesheets/autoprefixer-test.scss +3 -3
package/init/test/src/stylesheets/env-test.scss +28 -28
package/init/test/src/stylesheets/ignore-test.scss +4 -4
package/init/test/src/stylesheets/nested-calc-test.scss +3 -3
package/init/test/src/stylesheets/sub-folder/import-test.scss +2 -2
package/lib/camelize-file-name.js +21 -21
package/lib/generate-gulp-tasks.js +85 -85
package/lib/get-config.js +203 -204
package/lib/get-file-names.js +23 -23
package/lib/get-path.js +102 -102
package/lib/globs-helper.js +243 -243
package/lib/gulp/dynamic-task.js +8 -8
package/lib/gulp/resolve-dynamic-task.js +11 -11
package/lib/gulp/task-before-dest.js +8 -8
package/lib/gulp/task-end.js +10 -10
package/lib/gulp/task-start.js +12 -12
package/lib/gulp/task-watch.js +66 -66
package/lib/init/copy-folder.js +50 -50
package/lib/init/folder-exists.js +10 -10
package/lib/init/get-folder-list.js +16 -16
package/lib/init/merge-package.js +17 -17
package/lib/init/read-package.js +17 -17
package/lib/log-error.js +15 -15
package/lib/merge.js +27 -27
package/lib/run-preprocess.js +32 -32
package/lib/task-order.js +19 -19
package/package.json +68 -68
package/plugins/example/preprocess-config.js +17 -17
package/plugins/example/task.js +55 -55
package/plugins/example.js +38 -38
package/plugins/sass-engine/preprocess-config.js +59 -59
package/plugins/sass.js +41 -41
package/plugins/twig/lodash-filters/filters.js +91 -91
package/plugins/twig/lodash-filters.js +14 -14
package/plugins/twig/symfony-filters/filters.js +102 -102
package/plugins/twig/symfony-filters/preposition_nbsp.js +77 -77
package/plugins/twig/symfony-filters.js +14 -14
package/plugins/twig/symfony-functions/functions.js +31 -31
package/plugins/twig/symfony-functions.js +14 -14
package/plugins/twig-engine/preprocess-config.js +53 -53
package/plugins/twig.js +74 -74
package/tasks/browser-sync/config.js +39 -39
package/tasks/browser-sync/preprocess-config.js +32 -32
package/tasks/browser-sync/task.js +9 -9
package/tasks/clean/config.js +20 -20
package/tasks/clean/preprocess-config.js +19 -19
package/tasks/clean/task.js +7 -7
package/tasks/data/config.js +34 -34
package/tasks/data/data-loader-js.js +14 -14
package/tasks/data/data-loader-json.js +5 -5
package/tasks/data/get-data.js +96 -96
package/tasks/env/config.js +26 -26
package/tasks/env/get-env.js +113 -113
package/tasks/fonts/config.js +24 -24
package/tasks/fonts/task.js +47 -47
package/tasks/global/config.js +7 -7
package/tasks/html/config.js +42 -42
package/tasks/html/task.js +91 -91
package/tasks/icons/config.js +47 -47
package/tasks/icons/preprocess-config.js +60 -60
package/tasks/icons/task.js +56 -56
package/tasks/images/config.js +27 -27
package/tasks/images/task.js +46 -46
package/tasks/javascripts/config.js +69 -69
package/tasks/javascripts/preprocess-config.js +109 -109
package/tasks/javascripts/task.js +86 -86
package/tasks/sitemap/config.js +48 -48
package/tasks/sitemap/preprocess-config.js +18 -18
package/tasks/sitemap/task.js +69 -69
package/tasks/sizereport/config.js +23 -23
package/tasks/sizereport/task.js +16 -16
package/tasks/static/config.js +27 -27
package/tasks/static/task.js +46 -46
package/tasks/stylesheets/config.js +85 -85
package/tasks/stylesheets/preprocess-config.js +41 -41
package/tasks/stylesheets/task.js +73 -73
package/tests/build/build.test.js +153 -153
package/tests/camelize-file-name.test.js +11 -11
package/tests/generate-gulp-tasks.test.js +78 -78
package/tests/glob-helper.test.js +99 -99
package/tests/merge.test.js +10 -10
package/tests/preposition_nbsp.test.js +50 -50
package/tests/run-preprocess.test.js +90 -90
package/tests/sass-stringify.test.js +24 -24
package/tests/sitemap.test.js +12 -12
package/vendor/gulp-rolldown/index.js +151 -151
package/vendor/gulp-rolldown/plugin-raw.js +17 -17
package/vendor/gulp-rolldown/plugin-virtual-entry.js +30 -30
package/vendor/gulp-sass/CHANGELOG.md +168 -168
package/vendor/gulp-sass/LICENSE +20 -20
package/vendor/gulp-sass/README.md +187 -187
package/vendor/gulp-sass/index.js +208 -208
package/vendor/gulp-sass/package.json +61 -61
package/vendor/gulp-sass/sass-stringify.js +32 -32
package/vendor/gulp-twig/LICENSE +20 -20
package/vendor/gulp-twig/README.md +167 -167
package/vendor/gulp-twig/index.js +138 -138
package/vendor/gulp-twig/package.json +44 -44

package/tests/build/build.test.js CHANGED Viewed

@@ -1,153 +1,153 @@
-import path from 'path';
-import { fileURLToPath } from 'node:url';
-import fsPromises from 'fs/promises';
-const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const publicPath = path.resolve(__dirname, 'public');
-test('TWIG templates rendered and minified with JS and JSON data', () => {
-    return fsPromises.readFile(path.resolve(publicPath, 'index.html'), { encoding: 'utf8' }).then((html) => {
-        expect(html).toBe('<html><body><h1>Hello World!</h1></body></html>');
-    });
-});
-test('Multiple TWIG templates rendered', () => {
-    expect.assertions(1);
-    return expect(fsPromises.access(path.resolve(publicPath, 'other.html'))).resolves.toBe(undefined);
-});
-test('SASS variable test', () => {
-    return fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/variable-test.css'), { encoding: 'utf8' }).then((css) => {
-        expect(css).toBe('main{background:#fff;color:#222}');
-    });
-});
-test('SASS import test', () => {
-    return fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/import-test.css'), { encoding: 'utf8' }).then((css) => {
-        expect(css).toBe('.btn{background:#222;color:#fff}');
-    });
-});
-test('SASS sub-folder import test', () => {
-    return fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/sub-folder/import-test.css'), { encoding: 'utf8' }).then((css) => {
-        expect(css).toBe('.btn{background:#222;color:#fff}');
-    });
-});
-test('SASS autoprefixer test', () => {
-    return fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/autoprefixer-test.css'), { encoding: 'utf8' }).then((css) => {
-        expect(css).toBe('main{clip-path:polygon(0 0,100% 0,100% 100%,0 100%)}');
-    });
-});
-test('CSS nano ignore test', () => {
-    return fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/ignore-test.css'), { encoding: 'utf8' }).then((css) => {
-        expect(css).toBe(':root{--yes: ;--no:initial}');
-    });
-});
-test('CSS nano nested calc test', () => {
-    return fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/nested-calc-test.css'), { encoding: 'utf8' }).then((css) => {
-        expect(css).toBe('body{padding-top:calc(10vw + 15vh)}');
-    });
-});
-test('Font file woff copied', () => {
-    expect.assertions(1);
-    return expect(fsPromises.access(path.resolve(publicPath, 'assets/fonts/font.woff'))).resolves.toBe(undefined);
-});
-test('Font file fake not copied', () => {
-    expect.assertions(1);
-    return expect(fsPromises.access(path.resolve(publicPath, 'assets/fonts/font.fake'))).rejects.toThrow('no such file or directory');
-});
-test('shared.js file exists', () => {
-    return Promise.all([
-        fsPromises.readFile(path.resolve(publicPath, 'assets/javascripts/shared.js'), { encoding: 'utf8' }).then((js) => {
-            expect(js.indexOf('console.log(`Shared file loaded`)')).not.toBe(-1);
-        }),
-    ]);
-});
-test('main.js file exists', () => {
-    return Promise.all([
-        fsPromises.readFile(path.resolve(publicPath, 'assets/javascripts/main.js'), { encoding: 'utf8' }).then((js) => {
-            expect(js.indexOf('console.log(`Hello from main page!`')).not.toBe(-1);
-        }),
-        fsPromises.readFile(path.resolve(publicPath, 'assets/javascripts/alt/main.js'), { encoding: 'utf8' }).then((js) => {
-            expect(js.indexOf('console.log(`Hello from main page!`')).not.toBe(-1);
-        }),
-    ]);
-});
-test('other.js file exists', () => {
-    return fsPromises.readFile(path.resolve(publicPath, 'assets/javascripts/other.js'), { encoding: 'utf8' }).then((js) => {
-        expect(js.indexOf('console.log(`Hello from other page!`)')).not.toBe(-1);
-    });
-});
-test('something.ts was converted', () => {
-    return Promise.all([
-        fsPromises.readFile(path.resolve(publicPath, 'assets/javascripts/something.js'), { encoding: 'utf8' }).then((js) => {
-            expect(js.indexOf('console.log({name:`something`})')).not.toBe(-1);
-        }),
-    ]);
-});
-test("alt/other.js file doesn't exist", async () => {
-    expect(fsPromises.stat(path.resolve(publicPath, 'assets/javascripts/alt/other.js'))).rejects.toThrow();
-});
-test('.env and .env.local files loaded', () => {
-    return Promise.all([
-        fsPromises.readFile(path.resolve(publicPath, 'assets/javascripts/main.js'), { encoding: 'utf8' }).then((js) => {
-            expect(js.indexOf('console.log(`env.host ==`,`https://test-local.tld`)')).not.toBe(-1);
-            expect(js.indexOf('console.log(`env.foo ==`,`foo-global`)')).not.toBe(-1);
-            expect(js.indexOf('console.log(`env.bar ==`,`bar-local`)')).not.toBe(-1);
-            expect(js.indexOf('console.log(`env.typeBoolTrue ==`,!0)')).not.toBe(-1);
-            expect(js.indexOf('console.log(`env.typeBoolFalse ==`,!1)')).not.toBe(-1);
-            expect(js.indexOf('console.log(`env.typeNumber ==`,123.456)')).not.toBe(-1);
-        }),
-        fsPromises.readFile(path.resolve(publicPath, 'env.html'), { encoding: 'utf8' }).then((html) => {
-            expect(html.indexOf('<p>HOST: https://test-local.tld</p>')).not.toBe(-1);
-            expect(html.indexOf('<p>TYPE_BOOL_TRUE: pass</p>')).not.toBe(-1);
-            expect(html.indexOf('<p>TYPE_BOOL_FALSE: pass</p>')).not.toBe(-1);
-            expect(html.indexOf('<p>TYPE_NUMBER: 123.456</p>')).not.toBe(-1);
-        }),
-        fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/env-test.css'), { encoding: 'utf8' }).then((css) => {
-            expect(css.indexOf('.env-test:before{content:"https://test-local.tld"}')).not.toBe(-1);
-            expect(css.indexOf('--env-test-bool-true:true')).not.toBe(-1);
-            expect(css.indexOf('--env-test-bool-false:false')).not.toBe(-1);
-            expect(css.indexOf('--env-test-type-number:123.456')).not.toBe(-1);
-            expect(css.indexOf('--env-test-type-empty:""')).not.toBe(-1);
-        }),
-    ]);
-});
-test('process.env available in html/data', () => {
-    return fsPromises.readFile(path.resolve(publicPath, 'env.html'), { encoding: 'utf8' }).then((html) => {
-        expect(html.indexOf('<p>HOST FROM GLOBAL JS: https://test-local.tld</p>')).not.toBe(-1);
-    });
-});
-test('icons generated', () => {
-    return fsPromises.readFile(path.resolve(publicPath, 'assets/images/icons.svg'), { encoding: 'utf8' }).then((svg) => {
-        expect(svg.indexOf('<symbol id="example-arrow">')).not.toBe(-1);
-    });
-});
-test('image copied', () => {
-    expect.assertions(1);
-    return expect(fsPromises.access(path.resolve(publicPath, 'assets/images/px.gif'))).resolves.toBe(undefined);
-});
-test('static copied', () => {
-    expect.assertions(1);
-    return expect(fsPromises.access(path.resolve(publicPath, 'assets/manifest/manifest.webmanifest'))).resolves.toBe(undefined);
-});
-test('static file merged into images', () => {
-    expect.assertions(1);
-    return expect(fsPromises.access(path.resolve(publicPath, 'assets/images/static.png'))).resolves.toBe(undefined);
-});
+import path from 'path';
+import { fileURLToPath } from 'node:url';
+import fsPromises from 'fs/promises';
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+const publicPath = path.resolve(__dirname, 'public');
+test('TWIG templates rendered and minified with JS and JSON data', () => {
+    return fsPromises.readFile(path.resolve(publicPath, 'index.html'), { encoding: 'utf8' }).then((html) => {
+        expect(html).toBe('<html><body><h1>Hello World!</h1></body></html>');
+    });
+});
+test('Multiple TWIG templates rendered', () => {
+    expect.assertions(1);
+    return expect(fsPromises.access(path.resolve(publicPath, 'other.html'))).resolves.toBe(undefined);
+});
+test('SASS variable test', () => {
+    return fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/variable-test.css'), { encoding: 'utf8' }).then((css) => {
+        expect(css).toBe('main{background:#fff;color:#222}');
+    });
+});
+test('SASS import test', () => {
+    return fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/import-test.css'), { encoding: 'utf8' }).then((css) => {
+        expect(css).toBe('.btn{background:#222;color:#fff}');
+    });
+});
+test('SASS sub-folder import test', () => {
+    return fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/sub-folder/import-test.css'), { encoding: 'utf8' }).then((css) => {
+        expect(css).toBe('.btn{background:#222;color:#fff}');
+    });
+});
+test('SASS autoprefixer test', () => {
+    return fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/autoprefixer-test.css'), { encoding: 'utf8' }).then((css) => {
+        expect(css).toBe('main{clip-path:polygon(0 0,100% 0,100% 100%,0 100%)}');
+    });
+});
+test('CSS nano ignore test', () => {
+    return fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/ignore-test.css'), { encoding: 'utf8' }).then((css) => {
+        expect(css).toBe(':root{--yes: ;--no:initial}');
+    });
+});
+test('CSS nano nested calc test', () => {
+    return fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/nested-calc-test.css'), { encoding: 'utf8' }).then((css) => {
+        expect(css).toBe('body{padding-top:calc(10vw + 15vh)}');
+    });
+});
+test('Font file woff copied', () => {
+    expect.assertions(1);
+    return expect(fsPromises.access(path.resolve(publicPath, 'assets/fonts/font.woff'))).resolves.toBe(undefined);
+});
+test('Font file fake not copied', () => {
+    expect.assertions(1);
+    return expect(fsPromises.access(path.resolve(publicPath, 'assets/fonts/font.fake'))).rejects.toThrow('no such file or directory');
+});
+test('shared.js file exists', () => {
+    return Promise.all([
+        fsPromises.readFile(path.resolve(publicPath, 'assets/javascripts/shared.js'), { encoding: 'utf8' }).then((js) => {
+            expect(js.indexOf('console.log(`Shared file loaded`)')).not.toBe(-1);
+        }),
+    ]);
+});
+test('main.js file exists', () => {
+    return Promise.all([
+        fsPromises.readFile(path.resolve(publicPath, 'assets/javascripts/main.js'), { encoding: 'utf8' }).then((js) => {
+            expect(js.indexOf('console.log(`Hello from main page!`')).not.toBe(-1);
+        }),
+        fsPromises.readFile(path.resolve(publicPath, 'assets/javascripts/alt/main.js'), { encoding: 'utf8' }).then((js) => {
+            expect(js.indexOf('console.log(`Hello from main page!`')).not.toBe(-1);
+        }),
+    ]);
+});
+test('other.js file exists', () => {
+    return fsPromises.readFile(path.resolve(publicPath, 'assets/javascripts/other.js'), { encoding: 'utf8' }).then((js) => {
+        expect(js.indexOf('console.log(`Hello from other page!`)')).not.toBe(-1);
+    });
+});
+test('something.ts was converted', () => {
+    return Promise.all([
+        fsPromises.readFile(path.resolve(publicPath, 'assets/javascripts/something.js'), { encoding: 'utf8' }).then((js) => {
+            expect(js.indexOf('console.log({name:`something`})')).not.toBe(-1);
+        }),
+    ]);
+});
+test("alt/other.js file doesn't exist", async () => {
+    expect(fsPromises.stat(path.resolve(publicPath, 'assets/javascripts/alt/other.js'))).rejects.toThrow();
+});
+test('.env and .env.local files loaded', () => {
+    return Promise.all([
+        fsPromises.readFile(path.resolve(publicPath, 'assets/javascripts/main.js'), { encoding: 'utf8' }).then((js) => {
+            expect(js.indexOf('console.log(`env.host ==`,`https://test-local.tld`)')).not.toBe(-1);
+            expect(js.indexOf('console.log(`env.foo ==`,`foo-global`)')).not.toBe(-1);
+            expect(js.indexOf('console.log(`env.bar ==`,`bar-local`)')).not.toBe(-1);
+            expect(js.indexOf('console.log(`env.typeBoolTrue ==`,!0)')).not.toBe(-1);
+            expect(js.indexOf('console.log(`env.typeBoolFalse ==`,!1)')).not.toBe(-1);
+            expect(js.indexOf('console.log(`env.typeNumber ==`,123.456)')).not.toBe(-1);
+        }),
+        fsPromises.readFile(path.resolve(publicPath, 'env.html'), { encoding: 'utf8' }).then((html) => {
+            expect(html.indexOf('<p>HOST: https://test-local.tld</p>')).not.toBe(-1);
+            expect(html.indexOf('<p>TYPE_BOOL_TRUE: pass</p>')).not.toBe(-1);
+            expect(html.indexOf('<p>TYPE_BOOL_FALSE: pass</p>')).not.toBe(-1);
+            expect(html.indexOf('<p>TYPE_NUMBER: 123.456</p>')).not.toBe(-1);
+        }),
+        fsPromises.readFile(path.resolve(publicPath, 'assets/stylesheets/env-test.css'), { encoding: 'utf8' }).then((css) => {
+            expect(css.indexOf('.env-test:before{content:"https://test-local.tld"}')).not.toBe(-1);
+            expect(css.indexOf('--env-test-bool-true:true')).not.toBe(-1);
+            expect(css.indexOf('--env-test-bool-false:false')).not.toBe(-1);
+            expect(css.indexOf('--env-test-type-number:123.456')).not.toBe(-1);
+            expect(css.indexOf('--env-test-type-empty:""')).not.toBe(-1);
+        }),
+    ]);
+});
+test('process.env available in html/data', () => {
+    return fsPromises.readFile(path.resolve(publicPath, 'env.html'), { encoding: 'utf8' }).then((html) => {
+        expect(html.indexOf('<p>HOST FROM GLOBAL JS: https://test-local.tld</p>')).not.toBe(-1);
+    });
+});
+test('icons generated', () => {
+    return fsPromises.readFile(path.resolve(publicPath, 'assets/images/icons.svg'), { encoding: 'utf8' }).then((svg) => {
+        expect(svg.indexOf('<symbol id="example-arrow">')).not.toBe(-1);
+    });
+});
+test('image copied', () => {
+    expect.assertions(1);
+    return expect(fsPromises.access(path.resolve(publicPath, 'assets/images/px.gif'))).resolves.toBe(undefined);
+});
+test('static copied', () => {
+    expect.assertions(1);
+    return expect(fsPromises.access(path.resolve(publicPath, 'assets/manifest/manifest.webmanifest'))).resolves.toBe(undefined);
+});
+test('static file merged into images', () => {
+    expect.assertions(1);
+    return expect(fsPromises.access(path.resolve(publicPath, 'assets/images/static.png'))).resolves.toBe(undefined);
+});

package/tests/camelize-file-name.test.js CHANGED Viewed

@@ -1,11 +1,11 @@
-import camelizeFileName  from '../lib/camelize-file-name.js';
-test('Camelize file name', () => {
-    expect(camelizeFileName('test-file-name')).toBe('testFileName');
-    expect(camelizeFileName('testFileName')).toBe('testFileName');
-    expect(camelizeFileName('testFile_name')).toBe('testFileName');
-    expect(camelizeFileName('test-file-name.jpg')).toBe('testFileName');
-    expect(camelizeFileName('testFileName.jpg')).toBe('testFileName');
-    expect(camelizeFileName('test-āēūīķļ-name.jpg.png')).toBe('testName');
-    expect(camelizeFileName('.gitignore')).toBe('gitignore');
-});
+import camelizeFileName  from '../lib/camelize-file-name.js';
+test('Camelize file name', () => {
+    expect(camelizeFileName('test-file-name')).toBe('testFileName');
+    expect(camelizeFileName('testFileName')).toBe('testFileName');
+    expect(camelizeFileName('testFile_name')).toBe('testFileName');
+    expect(camelizeFileName('test-file-name.jpg')).toBe('testFileName');
+    expect(camelizeFileName('testFileName.jpg')).toBe('testFileName');
+    expect(camelizeFileName('test-āēūīķļ-name.jpg.png')).toBe('testName');
+    expect(camelizeFileName('.gitignore')).toBe('gitignore');
+});

package/tests/generate-gulp-tasks.test.js CHANGED Viewed

@@ -1,78 +1,78 @@
-import pick  from 'lodash/pick.js';
-import { generateTaskList }  from '../lib/generate-gulp-tasks.js';
-import { BEFORE_BUILD, BUILD, AFTER_BUILD, BEFORE_WATCH, WATCH }  from '../lib/task-order.js';
-test('Tasks are organized correctly', () => {
-    const beforeBuildA = () => {};
-    const beforeBuildB = () => {};
-    const buildA = () => {};
-    const buildB = () => {};
-    const beforeWatchA = () => {};
-    const watchA = () => {};
-    const afterBuildA = () => {};
-    const taskConfig = {'tasks': {
-        'task1': [
-            {[BEFORE_BUILD]: beforeBuildA},
-            {[BEFORE_BUILD]: beforeBuildB},
-        ],
-        'task2': [
-            {[BUILD]: buildA, [WATCH]: watchA}
-        ],
-        'task3': [
-            {[BUILD]: buildB, [AFTER_BUILD]: afterBuildA}
-        ],
-        'task4': [
-            {[BEFORE_WATCH]: beforeWatchA}
-        ],
-    }};
-    expect(pick(generateTaskList(taskConfig), ['default', 'watch', 'build'])).toEqual({
-        default: [
-            [beforeBuildA, beforeBuildB],
-            [buildA, buildB],
-            [beforeWatchA],
-            [watchA],
-        ],
-        watch: [
-            [beforeBuildA, beforeBuildB],
-            [buildA, buildB],
-            [beforeWatchA],
-            [watchA],
-        ],
-        build: [
-            [beforeBuildA, beforeBuildB],
-            [buildA, buildB],
-            [afterBuildA],
-        ]
-    });
-});
-test('Skipping tasks doesn\'t genearate empty arrays', () => {
-    const beforeBuildA = () => {};
-    const beforeBuildB = () => {};
-    const buildA = () => {};
-    const buildB = () => {};
-    const afterBuildA = () => {};
-    const taskConfig = {'tasks': {
-        'task1': [
-            {[BEFORE_BUILD]: beforeBuildA},
-            {[BEFORE_BUILD]: beforeBuildB},
-        ],
-        'task2': [
-            {[BUILD]: buildA}
-        ],
-        'task3': [
-            {[BUILD]: buildB, [AFTER_BUILD]: afterBuildA}
-        ],
-    }};
-    const taskList = pick(generateTaskList(taskConfig), ['default', 'watch', 'build']);
-    for (let taskName in taskList) {
-        taskList[taskName].forEach((parallel) => {
-            expect(parallel.length).not.toBe(0);
-        });
-    }
-});
+import pick  from 'lodash/pick.js';
+import { generateTaskList }  from '../lib/generate-gulp-tasks.js';
+import { BEFORE_BUILD, BUILD, AFTER_BUILD, BEFORE_WATCH, WATCH }  from '../lib/task-order.js';
+test('Tasks are organized correctly', () => {
+    const beforeBuildA = () => {};
+    const beforeBuildB = () => {};
+    const buildA = () => {};
+    const buildB = () => {};
+    const beforeWatchA = () => {};
+    const watchA = () => {};
+    const afterBuildA = () => {};
+    const taskConfig = {'tasks': {
+        'task1': [
+            {[BEFORE_BUILD]: beforeBuildA},
+            {[BEFORE_BUILD]: beforeBuildB},
+        ],
+        'task2': [
+            {[BUILD]: buildA, [WATCH]: watchA}
+        ],
+        'task3': [
+            {[BUILD]: buildB, [AFTER_BUILD]: afterBuildA}
+        ],
+        'task4': [
+            {[BEFORE_WATCH]: beforeWatchA}
+        ],
+    }};
+    expect(pick(generateTaskList(taskConfig), ['default', 'watch', 'build'])).toEqual({
+        default: [
+            [beforeBuildA, beforeBuildB],
+            [buildA, buildB],
+            [beforeWatchA],
+            [watchA],
+        ],
+        watch: [
+            [beforeBuildA, beforeBuildB],
+            [buildA, buildB],
+            [beforeWatchA],
+            [watchA],
+        ],
+        build: [
+            [beforeBuildA, beforeBuildB],
+            [buildA, buildB],
+            [afterBuildA],
+        ]
+    });
+});
+test('Skipping tasks doesn\'t genearate empty arrays', () => {
+    const beforeBuildA = () => {};
+    const beforeBuildB = () => {};
+    const buildA = () => {};
+    const buildB = () => {};
+    const afterBuildA = () => {};
+    const taskConfig = {'tasks': {
+        'task1': [
+            {[BEFORE_BUILD]: beforeBuildA},
+            {[BEFORE_BUILD]: beforeBuildB},
+        ],
+        'task2': [
+            {[BUILD]: buildA}
+        ],
+        'task3': [
+            {[BUILD]: buildB, [AFTER_BUILD]: afterBuildA}
+        ],
+    }};
+    const taskList = pick(generateTaskList(taskConfig), ['default', 'watch', 'build']);
+    for (let taskName in taskList) {
+        taskList[taskName].forEach((parallel) => {
+            expect(parallel.length).not.toBe(0);
+        });
+    }
+});