Drop gulp-autoprefixer and cleanup boot process

This commit is contained in:
djmaze 2021-02-04 15:03:11 +01:00
parent b26586f2ba
commit 192f76c08a
6 changed files with 390 additions and 459 deletions

View file

@ -1,4 +1,4 @@
.progressjs { #progressjs {
left: 0; left: 0;
position: fixed; position: fixed;
top: 0; top: 0;

View file

@ -33,13 +33,14 @@ const
} }
}; };
} }
return win[name];
}, },
STORAGE_KEY = '__rlA', STORAGE_KEY = '__rlA',
TIME_KEY = '__rlT', TIME_KEY = '__rlT',
AUTH_KEY = 'AuthAccountHash', AUTH_KEY = 'AuthAccountHash',
storage = () => window.sessionStorage, storage = Storage('session'),
timestamp = () => Math.round(Date.now() / 1000), timestamp = () => Math.round(Date.now() / 1000),
setTimestamp = () => storage().setItem(TIME_KEY, timestamp()), setTimestamp = () => storage.setItem(TIME_KEY, timestamp()),
showError = () => { showError = () => {
eId('rl-loading').hidden = true; eId('rl-loading').hidden = true;
@ -83,29 +84,29 @@ if (!navigator || !navigator.cookieEnabled) {
} }
let pStep = 0, let pStep = 0,
container = doc.querySelector('.progressjs'), container = eId('progressjs'),
progress = doc.querySelector('.progressjs-inner'), progress = container.querySelector('.progressjs-inner'),
RL_APP_DATA = {}; RL_APP_DATA = {};
win.rl = { win.rl = {
hash: { hash: {
// getHash // getHash
get: () => storage().getItem(STORAGE_KEY) || null, get: () => storage.getItem(STORAGE_KEY) || null,
// setHash // setHash
set: () => { set: () => {
storage().setItem(STORAGE_KEY, RL_APP_DATA && RL_APP_DATA[AUTH_KEY] storage.setItem(STORAGE_KEY, RL_APP_DATA && RL_APP_DATA[AUTH_KEY]
? RL_APP_DATA[AUTH_KEY] : ''); ? RL_APP_DATA[AUTH_KEY] : '');
setTimestamp(); setTimestamp();
}, },
// clearHash // clearHash
clear: () => { clear: () => {
storage().setItem(STORAGE_KEY, ''); storage.setItem(STORAGE_KEY, '');
setTimestamp(); setTimestamp();
}, },
// checkTimestamp // checkTimestamp
check: () => { check: () => {
if (timestamp() > (parseInt(storage().getItem(TIME_KEY) || 0, 10) || 0) + 3600000) { if (timestamp() > (parseInt(storage.getItem(TIME_KEY) || 0, 10) || 0) + 3600000) {
// 60m // 60m
rl.hash.clear(); rl.hash.clear();
return true; return true;
@ -166,7 +167,6 @@ win.rl = {
p.set(1); p.set(1);
Storage('local'); Storage('local');
Storage('session');
// init section // init section
setInterval(setTimestamp, 60000); // 1m setInterval(setTimestamp, 60000); // 1m

View file

@ -50,7 +50,6 @@
"eslint": "6.8.0", "eslint": "6.8.0",
"eslint-plugin-prettier": "3.3.1", "eslint-plugin-prettier": "3.3.1",
"gulp": "4.0.2", "gulp": "4.0.2",
"gulp-autoprefixer": "7.0.1",
"gulp-cached": "1.1.1", "gulp-cached": "1.1.1",
"gulp-clean-css": "4.3.0", "gulp-clean-css": "4.3.0",
"gulp-concat-util": "0.5.5", "gulp-concat-util": "0.5.5",

View file

@ -41,7 +41,7 @@
</div> </div>
<div id="rl-templates"></div> <div id="rl-templates"></div>
</div> </div>
<div class="progressjs"><div class="progressjs-inner"><div class="progressjs-percent"></div></div></div> <div id="progressjs"><div class="progressjs-inner"><div class="progressjs-percent"></div></div></div>
<script type="text/javascript">{{BaseAppBootScript}}</script> <script type="text/javascript">{{BaseAppBootScript}}</script>
</body> </body>

View file

@ -15,20 +15,19 @@ const { del } = require('./common');
const cssClean = () => del(config.paths.staticCSS + '/*.css'); const cssClean = () => del(config.paths.staticCSS + '/*.css');
const cssBootBuild = () => { const cssBootBuild = () => {
const autoprefixer = require('gulp-autoprefixer'), const
src = config.paths.css.boot.src; src = config.paths.css.boot.src;
return gulp return gulp
.src(src) .src(src)
.pipe(expect.real({ errorOnFailure: true }, src)) .pipe(expect.real({ errorOnFailure: true }, src))
.pipe(concat(config.paths.css.boot.name)) .pipe(concat(config.paths.css.boot.name))
.pipe(autoprefixer())
.pipe(replace(/\.\.\/(img|images|fonts|svg)\//g, '$1/')) .pipe(replace(/\.\.\/(img|images|fonts|svg)\//g, '$1/'))
.pipe(eol('\n', true)) .pipe(eol('\n', true))
.pipe(gulp.dest(config.paths.staticCSS)); .pipe(gulp.dest(config.paths.staticCSS));
}; };
const cssMainBuild = () => { const cssMainBuild = () => {
const autoprefixer = require('gulp-autoprefixer'), const
less = require('gulp-less'), less = require('gulp-less'),
lessFilter = filter('**/*.less', { restore: true }), lessFilter = filter('**/*.less', { restore: true }),
src = config.paths.css.main.src.concat([config.paths.less.main.src]); src = config.paths.css.main.src.concat([config.paths.less.main.src]);
@ -44,7 +43,6 @@ const cssMainBuild = () => {
) )
.pipe(lessFilter.restore) .pipe(lessFilter.restore)
.pipe(concat(config.paths.css.main.name)) .pipe(concat(config.paths.css.main.name))
.pipe(autoprefixer())
.pipe(replace(/\.\.\/(img|images|fonts|svg)\//g, '$1/')) .pipe(replace(/\.\.\/(img|images|fonts|svg)\//g, '$1/'))
.pipe(eol('\n', true)) .pipe(eol('\n', true))
.pipe(gulp.dest(config.paths.staticCSS)) .pipe(gulp.dest(config.paths.staticCSS))

820
yarn.lock

File diff suppressed because it is too large Load diff