mirror of
https://github.com/Terncode/pixel.horse.git
synced 2026-09-24 21:55:52 +02:00
Update gulp*
This commit is contained in:
@@ -1,35 +1,35 @@
|
||||
@import "node_modules/bootstrap/scss/functions";
|
||||
@import "node_modules/bootstrap/scss/variables";
|
||||
@import "node_modules/bootstrap/scss/mixins";
|
||||
// @import "node_modules/bootstrap/scss/root";
|
||||
// @import "node_modules/bootstrap/scss/print";
|
||||
@import "node_modules/bootstrap/scss/reboot";
|
||||
@import "node_modules/bootstrap/scss/type";
|
||||
@import "node_modules/bootstrap/scss/images";
|
||||
@import "node_modules/bootstrap/scss/code";
|
||||
@import "node_modules/bootstrap/scss/grid";
|
||||
@import "node_modules/bootstrap/scss/tables";
|
||||
@import "node_modules/bootstrap/scss/forms";
|
||||
@import "node_modules/bootstrap/scss/buttons";
|
||||
@import "node_modules/bootstrap/scss/transitions";
|
||||
@import "node_modules/bootstrap/scss/dropdown";
|
||||
@import "node_modules/bootstrap/scss/button-group";
|
||||
@import "node_modules/bootstrap/scss/input-group";
|
||||
@import "node_modules/bootstrap/scss/custom-forms";
|
||||
@import "node_modules/bootstrap/scss/nav";
|
||||
@import "node_modules/bootstrap/scss/navbar";
|
||||
// @import "node_modules/bootstrap/scss/card";
|
||||
// @import "node_modules/bootstrap/scss/breadcrumb";
|
||||
@import "node_modules/bootstrap/scss/pagination";
|
||||
@import "node_modules/bootstrap/scss/badge";
|
||||
// @import "node_modules/bootstrap/scss/jumbotron";
|
||||
@import "node_modules/bootstrap/scss/alert";
|
||||
@import "node_modules/bootstrap/scss/progress";
|
||||
// @import "node_modules/bootstrap/scss/media";
|
||||
@import "node_modules/bootstrap/scss/list-group";
|
||||
@import "node_modules/bootstrap/scss/close";
|
||||
@import "node_modules/bootstrap/scss/modal";
|
||||
@import "node_modules/bootstrap/scss/tooltip";
|
||||
@import "node_modules/bootstrap/scss/popover";
|
||||
// @import "node_modules/bootstrap/scss/carousel";
|
||||
@import "node_modules/bootstrap/scss/utilities";
|
||||
@import "../../../node_modules/bootstrap/scss/functions";
|
||||
@import "../../../node_modules/bootstrap/scss/variables";
|
||||
@import "../../../node_modules/bootstrap/scss/mixins";
|
||||
// @import "../../../node_modules/bootstrap/scss/root";
|
||||
// @import "../../../node_modules/bootstrap/scss/print";
|
||||
@import "../../../node_modules/bootstrap/scss/reboot";
|
||||
@import "../../../node_modules/bootstrap/scss/type";
|
||||
@import "../../../node_modules/bootstrap/scss/images";
|
||||
@import "../../../node_modules/bootstrap/scss/code";
|
||||
@import "../../../node_modules/bootstrap/scss/grid";
|
||||
@import "../../../node_modules/bootstrap/scss/tables";
|
||||
@import "../../../node_modules/bootstrap/scss/forms";
|
||||
@import "../../../node_modules/bootstrap/scss/buttons";
|
||||
@import "../../../node_modules/bootstrap/scss/transitions";
|
||||
@import "../../../node_modules/bootstrap/scss/dropdown";
|
||||
@import "../../../node_modules/bootstrap/scss/button-group";
|
||||
@import "../../../node_modules/bootstrap/scss/input-group";
|
||||
@import "../../../node_modules/bootstrap/scss/custom-forms";
|
||||
@import "../../../node_modules/bootstrap/scss/nav";
|
||||
@import "../../../node_modules/bootstrap/scss/navbar";
|
||||
// @import "../../../node_modules/bootstrap/scss/card";
|
||||
// @import "../../../node_modules/bootstrap/scss/breadcrumb";
|
||||
@import "../../../node_modules/bootstrap/scss/pagination";
|
||||
@import "../../../node_modules/bootstrap/scss/badge";
|
||||
// @import "../../../node_modules/bootstrap/scss/jumbotron";
|
||||
@import "../../../node_modules/bootstrap/scss/alert";
|
||||
@import "../../../node_modules/bootstrap/scss/progress";
|
||||
// @import "../../../node_modules/bootstrap/scss/media";
|
||||
@import "../../../node_modules/bootstrap/scss/list-group";
|
||||
@import "../../../node_modules/bootstrap/scss/close";
|
||||
@import "../../../node_modules/bootstrap/scss/modal";
|
||||
@import "../../../node_modules/bootstrap/scss/tooltip";
|
||||
@import "../../../node_modules/bootstrap/scss/popover";
|
||||
// @import "../../../node_modules/bootstrap/scss/carousel";
|
||||
@import "../../../node_modules/bootstrap/scss/utilities";
|
||||
|
||||
@@ -1,35 +1,35 @@
|
||||
@import "node_modules/bootstrap/scss/functions";
|
||||
@import "node_modules/bootstrap/scss/variables";
|
||||
@import "node_modules/bootstrap/scss/mixins";
|
||||
// @import "node_modules/bootstrap/scss/root";
|
||||
// @import "node_modules/bootstrap/scss/print";
|
||||
@import "node_modules/bootstrap/scss/reboot";
|
||||
@import "node_modules/bootstrap/scss/type";
|
||||
@import "node_modules/bootstrap/scss/images";
|
||||
@import "node_modules/bootstrap/scss/code";
|
||||
@import "node_modules/bootstrap/scss/grid";
|
||||
// @import "node_modules/bootstrap/scss/tables";
|
||||
@import "node_modules/bootstrap/scss/forms";
|
||||
@import "node_modules/bootstrap/scss/buttons";
|
||||
@import "node_modules/bootstrap/scss/transitions";
|
||||
@import "node_modules/bootstrap/scss/dropdown";
|
||||
@import "node_modules/bootstrap/scss/button-group";
|
||||
@import "node_modules/bootstrap/scss/input-group";
|
||||
@import "node_modules/bootstrap/scss/custom-forms";
|
||||
@import "node_modules/bootstrap/scss/nav";
|
||||
@import "node_modules/bootstrap/scss/navbar";
|
||||
// @import "node_modules/bootstrap/scss/card";
|
||||
// @import "node_modules/bootstrap/scss/breadcrumb";
|
||||
// @import "node_modules/bootstrap/scss/pagination";
|
||||
@import "node_modules/bootstrap/scss/badge";
|
||||
// @import "node_modules/bootstrap/scss/jumbotron";
|
||||
@import "node_modules/bootstrap/scss/alert";
|
||||
// @import "node_modules/bootstrap/scss/progress";
|
||||
// @import "node_modules/bootstrap/scss/media";
|
||||
@import "node_modules/bootstrap/scss/list-group";
|
||||
// @import "node_modules/bootstrap/scss/close";
|
||||
@import "node_modules/bootstrap/scss/modal";
|
||||
@import "node_modules/bootstrap/scss/tooltip";
|
||||
@import "node_modules/bootstrap/scss/popover";
|
||||
// @import "node_modules/bootstrap/scss/carousel";
|
||||
@import "node_modules/bootstrap/scss/utilities";
|
||||
@import "../../../node_modules/bootstrap/scss/functions";
|
||||
@import "../../../node_modules/bootstrap/scss/variables";
|
||||
@import "../../../node_modules/bootstrap/scss/mixins";
|
||||
// @import "../../../node_modules/bootstrap/scss/root";
|
||||
// @import "../../../node_modules/bootstrap/scss/print";
|
||||
@import "../../../node_modules/bootstrap/scss/reboot";
|
||||
@import "../../../node_modules/bootstrap/scss/type";
|
||||
@import "../../../node_modules/bootstrap/scss/images";
|
||||
@import "../../../node_modules/bootstrap/scss/code";
|
||||
@import "../../../node_modules/bootstrap/scss/grid";
|
||||
// @import "../../../node_modules/bootstrap/scss/tables";
|
||||
@import "../../../node_modules/bootstrap/scss/forms";
|
||||
@import "../../../node_modules/bootstrap/scss/buttons";
|
||||
@import "../../../node_modules/bootstrap/scss/transitions";
|
||||
@import "../../../node_modules/bootstrap/scss/dropdown";
|
||||
@import "../../../node_modules/bootstrap/scss/button-group";
|
||||
@import "../../../node_modules/bootstrap/scss/input-group";
|
||||
@import "../../../node_modules/bootstrap/scss/custom-forms";
|
||||
@import "../../../node_modules/bootstrap/scss/nav";
|
||||
@import "../../../node_modules/bootstrap/scss/navbar";
|
||||
// @import "../../../node_modules/bootstrap/scss/card";
|
||||
// @import "../../../node_modules/bootstrap/scss/breadcrumb";
|
||||
// @import "../../../node_modules/bootstrap/scss/pagination";
|
||||
@import "../../../node_modules/bootstrap/scss/badge";
|
||||
// @import "../../../node_modules/bootstrap/scss/jumbotron";
|
||||
@import "../../../node_modules/bootstrap/scss/alert";
|
||||
// @import "../../../node_modules/bootstrap/scss/progress";
|
||||
// @import "../../../node_modules/bootstrap/scss/media";
|
||||
@import "../../../node_modules/bootstrap/scss/list-group";
|
||||
// @import "../../../node_modules/bootstrap/scss/close";
|
||||
@import "../../../node_modules/bootstrap/scss/modal";
|
||||
@import "../../../node_modules/bootstrap/scss/tooltip";
|
||||
@import "../../../node_modules/bootstrap/scss/popover";
|
||||
// @import "../../../node_modules/bootstrap/scss/carousel";
|
||||
@import "../../../node_modules/bootstrap/scss/utilities";
|
||||
|
||||
@@ -202,6 +202,6 @@ $flag-black: #3e4347;
|
||||
$flag-yellow: #ffe62e;
|
||||
$flag-green: #00aa00;
|
||||
|
||||
@import "node_modules/bootstrap/scss/functions";
|
||||
@import "node_modules/bootstrap/scss/variables";
|
||||
@import "node_modules/bootstrap/scss/mixins";
|
||||
@import "../../../node_modules/bootstrap/scss/functions";
|
||||
@import "../../../node_modules/bootstrap/scss/variables";
|
||||
@import "../../../node_modules/bootstrap/scss/mixins";
|
||||
|
||||
@@ -81,7 +81,7 @@ function getLabel(arg: LogArgument | undefined) {
|
||||
if (typeof arg === 'string') {
|
||||
return arg;
|
||||
} else if (arg && 'message' in arg) {
|
||||
return arg.message + (arg.stack || '');
|
||||
return (arg as any).message + (arg.stack || '');
|
||||
} else {
|
||||
return arg ? arg.toString() : '';
|
||||
}
|
||||
|
||||
+14
-1
@@ -6,7 +6,20 @@ import 'core-js/stable/promise/finally';
|
||||
import 'reflect-metadata';
|
||||
import * as Bluebird from 'bluebird';
|
||||
import * as fs from 'fs';
|
||||
import { argv } from 'yargs';
|
||||
import * as yargs from 'yargs';
|
||||
import { hideBin } from 'yargs/helpers';
|
||||
|
||||
const argv = (yargs as any)(hideBin(process.argv))
|
||||
.option('beta', {
|
||||
type: 'boolean',
|
||||
default: false
|
||||
})
|
||||
.option('tools', {
|
||||
type: 'boolean',
|
||||
default: false
|
||||
})
|
||||
.parseSync();
|
||||
|
||||
|
||||
(global as any).DEVELOPMENT = process.env.NODE_ENV !== 'production';
|
||||
(global as any).BETA = !!argv.beta;
|
||||
|
||||
+16
-1
@@ -1,5 +1,20 @@
|
||||
import { argv } from 'yargs';
|
||||
import { ServerConfig } from '../common/adminInterfaces';
|
||||
import * as yargs from 'yargs';
|
||||
import { hideBin } from 'yargs/helpers';
|
||||
|
||||
const argv = (yargs as any)(hideBin(process.argv))
|
||||
.option('port', { type: 'string' })
|
||||
.option('login', { type: 'boolean', default: false })
|
||||
.option('admin', { type: 'boolean', default: false })
|
||||
.option('standaloneadmin', { type: 'boolean', default: false })
|
||||
.option('game', { type: 'string', default: DEVELOPMENT })
|
||||
.option('superadmin', { type: 'string' })
|
||||
.option('users', { type: 'boolean', default: false })
|
||||
.option('tools', { type: 'boolean', default: false })
|
||||
.option('webpack', { type: 'boolean', default: false })
|
||||
.option('local', { type: 'boolean', default: false })
|
||||
.option('nocleanup', { type: 'boolean', default: false })
|
||||
.parse();
|
||||
|
||||
export interface AppConfig {
|
||||
title: string;
|
||||
|
||||
+2
-2
@@ -4,7 +4,7 @@ import '../server/boot';
|
||||
import * as mongoose from 'mongoose';
|
||||
import * as fs from 'fs';
|
||||
import * as path from 'path';
|
||||
import * as del from 'del';
|
||||
import { deleteAsync } from 'del';
|
||||
import { once, mapValues } from 'lodash';
|
||||
import { spawnSync } from 'child_process';
|
||||
import { createStubInstance, SinonStubbedInstance, stub } from 'sinon';
|
||||
@@ -51,7 +51,7 @@ export function generateDiff(expectedPath: string, actualPath: string) {
|
||||
}
|
||||
|
||||
export async function clearCompareResults(group: string) {
|
||||
await del([pathTo('tools', 'temp', group, '*.png').replace(/\\/g, '/')]);
|
||||
await deleteAsync([pathTo('tools', 'temp', group, '*.png').replace(/\\/g, '/')]);
|
||||
}
|
||||
|
||||
export function compareCanvases(
|
||||
|
||||
Reference in New Issue
Block a user