Skip to content
This repository was archived by the owner on Dec 25, 2023. It is now read-only.

Commit ba224e6

Browse files
authored
Apply changes from Lychee (#3)
* Add workflow and prettier * fix git * don't install git * fix job nsme * Update gitignore * fix format * Apply changes from Lychee * Fix + rebuild * Fix SCSS * fix build * fix git job * update metadata * use tabs * Reformat * update metadata * reformat * update lockfile * fix git job again * Fix lockfile * Remove gulp plugins * Rework gulpfile Change it to be similar to basicModal * Fix styles * Bump version * Add scope to name
1 parent 0e23b1b commit ba224e6

File tree

16 files changed

+9049
-4624
lines changed

16 files changed

+9049
-4624
lines changed

dist/addons/fadein.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/addons/popin.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/basicContext.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/basicContext.min.js

Lines changed: 1 addition & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/themes/bright.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/themes/dark.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/themes/default.min.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/themes/light.min.css

Lines changed: 0 additions & 1 deletion
This file was deleted.

gulpfile.js

Lines changed: 54 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,74 +1,75 @@
1-
var name = require("./package.json").moduleName,
2-
fs = require("fs"),
3-
gulp = require("gulp"),
4-
plugins = require("gulp-load-plugins")();
5-
sass = require("gulp-sass")(require("sass"));
1+
"use strict";
62

7-
var head = fs.readFileSync("./node_modules/@electerious/modulizer/head.js", {
8-
encoding: "utf8",
9-
}),
10-
foot = fs.readFileSync("./node_modules/@electerious/modulizer/foot.js", {
11-
encoding: "utf8",
12-
});
3+
const name = require("./package.json").moduleName;
4+
const gulp = require("gulp");
5+
const browserify = require("browserify");
6+
const babelify = require("babelify");
7+
const source = require("vinyl-source-stream");
8+
const buffer = require("vinyl-buffer");
9+
const uglify = require("gulp-uglify");
10+
const sass = require("gulp-sass")(require("sass"));
11+
const rename = require("gulp-rename");
12+
const autoprefixer = require("gulp-autoprefixer");
13+
const csso = require("gulp-csso");
1314

14-
var catchError = function (err) {
15+
const catchError = function (err) {
1516
console.log(err.toString());
1617
this.emit("end");
1718
};
1819

19-
gulp.task("styles", function () {
20-
gulp
21-
.src("./src/styles/main.scss")
22-
.pipe(sass().on("error", catchError))
20+
gulp.task("scripts", function () {
21+
return browserify({
22+
entries: "./src/scripts/basicContext.js",
23+
standalone: name,
24+
})
25+
.transform(
26+
babelify.configure({
27+
presets: ["@babel/preset-env"],
28+
})
29+
)
30+
.bundle()
31+
.on("error", catchError)
32+
.pipe(source(name + ".min.js"))
33+
.pipe(buffer())
34+
.pipe(uglify())
2335
.on("error", catchError)
24-
.pipe(plugins.concat(name + ".min.css", { newLine: "\n" }))
25-
.pipe(plugins.autoprefixer("last 2 version", "> 1%"))
26-
.pipe(plugins.minifyCss())
2736
.pipe(gulp.dest("./dist"));
37+
});
2838

29-
gulp
30-
.src("./src/styles/themes/*.scss")
31-
.pipe(sass().on("error", catchError))
39+
gulp.task("styles", function () {
40+
return gulp
41+
.src("./src/styles/main.scss")
42+
.pipe(sass())
3243
.on("error", catchError)
33-
.pipe(
34-
plugins.rename(function (path) {
35-
path.basename += ".min";
36-
})
37-
)
38-
.pipe(plugins.autoprefixer("last 2 version", "> 1%"))
39-
.pipe(plugins.minifyCss())
40-
.pipe(gulp.dest("./dist/themes"));
44+
.pipe(rename((path) => (path.basename = name + ".min")))
45+
.pipe(autoprefixer("last 2 version", "> 1%"))
46+
.pipe(csso({ restructure: false }))
47+
.pipe(gulp.dest("./dist"));
48+
});
4149

50+
gulp.task("addons", function () {
4251
return gulp
4352
.src("./src/styles/addons/*.scss")
44-
.pipe(sass().on("error", catchError))
53+
.pipe(sass())
4554
.on("error", catchError)
46-
.pipe(
47-
plugins.rename(function (path) {
48-
path.basename += ".min";
49-
})
50-
)
51-
.pipe(plugins.autoprefixer("last 2 version", "> 1%"))
52-
.pipe(plugins.minifyCss())
55+
.pipe(rename((path) => (path.basename = path.basename + ".min")))
56+
.pipe(autoprefixer("last 2 version", "> 1%"))
57+
.pipe(csso({ restructure: false }))
5358
.pipe(gulp.dest("./dist/addons"));
5459
});
5560

56-
gulp.task("scripts", function () {
61+
gulp.task("themes", function () {
5762
return gulp
58-
.src("./src/scripts/*.js")
59-
.pipe(plugins.header(head, { name: name }))
60-
.pipe(plugins.footer(foot))
61-
.pipe(plugins.babel())
62-
.on("error", catchError)
63-
.pipe(plugins.concat(name + ".min.js", { newLine: "\n" }))
64-
.pipe(plugins.uglify())
63+
.src("./src/styles/themes/*.scss")
64+
.pipe(sass())
6565
.on("error", catchError)
66-
.pipe(gulp.dest("./dist"));
66+
.pipe(rename((path) => (path.basename = path.basename + ".min")))
67+
.pipe(autoprefixer("last 2 version", "> 1%"))
68+
.pipe(csso({ restructure: false }))
69+
.pipe(gulp.dest("./dist/themes"));
6770
});
6871

69-
gulp.task("default", gulp.series(gulp.parallel("styles", "scripts")));
70-
71-
gulp.task("watch", gulp.series("default"), function () {
72-
gulp.watch("./src/styles/**/*.scss", ["styles"]);
73-
gulp.watch("./src/scripts/**/*.js", ["scripts"]);
74-
});
72+
gulp.task(
73+
"default",
74+
gulp.series(gulp.parallel("scripts", "styles", "addons", "themes"))
75+
);

0 commit comments

Comments
 (0)