From c0ebf8a84b7bfb54178d2bda55fd6d67accc9ea0 Mon Sep 17 00:00:00 2001 From: jobxhub <39736850+jobxhub@users.noreply.github.com> Date: Thu, 9 Aug 2018 11:12:37 +0800 Subject: [PATCH 01/46] Update JobXProcess.java --- .../main/java/com/jobxhub/agent/process/JobXProcess.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java b/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java index 69e3465c..889e77ff 100644 --- a/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java +++ b/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java @@ -58,8 +58,8 @@ public class JobXProcess { private final CountDownLatch startupLatch; private final CountDownLatch completeLatch; private File logFile; - private volatile Integer processId; - private volatile Process process; + private Integer processId; + private Process process; private boolean killed = false; private String execUser; private final String runAsUserBinary = Constants.JOBX_EXECUTE_AS_USER_LIB; @@ -156,7 +156,7 @@ public void run() { kill(); timer.cancel(); } - }, 0,timeout * 60 * 1000); + },timeout * 60 * 1000); } } From fb782a7d190a3184dc922966e95bca646f48da46 Mon Sep 17 00:00:00 2001 From: benjobs Date: Sun, 26 Aug 2018 22:57:22 +0800 Subject: [PATCH 02/46] exec big fix! --- .../jobxhub/agent/process/ExecuteUser.java | 46 +++- .../jobxhub/agent/process/JobXProcess.java | 145 +++++------ .../jobxhub/agent/service/AgentService.java | 33 +-- .../java/com/jobxhub/common/Constants.java | 6 +- .../java/com/jobxhub/common/job/Response.java | 2 +- .../com/jobxhub/common/util/CommandUtils.java | 233 ++++++++++++++---- .../jobxhub/common/util/HttpClientUtils.java | 2 +- .../java/com/jobxhub/common/util/IOUtils.java | 1 + .../main/java/com/jobxhub/rpc/RpcFuture.java | 2 +- .../jobxhub/rpc/netty/NettyServerHandler.java | 4 +- .../server/service/ExecuteService.java | 12 +- .../jobxhub/server/service/RecordService.java | 8 +- 12 files changed, 311 insertions(+), 183 deletions(-) diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java b/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java index 1b4e23c5..c8009ec5 100644 --- a/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java +++ b/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java @@ -22,19 +22,22 @@ package com.jobxhub.agent.process; import com.jobxhub.common.Constants; +import com.jobxhub.common.util.AssertUtils; +import com.jobxhub.common.util.CommonUtils; import com.jobxhub.common.util.IOUtils; -import com.jobxhub.common.util.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import java.io.File; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; + +import static com.jobxhub.common.util.CommandUtils.*; public class ExecuteUser { private final static Logger logger = LoggerFactory.getLogger(ExecuteUser.class); + public ExecuteUser() { if (!IOUtils.fileExists(Constants.JOBX_EXECUTE_AS_USER_LIB)) { throw new RuntimeException("[JobX]not found ExecuteUser binary. Invalid Path: " + Constants.JOBX_EXECUTE_AS_USER_LIB); @@ -44,14 +47,14 @@ public ExecuteUser() { /** * API to execute a command on behalf of another user. * - * @param user The proxy user + * @param user The proxy user * @param command the list containing the program and its arguments * @return The return value of the shell command */ - public int execute(final String user, final List command) throws IOException { - logger.info("[Jobx]execute Command {} ",StringUtils.joinString(command)); + public static int execute(final String user, final File file, final String command) throws IOException { + logger.info("[Jobx]execute Command {} ", command); final Process process = new ProcessBuilder() - .command(buildCommand(user, command)) + .command(buildCommand(user, file, command)) .inheritIO() .start(); int exitCode; @@ -64,11 +67,28 @@ public int execute(final String user, final List command) throws IOExcep return exitCode; } - public static List buildCommand(final String user, final List command) { - final List commandList = new ArrayList(); - commandList.add(Constants.JOBX_EXECUTE_AS_USER_LIB); - commandList.add(user); - commandList.addAll(command); - return commandList; + public static String buildCommand(final String proxyUser, final File execFile, final String command) { + AssertUtils.notNull(command); + if (CommonUtils.isUnix()) { + //写入命令到文件 + write(execFile, command); + String execCmd = String.format("/bin/bash +x %s", execFile.getAbsolutePath()); + if (CommonUtils.notEmpty(proxyUser)) { + //授权文件... + try { + chown(false,proxyUser, proxyUser,execFile); + } catch (Exception e) { + throw new RuntimeException("[JobX] chown command file error,{}", e.getCause()); + } + return Constants.JOBX_EXECUTE_AS_USER_LIB + .concat(IOUtils.BLANK_CHAR) + .concat(proxyUser) + .concat(IOUtils.BLANK_CHAR) + .concat(execCmd); + + } + return execCmd; + } + return command; } } diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java b/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java index 889e77ff..dd2e7627 100644 --- a/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java +++ b/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java @@ -23,7 +23,9 @@ import com.jobxhub.agent.util.ProcessLogger; import com.jobxhub.common.Constants; +import com.jobxhub.common.Constants.ExitCode ; import com.jobxhub.common.logging.LoggerFactory; +import com.jobxhub.common.util.CommandUtils; import com.jobxhub.common.util.CommonUtils; import com.jobxhub.common.util.IOUtils; import com.jobxhub.common.util.ReflectUtils; @@ -45,39 +47,38 @@ public class JobXProcess { + private org.slf4j.Logger logger = LoggerFactory.getLogger(JobXProcess.class); private Logger processLogger; - private final String workingDir; public static String KILL_COMMAND = "kill"; - private final List command; + private final String command; private final int timeout; private final CountDownLatch startupLatch; private final CountDownLatch completeLatch; - private File logFile; private Integer processId; + private ExitCode kill; + private File logFile; + private File execShell; private Process process; - private boolean killed = false; private String execUser; - private final String runAsUserBinary = Constants.JOBX_EXECUTE_AS_USER_LIB; public JobXProcess(String command, int timeout, String pid, String execUser) { - this.workingDir = IOUtils.getTmpdir(); this.timeout = timeout; - this.logFile = new File(Constants.JOBX_LOG_PATH + "/." + pid + ".log"); + this.logFile = getLogFile(pid); this.processId = -1; this.processLogger = this.getLogger(pid); this.startupLatch = new CountDownLatch(1); this.completeLatch = new CountDownLatch(1); this.execUser = execUser; - List commandLine = getCommandLine(command); - if (isExecAsUser()) { - this.command = ExecuteUser.buildCommand(execUser,commandLine); - }else { - this.command = commandLine; + if (CommonUtils.isUnix()) { + this.execShell = getExecShell(pid); + this.command = ExecuteUser.buildCommand(execUser, execShell, command); + } else { + this.command = command; } } @@ -85,25 +86,21 @@ public JobXProcess(String command, int timeout, String pid, String execUser) { * Execute this process, blocking until it has completed. */ public int start() { - if (this.isStarted() || this.isComplete()) { throw new IllegalStateException("[JobX]The process can only be used once."); } - ProcessBuilder builder = new ProcessBuilder(this.command); - builder.directory(new File(this.workingDir)); - builder.redirectErrorStream(true); - int exitCode = -1; try { this.watchTimeOut(); - this.process = builder.start(); + this.process = Runtime.getRuntime().exec(this.command); this.processId = getProcessId(); - if (processId == null) { - this.logger.debug("[JobX]Spawned thread with unknown process id"); + if (this.processId == 0) { + this.logger.info("[JobX]Spawned thread with unknown process id"); } else { - this.logger.debug("[JobX]Spawned thread with process id " + processId); + this.logger.info("[JobX]Spawned thread with process id " + this.processId); } + this.startupLatch.countDown(); ProcessLogger outputLogger = ProcessLogger.getLoger(this.process.getInputStream(), this.processLogger, Level.INFO); ProcessLogger errorLogger = ProcessLogger.getLoger(this.process.getErrorStream(), this.processLogger, Level.ERROR); @@ -136,11 +133,12 @@ public int start() { IOUtils.closeQuietly(this.process.getInputStream()); IOUtils.closeQuietly(this.process.getOutputStream()); IOUtils.closeQuietly(this.process.getErrorStream()); + //最后以特殊不了见的字符作为log和exitCode+结束时间的分隔符. this.processLogger.info(IOUtils.FIELD_TERMINATED_BY + exitCode + IOUtils.TAB + new Date().getTime()); this.process.destroy(); - if (this.killed) { - exitCode = Constants.StatusCode.KILL.getValue(); + if (this.kill!=null) { + exitCode = this.kill.getValue(); } return exitCode; } @@ -153,10 +151,10 @@ private void watchTimeOut() { @Override public void run() { //kill job... - kill(); + kill(Constants.ExitCode.TIME_OUT); timer.cancel(); } - },timeout * 60 * 1000); + }, timeout * 60 * 1000); } } @@ -174,11 +172,18 @@ public String getLogMessage() { } public void deleteLog() { - if (this.logFile.exists()) { + if (CommonUtils.notEmpty(this.logFile)) { this.logFile.delete(); } } + public void deleteExecShell() { + if (CommonUtils.notEmpty(this.execShell)) { + this.execShell.delete(); + } + } + + /** * Await the completion of this process * @@ -199,20 +204,19 @@ public void awaitStartup() throws InterruptedException { this.startupLatch.await(); } - public void kill() { + public void kill(ExitCode kill) { if (isStarted()) { + this.kill = kill; try { if (CommonUtils.isWindows()) { - killed = true; hardKill(); }else { - boolean flag = softKill(1000*5,TimeUnit.SECONDS); + boolean flag = softKill(1000,TimeUnit.SECONDS); if (!flag) { hardKill(); } } }catch (Exception e) { - killed = false; logger.info("[JobX]Kill attempt failed：{}",e.getMessage()); } } @@ -228,22 +232,25 @@ public void kill() { private boolean softKill(long time, TimeUnit unit) throws InterruptedException { if (this.processId != 0 && isStarted()) { try { + String cmd; if (isExecAsUser()) { - String cmd = String.format( + cmd = String.format( "%s %s %s %d", - runAsUserBinary, + Constants.JOBX_EXECUTE_AS_USER_LIB, this.execUser, KILL_COMMAND, this.processId ); - Runtime.getRuntime().exec(cmd); } else { - String cmd = String.format("%s %d", KILL_COMMAND, this.processId); - Runtime.getRuntime().exec(cmd); + cmd = String.format("%s %d", KILL_COMMAND, this.processId); } + Process process = Runtime.getRuntime().exec(cmd); + process.waitFor(); + process.destroy(); + this.processLogger.error("[JobX]hardKill attempt successful."); return this.completeLatch.await(time, unit); } catch (IOException e) { - this.processLogger.error("[JobX]Kill attempt failed.", e); + this.processLogger.error("[JobX]softKill attempt failed.", e); } return false; } @@ -260,7 +267,7 @@ private void hardKill() { if (CommonUtils.isUnix()) { if (isExecAsUser()) { cmd = String.format("%s %s %s -9 %d", - this.runAsUserBinary, + Constants.JOBX_EXECUTE_AS_USER_LIB, this.execUser, KILL_COMMAND, this.processId); } else { @@ -269,13 +276,12 @@ private void hardKill() { }else if(CommonUtils.isWindows()) { cmd = String.format("cmd.exe /c taskkill /PID %s /F /T ",this.processId) ; } - Runtime runtime =Runtime.getRuntime(); - Process process = runtime.exec(cmd); + Process process = Runtime.getRuntime().exec(cmd); process.waitFor(); process.destroy(); - this.processLogger.error("[JobX]Kill attempt successful."); + this.processLogger.error("[JobX]hardKill attempt successful."); }catch (Exception e) { - this.processLogger.error("[JobX]Kill attempt failed.", e); + this.processLogger.error("[JobX]hardKill attempt failed.", e); } this.processId = null; } @@ -291,7 +297,8 @@ private Integer getProcessId() { if (this.process == null) return null; if (CommonUtils.isUnix()) { Field field = ReflectUtils.getField(this.process.getClass(), "pid"); - return field.getInt(this.process); + Integer pid = field.getInt(this.process); + return CommandUtils.getPIDByPPID(pid); }else if(CommonUtils.isWindows()) { Field field = ReflectUtils.getField(this.process.getClass(), "handle"); field.setAccessible(true); @@ -358,54 +365,12 @@ private Logger getLogger(String name) { return logger; } - private List getCommandLine(String command) { - ArrayList commands = new ArrayList(); - int index = 0; - - StringBuffer buffer = new StringBuffer(command.length()); - - boolean isApos = false; - boolean isQuote = false; - while (index < command.length()) { - char c = command.charAt(index); - switch (c) { - case ' ': - if (!isQuote && !isApos) { - String arg = buffer.toString(); - buffer = new StringBuffer(command.length() - index); - if (arg.length() > 0) { - commands.add(arg); - } - } else { - buffer.append(c); - } - break; - case '\'': - if (!isQuote) { - isApos = !isApos; - } else { - buffer.append(c); - } - break; - case '"': - if (!isApos) { - isQuote = !isQuote; - } else { - buffer.append(c); - } - break; - default: - buffer.append(c); - } - - index++; - } - - if (buffer.length() > 0) { - String arg = buffer.toString(); - commands.add(arg); - } + private File getExecShell(String pid) { + return new File(Constants.JOBX_TMP_PATH + "/." + pid + ".sh"); + } - return Arrays.asList(commands.toArray(new String[commands.size()])); + private File getLogFile(String pid) { + return new File(Constants.JOBX_LOG_PATH + "/." + pid + ".log"); } + } diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/service/AgentService.java b/jobx-agent/src/main/java/com/jobxhub/agent/service/AgentService.java index fff43746..82627f12 100644 --- a/jobx-agent/src/main/java/com/jobxhub/agent/service/AgentService.java +++ b/jobx-agent/src/main/java/com/jobxhub/agent/service/AgentService.java @@ -23,6 +23,7 @@ import com.alibaba.fastjson.JSON; import com.jobxhub.agent.process.JobXProcess; import com.jobxhub.common.Constants; +import com.jobxhub.common.Constants.ExitCode ; import com.jobxhub.common.api.AgentJob; import com.jobxhub.common.ext.ExtensionLoader; import com.jobxhub.common.job.Action; @@ -91,8 +92,8 @@ public Response handle(Request request) { return Response.response(request) .setSuccess(false) .setResult(result) - .setExitCode(Constants.StatusCode.ERROR_PASSWORD.getValue()) - .setMessage(Constants.StatusCode.ERROR_PASSWORD.getDescription()) + .setExitCode(ExitCode.ERROR_PASSWORD.getValue()) + .setMessage(ExitCode.ERROR_PASSWORD.getDescription()) .end(); } @@ -143,7 +144,7 @@ public Response ping(Request request) { return Response.response(request) .setResult(result) .setSuccess(true) - .setExitCode(Constants.StatusCode.SUCCESS_EXIT.getValue()) + .setExitCode(ExitCode.SUCCESS_EXIT.getValue()) .end(); } @@ -151,14 +152,14 @@ public Response ping(Request request) { public Response path(Request request) { //返回密码文件的路径... return Response.response(request).setSuccess(true) - .setExitCode(Constants.StatusCode.SUCCESS_EXIT.getValue()) + .setExitCode(ExitCode.SUCCESS_EXIT.getValue()) .setMessage(Constants.JOBX_HOME) .end(); } @Override public Response listPath(Request request) { - Response response = Response.response(request).setExitCode(Constants.StatusCode.SUCCESS_EXIT.getValue()); + Response response = Response.response(request).setExitCode(ExitCode.SUCCESS_EXIT.getValue()); String path = request.getParams().getString(Constants.PARAM_LISTPATH_PATH_KEY); if (CommonUtils.isEmpty(path)) return response.setSuccess(false).end(); File file = new File(path); @@ -191,7 +192,7 @@ public Response monitor(Request request) { Map map = monitor.toMap(); response.setResult(map) .setSuccess(true) - .setExitCode(Constants.StatusCode.SUCCESS_EXIT.getValue()) + .setExitCode(ExitCode.SUCCESS_EXIT.getValue()) .end(); return response; } catch (SigarException e) { @@ -224,14 +225,14 @@ public Response execute(final Request request) { processMap.put(pid,jobXProcess); try { - int exitCode = jobXProcess.start(); - response.setExitCode(exitCode); + response.setExitCode(jobXProcess.start()); }catch (Exception e) { response.setExitCode(-1); }finally { String message = jobXProcess.getLogMessage(); response.setMessage(message); response.end(); + jobXProcess.deleteExecShell(); //todo 得确保server和agent是连接的状态才可以清理log... jobXProcess.deleteLog(); processMap.remove(pid); @@ -244,7 +245,7 @@ public Response password(Request request) { String newPassword = request.getParams().getString(Constants.PARAM_NEWPASSWORD_KEY); Response response = Response.response(request); if (isEmpty(newPassword)) { - return response.setSuccess(false).setExitCode(Constants.StatusCode.SUCCESS_EXIT.getValue()).setMessage("密码不能为空").end(); + return response.setSuccess(false).setExitCode(ExitCode.SUCCESS_EXIT.getValue()).setMessage("密码不能为空").end(); } //把老的注册删除 @@ -256,7 +257,7 @@ public Response password(Request request) { //最新密码信息注册进来 register(request.getHost(),request.getPort()); - return response.setSuccess(true).setExitCode(Constants.StatusCode.SUCCESS_EXIT.getValue()).end(); + return response.setSuccess(true).setExitCode(ExitCode.SUCCESS_EXIT.getValue()).end(); } @Override @@ -268,13 +269,13 @@ public Response kill(Request request) { Response response = Response.response(request); JobXProcess jobXProcess = processMap.get(pid); if (jobXProcess!=null) { - jobXProcess.kill(); - response.setExitCode(Constants.StatusCode.SUCCESS_EXIT.getValue()).end(); + jobXProcess.kill(ExitCode.KILL); + response.setExitCode(ExitCode.SUCCESS_EXIT.getValue()).end(); if (logger.isInfoEnabled()) { logger.info("[JobX]:kill successful"); } }else { - response.setExitCode(Constants.StatusCode.ERROR_EXIT.getValue()).end(); + response.setExitCode(ExitCode.ERROR_EXIT.getValue()).end(); if (logger.isInfoEnabled()) { logger.info("[JobX]:kill error,can not found process"); } @@ -305,7 +306,7 @@ public Response proxy(Request request) { } catch (Exception e) { e.printStackTrace(); response = Response.response(request); - response.setExitCode(Constants.StatusCode.ERROR_EXIT.getValue()) + response.setExitCode(ExitCode.ERROR_EXIT.getValue()) .setMessage("[JobX]:proxy error:" + e.getLocalizedMessage()) .setSuccess(false) .end(); @@ -318,9 +319,9 @@ public Response macId(Request request) { String guid = getMacId(); Response response = Response.response(request).end(); if (notEmpty(guid)) { - return response.setMessage(guid).setSuccess(true).setExitCode(Constants.StatusCode.SUCCESS_EXIT.getValue()); + return response.setMessage(guid).setSuccess(true).setExitCode(ExitCode.SUCCESS_EXIT.getValue()); } - return response.setSuccess(false).setExitCode(Constants.StatusCode.ERROR_EXIT.getValue()); + return response.setSuccess(false).setExitCode(ExitCode.ERROR_EXIT.getValue()); } /** diff --git a/jobx-common/src/main/java/com/jobxhub/common/Constants.java b/jobx-common/src/main/java/com/jobxhub/common/Constants.java index a21ba5ce..fd8a553a 100644 --- a/jobx-common/src/main/java/com/jobxhub/common/Constants.java +++ b/jobx-common/src/main/java/com/jobxhub/common/Constants.java @@ -169,6 +169,8 @@ public class Constants { public static final String JOBX_LOG_PATH = JOBX_HOME + "/logs"; + public static final String JOBX_TMP_PATH = JOBX_HOME + "/temp"; + public static final String JOBX_USER_HOME = SystemPropertyUtils.get("user.home") + File.separator + ".jobx"; public static final File JOBX_UID_FILE = new File(JOBX_USER_HOME,"id"); @@ -226,7 +228,7 @@ public void setName(String name) { } } - public enum StatusCode implements Serializable { + public enum ExitCode implements Serializable { SUCCESS_EXIT(0x0, "正常退出"), ERROR_EXIT(0x1, "异常退出"), ERROR_PING(-0x63, "连接失败,ping不通"), @@ -240,7 +242,7 @@ public enum StatusCode implements Serializable { private Integer value; private String description; - StatusCode(Integer value, String description) { + ExitCode(Integer value, String description) { this.value = value; this.description = description; } diff --git a/jobx-common/src/main/java/com/jobxhub/common/job/Response.java b/jobx-common/src/main/java/com/jobxhub/common/job/Response.java index c4cf1335..ddaf5f06 100755 --- a/jobx-common/src/main/java/com/jobxhub/common/job/Response.java +++ b/jobx-common/src/main/java/com/jobxhub/common/job/Response.java @@ -89,7 +89,7 @@ public int getExitCode() { public Response setExitCode(int exitCode) { this.exitCode = exitCode; - setSuccess(Constants.StatusCode.SUCCESS_EXIT.getValue() == exitCode); + setSuccess(Constants.ExitCode.SUCCESS_EXIT.getValue() == exitCode); return this; } diff --git a/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java b/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java index c17f9e08..8099a350 100644 --- a/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java +++ b/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java @@ -26,8 +26,14 @@ import org.apache.commons.exec.CommandLine; import org.apache.commons.exec.DefaultExecutor; import org.apache.commons.exec.PumpStreamHandler; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.io.*; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CountDownLatch; /** @@ -43,38 +49,11 @@ public abstract class CommandUtils implements Serializable { private static final long serialVersionUID = 6458428317155311192L; - public static File createLogFile(String logFileName) { - String dirPath = IOUtils.getTmpdir(); - File dir = new File(dirPath); - if (!dir.exists()) dir.mkdirs(); - String tempLogFilePath = dirPath + File.separator + logFileName + ".log"; - File logFile = new File(tempLogFilePath); - return logFile; - } + private static Logger logger = LoggerFactory.getLogger(CommandUtils.class); - public static File createAttachmentFile(String fileName, String content) { - String dirPath = Constants.JOBX_USER_HOME; - File dir = new File(dirPath); - if (!dir.exists()) dir.mkdirs(); + public static String DEFAULT_USER = "root"; - String tempShellFilePath = dirPath + File.separator + fileName + ".txt"; - File attachmentFile = new File(tempShellFilePath); - try { - if (attachmentFile.exists()) { - attachmentFile.delete(); - } - attachmentFile.createNewFile(); - FileWriter fw = new FileWriter(attachmentFile); - BufferedWriter out = new BufferedWriter(fw); - out.write(content, 0, content.length() - 1); - out.flush(); - out.close(); - } catch (Exception e) { - e.printStackTrace(); - } finally { - return attachmentFile; - } - } + public static String BASH_SCHEAM = "#!/bin/bash"; public static File createShellFile(String command, String shellFileName) { String dirPath = IOUtils.getTmpdir(); @@ -119,7 +98,6 @@ public static String executeShell(File shellFile, String... args) { exec.setExitValues(null); PumpStreamHandler streamHandler = new PumpStreamHandler(outputStream, outputStream); exec.setStreamHandler(streamHandler); - exec.execute(commandLine); info = outputStream.toString().trim(); } catch (Exception e) { @@ -136,31 +114,192 @@ public static String executeShell(File shellFile, String... args) { } - public static String executeScript(String scriptText) { - String info = null; - ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); + public static int executeScript(String script) { + if (CommonUtils.isEmpty(script)) { + throw new IllegalStateException("[JobX] script == null."); + } + ProcessBuilder builder = new ProcessBuilder(getCommandLine(script)); + builder.directory(new File(IOUtils.getTmpdir())); + builder.redirectErrorStream(true); + + int exitCode = -1; + Process process = null; + CountDownLatch startupLatch = new CountDownLatch(1); + CountDownLatch completeLatch = new CountDownLatch(1); + try { - CommandLine commandLine = CommandLine.parse(scriptText); - DefaultExecutor exec = new DefaultExecutor(); - exec.setExitValues(null); - PumpStreamHandler streamHandler = new PumpStreamHandler(outputStream, outputStream); - exec.setStreamHandler(streamHandler); + process = builder.start(); + int processId = getPID(process); + if (processId == 0) { + logger.debug("[JobX]Spawned thread with unknown process id"); + } else { + logger.debug("[JobX]Spawned thread with process id " + processId); + } + startupLatch.countDown(); + try { + exitCode = process.waitFor(); + } catch (InterruptedException e) { + logger.info("[JobX]Process interrupted. Exit code is " + exitCode, e); + } - exec.execute(commandLine); - info = outputStream.toString().trim(); + completeLatch.countDown(); + + String output = new StringBuilder() + .append("Stdout:\n") + .append(StringUtils.join(IOUtils.readLines(process.getInputStream()),IOUtils.LINE_SEPARATOR_UNIX)) + .append("\n\n") + .append("Stderr:\n") + .append(StringUtils.join(IOUtils.readLines(process.getErrorStream()),IOUtils.LINE_SEPARATOR_UNIX)) + .append("\n") + .toString(); + + logger.info("[JobX] executeScript,cmd:{},resulr:{}",script,output); + + }catch (Exception e) { + logger.error("[JobX] executeScript,error:{}",e.getMessage()); + }finally { + if (process!=null) { + IOUtils.closeQuietly(process.getInputStream()); + IOUtils.closeQuietly(process.getOutputStream()); + IOUtils.closeQuietly(process.getErrorStream()); + } + return exitCode; + } + } + + public static int getPID(Process process) { + int processId = 0; + try { + Field field = ReflectUtils.getField(process.getClass(), "pid"); + processId = field.getInt(process); + } catch (Throwable e) { + e.printStackTrace(); + } + return processId; + } + + public static Integer getPIDByPPID(Integer ppid) { + if (ppid==null||ppid == 0) return -1; + try { + String cmd = String.format("ps -ef|awk '{if($3~/%d/) print $2}'",ppid); + return CommonUtils.toInt(execute(cmd),0); } catch (Exception e) { e.printStackTrace(); - } finally { + } + return null; + } + + public static String execute(String command) { + Process process = null; + StringBuffer buffer = new StringBuffer(); + try { + process = Runtime.getRuntime().exec(command); + BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream())); + String line; + while ((line = reader.readLine()) != null) { + buffer.append(line).append("\n"); + } + process.waitFor(); + } catch (Exception e) { + e.printStackTrace(); + } + + if (process != null) { try { - outputStream.flush(); - outputStream.close(); - } catch (IOException e) { - e.printStackTrace(); + process.getErrorStream().close(); + process.getInputStream().close(); + process.getOutputStream().close(); + } catch (Exception ee) { } - return info; } + return buffer.toString(); + } + + public static List getCommandLine(String command) { + ArrayList commands = new ArrayList(); + int index = 0; + + StringBuffer buffer = new StringBuffer(command.length()); + + boolean isApos = false; + boolean isQuote = false; + while (index < command.length()) { + char c = command.charAt(index); + switch (c) { + case ' ': + if (!isQuote && !isApos) { + String arg = buffer.toString(); + buffer = new StringBuffer(command.length() - index); + if (arg.length() > 0) { + commands.add(arg); + } + } else { + buffer.append(c); + } + break; + case '\'': + if (!isQuote) { + isApos = !isApos; + } else { + buffer.append(c); + } + break; + case '"': + if (!isApos) { + isQuote = !isQuote; + } else { + buffer.append(c); + } + break; + default: + buffer.append(c); + } + + index++; + } + + if (buffer.length() > 0) { + String arg = buffer.toString(); + commands.add(arg); + } + + return commands; } + + public static void write(File shellFile, String command) { + try { + if (!shellFile.exists()) { + PrintWriter out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(shellFile))); + out.write(BASH_SCHEAM); + out.write("\n\n"); + out.write(command); + out.flush(); + out.close(); + } + } catch (Exception e) { + e.printStackTrace(); + } finally { + } + } + + public static int chown(boolean r,String user,String group,File file) throws IOException, InterruptedException { + return runAsExecUser(DEFAULT_USER,String.format("chown %s %s:%s %s",(r?"-R":""),user,group,file.getAbsolutePath())); + } + + private static int runAsExecUser(final String execUser,final String command) throws IOException, InterruptedException { + String execCmd = Constants.JOBX_EXECUTE_AS_USER_LIB + .concat(IOUtils.BLANK_CHAR) + .concat(execUser) + .concat(IOUtils.BLANK_CHAR) + .concat(command); + final Process process = Runtime.getRuntime().exec(execCmd); + return process.waitFor(); + } + + } + + diff --git a/jobx-common/src/main/java/com/jobxhub/common/util/HttpClientUtils.java b/jobx-common/src/main/java/com/jobxhub/common/util/HttpClientUtils.java index 1fa54a90..df310f51 100644 --- a/jobx-common/src/main/java/com/jobxhub/common/util/HttpClientUtils.java +++ b/jobx-common/src/main/java/com/jobxhub/common/util/HttpClientUtils.java @@ -206,7 +206,7 @@ private static String getResult(HttpRequestBase request) { CloseableHttpClient httpClient = getHttpClient(); try { CloseableHttpResponse response = httpClient.execute(request); - // response.getStatusLine().getStatusCode(); + // response.getStatusLine().getExitCode(); HttpEntity entity = response.getEntity(); if (entity != null) { diff --git a/jobx-common/src/main/java/com/jobxhub/common/util/IOUtils.java b/jobx-common/src/main/java/com/jobxhub/common/util/IOUtils.java index 63f6d863..86061caa 100644 --- a/jobx-common/src/main/java/com/jobxhub/common/util/IOUtils.java +++ b/jobx-common/src/main/java/com/jobxhub/common/util/IOUtils.java @@ -65,6 +65,7 @@ public abstract class IOUtils implements Serializable { private static final int BUFFER_SIZE = 1024 * 8; + public static final String BLANK_CHAR = " "; public static String readText(File file, String charset) { InputStream inputStream = null; diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/RpcFuture.java b/jobx-rpc/src/main/java/com/jobxhub/rpc/RpcFuture.java index df018091..257ed224 100644 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/RpcFuture.java +++ b/jobx-rpc/src/main/java/com/jobxhub/rpc/RpcFuture.java @@ -146,7 +146,7 @@ public void caught(Throwable throwable) { this.response.setThrowable(throwable); this.response.setStartTime(this.startTime); this.response.setSuccess(false); - this.response.setExitCode(Constants.StatusCode.ERROR_EXEC.getValue()); + this.response.setExitCode(Constants.ExitCode.ERROR_EXEC.getValue()); invokeCallback(); } finally { lock.unlock(); diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyServerHandler.java b/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyServerHandler.java index e461d39b..62baa550 100644 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyServerHandler.java +++ b/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyServerHandler.java @@ -87,7 +87,7 @@ public void operationComplete(ChannelFuture channelFuture) throws Exception { return; } - Response response = Response.response(request).setExitCode(Constants.StatusCode.SUCCESS_EXIT.getValue()).setSuccess(true); + Response response = Response.response(request).setExitCode(Constants.ExitCode.SUCCESS_EXIT.getValue()).setSuccess(true); final RequestFile requestFile = request.getUploadFile(); @@ -99,7 +99,7 @@ public void operationComplete(ChannelFuture channelFuture) throws Exception { if (!savePath.exists()) { ResponseFile responseFile = new ResponseFile(start, requestFile.getFileMD5()); responseFile.setEnd(true); - response.setExitCode(Constants.StatusCode.NOTFOUND.getValue()).setSuccess(false).setUploadFile(responseFile).end(); + response.setExitCode(Constants.ExitCode.NOTFOUND.getValue()).setSuccess(false).setUploadFile(responseFile).end(); handlerContext.writeAndFlush(response).addListener(new ChannelFutureListener() { @Override public void operationComplete(ChannelFuture channelFuture) throws Exception { diff --git a/jobx-server/src/main/java/com/jobxhub/server/service/ExecuteService.java b/jobx-server/src/main/java/com/jobxhub/server/service/ExecuteService.java index 360d45e0..41ec98b5 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/service/ExecuteService.java +++ b/jobx-server/src/main/java/com/jobxhub/server/service/ExecuteService.java @@ -135,7 +135,7 @@ public void executeBatchJob(final Long userId, String command, String agentIds) for (String agentId : arrayIds) { Agent agent = agentService.getAgent(Long.parseLong(agentId)); final Job job = new Job(userId, command, agent); - job.setSuccessExit(StatusCode.SUCCESS_EXIT.getValue().toString()); + job.setSuccessExit(ExitCode.SUCCESS_EXIT.getValue().toString()); exec.submit(new Runnable() { @Override public void run() { @@ -200,11 +200,11 @@ private void responseToRecord(Response response, Record record) { record.setSuccess(ResultStatus.FAILED.getStatus()); } int exitCode = response.getExitCode(); - if (exitCode == StatusCode.KILL.getValue() - ||exitCode == StatusCode.OTHER_KILL.getValue()) { + if (exitCode == ExitCode.KILL.getValue() + ||exitCode == ExitCode.OTHER_KILL.getValue()) { record.setStatus(RunStatus.STOPED.getStatus()); record.setSuccess(ResultStatus.KILLED.getStatus()); - } else if (exitCode == StatusCode.TIME_OUT.getValue()) { + } else if (exitCode == ExitCode.TIME_OUT.getValue()) { record.setStatus(RunStatus.STOPED.getStatus()); record.setSuccess(ResultStatus.TIMEOUT.getStatus()); } else { @@ -228,7 +228,7 @@ private void checkPing(Job job, Record record) throws PingException { if (!connStatus.equals(ConnStatus.CONNECTED)) { //已完成 record.setStatus(RunStatus.DONE.getStatus()); - record.setReturnCode(StatusCode.ERROR_PING.getValue()); + record.setReturnCode(ExitCode.ERROR_PING.getValue()); String format = "can't to communicate with agent:%s(%s:%d),execute job:%s failed"; String content = String.format(format, job.getAgent().getName(), @@ -396,7 +396,7 @@ public Response upload(Agent agent, RequestFile requestFile) { request.setUploadFile(requestFile); Response response = caller.sentSync(request); if (!response.isSuccess()) { - response.setSuccess(response.getExitCode() == StatusCode.SUCCESS_EXIT.getValue()); + response.setSuccess(response.getExitCode() == ExitCode.SUCCESS_EXIT.getValue()); } return response; } diff --git a/jobx-server/src/main/java/com/jobxhub/server/service/RecordService.java b/jobx-server/src/main/java/com/jobxhub/server/service/RecordService.java index e0d37345..eeac7cc4 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/service/RecordService.java +++ b/jobx-server/src/main/java/com/jobxhub/server/service/RecordService.java @@ -166,17 +166,17 @@ public void doLostLog(String pid, String message, Integer exitCode, Long entTime if (recordBean!=null) { recordBean.setEndTime(new Date(entTime)); recordBean.setReturnCode(exitCode); - if (exitCode == Constants.StatusCode.SUCCESS_EXIT.getValue()) { + if (exitCode == Constants.ExitCode.SUCCESS_EXIT.getValue()) { recordBean.setSuccess(Constants.ResultStatus.SUCCESSFUL.getStatus()); }else { recordBean.setSuccess(Constants.ResultStatus.FAILED.getStatus()); } - if (exitCode == Constants.StatusCode.KILL.getValue() - ||exitCode == Constants.StatusCode.OTHER_KILL.getValue()) { + if (exitCode == Constants.ExitCode.KILL.getValue() + ||exitCode == Constants.ExitCode.OTHER_KILL.getValue()) { recordBean.setStatus(Constants.RunStatus.STOPED.getStatus()); recordBean.setSuccess(Constants.ResultStatus.KILLED.getStatus()); - } else if (exitCode == Constants.StatusCode.TIME_OUT.getValue()) { + } else if (exitCode == Constants.ExitCode.TIME_OUT.getValue()) { recordBean.setStatus(Constants.RunStatus.STOPED.getStatus()); recordBean.setSuccess(Constants.ResultStatus.TIMEOUT.getStatus()); } else { From 158d63df0063c7da489bcd87da8ffcba8a733077 Mon Sep 17 00:00:00 2001 From: jobxhub <39736850+jobxhub@users.noreply.github.com> Date: Mon, 27 Aug 2018 11:04:32 +0800 Subject: [PATCH 03/46] Delete build.sh --- build.sh | 208 ------------------------------------------------------- 1 file changed, 208 deletions(-) delete mode 100644 build.sh diff --git a/build.sh b/build.sh deleted file mode 100644 index 37e284da..00000000 --- a/build.sh +++ /dev/null @@ -1,208 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2015 The JobX Project -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -#echo color -WHITE_COLOR="\E[1;37m"; -RED_COLOR="\E[1;31m"; -BLUE_COLOR='\E[1;34m'; -GREEN_COLOR="\E[1;32m"; -YELLOW_COLOR="\E[1;33m"; -RES="\E[0m"; - - -printf "${GREEN_COLOR} _______ ${RES}\n" -printf "${GREEN_COLOR} /\ _________ ______ _____ / / ${RES}\n" -printf "${GREEN_COLOR} (()) ______ / ________ / ___ \/ / ${RES}\n" -printf "${GREEN_COLOR} \/ ___ _ / _ __ \_ __ \ ___ / ${RES}\n" -printf "${GREEN_COLOR} / /_/ / / /_/ / /_/ / __ . \ ${RES}\n" -printf "${GREEN_COLOR} \____/ \____/ /_.___/ __ / \_\__ ${RES}\n" -printf "${GREEN_COLOR} _____ / ${RES}\n\n" - -# resolve links - $0 may be a softlink -PRG="$0" - -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done - -PRGDIR=`dirname "$PRG"` - -WORKDIR=`cd "$PRGDIR" >/dev/null; pwd`; - -# Get standard environment variables -############################################################################################## -JOBX_VERSION="1.2.0-RELEASE"; ## -JOBX_AGENT=${WORKDIR}/jobx-agent/target/jobx-agent-${JOBX_VERSION}.tar.gz ## -JOBX_SERVER=${WORKDIR}/jobx-server/target/jobx-server-${JOBX_VERSION}.war ## -DIST_HOME="${WORKDIR}/dist" ## -############################################################################################## - -echo_r () { - # Color red: Error, Failed - [ $# -ne 1 ] && return 1 - printf "[${BLUE_COLOR}jobx${RES}] ${RED_COLOR}$1${RES}\n" -} - -echo_g () { - # Color green: Success - [ $# -ne 1 ] && return 1 - printf "[${BLUE_COLOR}jobx${RES}] ${GREEN_COLOR}$1${RES}\n" -} - -echo_y () { - # Color yellow: Warning - [ $# -ne 1 ] && return 1 - printf "[${BLUE_COLOR}jobx${RES}] ${YELLOW_COLOR}$1${RES}\n" -} - -echo_w () { - # Color yellow: White - [ $# -ne 1 ] && return 1 - printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR}$1${RES}\n" -} - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false -darwin=false -os400=false -case "`uname`" in -CYGWIN*) cygwin=true;; -Darwin*) darwin=true;; -OS400*) os400=true;; -esac - -# Make sure prerequisite environment variables are set -if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then - if $darwin; then - # Bugzilla 54390 - if [ -x '/usr/libexec/java_home' ] ; then - export JAVA_HOME=`/usr/libexec/java_home` - # Bugzilla 37284 (reviewed). - elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then - export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" - fi - else - JAVA_PATH=`which java 2>/dev/null` - if [ "x$JAVA_PATH" != "x" ]; then - JAVA_PATH=`dirname $JAVA_PATH 2>/dev/null` - JRE_HOME=`dirname $JAVA_PATH 2>/dev/null` - fi - if [ "x$JRE_HOME" = "x" ]; then - # XXX: Should we try other locations? - if [ -x /usr/bin/java ]; then - JRE_HOME=/usr - fi - fi - fi - if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then - echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined" - echo "At least one of these environment variable is needed to run this program" - exit 1 - fi -fi -if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then - echo "JAVA_HOME should point to a JDK in order to run in debug mode." - exit 1 -fi -if [ -z "$JRE_HOME" ]; then - JRE_HOME="$JAVA_HOME" -fi - -# If we're running under jdb, we need a full jdk. -if [ "$1" = "debug" ] ; then - if [ "$os400" = "true" ]; then - if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/javac ]; then - echo "The JAVA_HOME environment variable is not defined correctly" - echo "This environment variable is needed to run this program" - echo "NB: JAVA_HOME should point to a JDK not a JRE" - exit 1 - fi - else - if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/jdb -o ! -x "$JAVA_HOME"/bin/javac ]; then - echo "The JAVA_HOME environment variable is not defined correctly" - echo "This environment variable is needed to run this program" - echo "NB: JAVA_HOME should point to a JDK not a JRE" - exit 1 - fi - fi -fi - -# Don't override the endorsed dir if the user has set it previously -if [ -z "$JAVA_ENDORSED_DIRS" ]; then - # Set the default -Djava.endorsed.dirs argument - JAVA_ENDORSED_DIRS="$JOBX_HOME"/endorsed -fi - -if [ -z "$JAVACMD" ] ; then - if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - else - JAVACMD="`which java`" - fi -fi - -#check java exists. -$JAVACMD >/dev/null 2>&1 - -if [ $? -ne 1 ];then - echo_r "ERROR: java is not install,please install java first!" - exit 1; -fi - -#check openjdk -if [ "`$JAVACMD -version 2>&1 | head -1|grep "openjdk"|wc -l`"x == "1"x ]; then - echo_r "ERROR: please uninstall OpenJDK and install JDK 1.7+ first" - exit 1; -fi - -echo_w "build jobx Starting..."; - -if [ ! -f "${WORKDIR}/.mvn/mvnw" ];then - echo_r "ERROR: ${WORKDIR}/.mvn/mvnw is not exists,This file is needed to run this program!" - exit 1; -fi - -${WORKDIR}/.mvn/mvnw clean install -Dmaven.test.skip=true; - -retval=$? - -if [ ${retval} -eq 0 ] ; then - [ ! -d "${DIST_HOME}" ] && mkdir ${DIST_HOME} || rm -rf ${DIST_HOME}/* ; - cp ${JOBX_AGENT} ${DIST_HOME} - cp ${JOBX_SERVER} ${DIST_HOME} - printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR}build jobx @Version ${JOBX_VERSION} successfully! please goto${RES} ${GREEN_COLOR}${DIST_HOME}${RES}\n" - exit 0 -else - echo_r "build jobx failed! please try again " - exit 1 -fi From c1095dc54cf1f510923c206c97a26ea141032609 Mon Sep 17 00:00:00 2001 From: jobxhub <39736850+jobxhub@users.noreply.github.com> Date: Mon, 27 Aug 2018 11:04:42 +0800 Subject: [PATCH 04/46] Delete build.bat --- build.bat | 143 ------------------------------------------------------ 1 file changed, 143 deletions(-) delete mode 100644 build.bat diff --git a/build.bat b/build.bat deleted file mode 100644 index 396282f9..00000000 --- a/build.bat +++ /dev/null @@ -1,143 +0,0 @@ -@echo off -@REM -@REM Copyright (c) 2015 The JobX Project -@REM -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM -@REM --------------------------------------------------------------------------- -@REM Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings -@REM are valid and consistent with the selected start-up options and set up the -@REM endorsed directory. -@REM --------------------------------------------------------------------------- -@REM Make sure prerequisite environment variables are set - -@REM In debug mode we need a real JDK (JAVA_HOME) - -echo\ -echo _______ -echo /\ _________ ______ _____ / / -echo (()) ______ / ________ / ___ \/ / -echo \/ ___ _ / _ __ \_ __ \ ___ / -echo / /_/ / / /_/ / /_/ / __ . \ -echo \____/ \____/ /_.___/ __ / \_\__ -echo _____ / -echo\ - -if ""%1"" == ""debug"" goto needJavaHome -@REM Otherwise either JRE or JDK are fine -if not "%JRE_HOME%" == "" goto gotJreHome -if not "%JAVA_HOME%" == "" goto gotJavaHome -echo Neither the JAVA_HOME nor the JRE_HOME environment variable is defined -echo At least one of these environment variable is needed to run this program -goto exit - -:needJavaHome -@REM Check if we have a usable JDK -if "%JAVA_HOME%" == "" goto noJavaHome -if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome -if not exist "%JAVA_HOME%\bin\javaw.exe" goto noJavaHome -if not exist "%JAVA_HOME%\bin\jdb.exe" goto noJavaHome -if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavaHome -set "JRE_HOME=%JAVA_HOME%" -goto okJava - -:noJavaHome -echo The JAVA_HOME environment variable is not defined correctly. -echo It is needed to run this program in debug mode. -echo NB: JAVA_HOME should point to a JDK not a JRE. -goto exit - -:gotJavaHome -@REM No JRE given, use JAVA_HOME as JRE_HOME -set "JRE_HOME=%JAVA_HOME%" - -:gotJreHome -@REM Check if we have a usable JRE -if not exist "%JRE_HOME%\bin\java.exe" goto noJreHome -if not exist "%JRE_HOME%\bin\javaw.exe" goto noJreHome -goto okJava - -:noJreHome -@REM Needed at least a JRE -echo The JRE_HOME environment variable is not defined correctly -echo This environment variable is needed to run this program -goto exit - -:okJava -@REM Don't override the endorsed dir if the user has set it previously -if not "%JAVA_ENDORSED_DIRS%" == "" goto gotEndorseddir -@REM Java 9 no longer supports the java.endorsed.dirs -@REM system property. Only try to use it if -@REM JOBX_HOME/endorsed exists. -if not exist "%JOBX_HOME%\endorsed" goto gotEndorseddir -set "JAVA_ENDORSED_DIRS=%JOBX_HOME%\endorsed" -:gotEndorseddir - -@REM Don't override _RUNJAVA if the user has set it previously -if not "%_RUNJAVA%" == "" goto gotRunJava -@REM Set standard command for invoking Java. -@REM Also note the quoting as JRE_HOME may contain spaces. -set _RUNJAVA="%JRE_HOME%\bin\java.exe" -:gotRunJava - -@REM Don't override _RUNJDB if the user has set it previously -@REM Also note the quoting as JAVA_HOME may contain spaces. -if not "%_RUNJDB%" == "" goto gotRunJdb -set _RUNJDB="%JAVA_HOME%\bin\jdb.exe" -:gotRunJdb - -setlocal - -@REM Guess JOBX_HOME if not defined - -set "WORK_DIR=%~dp0" -set "JOBX_HOME=%WORK_DIR%" -set "JOBX_BASE=%JOBX_HOME%" - -@REM ################################################################################################# -set JOBX_VERSION=1.2.0-RELEASE -set DIST_HOME=%JOBX_HOME%\dist -set JOBX_AGENT=%JOBX_HOME%\jobx-agent\target\jobx-agent-%JOBX_VERSION%.tar.gz -set JOBX_SERVER=%JOBX_HOME%\jobx-server\target\jobx-server-%JOBX_VERSION%.war -set "EXECUTABLE=%JOBX_HOME%\.mvn\mvnw.cmd" -@REM ################################################################################################# - -if exist "%EXECUTABLE%" goto okExec -echo Cannot find "%EXECUTABLE%" -echo This file is needed to run this program -goto exit - -:okExec -call "%EXECUTABLE%" "clean" "install" "-Dmaven.test.skip=true" -if %errorlevel%==0 goto toDist -goto exit - -:toDist -if exist "%DIST_HOME%" rd /s /q %DIST_HOME% -if not exist "%DIST_HOME%" mkdir %DIST_HOME% -copy %JOBX_AGENT% %DIST_HOME% -copy %JOBX_SERVER% %DIST_HOME% -echo [JobX] build jobx @Version %JOBX_VERSION% successfully! please goto %DIST_HOME% -pause - -:exit -exit /b 1 - -:end -exit /b 0 - From 3bc78041b23dc883b38171923df4b1c2b640d570 Mon Sep 17 00:00:00 2001 From: jobxhub <39736850+jobxhub@users.noreply.github.com> Date: Mon, 27 Aug 2018 11:04:55 +0800 Subject: [PATCH 05/46] Delete agent.sh --- agent.sh | 108 ------------------------------------------------------- 1 file changed, 108 deletions(-) delete mode 100644 agent.sh diff --git a/agent.sh b/agent.sh deleted file mode 100644 index 6b0839e5..00000000 --- a/agent.sh +++ /dev/null @@ -1,108 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2015 The JobX Project -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -#echo color -RED_COLOR="\E[1;31m"; -BLUE_COLOR='\E[1;34m'; -RES="\E[0m"; - -echo_r () { - # Color red: Error, Failed - [ $# -ne 1 ] && return 1 - printf "[${BLUE_COLOR}jobx${RES}] ${RED_COLOR}$1${RES}\n" -} - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false -darwin=false -os400=false -case "`uname`" in -CYGWIN*) cygwin=true;; -Darwin*) darwin=true;; -OS400*) os400=true;; -esac - -# resolve links - $0 may be a softlink -PRG="$0" - -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done - -# Get standard environment variables -PRGDIR=`dirname "$PRG"` - -WORKDIR=`cd "$PRGDIR" >/dev/null; pwd`; - -# Get standard environment variables -############################################################################################### -APP_ARTIFACT=jobx-agent -APP_VERSION="1.2.0-RELEASE"; -APP_TAR_NAME=${APP_ARTIFACT}-${APP_VERSION}.tar.gz -MAVEN_TARGET_TAR="${WORKDIR}"/${APP_ARTIFACT}/target/${APP_TAR_NAME} -DIST_PATH=${WORKDIR}/dist/ -############################################################################################### - -[ ! -d "${DIST_PATH}" ] && mkdir -p "${DIST_PATH}" - -DEPLOY_PATH=${WORKDIR}/dist/jobx-agent - -#先检查dist下是否有war包 -if [ ! -f "${DIST_PATH}/${APP_TAR_NAME}" ] ; then - #dist下没有tar包则检查agent的target下是否有tar包. - if [ ! -f "${MAVEN_TARGET_TAR}" ] ; then - echo_r "[JobX] please build project first!" - exit 0; - else - cp ${MAVEN_TARGET_TAR} ${DIST_PATH}; - fi -fi - -[ -d "${DEPLOY_PATH}" ] && rm -rf ${DEPLOY_PATH}/* || mkdir -p ${DEPLOY_PATH} - -tar -xzvf ${DIST_PATH}/${APP_TAR_NAME} -C ${DEPLOY_PATH}/../ >/dev/null 2>&1 && chmod +x ${DEPLOY_PATH}/bin/* >/dev/null 2>&1 - -EXECUTABLE=${DEPLOY_PATH}/bin/startup.sh - -# Check that target executable exists -if $os400; then - # -x will Only work on the os400 if the files are: - # 1. owned by the user - # 2. owned by the PRIMARY group of the user - # this will not work if the user belongs in secondary groups - eval -else - if [ ! -x "$EXECUTABLE" ]; then - echo "Cannot find $EXECUTABLE" - echo "The file is absent or does not have execute permission" - echo "This file is needed to run this program" - exit 1 - fi -fi - -exec "$EXECUTABLE" "$@" From 10166571cd70bad513b25f6af6f1abc885e8713a Mon Sep 17 00:00:00 2001 From: jobxhub <39736850+jobxhub@users.noreply.github.com> Date: Mon, 27 Aug 2018 11:05:05 +0800 Subject: [PATCH 06/46] Delete server.bat --- server.bat | 179 ----------------------------------------------------- 1 file changed, 179 deletions(-) delete mode 100644 server.bat diff --git a/server.bat b/server.bat deleted file mode 100644 index 36d18168..00000000 --- a/server.bat +++ /dev/null @@ -1,179 +0,0 @@ -@echo off -@REM -@REM Copyright (c) 2015 The JobX Project -@REM -@REM Licensed to the Apache Software Foundation (ASF) under one -@REM or more contributor license agreements. See the NOTICE file -@REM distributed with this work for additional information -@REM regarding copyright ownership. The ASF licenses this file -@REM to you under the Apache License, Version 2.0 (the -@REM "License"); you may not use this file except in compliance -@REM with the License. You may obtain a copy of the License at -@REM -@REM http://www.apache.org/licenses/LICENSE-2.0 -@REM -@REM Unless required by applicable law or agreed to in writing, -@REM software distributed under the License is distributed on an -@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -@REM KIND, either express or implied. See the License for the -@REM specific language governing permissions and limitations -@REM under the License. -@REM -@REM --------------------------------------------------------------------------- -@REM Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings -@REM are valid and consistent with the selected start-up options and set up the -@REM endorsed directory. -@REM --------------------------------------------------------------------------- -@REM Make sure prerequisite environment variables are set - -@REM In debug mode we need a real JDK (JAVA_HOME) - -if ""%1"" == ""debug"" goto needJavaHome -@REM Otherwise either JRE or JDK are fine -if not "%JRE_HOME%" == "" goto gotJreHome -if not "%JAVA_HOME%" == "" goto gotJavaHome -echo Neither the JAVA_HOME nor the JRE_HOME environment variable is defined -echo At least one of these environment variable is needed to run this program -goto exit - -:needJavaHome -@REM Check if we have a usable JDK -if "%JAVA_HOME%" == "" goto noJavaHome -if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome -if not exist "%JAVA_HOME%\bin\javaw.exe" goto noJavaHome -if not exist "%JAVA_HOME%\bin\jdb.exe" goto noJavaHome -if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavaHome -set "JRE_HOME=%JAVA_HOME%" -goto okJava - -:noJavaHome -echo The JAVA_HOME environment variable is not defined correctly. -echo It is needed to run this program in debug mode. -echo NB: JAVA_HOME should point to a JDK not a JRE. -goto exit - -:gotJavaHome -@REM No JRE given, use JAVA_HOME as JRE_HOME -set "JRE_HOME=%JAVA_HOME%" - -:gotJreHome -@REM Check if we have a usable JRE -if not exist "%JRE_HOME%\bin\java.exe" goto noJreHome -if not exist "%JRE_HOME%\bin\javaw.exe" goto noJreHome -goto okJava - -:noJreHome -@REM Needed at least a JRE -echo The JRE_HOME environment variable is not defined correctly -echo This environment variable is needed to run this program -goto exit - -:okJava -@REM Don't override the endorsed dir if the user has set it previously -if not "%JAVA_ENDORSED_DIRS%" == "" goto gotEndorseddir -@REM Java 9 no longer supports the java.endorsed.dirs -@REM system property. Only try to use it if -@REM JOBX_HOME/endorsed exists. -if not exist "%JOBX_HOME%\endorsed" goto gotEndorseddir -set "JAVA_ENDORSED_DIRS=%JOBX_HOME%\endorsed" -:gotEndorseddir - -@REM Don't override _RUNJAVA if the user has set it previously -if not "%_RUNJAVA%" == "" goto gotRunJava -@REM Set standard command for invoking Java. -@REM Also note the quoting as JRE_HOME may contain spaces. -set _RUNJAVA="%JRE_HOME%\bin\java.exe" -:gotRunJava - -@REM Don't override _RUNJDB if the user has set it previously -@REM Also note the quoting as JAVA_HOME may contain spaces. -if not "%_RUNJDB%" == "" goto gotRunJdb -set _RUNJDB="%JAVA_HOME%\bin\jdb.exe" -:gotRunJdb - -@REM Don't override _RUNJAR if the user has set it previously -if not "%_RUNJAR%" == "" goto gotRunJar -@REM Set standard command for invoking Java. -@REM Also note the quoting as JRE_HOME may contain spaces. -set _RUNJAR="%JRE_HOME%\bin\jar.exe" -:gotRunJar - -setlocal - -@REM Guess JOBX_HOME if not defined - -set "WORK_DIR=%~dp0" -set "JOBX_HOME=%WORK_DIR%" -set "JOBX_BASE=%JOBX_HOME%" - -@REM ################################################################################################# -set APP_ARTIFACT=jobx-server -set APP_VERSION=1.2.0-RELEASE -set APP_WAR_NAME=%APP_ARTIFACT%-%APP_VERSION%.war -set MAVEN_TARGET_WAR=%JOBX_HOME%%APP_ARTIFACT%\target\%APP_WAR_NAME% -set DIST_PATH=%JOBX_HOME%dist -set DEPLOY_PATH=%DIST_PATH%\%APP_ARTIFACT% -set CONTAINER_PATH=%DEPLOY_PATH%\container -@REM ################################################################################################# - -if exist "%DIST_PATH%\%APP_WAR_NAME%" goto initEnv -if not exist %DIST_PATH% mkdir %DIST_PATH% -if exist "%MAVEN_TARGET_WAR%" ( - copy %MAVEN_TARGET_WAR% %DIST_PATH% - goto initEnv -) else ( - echo [JobX] please build project first! - goto exit -) - -:initEnv -if not exist "%DEPLOY_PATH%" ( - mkdir %DEPLOY_PATH% - copy %DIST_PATH%\%APP_WAR_NAME% %DEPLOY_PATH% - cd %DEPLOY_PATH% - %_RUNJAR% xvf %APP_WAR_NAME% 1>nul - del %DEPLOY_PATH%\%APP_WAR_NAME% -) - -@REM cd to DEPLOY_PATH -cd %DEPLOY_PATH% - -@REM copy container to deploy_path -if not exist "%CONTAINER_PATH%" ( - mkdir %CONTAINER_PATH% - xcopy %JOBX_HOME%%APP_ARTIFACT%\container %CONTAINER_PATH% /E 1>nul -) -@REM create log -set LOG_PATH=%CONTAINER_PATH%\logs -if exist %LOG_PATH% ( - set LOG_PATH=%LOG_PATH%\jobx.out -)else ( - md %LOG_PATH% - set LOG_PATH=%LOG_PATH%\jobx.out -) -@REM set classpath -set jar_dir=%DEPLOY_PATH%\WEB-INF\lib -setLocal EnableDelayedExpansion -set CLASSPATH="%CLASSPATH%; -for /R %jar_dir% %%a in (*.jar) do set CLASSPATH=!CLASSPATH!;%%a -set CLASSPATH=!CLASSPATH!;%DEPLOY_PATH%\WEB-INF\classes" -goto doStart - -:doStart -if "%TITLE%" == "" set TITLE=JobX-Server -set EXECJAVA=start "%TITLE%" %_RUNJAVA% -set MAIN="com.jobxhub.server.bootstrap.Startup" -set JOBX_LAUNCHER=tomcat -set JOBX_PORT=8090 -%EXECJAVA% ^ - -classpath "%CLASSPATH%" ^ - -Dserver.launcher="%JOBX_LAUNCHER%" ^ - -Dserver.port="%JOBX_PORT%" ^ - %MAIN% start >> %LOG_PATH% -goto end - -:exit -exit 1 - -:end -exit 0 From 566876159dac5922922187f40c412a35171feacd Mon Sep 17 00:00:00 2001 From: jobxhub <39736850+jobxhub@users.noreply.github.com> Date: Mon, 27 Aug 2018 11:05:17 +0800 Subject: [PATCH 07/46] Delete server.sh --- server.sh | 192 ------------------------------------------------------ 1 file changed, 192 deletions(-) delete mode 100644 server.sh diff --git a/server.sh b/server.sh deleted file mode 100644 index 9eb2b144..00000000 --- a/server.sh +++ /dev/null @@ -1,192 +0,0 @@ -#!/bin/bash -# -# Copyright (c) 2015 The JobX Project -# -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -# - -#echo color -WHITE_COLOR="\E[1;37m"; -RED_COLOR="\E[1;31m"; -BLUE_COLOR='\E[1;34m'; -GREEN_COLOR="\E[1;32m"; -YELLOW_COLOR="\E[1;33m"; -RES="\E[0m"; - -echo_r () { - # Color red: Error, Failed - [ $# -ne 1 ] && return 1 - printf "[${BLUE_COLOR}jobx${RES}] ${RED_COLOR}$1${RES}\n" -} - -echo_g () { - # Color green: Success - [ $# -ne 1 ] && return 1 - printf "[${BLUE_COLOR}jobx${RES}] ${GREEN_COLOR}$1${RES}\n" -} - -echo_y () { - # Color yellow: Warning - [ $# -ne 1 ] && return 1 - printf "[${BLUE_COLOR}jobx${RES}] ${YELLOW_COLOR}$1${RES}\n" -} - -echo_w () { - # Color yellow: White - [ $# -ne 1 ] && return 1 - printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR}$1${RES}\n" -} - -if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then - echo_r "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined" - echo_r "At least one of these environment variable is needed to run this program" - exit 1 -fi - -# Set standard commands for invoking Java, if not already set. -if [ -z "$RUNJAVA" ]; then - RUNJAVA="$JAVA_HOME"/bin/java -fi - -if [ -z "$RUNJAR" ]; then - RUNJAR="$JAVA_HOME"/bin/jar -fi - -#check java exists. -$RUNJAVA >/dev/null 2>&1 - -if [ $? -ne 1 ];then - echo_r "ERROR: java is not install,please install java first!" - exit 1; -fi - -#check openjdk -if [ "`${RUNJAVA} -version 2>&1 | head -1|grep "openjdk"|wc -l`"x == "1"x ]; then - echo_r "ERROR: please uninstall OpenJDK and install jdk first" - exit 1; -fi - -# OS specific support. $var _must_ be set to either true or false. -cygwin=false -darwin=false -os400=false -case "`uname`" in -CYGWIN*) cygwin=true;; -Darwin*) darwin=true;; -OS400*) os400=true;; -esac - -# resolve links - $0 may be a softlink -PRG="$0" - -while [ -h "$PRG" ]; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`/"$link" - fi -done - -# Get standard environment variables -PRGDIR=`dirname "$PRG"` - -WORK_DIR=`cd "$PRGDIR" >/dev/null; pwd`; - -# Get standard environment variables -############################################################################################### -APP_ARTIFACT=jobx-server -APP_VERSION="1.2.0-RELEASE"; -APP_WAR_NAME=${APP_ARTIFACT}-${APP_VERSION}.war -MAVEN_TARGET_WAR=${WORK_DIR}/${APP_ARTIFACT}/target/${APP_WAR_NAME} -DIST_PATH=${WORK_DIR}/dist/ -DEPLOY_PATH=${DIST_PATH}${APP_ARTIFACT} -LIB_PATH=${DEPLOY_PATH}/WEB-INF/lib -CONTAINER_PATH=${DEPLOY_PATH}/container -LOG_PATH=${CONTAINER_PATH}/logs -############################################################################################### - -#先检查dist下是否有war包 -if [ ! -f "${DIST_PATH}/${APP_WAR_NAME}" ] ; then - #dist下没有war包则检查server的target下是否有war包. - if [ ! -f "${MAVEN_TARGET_WAR}" ] ; then - echo_w "[JobX] please build project first!" - exit 0; - else - cp ${MAVEN_TARGET_WAR} ${DIST_PATH}; - fi -fi -if [ ! -f "${DEPLOY_PATH}" ] ; then - mkdir -p ${DEPLOY_PATH} - # unpackage war to dist - cp ${DIST_PATH}/${APP_WAR_NAME} ${DEPLOY_PATH} && - cd ${DEPLOY_PATH} && - ${RUNJAR} xvf ${APP_WAR_NAME} >/dev/null 2>&1 && - rm -rf ${DEPLOY_PATH}/${APP_WAR_NAME} && - #copy jars... - cp -r ${WORK_DIR}/${APP_ARTIFACT}/container ${DEPLOY_PATH} -fi -if [ ! -d "${LOG_PATH}" ] ; then - mkdir -p ${LOG_PATH} -fi -LOG_PATH=${LOG_PATH}/jobx.out - -# Add jars to classpath -if [ ! -z "$CLASSPATH" ] ; then - CLASSPATH="$CLASSPATH": -fi - -for jar in ${LIB_PATH}/* -do - CLASSPATH="$CLASSPATH":"$jar" -done -CLASSPATH="$CLASSPATH":${DEPLOY_PATH}/WEB-INF/classes - -#default launcher -[ -z "${JOBX_LAUNCHER}" ] && JOBX_LAUNCHER="tomcat"; - -#server'port -if [ $# -gt 0 ] ;then - JOBX_PORT=$1 - if [ "$JOBX_PORT" -gt 0 ] 2>/dev/null ;then - if [ $JOBX_PORT -lt 0 ] || [ $JOBX_PORT -gt 65535 ];then - echo_r "server'port error,muse be between 0 and 65535!" - fi - else - echo_r "server'port bust be number." - exit 1; - fi -fi -[ -z "${JOBX_PORT}" ] && JOBX_PORT="20501"; - -#start server.... -printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR} server Starting @ [${GREEN_COLOR}${JOBX_PORT}${RES}].... ${RES}\n" - -MAIN="com.jobxhub.server.bootstrap.Startup" -cd ${DEPLOY_PATH} -eval "$RUNJAVA" \ - -classpath "$CLASSPATH" \ - -Dserver.launcher=${JOBX_LAUNCHER} \ - -Dserver.port=${JOBX_PORT} \ - ${MAIN} $1 >> ${LOG_PATH} 2>&1 & - -printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR} please see log for more detail:${RES}${GREEN_COLOR} $LOG_PATH ${RES}\n" - -exit $? - From d96a0e2ce9983a688d47ffd6d2b737fd229eeaf6 Mon Sep 17 00:00:00 2001 From: jobxhub <39736850+jobxhub@users.noreply.github.com> Date: Mon, 27 Aug 2018 11:06:12 +0800 Subject: [PATCH 08/46] Delete pom.xml --- jobx-executor/pom.xml | 38 -------------------------------------- 1 file changed, 38 deletions(-) delete mode 100644 jobx-executor/pom.xml diff --git a/jobx-executor/pom.xml b/jobx-executor/pom.xml deleted file mode 100644 index c136e5ca..00000000 --- a/jobx-executor/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - jobx-executor - com.jobxhub - 1.2.0-RELEASE - 4.0.0 - so - jobx-executor - - - ${project.basedir} - - - - - - org.codehaus.mojo - native-maven-plugin - 1.0-alpha-9 - true - - linux - - - src/main/c - - executor.c - - - - generic-classic - g++ - - - - - \ No newline at end of file From a88b3316c8a3a6cce35c485427eb1fabb4bf6d34 Mon Sep 17 00:00:00 2001 From: jobxhub <39736850+jobxhub@users.noreply.github.com> Date: Mon, 27 Aug 2018 11:06:24 +0800 Subject: [PATCH 09/46] Delete executor.c --- jobx-executor/src/main/c/executor.c | 132 ---------------------------- 1 file changed, 132 deletions(-) delete mode 100644 jobx-executor/src/main/c/executor.c diff --git a/jobx-executor/src/main/c/executor.c b/jobx-executor/src/main/c/executor.c deleted file mode 100644 index f2c88459..00000000 --- a/jobx-executor/src/main/c/executor.c +++ /dev/null @@ -1,132 +0,0 @@ -/** - * Copyright (c) 2015 The JobX Project - *

- * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - *

- * http://www.apache.org/licenses/LICENSE-2.0 - *

- * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -FILE *LOGFILE = NULL; -FILE *ERRORFILE = NULL; -int SETUID_OPER_FAILED = 10; -int USER_NOT_FOUND = 20; -int INVALID_INPUT = 30; - -/* - * Change the real and effective user and group from super user to the specified user - * - */ - -int change_user(char *username, uid_t user, gid_t group) { - if (user == getuid() && user == geteuid() && - group == getgid() && group == getegid()) { - return 0; - } - - if (initgroups(username, group) != 0) { - fprintf(LOGFILE, "Error setting supplementary groups for user %s: %s\n", - username, strerror(errno)); - return SETUID_OPER_FAILED; - } - if (seteuid(0) != 0) { - fprintf(LOGFILE, "unable to reacquire root - %s\n", strerror(errno)); - fprintf(LOGFILE, "Real: %d:%d; Effective: %d:%d\n", - getuid(), getgid(), geteuid(), getegid()); - return SETUID_OPER_FAILED; - } - if (setgid(group) != 0) { - fprintf(LOGFILE, "unable to set group to %d - %s\n", group, - strerror(errno)); - fprintf(LOGFILE, "Real: %d:%d; Effective: %d:%d\n", - getuid(), getgid(), geteuid(), getegid()); - return SETUID_OPER_FAILED; - } - if (setuid(user) != 0) { - fprintf(LOGFILE, "unable to set user to %d - %s\n", user, strerror(errno)); - fprintf(LOGFILE, "Real: %d:%d; Effective: %d:%d\n", - getuid(), getgid(), geteuid(), getegid()); - return SETUID_OPER_FAILED; - } - - return 0; -} - -int main(int argc, char **argv){ - - // set up the logging stream - if (!LOGFILE){ - LOGFILE=stdout; - } - if (!ERRORFILE){ - ERRORFILE=stderr; - } - - if (argc < 3) { - fprintf(ERRORFILE, "Requires at least 3 variables: ./execute-as-user username command [args]"); - return INVALID_INPUT; - } - - char *username = argv[1]; - - // gather information about user - struct passwd *user_info = getpwnam(username); - if (user_info == NULL){ - fprintf(LOGFILE, "user does not exist: %s", username); - return USER_NOT_FOUND; - } - - // try to change user - fprintf(LOGFILE, "Changing user: user: %s, uid: %d, gid: %d\n", username, user_info->pw_uid, user_info->pw_gid); - int retval = change_user(username, user_info->pw_uid, user_info->pw_gid); - if (retval != 0){ - fprintf(LOGFILE, "Error changing user to %s\n", username); - return SETUID_OPER_FAILED; - } - - // execute the command - char **user_argv = &argv[2]; - fprintf(LOGFILE, "user command starting from: %s\n", user_argv[0]); - fflush(LOGFILE); - retval = execvp(*user_argv, user_argv); - fprintf(LOGFILE, "system call return value: %d\n", retval); - - // sometimes system(cmd) returns 256, which is interpreted to 0, making a failed job a successful job - // hence this goofy piece of if statement. - if (retval != 0){ - return 1; - } - else{ - return 0; - } - -} From 58c725b59991dbcede19130e267bca6eafb00f9a Mon Sep 17 00:00:00 2001 From: jobxhub <39736850+jobxhub@users.noreply.github.com> Date: Mon, 27 Aug 2018 11:09:08 +0800 Subject: [PATCH 10/46] Create deployment --- deployment | 1 + 1 file changed, 1 insertion(+) create mode 100644 deployment diff --git a/deployment b/deployment new file mode 100644 index 00000000..8b137891 --- /dev/null +++ b/deployment @@ -0,0 +1 @@ + From b13bc611a06a0bddf6fcedb4dc28d79a1fa05c4b Mon Sep 17 00:00:00 2001 From: benjobs Date: Mon, 27 Aug 2018 11:32:49 +0800 Subject: [PATCH 11/46] fix bug --- jobx-agent/assembly.xml | 12 ++++++------ jobx-agent/src/{conf => assembly}/bin/jobx.bat | 0 jobx-agent/src/{conf => assembly}/bin/jobx.sh | 0 jobx-agent/src/{conf => assembly}/bin/monitor.sh | 0 .../src/{conf => assembly}/bin/setclasspath.bat | 0 .../src/{conf => assembly}/bin/setclasspath.sh | 0 .../src/{conf => assembly}/bin/shutdown.bat | 0 .../src/{conf => assembly}/bin/shutdown.sh | 0 .../src/{conf => assembly}/bin/startup.bat | 0 jobx-agent/src/{conf => assembly}/bin/startup.sh | 0 .../src/{conf => assembly}/conf/conf.properties | 0 .../src/{conf => assembly}/conf/log4j.properties | 0 jobx-agent/src/{conf => assembly}/logs/.keep | 0 .../native/libsigar-amd64-freebsd-6.so | Bin .../native/libsigar-amd64-linux.so | Bin .../native/libsigar-amd64-solaris.so | Bin .../native/libsigar-ia64-hpux-11.sl | Bin .../native/libsigar-ia64-linux.so | Bin .../native/libsigar-pa-hpux-11.sl | Bin .../native/libsigar-ppc-aix-5.so | Bin .../native/libsigar-ppc-linux.so | Bin .../native/libsigar-ppc64-aix-5.so | Bin .../native/libsigar-ppc64-linux.so | Bin .../native/libsigar-s390x-linux.so | Bin .../native/libsigar-sparc-solaris.so | Bin .../native/libsigar-sparc64-solaris.so | Bin .../native/libsigar-universal-macosx.dylib | Bin .../native/libsigar-universal64-macosx.dylib | Bin .../native/libsigar-x86-freebsd-5.so | Bin .../native/libsigar-x86-freebsd-6.so | Bin .../native/libsigar-x86-linux.so | Bin .../native/libsigar-x86-solaris.so | Bin .../native/sigar-amd64-winnt.dll | Bin .../native/sigar-x86-winnt.dll | Bin .../native/sigar-x86-winnt.lib | Bin jobx-agent/src/{conf => assembly}/temp/.keep | 0 jobx-agent/src/conf/bin/executor.so | Bin 9480 -> 0 bytes 37 files changed, 6 insertions(+), 6 deletions(-) rename jobx-agent/src/{conf => assembly}/bin/jobx.bat (100%) rename jobx-agent/src/{conf => assembly}/bin/jobx.sh (100%) rename jobx-agent/src/{conf => assembly}/bin/monitor.sh (100%) rename jobx-agent/src/{conf => assembly}/bin/setclasspath.bat (100%) rename jobx-agent/src/{conf => assembly}/bin/setclasspath.sh (100%) rename jobx-agent/src/{conf => assembly}/bin/shutdown.bat (100%) rename jobx-agent/src/{conf => assembly}/bin/shutdown.sh (100%) rename jobx-agent/src/{conf => assembly}/bin/startup.bat (100%) rename jobx-agent/src/{conf => assembly}/bin/startup.sh (100%) rename jobx-agent/src/{conf => assembly}/conf/conf.properties (100%) rename jobx-agent/src/{conf => assembly}/conf/log4j.properties (100%) rename jobx-agent/src/{conf => assembly}/logs/.keep (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-amd64-freebsd-6.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-amd64-linux.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-amd64-solaris.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-ia64-hpux-11.sl (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-ia64-linux.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-pa-hpux-11.sl (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-ppc-aix-5.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-ppc-linux.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-ppc64-aix-5.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-ppc64-linux.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-s390x-linux.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-sparc-solaris.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-sparc64-solaris.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-universal-macosx.dylib (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-universal64-macosx.dylib (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-x86-freebsd-5.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-x86-freebsd-6.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-x86-linux.so (100%) rename jobx-agent/src/{conf => assembly}/native/libsigar-x86-solaris.so (100%) rename jobx-agent/src/{conf => assembly}/native/sigar-amd64-winnt.dll (100%) rename jobx-agent/src/{conf => assembly}/native/sigar-x86-winnt.dll (100%) rename jobx-agent/src/{conf => assembly}/native/sigar-x86-winnt.lib (100%) rename jobx-agent/src/{conf => assembly}/temp/.keep (100%) delete mode 100755 jobx-agent/src/conf/bin/executor.so diff --git a/jobx-agent/assembly.xml b/jobx-agent/assembly.xml index 5d57c52b..979c2611 100644 --- a/jobx-agent/assembly.xml +++ b/jobx-agent/assembly.xml @@ -11,7 +11,7 @@ - src/conf/bin + src/assembly/bin bin @@ -19,24 +19,24 @@ bin - src/conf/lib + src/assembly/lib lib - src/conf/native + src/assembly/native native - src/conf/conf + src/assembly/conf conf - src/conf/logs + src/assembly/logs logs - src/conf/temp + src/assembly/temp temp diff --git a/jobx-agent/src/conf/bin/jobx.bat b/jobx-agent/src/assembly/bin/jobx.bat similarity index 100% rename from jobx-agent/src/conf/bin/jobx.bat rename to jobx-agent/src/assembly/bin/jobx.bat diff --git a/jobx-agent/src/conf/bin/jobx.sh b/jobx-agent/src/assembly/bin/jobx.sh similarity index 100% rename from jobx-agent/src/conf/bin/jobx.sh rename to jobx-agent/src/assembly/bin/jobx.sh diff --git a/jobx-agent/src/conf/bin/monitor.sh b/jobx-agent/src/assembly/bin/monitor.sh similarity index 100% rename from jobx-agent/src/conf/bin/monitor.sh rename to jobx-agent/src/assembly/bin/monitor.sh diff --git a/jobx-agent/src/conf/bin/setclasspath.bat b/jobx-agent/src/assembly/bin/setclasspath.bat similarity index 100% rename from jobx-agent/src/conf/bin/setclasspath.bat rename to jobx-agent/src/assembly/bin/setclasspath.bat diff --git a/jobx-agent/src/conf/bin/setclasspath.sh b/jobx-agent/src/assembly/bin/setclasspath.sh similarity index 100% rename from jobx-agent/src/conf/bin/setclasspath.sh rename to jobx-agent/src/assembly/bin/setclasspath.sh diff --git a/jobx-agent/src/conf/bin/shutdown.bat b/jobx-agent/src/assembly/bin/shutdown.bat similarity index 100% rename from jobx-agent/src/conf/bin/shutdown.bat rename to jobx-agent/src/assembly/bin/shutdown.bat diff --git a/jobx-agent/src/conf/bin/shutdown.sh b/jobx-agent/src/assembly/bin/shutdown.sh similarity index 100% rename from jobx-agent/src/conf/bin/shutdown.sh rename to jobx-agent/src/assembly/bin/shutdown.sh diff --git a/jobx-agent/src/conf/bin/startup.bat b/jobx-agent/src/assembly/bin/startup.bat similarity index 100% rename from jobx-agent/src/conf/bin/startup.bat rename to jobx-agent/src/assembly/bin/startup.bat diff --git a/jobx-agent/src/conf/bin/startup.sh b/jobx-agent/src/assembly/bin/startup.sh similarity index 100% rename from jobx-agent/src/conf/bin/startup.sh rename to jobx-agent/src/assembly/bin/startup.sh diff --git a/jobx-agent/src/conf/conf/conf.properties b/jobx-agent/src/assembly/conf/conf.properties similarity index 100% rename from jobx-agent/src/conf/conf/conf.properties rename to jobx-agent/src/assembly/conf/conf.properties diff --git a/jobx-agent/src/conf/conf/log4j.properties b/jobx-agent/src/assembly/conf/log4j.properties similarity index 100% rename from jobx-agent/src/conf/conf/log4j.properties rename to jobx-agent/src/assembly/conf/log4j.properties diff --git a/jobx-agent/src/conf/logs/.keep b/jobx-agent/src/assembly/logs/.keep similarity index 100% rename from jobx-agent/src/conf/logs/.keep rename to jobx-agent/src/assembly/logs/.keep diff --git a/jobx-agent/src/conf/native/libsigar-amd64-freebsd-6.so b/jobx-agent/src/assembly/native/libsigar-amd64-freebsd-6.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-amd64-freebsd-6.so rename to jobx-agent/src/assembly/native/libsigar-amd64-freebsd-6.so diff --git a/jobx-agent/src/conf/native/libsigar-amd64-linux.so b/jobx-agent/src/assembly/native/libsigar-amd64-linux.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-amd64-linux.so rename to jobx-agent/src/assembly/native/libsigar-amd64-linux.so diff --git a/jobx-agent/src/conf/native/libsigar-amd64-solaris.so b/jobx-agent/src/assembly/native/libsigar-amd64-solaris.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-amd64-solaris.so rename to jobx-agent/src/assembly/native/libsigar-amd64-solaris.so diff --git a/jobx-agent/src/conf/native/libsigar-ia64-hpux-11.sl b/jobx-agent/src/assembly/native/libsigar-ia64-hpux-11.sl similarity index 100% rename from jobx-agent/src/conf/native/libsigar-ia64-hpux-11.sl rename to jobx-agent/src/assembly/native/libsigar-ia64-hpux-11.sl diff --git a/jobx-agent/src/conf/native/libsigar-ia64-linux.so b/jobx-agent/src/assembly/native/libsigar-ia64-linux.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-ia64-linux.so rename to jobx-agent/src/assembly/native/libsigar-ia64-linux.so diff --git a/jobx-agent/src/conf/native/libsigar-pa-hpux-11.sl b/jobx-agent/src/assembly/native/libsigar-pa-hpux-11.sl similarity index 100% rename from jobx-agent/src/conf/native/libsigar-pa-hpux-11.sl rename to jobx-agent/src/assembly/native/libsigar-pa-hpux-11.sl diff --git a/jobx-agent/src/conf/native/libsigar-ppc-aix-5.so b/jobx-agent/src/assembly/native/libsigar-ppc-aix-5.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-ppc-aix-5.so rename to jobx-agent/src/assembly/native/libsigar-ppc-aix-5.so diff --git a/jobx-agent/src/conf/native/libsigar-ppc-linux.so b/jobx-agent/src/assembly/native/libsigar-ppc-linux.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-ppc-linux.so rename to jobx-agent/src/assembly/native/libsigar-ppc-linux.so diff --git a/jobx-agent/src/conf/native/libsigar-ppc64-aix-5.so b/jobx-agent/src/assembly/native/libsigar-ppc64-aix-5.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-ppc64-aix-5.so rename to jobx-agent/src/assembly/native/libsigar-ppc64-aix-5.so diff --git a/jobx-agent/src/conf/native/libsigar-ppc64-linux.so b/jobx-agent/src/assembly/native/libsigar-ppc64-linux.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-ppc64-linux.so rename to jobx-agent/src/assembly/native/libsigar-ppc64-linux.so diff --git a/jobx-agent/src/conf/native/libsigar-s390x-linux.so b/jobx-agent/src/assembly/native/libsigar-s390x-linux.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-s390x-linux.so rename to jobx-agent/src/assembly/native/libsigar-s390x-linux.so diff --git a/jobx-agent/src/conf/native/libsigar-sparc-solaris.so b/jobx-agent/src/assembly/native/libsigar-sparc-solaris.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-sparc-solaris.so rename to jobx-agent/src/assembly/native/libsigar-sparc-solaris.so diff --git a/jobx-agent/src/conf/native/libsigar-sparc64-solaris.so b/jobx-agent/src/assembly/native/libsigar-sparc64-solaris.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-sparc64-solaris.so rename to jobx-agent/src/assembly/native/libsigar-sparc64-solaris.so diff --git a/jobx-agent/src/conf/native/libsigar-universal-macosx.dylib b/jobx-agent/src/assembly/native/libsigar-universal-macosx.dylib similarity index 100% rename from jobx-agent/src/conf/native/libsigar-universal-macosx.dylib rename to jobx-agent/src/assembly/native/libsigar-universal-macosx.dylib diff --git a/jobx-agent/src/conf/native/libsigar-universal64-macosx.dylib b/jobx-agent/src/assembly/native/libsigar-universal64-macosx.dylib similarity index 100% rename from jobx-agent/src/conf/native/libsigar-universal64-macosx.dylib rename to jobx-agent/src/assembly/native/libsigar-universal64-macosx.dylib diff --git a/jobx-agent/src/conf/native/libsigar-x86-freebsd-5.so b/jobx-agent/src/assembly/native/libsigar-x86-freebsd-5.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-x86-freebsd-5.so rename to jobx-agent/src/assembly/native/libsigar-x86-freebsd-5.so diff --git a/jobx-agent/src/conf/native/libsigar-x86-freebsd-6.so b/jobx-agent/src/assembly/native/libsigar-x86-freebsd-6.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-x86-freebsd-6.so rename to jobx-agent/src/assembly/native/libsigar-x86-freebsd-6.so diff --git a/jobx-agent/src/conf/native/libsigar-x86-linux.so b/jobx-agent/src/assembly/native/libsigar-x86-linux.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-x86-linux.so rename to jobx-agent/src/assembly/native/libsigar-x86-linux.so diff --git a/jobx-agent/src/conf/native/libsigar-x86-solaris.so b/jobx-agent/src/assembly/native/libsigar-x86-solaris.so similarity index 100% rename from jobx-agent/src/conf/native/libsigar-x86-solaris.so rename to jobx-agent/src/assembly/native/libsigar-x86-solaris.so diff --git a/jobx-agent/src/conf/native/sigar-amd64-winnt.dll b/jobx-agent/src/assembly/native/sigar-amd64-winnt.dll similarity index 100% rename from jobx-agent/src/conf/native/sigar-amd64-winnt.dll rename to jobx-agent/src/assembly/native/sigar-amd64-winnt.dll diff --git a/jobx-agent/src/conf/native/sigar-x86-winnt.dll b/jobx-agent/src/assembly/native/sigar-x86-winnt.dll similarity index 100% rename from jobx-agent/src/conf/native/sigar-x86-winnt.dll rename to jobx-agent/src/assembly/native/sigar-x86-winnt.dll diff --git a/jobx-agent/src/conf/native/sigar-x86-winnt.lib b/jobx-agent/src/assembly/native/sigar-x86-winnt.lib similarity index 100% rename from jobx-agent/src/conf/native/sigar-x86-winnt.lib rename to jobx-agent/src/assembly/native/sigar-x86-winnt.lib diff --git a/jobx-agent/src/conf/temp/.keep b/jobx-agent/src/assembly/temp/.keep similarity index 100% rename from jobx-agent/src/conf/temp/.keep rename to jobx-agent/src/assembly/temp/.keep diff --git a/jobx-agent/src/conf/bin/executor.so b/jobx-agent/src/conf/bin/executor.so deleted file mode 100755 index cc59c71fe29e6ea6867a387e5a8b5a8bd3cdde17..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9480 zcmeHNZ)_CD6`unW94GD>N|RIx%|hyk`~gBzN5-uyySXK6#n^}ORVWqRoPB%tCFi@# z-kxKmS~WFRSuIwtQXq(s)>1&FNUc!I2U@iiagd7IRIyMM@xe+RiMH#+l^hgRlp@^U zZ+6c6j0pvl5MM;r zkaa!U`mFlA+SN(!@)TMQZ;NQ>G8A>aTiw&WTt&98Th0?chHnDy$V?4gw~Qf+l$V0` zTB<}EXo>GKtW_8$10=id>35{S#wGTRX7dLi>lDwEJtnPgVt z<@0eC3xK9L=S;*w8=k}~m*zFn+TB_v!Td>=O7j}1Ij>lAW%HUz>-l{HJ=wILvrPDT zdwV4_Tpw&-N{oN`&~?2pTeeJYu~&!o^si)(IB2gVV;{Pnj(?Vaif=DRWhCNqdmQgt zDe($jPsFYG5+gX?qHphRUxoOy=0VqcvjYR!Ovz%<-h^)t)nY35PtMh%q;k5I$W06Pa`sA9Anj!S8yzamik8j zyZ7ZSV_?fSw!n{650sD|MrMCghzG~}h>sbcN~%QQ{~dvtX8%>&KX)E}X!h{DU6`|D zt`kFf#l4Od?!>NapA3(6K<=n>wmRcpB6sJ^_P4@g+z^iH+Um4BDY?_+ZY*&xyAzUo znOtt5->WxJirMdC2Wigmyi;)9*P$|cO@t3T2Z`o1{}CsU=EUaV&6H-xF1iugXmlM^ z+IYhzoKt8z1(l1M{ni=bJ`F*{Sv87w5nH`ss~2V;g#B#`?v9e_?|Y_mG;I%`b3ew( z36qVU$vZuh=QMi~=Kc;D+=xKeR?kBHlzSB{TRq{vFY5_+O4i5SNve)FxHRJopK@X+ zoShR9M?Kyu9eV>}r}iWKWwUp}t)sICLtqTM?pX-rkWYGkU51JibJ17PjvaD$vt6Tm z%(MPe&w9~`9rDJzgM6p?P1;otqS1)E3oLu=I|~a7Zj&U3NIoJ-i{yQ5Gv4rZ&(?@@ zn7Yn5)gsOqRXmqJMBtp-M&ISJ90aqM;G{D==T^an^!nGH*BhnRbDI6zeyG`p6DZx+ zXrR%3pA$UZP%HbBa!1O&5gee@Y5o9lx5r*UGuYU});0w8ST{*il2MXzNw$-WvgLTg zAcy0~HqK$HJLA;EP^je%g=@g69bg}b{+I^AEatSd1|9W=w*SI;F!sKkOeVL4A3OkB z2)Q3d=c4{nwTG{1c41x{ZGIA#M0kvUt2AfT8**e=O{?w)A7WNZ;=x6675JmW*H(td zA7;z(200Z@^Bgp=+V*it)V>QK*T_4w?OPc!Fh!v2h-)v<~=E$h(mD)rD4cGZkyLV~Jm z9k!A?{cp^zIz2i(jVV`04E6fD6H7&r}GCpL}7UxPLs!#)ik z@Xr@SKm_M`^g?v++r@?YdDvK}zbea5Wcg27UX$f@S>BN4OhF+c zwJd8;3ei5kem|63cQ4exjJnuQ=Ir0F+WPV3EoP@lttWMf)MKPBl4>ILJ5p_=&XU?g z>NKe&sR>epq>hj}KLe*{kl*^9G#a)K%Ft5ZdC2hp>mhzM`7&lXN z3I1)_Y77~@1-1vN8&t1^-1V!InH>tt(kmk5bIr6~Hp zSC9Gi3BUfiU!U{qNxy!_uix|Q8NdF}uRrnYn|@u54{?rXtzUC|>yW?nDgIR0l?YTK zP>Db#0+k3(>l**(m?{bRr95}ct zGJJ(05BkPNLLT&m2PL%3(ik`_Tu$hCqh76xy#w)7M*J|eTkVduMfA?7+NJMkZEIH} z;z%gA8>pkRTi?+c>xhWgLv0=3Y;A{HTSqk3Eha+kozL!ot~eP|ySh5NBz-z0Rt)sZ zDB(^D|1uC~U=N0#-?mL&8yPw;ilV(Qz9q2;e^l@N@vX z0sL_Q|0{q)UT2HryDNYZHu;9lYi7;`-=BHG%LwvKU@h|Jk$Ly^1>}2>??vW&F;WYr zPVjE*f3>3seQD)kS(YzPy|g;@+bnK9u(oymHtSQ@Z(Yc`+%Py*y!}*mym+KMSxRR_ u>2z2;7Zy(hNpOdf;KpU`?SE2IQnu$8cRLBGj#?_=-)KBfZaK>s;Qs*JK3I|f From ea81d601cc607ce9600eb37e1344f37111205666 Mon Sep 17 00:00:00 2001 From: benjobs Date: Mon, 27 Aug 2018 11:34:55 +0800 Subject: [PATCH 12/46] fix bug --- jobx-webapp/.babelrc | 12 - jobx-webapp/.editorconfig | 9 - jobx-webapp/.gitignore | 14 - jobx-webapp/.postcssrc.js | 10 - jobx-webapp/README.md | 21 - jobx-webapp/build/build.js | 41 - jobx-webapp/build/check-versions.js | 54 - jobx-webapp/build/logo.png | Bin 6849 -> 0 bytes jobx-webapp/build/utils.js | 101 - jobx-webapp/build/vue-loader.conf.js | 22 - jobx-webapp/build/webpack.base.conf.js | 82 - jobx-webapp/build/webpack.dev.conf.js | 95 - jobx-webapp/build/webpack.prod.conf.js | 145 - jobx-webapp/config/dev.env.js | 7 - jobx-webapp/config/index.js | 69 - jobx-webapp/config/prod.env.js | 4 - jobx-webapp/index.html | 99 - jobx-webapp/package-lock.json | 10708 ----------------- jobx-webapp/package.json | 66 - jobx-webapp/src/App.vue | 33 - jobx-webapp/src/assets/logo.png | Bin 6849 -> 0 bytes jobx-webapp/src/components/header/Avatar.vue | 70 - jobx-webapp/src/components/header/Header.vue | 32 - jobx-webapp/src/components/nav/Nav.vue | 206 - jobx-webapp/src/main.js | 15 - jobx-webapp/src/router/index.js | 10 - 26 files changed, 11925 deletions(-) delete mode 100644 jobx-webapp/.babelrc delete mode 100644 jobx-webapp/.editorconfig delete mode 100644 jobx-webapp/.gitignore delete mode 100644 jobx-webapp/.postcssrc.js delete mode 100644 jobx-webapp/README.md delete mode 100644 jobx-webapp/build/build.js delete mode 100644 jobx-webapp/build/check-versions.js delete mode 100644 jobx-webapp/build/logo.png delete mode 100644 jobx-webapp/build/utils.js delete mode 100644 jobx-webapp/build/vue-loader.conf.js delete mode 100644 jobx-webapp/build/webpack.base.conf.js delete mode 100755 jobx-webapp/build/webpack.dev.conf.js delete mode 100644 jobx-webapp/build/webpack.prod.conf.js delete mode 100644 jobx-webapp/config/dev.env.js delete mode 100644 jobx-webapp/config/index.js delete mode 100644 jobx-webapp/config/prod.env.js delete mode 100644 jobx-webapp/index.html delete mode 100644 jobx-webapp/package-lock.json delete mode 100644 jobx-webapp/package.json delete mode 100644 jobx-webapp/src/App.vue delete mode 100644 jobx-webapp/src/assets/logo.png delete mode 100644 jobx-webapp/src/components/header/Avatar.vue delete mode 100644 jobx-webapp/src/components/header/Header.vue delete mode 100644 jobx-webapp/src/components/nav/Nav.vue delete mode 100644 jobx-webapp/src/main.js delete mode 100644 jobx-webapp/src/router/index.js diff --git a/jobx-webapp/.babelrc b/jobx-webapp/.babelrc deleted file mode 100644 index 3a280ba3..00000000 --- a/jobx-webapp/.babelrc +++ /dev/null @@ -1,12 +0,0 @@ -{ - "presets": [ - ["env", { - "modules": false, - "targets": { - "browsers": ["> 1%", "last 2 versions", "not ie <= 8"] - } - }], - "stage-2" - ], - "plugins": ["transform-vue-jsx", "transform-runtime"] -} diff --git a/jobx-webapp/.editorconfig b/jobx-webapp/.editorconfig deleted file mode 100644 index 9d08a1a8..00000000 --- a/jobx-webapp/.editorconfig +++ /dev/null @@ -1,9 +0,0 @@ -root = true - -[*] -charset = utf-8 -indent_style = space -indent_size = 2 -end_of_line = lf -insert_final_newline = true -trim_trailing_whitespace = true diff --git a/jobx-webapp/.gitignore b/jobx-webapp/.gitignore deleted file mode 100644 index 541a820f..00000000 --- a/jobx-webapp/.gitignore +++ /dev/null @@ -1,14 +0,0 @@ -.DS_Store -node_modules/ -/dist/ -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Editor directories and files -.idea -.vscode -*.suo -*.ntvs* -*.njsproj -*.sln diff --git a/jobx-webapp/.postcssrc.js b/jobx-webapp/.postcssrc.js deleted file mode 100644 index eee3e92d..00000000 --- a/jobx-webapp/.postcssrc.js +++ /dev/null @@ -1,10 +0,0 @@ -// https://github.com/michael-ciniawsky/postcss-load-config - -module.exports = { - "plugins": { - "postcss-import": {}, - "postcss-url": {}, - // to edit target browsers: use "browserslist" field in package.json - "autoprefixer": {} - } -} diff --git a/jobx-webapp/README.md b/jobx-webapp/README.md deleted file mode 100644 index 33954e78..00000000 --- a/jobx-webapp/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# jobx-webapp - -> jobx's webUI - -## Build Setup - -``` bash -# install dependencies -npm install - -# serve with hot reload at localhost:8080 -npm run dev - -# build for production with minification -npm run build - -# build for production and view the bundle analyzer report -npm run build --report -``` - -For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader). diff --git a/jobx-webapp/build/build.js b/jobx-webapp/build/build.js deleted file mode 100644 index 8f2ad8ad..00000000 --- a/jobx-webapp/build/build.js +++ /dev/null @@ -1,41 +0,0 @@ -'use strict' -require('./check-versions')() - -process.env.NODE_ENV = 'production' - -const ora = require('ora') -const rm = require('rimraf') -const path = require('path') -const chalk = require('chalk') -const webpack = require('webpack') -const config = require('../config') -const webpackConfig = require('./webpack.prod.conf') - -const spinner = ora('building for production...') -spinner.start() - -rm(path.join(config.build.assetsRoot, config.build.assetsSubDirectory), err => { - if (err) throw err - webpack(webpackConfig, (err, stats) => { - spinner.stop() - if (err) throw err - process.stdout.write(stats.toString({ - colors: true, - modules: false, - children: false, // If you are using ts-loader, setting this to true will make TypeScript errors show up during build. - chunks: false, - chunkModules: false - }) + '\n\n') - - if (stats.hasErrors()) { - console.log(chalk.red(' Build failed with errors.\n')) - process.exit(1) - } - - console.log(chalk.cyan(' Build complete.\n')) - console.log(chalk.yellow( - ' Tip: built files are meant to be served over an HTTP server.\n' + - ' Opening index.html over file:// won\'t work.\n' - )) - }) -}) diff --git a/jobx-webapp/build/check-versions.js b/jobx-webapp/build/check-versions.js deleted file mode 100644 index 3ef972a0..00000000 --- a/jobx-webapp/build/check-versions.js +++ /dev/null @@ -1,54 +0,0 @@ -'use strict' -const chalk = require('chalk') -const semver = require('semver') -const packageConfig = require('../package.json') -const shell = require('shelljs') - -function exec (cmd) { - return require('child_process').execSync(cmd).toString().trim() -} - -const versionRequirements = [ - { - name: 'node', - currentVersion: semver.clean(process.version), - versionRequirement: packageConfig.engines.node - } -] - -if (shell.which('npm')) { - versionRequirements.push({ - name: 'npm', - currentVersion: exec('npm --version'), - versionRequirement: packageConfig.engines.npm - }) -} - -module.exports = function () { - const warnings = [] - - for (let i = 0; i < versionRequirements.length; i++) { - const mod = versionRequirements[i] - - if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) { - warnings.push(mod.name + ': ' + - chalk.red(mod.currentVersion) + ' should be ' + - chalk.green(mod.versionRequirement) - ) - } - } - - if (warnings.length) { - console.log('') - console.log(chalk.yellow('To use this template, you must update following to modules:')) - console.log() - - for (let i = 0; i < warnings.length; i++) { - const warning = warnings[i] - console.log(' ' + warning) - } - - console.log() - process.exit(1) - } -} diff --git a/jobx-webapp/build/logo.png b/jobx-webapp/build/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 zcmaKRcUV(fvo}bjDT-7nLI_nlK}sT_69H+`qzVWDA|yaU?}j417wLi^B1KB1SLsC& zL0ag7$U(XW5YR7p&Ux?sP$d4lvMt8C^+TcQu4F zQqv!UF!I+kw)c0jhd6+g6oCr9P?7)?!qX1ui*iL{p}sKCAGuJ{{W)0z1pLF|=>h}& zt(2Lr0Z`2ig8<5i%Zk}cO5Fm=LByqGWaS`oqChZdEFmc`0hSb#gg|Aap^{+WKOYcj zHjINK)KDG%&s?Mt4CL(T=?;~U@bU2x_mLKN!#GJuK_CzbNw5SMEJorG!}_5;?R>@1 zSl)jns3WlU7^J%=(hUtfmuUCU&C3%8B5C^f5>W2Cy8jW3#{Od{lF1}|?c61##3dzA zsPlFG;l_FzBK}8>|H_Ru_H#!_7$UH4UKo3lKOA}g1(R&|e@}GINYVzX?q=_WLZCgh z)L|eJMce`D0EIwgRaNETDsr+?vQknSGAi=7H00r`QnI%oQnFxm`G2umXso9l+8*&Q z7WqF|$p49js$mdzo^BXpH#gURy=UO;=IMrYc5?@+sR4y_?d*~0^YP7d+y0{}0)zBM zIKVM(DBvICK#~7N0a+PY6)7;u=dutmNqK3AlsrUU9U`d;msiucB_|8|2kY=(7XA;G zwDA8AR)VCA#JOkxm#6oHNS^YVuOU;8p$N)2{`;oF|rQ?B~K$%rHDxXs+_G zF5|-uqHZvSzq}L;5Kcy_P+x0${33}Ofb6+TX&=y;;PkEOpz%+_bCw_{<&~ zeLV|!bP%l1qxywfVr9Z9JI+++EO^x>ZuCK);=$VIG1`kxK8F2M8AdC$iOe3cj1fo(ce4l-9 z7*zKy3={MixvUk=enQE;ED~7tv%qh&3lR<0m??@w{ILF|e#QOyPkFYK!&Up7xWNtL zOW%1QMC<3o;G9_S1;NkPB6bqbCOjeztEc6TsBM<(q9((JKiH{01+Ud=uw9B@{;(JJ z-DxI2*{pMq`q1RQc;V8@gYAY44Z!%#W~M9pRxI(R?SJ7sy7em=Z5DbuDlr@*q|25V)($-f}9c#?D%dU^RS<(wz?{P zFFHtCab*!rl(~j@0(Nadvwg8q|4!}L^>d?0al6}Rrv9$0M#^&@zjbfJy_n!%mVHK4 z6pLRIQ^Uq~dnyy$`ay51Us6WaP%&O;@49m&{G3z7xV3dLtt1VTOMYl3UW~Rm{Eq4m zF?Zl_v;?7EFx1_+#WFUXxcK78IV)FO>42@cm@}2I%pVbZqQ}3;p;sDIm&knay03a^ zn$5}Q$G!@fTwD$e(x-~aWP0h+4NRz$KlnO_H2c< z(XX#lPuW_%H#Q+c&(nRyX1-IadKR-%$4FYC0fsCmL9ky3 zKpxyjd^JFR+vg2!=HWf}2Z?@Td`0EG`kU?{8zKrvtsm)|7>pPk9nu@2^z96aU2<#` z2QhvH5w&V;wER?mopu+nqu*n8p~(%QkwSs&*0eJwa zMXR05`OSFpfyRb!Y_+H@O%Y z0=K^y6B8Gcbl?SA)qMP3Z+=C(?8zL@=74R=EVnE?vY!1BQy2@q*RUgRx4yJ$k}MnL zs!?74QciNb-LcG*&o<9=DSL>1n}ZNd)w1z3-0Pd^4ED1{qd=9|!!N?xnXjM!EuylY z5=!H>&hSofh8V?Jofyd!h`xDI1fYAuV(sZwwN~{$a}MX^=+0TH*SFp$vyxmUv7C*W zv^3Gl0+eTFgBi3FVD;$nhcp)ka*4gSskYIqQ&+M}xP9yLAkWzBI^I%zR^l1e?bW_6 zIn{mo{dD=)9@V?s^fa55jh78rP*Ze<3`tRCN4*mpO$@7a^*2B*7N_|A(Ve2VB|)_o z$=#_=aBkhe(ifX}MLT()@5?OV+~7cXC3r!%{QJxriXo9I%*3q4KT4Xxzyd{ z9;_%=W%q!Vw$Z7F3lUnY+1HZ*lO;4;VR2+i4+D(m#01OYq|L_fbnT;KN<^dkkCwtd zF7n+O7KvAw8c`JUh6LmeIrk4`F3o|AagKSMK3))_5Cv~y2Bb2!Ibg9BO7Vkz?pAYX zoI=B}+$R22&IL`NCYUYjrdhwjnMx_v=-Qcx-jmtN>!Zqf|n1^SWrHy zK|MwJ?Z#^>)rfT5YSY{qjZ&`Fjd;^vv&gF-Yj6$9-Dy$<6zeP4s+78gS2|t%Z309b z0^fp~ue_}i`U9j!<|qF92_3oB09NqgAoehQ`)<)dSfKoJl_A6Ec#*Mx9Cpd-p#$Ez z={AM*r-bQs6*z$!*VA4|QE7bf@-4vb?Q+pPKLkY2{yKsw{&udv_2v8{Dbd zm~8VAv!G~s)`O3|Q6vFUV%8%+?ZSVUa(;fhPNg#vab@J*9XE4#D%)$UU-T5`fwjz! z6&gA^`OGu6aUk{l*h9eB?opVdrHK>Q@U>&JQ_2pR%}TyOXGq_6s56_`U(WoOaAb+K zXQr#6H}>a-GYs9^bGP2Y&hSP5gEtW+GVC4=wy0wQk=~%CSXj=GH6q z-T#s!BV`xZVxm{~jr_ezYRpqqIcXC=Oq`b{lu`Rt(IYr4B91hhVC?yg{ol4WUr3v9 zOAk2LG>CIECZ-WIs0$N}F#eoIUEtZudc7DPYIjzGqDLWk_A4#(LgacooD z2K4IWs@N`Bddm-{%oy}!k0^i6Yh)uJ1S*90>|bm3TOZxcV|ywHUb(+CeX-o1|LTZM zwU>dY3R&U)T(}5#Neh?-CWT~@{6Ke@sI)uSuzoah8COy)w)B)aslJmp`WUcjdia-0 zl2Y}&L~XfA`uYQboAJ1;J{XLhYjH){cObH3FDva+^8ioOQy%Z=xyjGLmWMrzfFoH; zEi3AG`_v+%)&lDJE;iJWJDI@-X9K5O)LD~j*PBe(wu+|%ar~C+LK1+-+lK=t# z+Xc+J7qp~5q=B~rD!x78)?1+KUIbYr^5rcl&tB-cTtj+e%{gpZZ4G~6r15+d|J(ky zjg@@UzMW0k9@S#W(1H{u;Nq(7llJbq;;4t$awM;l&(2s+$l!Ay9^Ge|34CVhr7|BG z?dAR83smef^frq9V(OH+a+ki#q&-7TkWfFM=5bsGbU(8mC;>QTCWL5ydz9s6k@?+V zcjiH`VI=59P-(-DWXZ~5DH>B^_H~;4$)KUhnmGo*G!Tq8^LjfUDO)lASN*=#AY_yS zqW9UX(VOCO&p@kHdUUgsBO0KhXxn1sprK5h8}+>IhX(nSXZKwlNsjk^M|RAaqmCZB zHBolOHYBas@&{PT=R+?d8pZu zUHfyucQ`(umXSW7o?HQ3H21M`ZJal+%*)SH1B1j6rxTlG3hx1IGJN^M7{$j(9V;MZ zRKybgVuxKo#XVM+?*yTy{W+XHaU5Jbt-UG33x{u(N-2wmw;zzPH&4DE103HV@ER86 z|FZEmQb|&1s5#`$4!Cm}&`^{(4V}OP$bk`}v6q6rm;P!H)W|2i^e{7lTk2W@jo_9q z*aw|U7#+g59Fv(5qI`#O-qPj#@_P>PC#I(GSp3DLv7x-dmYK=C7lPF8a)bxb=@)B1 zUZ`EqpXV2dR}B&r`uM}N(TS99ZT0UB%IN|0H%DcVO#T%L_chrgn#m6%x4KE*IMfjX zJ%4veCEqbXZ`H`F_+fELMC@wuy_ch%t*+Z+1I}wN#C+dRrf2X{1C8=yZ_%Pt6wL_~ zZ2NN-hXOT4P4n$QFO7yYHS-4wF1Xfr-meG9Pn;uK51?hfel`d38k{W)F*|gJLT2#T z<~>spMu4(mul-8Q3*pf=N4DcI)zzjqAgbE2eOT7~&f1W3VsdD44Ffe;3mJp-V@8UC z)|qnPc12o~$X-+U@L_lWqv-RtvB~%hLF($%Ew5w>^NR82qC_0FB z)=hP1-OEx?lLi#jnLzH}a;Nvr@JDO-zQWd}#k^an$Kwml;MrD&)sC5b`s0ZkVyPkb zt}-jOq^%_9>YZe7Y}PhW{a)c39G`kg(P4@kxjcYfgB4XOOcmezdUI7j-!gs7oAo2o zx(Ph{G+YZ`a%~kzK!HTAA5NXE-7vOFRr5oqY$rH>WI6SFvWmahFav!CfRMM3%8J&c z*p+%|-fNS_@QrFr(at!JY9jCg9F-%5{nb5Bo~z@Y9m&SHYV`49GAJjA5h~h4(G!Se zZmK{Bo7ivCfvl}@A-ptkFGcWXAzj3xfl{evi-OG(TaCn1FAHxRc{}B|x+Ua1D=I6M z!C^ZIvK6aS_c&(=OQDZfm>O`Nxsw{ta&yiYPA~@e#c%N>>#rq)k6Aru-qD4(D^v)y z*>Rs;YUbD1S8^D(ps6Jbj0K3wJw>L4m)0e(6Pee3Y?gy9i0^bZO?$*sv+xKV?WBlh zAp*;v6w!a8;A7sLB*g-^<$Z4L7|5jXxxP1}hQZ<55f9<^KJ>^mKlWSGaLcO0=$jem zWyZkRwe~u{{tU63DlCaS9$Y4CP4f?+wwa(&1ou)b>72ydrFvm`Rj-0`kBJgK@nd(*Eh!(NC{F-@=FnF&Y!q`7){YsLLHf0_B6aHc# z>WIuHTyJwIH{BJ4)2RtEauC7Yq7Cytc|S)4^*t8Va3HR zg=~sN^tp9re@w=GTx$;zOWMjcg-7X3Wk^N$n;&Kf1RgVG2}2L-(0o)54C509C&77i zrjSi{X*WV=%C17((N^6R4Ya*4#6s_L99RtQ>m(%#nQ#wrRC8Y%yxkH;d!MdY+Tw@r zjpSnK`;C-U{ATcgaxoEpP0Gf+tx);buOMlK=01D|J+ROu37qc*rD(w`#O=3*O*w9?biwNoq3WN1`&Wp8TvKj3C z3HR9ssH7a&Vr<6waJrU zdLg!ieYz%U^bmpn%;(V%%ugMk92&?_XX1K@mwnVSE6!&%P%Wdi7_h`CpScvspMx?N zQUR>oadnG17#hNc$pkTp+9lW+MBKHRZ~74XWUryd)4yd zj98$%XmIL4(9OnoeO5Fnyn&fpQ9b0h4e6EHHw*l68j;>(ya`g^S&y2{O8U>1*>4zR zq*WSI_2o$CHQ?x0!wl9bpx|Cm2+kFMR)oMud1%n2=qn5nE&t@Fgr#=Zv2?}wtEz^T z9rrj=?IH*qI5{G@Rn&}^Z{+TW}mQeb9=8b<_a`&Cm#n%n~ zU47MvCBsdXFB1+adOO)03+nczfWa#vwk#r{o{dF)QWya9v2nv43Zp3%Ps}($lA02*_g25t;|T{A5snSY?3A zrRQ~(Ygh_ebltHo1VCbJb*eOAr;4cnlXLvI>*$-#AVsGg6B1r7@;g^L zFlJ_th0vxO7;-opU@WAFe;<}?!2q?RBrFK5U{*ai@NLKZ^};Ul}beukveh?TQn;$%9=R+DX07m82gP$=}Uo_%&ngV`}Hyv8g{u z3SWzTGV|cwQuFIs7ZDOqO_fGf8Q`8MwL}eUp>q?4eqCmOTcwQuXtQckPy|4F1on8l zP*h>d+cH#XQf|+6c|S{7SF(Lg>bR~l(0uY?O{OEVlaxa5@e%T&xju=o1`=OD#qc16 zSvyH*my(dcp6~VqR;o(#@m44Lug@~_qw+HA=mS#Z^4reBy8iV?H~I;{LQWk3aKK8$bLRyt$g?- { - const notifier = require('node-notifier') - - return (severity, errors) => { - if (severity !== 'error') return - - const error = errors[0] - const filename = error.file && error.file.split('!').pop() - - notifier.notify({ - title: packageConfig.name, - message: severity + ': ' + error.name, - subtitle: filename || '', - icon: path.join(__dirname, 'logo.png') - }) - } -} diff --git a/jobx-webapp/build/vue-loader.conf.js b/jobx-webapp/build/vue-loader.conf.js deleted file mode 100644 index 33ed58bc..00000000 --- a/jobx-webapp/build/vue-loader.conf.js +++ /dev/null @@ -1,22 +0,0 @@ -'use strict' -const utils = require('./utils') -const config = require('../config') -const isProduction = process.env.NODE_ENV === 'production' -const sourceMapEnabled = isProduction - ? config.build.productionSourceMap - : config.dev.cssSourceMap - -module.exports = { - loaders: utils.cssLoaders({ - sourceMap: sourceMapEnabled, - extract: isProduction - }), - cssSourceMap: sourceMapEnabled, - cacheBusting: config.dev.cacheBusting, - transformToRequire: { - video: ['src', 'poster'], - source: 'src', - img: 'src', - image: 'xlink:href' - } -} diff --git a/jobx-webapp/build/webpack.base.conf.js b/jobx-webapp/build/webpack.base.conf.js deleted file mode 100644 index a07e6836..00000000 --- a/jobx-webapp/build/webpack.base.conf.js +++ /dev/null @@ -1,82 +0,0 @@ -'use strict' -const path = require('path') -const utils = require('./utils') -const config = require('../config') -const vueLoaderConfig = require('./vue-loader.conf') - -function resolve (dir) { - return path.join(__dirname, '..', dir) -} - - - -module.exports = { - context: path.resolve(__dirname, '../'), - entry: { - app: './src/main.js' - }, - output: { - path: config.build.assetsRoot, - filename: '[name].js', - publicPath: process.env.NODE_ENV === 'production' - ? config.build.assetsPublicPath - : config.dev.assetsPublicPath - }, - resolve: { - extensions: ['.js', '.vue', '.json'], - alias: { - 'vue$': 'vue/dist/vue.esm.js', - '@': resolve('src'), - } - }, - module: { - rules: [ - { - test: /\.vue$/, - loader: 'vue-loader', - options: vueLoaderConfig - }, - { - test: /\.js$/, - loader: 'babel-loader', - include: [resolve('src'), resolve('test'), resolve('node_modules/webpack-dev-server/client')] - }, - { - test: /\.(png|jpe?g|gif|svg)(\?.*)?$/, - loader: 'url-loader', - options: { - limit: 10000, - name: utils.assetsPath('img/[name].[hash:7].[ext]') - } - }, - { - test: /\.(mp4|webm|ogg|mp3|wav|flac|aac)(\?.*)?$/, - loader: 'url-loader', - options: { - limit: 10000, - name: utils.assetsPath('media/[name].[hash:7].[ext]') - } - }, - { - test: /\.(woff2?|eot|ttf|otf)(\?.*)?$/, - loader: 'url-loader', - options: { - limit: 10000, - name: utils.assetsPath('fonts/[name].[hash:7].[ext]') - } - } - ] - }, - node: { - // prevent webpack from injecting useless setImmediate polyfill because Vue - // source contains it (although only uses it if it's native). - setImmediate: false, - // prevent webpack from injecting mocks to Node native modules - // that does not make sense for the client - dgram: 'empty', - fs: 'empty', - net: 'empty', - tls: 'empty', - child_process: 'empty' - } -} diff --git a/jobx-webapp/build/webpack.dev.conf.js b/jobx-webapp/build/webpack.dev.conf.js deleted file mode 100755 index 070ae221..00000000 --- a/jobx-webapp/build/webpack.dev.conf.js +++ /dev/null @@ -1,95 +0,0 @@ -'use strict' -const utils = require('./utils') -const webpack = require('webpack') -const config = require('../config') -const merge = require('webpack-merge') -const path = require('path') -const baseWebpackConfig = require('./webpack.base.conf') -const CopyWebpackPlugin = require('copy-webpack-plugin') -const HtmlWebpackPlugin = require('html-webpack-plugin') -const FriendlyErrorsPlugin = require('friendly-errors-webpack-plugin') -const portfinder = require('portfinder') - -const HOST = process.env.HOST -const PORT = process.env.PORT && Number(process.env.PORT) - -const devWebpackConfig = merge(baseWebpackConfig, { - module: { - rules: utils.styleLoaders({ sourceMap: config.dev.cssSourceMap, usePostCSS: true }) - }, - // cheap-module-eval-source-map is faster for development - devtool: config.dev.devtool, - - // these devServer options should be customized in /config/index.js - devServer: { - clientLogLevel: 'warning', - historyApiFallback: { - rewrites: [ - { from: /.*/, to: path.posix.join(config.dev.assetsPublicPath, 'index.html') }, - ], - }, - hot: true, - contentBase: false, // since we use CopyWebpackPlugin. - compress: true, - host: HOST || config.dev.host, - port: PORT || config.dev.port, - open: config.dev.autoOpenBrowser, - overlay: config.dev.errorOverlay - ? { warnings: false, errors: true } - : false, - publicPath: config.dev.assetsPublicPath, - proxy: config.dev.proxyTable, - quiet: true, // necessary for FriendlyErrorsPlugin - watchOptions: { - poll: config.dev.poll, - } - }, - plugins: [ - new webpack.DefinePlugin({ - 'process.env': require('../config/dev.env') - }), - new webpack.HotModuleReplacementPlugin(), - new webpack.NamedModulesPlugin(), // HMR shows correct file names in console on update. - new webpack.NoEmitOnErrorsPlugin(), - // https://github.com/ampedandwired/html-webpack-plugin - new HtmlWebpackPlugin({ - filename: 'index.html', - template: 'index.html', - inject: true - }), - // copy custom static assets - new CopyWebpackPlugin([ - { - from: path.resolve(__dirname, '../static'), - to: config.dev.assetsSubDirectory, - ignore: ['.*'] - } - ]) - ] -}) - -module.exports = new Promise((resolve, reject) => { - portfinder.basePort = process.env.PORT || config.dev.port - portfinder.getPort((err, port) => { - if (err) { - reject(err) - } else { - // publish the new Port, necessary for e2e tests - process.env.PORT = port - // add port to devServer config - devWebpackConfig.devServer.port = port - - // Add FriendlyErrorsPlugin - devWebpackConfig.plugins.push(new FriendlyErrorsPlugin({ - compilationSuccessInfo: { - messages: [`Your application is running here: http://${devWebpackConfig.devServer.host}:${port}`], - }, - onErrors: config.dev.notifyOnErrors - ? utils.createNotifierCallback() - : undefined - })) - - resolve(devWebpackConfig) - } - }) -}) diff --git a/jobx-webapp/build/webpack.prod.conf.js b/jobx-webapp/build/webpack.prod.conf.js deleted file mode 100644 index d9f99f65..00000000 --- a/jobx-webapp/build/webpack.prod.conf.js +++ /dev/null @@ -1,145 +0,0 @@ -'use strict' -const path = require('path') -const utils = require('./utils') -const webpack = require('webpack') -const config = require('../config') -const merge = require('webpack-merge') -const baseWebpackConfig = require('./webpack.base.conf') -const CopyWebpackPlugin = require('copy-webpack-plugin') -const HtmlWebpackPlugin = require('html-webpack-plugin') -const ExtractTextPlugin = require('extract-text-webpack-plugin') -const OptimizeCSSPlugin = require('optimize-css-assets-webpack-plugin') -const UglifyJsPlugin = require('uglifyjs-webpack-plugin') - -const env = require('../config/prod.env') - -const webpackConfig = merge(baseWebpackConfig, { - module: { - rules: utils.styleLoaders({ - sourceMap: config.build.productionSourceMap, - extract: true, - usePostCSS: true - }) - }, - devtool: config.build.productionSourceMap ? config.build.devtool : false, - output: { - path: config.build.assetsRoot, - filename: utils.assetsPath('js/[name].[chunkhash].js'), - chunkFilename: utils.assetsPath('js/[id].[chunkhash].js') - }, - plugins: [ - // http://vuejs.github.io/vue-loader/en/workflow/production.html - new webpack.DefinePlugin({ - 'process.env': env - }), - new UglifyJsPlugin({ - uglifyOptions: { - compress: { - warnings: false - } - }, - sourceMap: config.build.productionSourceMap, - parallel: true - }), - // extract css into its own file - new ExtractTextPlugin({ - filename: utils.assetsPath('css/[name].[contenthash].css'), - // Setting the following option to `false` will not extract CSS from codesplit chunks. - // Their CSS will instead be inserted dynamically with style-loader when the codesplit chunk has been loaded by webpack. - // It's currently set to `true` because we are seeing that sourcemaps are included in the codesplit bundle as well when it's `false`, - // increasing file size: https://github.com/vuejs-templates/webpack/issues/1110 - allChunks: true, - }), - // Compress extracted CSS. We are using this plugin so that possible - // duplicated CSS from different components can be deduped. - new OptimizeCSSPlugin({ - cssProcessorOptions: config.build.productionSourceMap - ? { safe: true, map: { inline: false } } - : { safe: true } - }), - // generate dist index.html with correct asset hash for caching. - // you can customize output by editing /index.html - // see https://github.com/ampedandwired/html-webpack-plugin - new HtmlWebpackPlugin({ - filename: config.build.index, - template: 'index.html', - inject: true, - minify: { - removeComments: true, - collapseWhitespace: true, - removeAttributeQuotes: true - // more options: - // https://github.com/kangax/html-minifier#options-quick-reference - }, - // necessary to consistently work with multiple chunks via CommonsChunkPlugin - chunksSortMode: 'dependency' - }), - // keep module.id stable when vendor modules does not change - new webpack.HashedModuleIdsPlugin(), - // enable scope hoisting - new webpack.optimize.ModuleConcatenationPlugin(), - // split vendor js into its own file - new webpack.optimize.CommonsChunkPlugin({ - name: 'vendor', - minChunks (module) { - // any required modules inside node_modules are extracted to vendor - return ( - module.resource && - /\.js$/.test(module.resource) && - module.resource.indexOf( - path.join(__dirname, '../node_modules') - ) === 0 - ) - } - }), - // extract webpack runtime and module manifest to its own file in order to - // prevent vendor hash from being updated whenever app bundle is updated - new webpack.optimize.CommonsChunkPlugin({ - name: 'manifest', - minChunks: Infinity - }), - // This instance extracts shared chunks from code splitted chunks and bundles them - // in a separate chunk, similar to the vendor chunk - // see: https://webpack.js.org/plugins/commons-chunk-plugin/#extra-async-commons-chunk - new webpack.optimize.CommonsChunkPlugin({ - name: 'app', - async: 'vendor-async', - children: true, - minChunks: 3 - }), - - // copy custom static assets - new CopyWebpackPlugin([ - { - from: path.resolve(__dirname, '../static'), - to: config.build.assetsSubDirectory, - ignore: ['.*'] - } - ]) - ] -}) - -if (config.build.productionGzip) { - const CompressionWebpackPlugin = require('compression-webpack-plugin') - - webpackConfig.plugins.push( - new CompressionWebpackPlugin({ - asset: '[path].gz[query]', - algorithm: 'gzip', - test: new RegExp( - '\\.(' + - config.build.productionGzipExtensions.join('|') + - ')$' - ), - threshold: 10240, - minRatio: 0.8 - }) - ) -} - -if (config.build.bundleAnalyzerReport) { - const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin - webpackConfig.plugins.push(new BundleAnalyzerPlugin()) -} - -module.exports = webpackConfig diff --git a/jobx-webapp/config/dev.env.js b/jobx-webapp/config/dev.env.js deleted file mode 100644 index 1e22973a..00000000 --- a/jobx-webapp/config/dev.env.js +++ /dev/null @@ -1,7 +0,0 @@ -'use strict' -const merge = require('webpack-merge') -const prodEnv = require('./prod.env') - -module.exports = merge(prodEnv, { - NODE_ENV: '"development"' -}) diff --git a/jobx-webapp/config/index.js b/jobx-webapp/config/index.js deleted file mode 100644 index c5eded7f..00000000 --- a/jobx-webapp/config/index.js +++ /dev/null @@ -1,69 +0,0 @@ -'use strict' -// Template version: 1.3.1 -// see http://vuejs-templates.github.io/webpack for documentation. - -const path = require('path') - -module.exports = { - dev: { - - // Paths - assetsSubDirectory: 'static', - assetsPublicPath: '/', - proxyTable: {}, - - // Various Dev Server settings - host: 'localhost', // can be overwritten by process.env.HOST - port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined - autoOpenBrowser: false, - errorOverlay: true, - notifyOnErrors: true, - poll: false, // https://webpack.js.org/configuration/dev-server/#devserver-watchoptions- - - - /** - * Source Maps - */ - - // https://webpack.js.org/configuration/devtool/#development - devtool: 'cheap-module-eval-source-map', - - // If you have problems debugging vue-files in devtools, - // set this to false - it *may* help - // https://vue-loader.vuejs.org/en/options.html#cachebusting - cacheBusting: true, - - cssSourceMap: true - }, - - build: { - // Template for index.html - index: path.resolve(__dirname, '../dist/index.html'), - - // Paths - assetsRoot: path.resolve(__dirname, '../dist'), - assetsSubDirectory: 'static', - assetsPublicPath: '/', - - /** - * Source Maps - */ - - productionSourceMap: true, - // https://webpack.js.org/configuration/devtool/#production - devtool: '#source-map', - - // Gzip off by default as many popular static hosts such as - // Surge or Netlify already gzip all static assets for you. - // Before setting to `true`, make sure to: - // npm install --save-dev compression-webpack-plugin - productionGzip: false, - productionGzipExtensions: ['js', 'css'], - - // Run the build command with an extra argument to - // View the bundle analyzer report after build finishes: - // `npm run build --report` - // Set to `true` or `false` to always turn it on or off - bundleAnalyzerReport: process.env.npm_config_report - } -} diff --git a/jobx-webapp/config/prod.env.js b/jobx-webapp/config/prod.env.js deleted file mode 100644 index a6f99761..00000000 --- a/jobx-webapp/config/prod.env.js +++ /dev/null @@ -1,4 +0,0 @@ -'use strict' -module.exports = { - NODE_ENV: '"production"' -} diff --git a/jobx-webapp/index.html b/jobx-webapp/index.html deleted file mode 100644 index c6a04b60..00000000 --- a/jobx-webapp/index.html +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - jobx-webapp - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

- - - diff --git a/jobx-webapp/package-lock.json b/jobx-webapp/package-lock.json deleted file mode 100644 index 8bbbc68f..00000000 --- a/jobx-webapp/package-lock.json +++ /dev/null @@ -1,10708 +0,0 @@ -{ - "name": "jobx-webapp", - "version": "1.0.0", - "lockfileVersion": 1, - "requires": true, - "dependencies": { - "accepts": { - "version": "1.3.5", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz", - "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=", - "dev": true, - "requires": { - "mime-types": "2.1.18", - "negotiator": "0.6.1" - } - }, - "acorn": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.1.tgz", - "integrity": "sha512-d+nbxBUGKg7Arpsvbnlq61mc12ek3EY8EQldM3GPAhWJ1UVxC6TDGbIvUMNU6obBX3i1+ptCIzV4vq0gFPEGVQ==", - "dev": true - }, - "acorn-dynamic-import": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/acorn-dynamic-import/-/acorn-dynamic-import-2.0.2.tgz", - "integrity": "sha1-x1K9IQvvZ5UBtsbLf8hPj0cVjMQ=", - "dev": true, - "requires": { - "acorn": "4.0.13" - }, - "dependencies": { - "acorn": { - "version": "4.0.13", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz", - "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c=", - "dev": true - } - } - }, - "ajv": { - "version": "5.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", - "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", - "dev": true, - "requires": { - "co": "4.6.0", - "fast-deep-equal": "1.1.0", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.3.1" - } - }, - "ajv-keywords": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.2.0.tgz", - "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=", - "dev": true - }, - "align-text": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz", - "integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=", - "dev": true, - "requires": { - "kind-of": "3.2.2", - "longest": "1.0.1", - "repeat-string": "1.6.1" - } - }, - "alphanum-sort": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/alphanum-sort/-/alphanum-sort-1.0.2.tgz", - "integrity": "sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=", - "dev": true - }, - "amdefine": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz", - "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=", - "dev": true - }, - "ansi-html": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/ansi-html/-/ansi-html-0.0.7.tgz", - "integrity": "sha1-gTWEAhliqenm/QOflA0S9WynhZ4=", - "dev": true - }, - "ansi-regex": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz", - "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=", - "dev": true - }, - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "1.9.2" - } - }, - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "dev": true, - "requires": { - "micromatch": "3.1.10", - "normalize-path": "2.1.1" - } - }, - "aproba": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz", - "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==", - "dev": true - }, - "argparse": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", - "dev": true, - "requires": { - "sprintf-js": "1.0.3" - } - }, - "arr-diff": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", - "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=", - "dev": true - }, - "arr-flatten": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", - "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==", - "dev": true - }, - "arr-union": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", - "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", - "dev": true - }, - "array-find-index": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=", - "dev": true - }, - "array-flatten": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=", - "dev": true - }, - "array-includes": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.0.3.tgz", - "integrity": "sha1-GEtI9i2S10UrsxsyMWXH+L0CJm0=", - "dev": true, - "requires": { - "define-properties": "1.1.2", - "es-abstract": "1.12.0" - } - }, - "array-union": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz", - "integrity": "sha1-mjRBDk9OPaI96jdb5b5w8kd47Dk=", - "dev": true, - "requires": { - "array-uniq": "1.0.3" - } - }, - "array-uniq": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", - "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", - "dev": true - }, - "array-unique": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", - "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=", - "dev": true - }, - "arrify": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz", - "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", - "dev": true - }, - "asn1.js": { - "version": "4.10.1", - "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz", - "integrity": "sha512-p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1" - } - }, - "assert": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz", - "integrity": "sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=", - "dev": true, - "requires": { - "util": "0.10.3" - }, - "dependencies": { - "inherits": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz", - "integrity": "sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=", - "dev": true - }, - "util": { - "version": "0.10.3", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz", - "integrity": "sha1-evsa/lCAUkZInj23/g7TeTNqwPk=", - "dev": true, - "requires": { - "inherits": "2.0.1" - } - } - } - }, - "assign-symbols": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", - "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=", - "dev": true - }, - "async": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", - "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", - "dev": true, - "requires": { - "lodash": "4.17.10" - } - }, - "async-each": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz", - "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=", - "dev": true - }, - "async-limiter": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz", - "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==", - "dev": true - }, - "atob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.1.tgz", - "integrity": "sha1-ri1acpR38onWDdf5amMUoi3Wwio=", - "dev": true - }, - "autoprefixer": { - "version": "7.2.6", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-7.2.6.tgz", - "integrity": "sha512-Iq8TRIB+/9eQ8rbGhcP7ct5cYb/3qjNYAR2SnzLCEcwF6rvVOax8+9+fccgXk4bEhQGjOZd5TLhsksmAdsbGqQ==", - "dev": true, - "requires": { - "browserslist": "2.11.3", - "caniuse-lite": "1.0.30000862", - "normalize-range": "0.1.2", - "num2fraction": "1.2.2", - "postcss": "6.0.23", - "postcss-value-parser": "3.3.0" - } - }, - "babel-code-frame": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz", - "integrity": "sha1-Y/1D99weO7fONZR9uP42mj9Yx0s=", - "dev": true, - "requires": { - "chalk": "1.1.3", - "esutils": "2.0.2", - "js-tokens": "3.0.2" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "babel-core": { - "version": "6.26.3", - "resolved": "https://registry.npmjs.org/babel-core/-/babel-core-6.26.3.tgz", - "integrity": "sha512-6jyFLuDmeidKmUEb3NM+/yawG0M2bDZ9Z1qbZP59cyHLz8kYGKYwpJP0UwUKKUiTRNvxfLesJnTedqczP7cTDA==", - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "babel-generator": "6.26.1", - "babel-helpers": "6.24.1", - "babel-messages": "6.23.0", - "babel-register": "6.26.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "convert-source-map": "1.5.1", - "debug": "2.6.9", - "json5": "0.5.1", - "lodash": "4.17.10", - "minimatch": "3.0.4", - "path-is-absolute": "1.0.1", - "private": "0.1.8", - "slash": "1.0.0", - "source-map": "0.5.7" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "babel-generator": { - "version": "6.26.1", - "resolved": "https://registry.npmjs.org/babel-generator/-/babel-generator-6.26.1.tgz", - "integrity": "sha512-HyfwY6ApZj7BYTcJURpM5tznulaBvyio7/0d4zFOeMPUmfxkCjHocCuoLa2SAGzBI8AREcH3eP3758F672DppA==", - "dev": true, - "requires": { - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "detect-indent": "4.0.0", - "jsesc": "1.3.0", - "lodash": "4.17.10", - "source-map": "0.5.7", - "trim-right": "1.0.1" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "babel-helper-bindify-decorators": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-bindify-decorators/-/babel-helper-bindify-decorators-6.24.1.tgz", - "integrity": "sha1-FMGeXxQte0fxmlJDHlKxzLxAozA=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-builder-binary-assignment-operator-visitor": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-builder-binary-assignment-operator-visitor/-/babel-helper-builder-binary-assignment-operator-visitor-6.24.1.tgz", - "integrity": "sha1-zORReto1b0IgvK6KAsKzRvmlZmQ=", - "dev": true, - "requires": { - "babel-helper-explode-assignable-expression": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-call-delegate": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz", - "integrity": "sha1-7Oaqzdx25Bw0YfiL/Fdb0Nqi340=", - "dev": true, - "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-define-map": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-define-map/-/babel-helper-define-map-6.26.0.tgz", - "integrity": "sha1-pfVtq0GiX5fstJjH66ypgZ+Vvl8=", - "dev": true, - "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.10" - } - }, - "babel-helper-explode-assignable-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-explode-assignable-expression/-/babel-helper-explode-assignable-expression-6.24.1.tgz", - "integrity": "sha1-8luCz33BBDPFX3BZLVdGQArCLKo=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-explode-class": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-explode-class/-/babel-helper-explode-class-6.24.1.tgz", - "integrity": "sha1-fcKjkQ3uAHBW4eMdZAztPVTqqes=", - "dev": true, - "requires": { - "babel-helper-bindify-decorators": "6.24.1", - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-function-name/-/babel-helper-function-name-6.24.1.tgz", - "integrity": "sha1-00dbjAPtmCQqJbSDUasYOZ01gKk=", - "dev": true, - "requires": { - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-get-function-arity": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-get-function-arity/-/babel-helper-get-function-arity-6.24.1.tgz", - "integrity": "sha1-j3eCqpNAfEHTqlCQj4mwMbG2hT0=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-hoist-variables": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-hoist-variables/-/babel-helper-hoist-variables-6.24.1.tgz", - "integrity": "sha1-HssnaJydJVE+rbyZFKc/VAi+enY=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-optimise-call-expression": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-optimise-call-expression/-/babel-helper-optimise-call-expression-6.24.1.tgz", - "integrity": "sha1-96E0J7qfc/j0+pk8VKl4gtEkQlc=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-regex": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-helper-regex/-/babel-helper-regex-6.26.0.tgz", - "integrity": "sha1-MlxZ+QL4LyS3T6zu0DY5VPZJXnI=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.10" - } - }, - "babel-helper-remap-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-remap-async-to-generator/-/babel-helper-remap-async-to-generator-6.24.1.tgz", - "integrity": "sha1-XsWBgnrXI/7N04HxySg5BnbkVRs=", - "dev": true, - "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-replace-supers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helper-replace-supers/-/babel-helper-replace-supers-6.24.1.tgz", - "integrity": "sha1-v22/5Dk40XNpohPKiov3S2qQqxo=", - "dev": true, - "requires": { - "babel-helper-optimise-call-expression": "6.24.1", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-helper-vue-jsx-merge-props": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz", - "integrity": "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==", - "dev": true - }, - "babel-helpers": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-helpers/-/babel-helpers-6.24.1.tgz", - "integrity": "sha1-NHHenK7DiOXIUOWX5Yom3fN2ArI=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" - } - }, - "babel-loader": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.4.tgz", - "integrity": "sha512-/hbyEvPzBJuGpk9o80R0ZyTej6heEOr59GoEUtn8qFKbnx4cJm9FWES6J/iv644sYgrtVw9JJQkjaLW/bqb5gw==", - "dev": true, - "requires": { - "find-cache-dir": "1.0.0", - "loader-utils": "1.1.0", - "mkdirp": "0.5.1" - } - }, - "babel-messages": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-messages/-/babel-messages-6.23.0.tgz", - "integrity": "sha1-8830cDhYA1sqKVHG7F7fbGLyYw4=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-check-es2015-constants": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-check-es2015-constants/-/babel-plugin-check-es2015-constants-6.22.0.tgz", - "integrity": "sha1-NRV7EBQm/S/9PaP3XH0ekYNbv4o=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-syntax-async-functions": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz", - "integrity": "sha1-ytnK0RkbWtY0vzCuCHI5HgZHvpU=", - "dev": true - }, - "babel-plugin-syntax-async-generators": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-async-generators/-/babel-plugin-syntax-async-generators-6.13.0.tgz", - "integrity": "sha1-a8lj67FuzLrmuStZbrfzXDQqi5o=", - "dev": true - }, - "babel-plugin-syntax-class-properties": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz", - "integrity": "sha1-1+sjt5oxf4VDlixQW4J8fWysJ94=", - "dev": true - }, - "babel-plugin-syntax-decorators": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-decorators/-/babel-plugin-syntax-decorators-6.13.0.tgz", - "integrity": "sha1-MSVjtNvePMgGzuPkFszurd0RrAs=", - "dev": true - }, - "babel-plugin-syntax-dynamic-import": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-dynamic-import/-/babel-plugin-syntax-dynamic-import-6.18.0.tgz", - "integrity": "sha1-jWomIpyDdFqZgqRBBRVyyqF5sdo=", - "dev": true - }, - "babel-plugin-syntax-exponentiation-operator": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz", - "integrity": "sha1-nufoM3KQ2pUoggGmpX9BcDF4MN4=", - "dev": true - }, - "babel-plugin-syntax-jsx": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz", - "integrity": "sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=", - "dev": true - }, - "babel-plugin-syntax-object-rest-spread": { - "version": "6.13.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz", - "integrity": "sha1-/WU28rzhODb/o6VFjEkDpZe7O/U=", - "dev": true - }, - "babel-plugin-syntax-trailing-function-commas": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-syntax-trailing-function-commas/-/babel-plugin-syntax-trailing-function-commas-6.22.0.tgz", - "integrity": "sha1-ugNgk3+NBuQBgKQ/4NVhb/9TLPM=", - "dev": true - }, - "babel-plugin-transform-async-generator-functions": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-generator-functions/-/babel-plugin-transform-async-generator-functions-6.24.1.tgz", - "integrity": "sha1-8FiQAUX9PpkHpt3yjaWfIVJYpds=", - "dev": true, - "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-generators": "6.13.0", - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-async-to-generator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-async-to-generator/-/babel-plugin-transform-async-to-generator-6.24.1.tgz", - "integrity": "sha1-ZTbjeK/2yx1VF6wOQOs+n8jQh2E=", - "dev": true, - "requires": { - "babel-helper-remap-async-to-generator": "6.24.1", - "babel-plugin-syntax-async-functions": "6.13.0", - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-class-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz", - "integrity": "sha1-anl2PqYdM9NvN7YRqp3vgagbRqw=", - "dev": true, - "requires": { - "babel-helper-function-name": "6.24.1", - "babel-plugin-syntax-class-properties": "6.13.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" - } - }, - "babel-plugin-transform-decorators": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-decorators/-/babel-plugin-transform-decorators-6.24.1.tgz", - "integrity": "sha1-eIAT2PjGtSIr33s0Q5Df13Vp4k0=", - "dev": true, - "requires": { - "babel-helper-explode-class": "6.24.1", - "babel-plugin-syntax-decorators": "6.13.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-arrow-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz", - "integrity": "sha1-RSaSy3EdX3ncf4XkQM5BufJE0iE=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-block-scoped-functions": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoped-functions/-/babel-plugin-transform-es2015-block-scoped-functions-6.22.0.tgz", - "integrity": "sha1-u8UbSflk1wy42OC5ToICRs46YUE=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-block-scoping": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-block-scoping/-/babel-plugin-transform-es2015-block-scoping-6.26.0.tgz", - "integrity": "sha1-1w9SmcEwjQXBL0Y4E7CgnnOxiV8=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "lodash": "4.17.10" - } - }, - "babel-plugin-transform-es2015-classes": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-classes/-/babel-plugin-transform-es2015-classes-6.24.1.tgz", - "integrity": "sha1-WkxYpQyclGHlZLSyo7+ryXolhNs=", - "dev": true, - "requires": { - "babel-helper-define-map": "6.26.0", - "babel-helper-function-name": "6.24.1", - "babel-helper-optimise-call-expression": "6.24.1", - "babel-helper-replace-supers": "6.24.1", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-computed-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-computed-properties/-/babel-plugin-transform-es2015-computed-properties-6.24.1.tgz", - "integrity": "sha1-b+Ko0WiV1WNPTNmZttNICjCBWbM=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" - } - }, - "babel-plugin-transform-es2015-destructuring": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-destructuring/-/babel-plugin-transform-es2015-destructuring-6.23.0.tgz", - "integrity": "sha1-mXux8auWf2gtKwh2/jWNYOdlxW0=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-duplicate-keys": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-duplicate-keys/-/babel-plugin-transform-es2015-duplicate-keys-6.24.1.tgz", - "integrity": "sha1-c+s9MQypaePvnskcU3QabxV2Qj4=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-for-of": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-for-of/-/babel-plugin-transform-es2015-for-of-6.23.0.tgz", - "integrity": "sha1-9HyVsrYT3x0+zC/bdXNiPHUkhpE=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-function-name": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-function-name/-/babel-plugin-transform-es2015-function-name-6.24.1.tgz", - "integrity": "sha1-g0yJhTvDaxrw86TF26qU/Y6sqos=", - "dev": true, - "requires": { - "babel-helper-function-name": "6.24.1", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-literals/-/babel-plugin-transform-es2015-literals-6.22.0.tgz", - "integrity": "sha1-T1SgLWzWbPkVKAAZox0xklN3yi4=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-modules-amd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-amd/-/babel-plugin-transform-es2015-modules-amd-6.24.1.tgz", - "integrity": "sha1-Oz5UAXI5hC1tGcMBHEvS8AoA0VQ=", - "dev": true, - "requires": { - "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" - } - }, - "babel-plugin-transform-es2015-modules-commonjs": { - "version": "6.26.2", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-commonjs/-/babel-plugin-transform-es2015-modules-commonjs-6.26.2.tgz", - "integrity": "sha512-CV9ROOHEdrjcwhIaJNBGMBCodN+1cfkwtM1SbUHmvyy35KGT7fohbpOxkE2uLz1o6odKK2Ck/tz47z+VqQfi9Q==", - "dev": true, - "requires": { - "babel-plugin-transform-strict-mode": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-modules-systemjs": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-systemjs/-/babel-plugin-transform-es2015-modules-systemjs-6.24.1.tgz", - "integrity": "sha1-/4mhQrkRmpBhlfXxBuzzBdlAfSM=", - "dev": true, - "requires": { - "babel-helper-hoist-variables": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" - } - }, - "babel-plugin-transform-es2015-modules-umd": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-modules-umd/-/babel-plugin-transform-es2015-modules-umd-6.24.1.tgz", - "integrity": "sha1-rJl+YoXNGO1hdq22B9YCNErThGg=", - "dev": true, - "requires": { - "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0" - } - }, - "babel-plugin-transform-es2015-object-super": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-object-super/-/babel-plugin-transform-es2015-object-super-6.24.1.tgz", - "integrity": "sha1-JM72muIcuDp/hgPa0CH1cusnj40=", - "dev": true, - "requires": { - "babel-helper-replace-supers": "6.24.1", - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-parameters": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-parameters/-/babel-plugin-transform-es2015-parameters-6.24.1.tgz", - "integrity": "sha1-V6w1GrScrxSpfNE7CfZv3wpiXys=", - "dev": true, - "requires": { - "babel-helper-call-delegate": "6.24.1", - "babel-helper-get-function-arity": "6.24.1", - "babel-runtime": "6.26.0", - "babel-template": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-shorthand-properties": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-shorthand-properties/-/babel-plugin-transform-es2015-shorthand-properties-6.24.1.tgz", - "integrity": "sha1-JPh11nIch2YbvZmkYi5R8U3jiqA=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-spread": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-spread/-/babel-plugin-transform-es2015-spread-6.22.0.tgz", - "integrity": "sha1-1taKmfia7cRTbIGlQujdnxdG+NE=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-sticky-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-sticky-regex/-/babel-plugin-transform-es2015-sticky-regex-6.24.1.tgz", - "integrity": "sha1-AMHNsaynERLN8M9hJsLta0V8zbw=", - "dev": true, - "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-es2015-template-literals": { - "version": "6.22.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-template-literals/-/babel-plugin-transform-es2015-template-literals-6.22.0.tgz", - "integrity": "sha1-qEs0UPfp+PH2g51taH2oS7EjbY0=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-typeof-symbol": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-typeof-symbol/-/babel-plugin-transform-es2015-typeof-symbol-6.23.0.tgz", - "integrity": "sha1-3sCfHN3/lLUqxz1QXITfWdzOs3I=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-es2015-unicode-regex": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-es2015-unicode-regex/-/babel-plugin-transform-es2015-unicode-regex-6.24.1.tgz", - "integrity": "sha1-04sS9C6nMj9yk4fxinxa4frrNek=", - "dev": true, - "requires": { - "babel-helper-regex": "6.26.0", - "babel-runtime": "6.26.0", - "regexpu-core": "2.0.0" - } - }, - "babel-plugin-transform-exponentiation-operator": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-exponentiation-operator/-/babel-plugin-transform-exponentiation-operator-6.24.1.tgz", - "integrity": "sha1-KrDJx/MJj6SJB3cruBP+QejeOg4=", - "dev": true, - "requires": { - "babel-helper-builder-binary-assignment-operator-visitor": "6.24.1", - "babel-plugin-syntax-exponentiation-operator": "6.13.0", - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-object-rest-spread": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz", - "integrity": "sha1-DzZpLVD+9rfi1LOsFHgTepY7ewY=", - "dev": true, - "requires": { - "babel-plugin-syntax-object-rest-spread": "6.13.0", - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-regenerator": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-regenerator/-/babel-plugin-transform-regenerator-6.26.0.tgz", - "integrity": "sha1-4HA2lvveJ/Cj78rPi03KL3s6jy8=", - "dev": true, - "requires": { - "regenerator-transform": "0.10.1" - } - }, - "babel-plugin-transform-runtime": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-runtime/-/babel-plugin-transform-runtime-6.23.0.tgz", - "integrity": "sha1-iEkNRGUC6puOfvsP4J7E2ZR5se4=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0" - } - }, - "babel-plugin-transform-strict-mode": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz", - "integrity": "sha1-1fr3qleKZbvlkc9e2uBKDGcCB1g=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0" - } - }, - "babel-plugin-transform-vue-jsx": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/babel-plugin-transform-vue-jsx/-/babel-plugin-transform-vue-jsx-3.7.0.tgz", - "integrity": "sha512-W39X07/n3oJMQd8tALBO+440NraGSF//Lo1ydd/9Nme3+QiRGFBb1Q39T9iixh0jZPPbfv3so18tNoIgLatymw==", - "dev": true, - "requires": { - "esutils": "2.0.2" - } - }, - "babel-preset-env": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.7.0.tgz", - "integrity": "sha512-9OR2afuKDneX2/q2EurSftUYM0xGu4O2D9adAhVfADDhrYDaxXV0rBbevVYoY9n6nyX1PmQW/0jtpJvUNr9CHg==", - "dev": true, - "requires": { - "babel-plugin-check-es2015-constants": "6.22.0", - "babel-plugin-syntax-trailing-function-commas": "6.22.0", - "babel-plugin-transform-async-to-generator": "6.24.1", - "babel-plugin-transform-es2015-arrow-functions": "6.22.0", - "babel-plugin-transform-es2015-block-scoped-functions": "6.22.0", - "babel-plugin-transform-es2015-block-scoping": "6.26.0", - "babel-plugin-transform-es2015-classes": "6.24.1", - "babel-plugin-transform-es2015-computed-properties": "6.24.1", - "babel-plugin-transform-es2015-destructuring": "6.23.0", - "babel-plugin-transform-es2015-duplicate-keys": "6.24.1", - "babel-plugin-transform-es2015-for-of": "6.23.0", - "babel-plugin-transform-es2015-function-name": "6.24.1", - "babel-plugin-transform-es2015-literals": "6.22.0", - "babel-plugin-transform-es2015-modules-amd": "6.24.1", - "babel-plugin-transform-es2015-modules-commonjs": "6.26.2", - "babel-plugin-transform-es2015-modules-systemjs": "6.24.1", - "babel-plugin-transform-es2015-modules-umd": "6.24.1", - "babel-plugin-transform-es2015-object-super": "6.24.1", - "babel-plugin-transform-es2015-parameters": "6.24.1", - "babel-plugin-transform-es2015-shorthand-properties": "6.24.1", - "babel-plugin-transform-es2015-spread": "6.22.0", - "babel-plugin-transform-es2015-sticky-regex": "6.24.1", - "babel-plugin-transform-es2015-template-literals": "6.22.0", - "babel-plugin-transform-es2015-typeof-symbol": "6.23.0", - "babel-plugin-transform-es2015-unicode-regex": "6.24.1", - "babel-plugin-transform-exponentiation-operator": "6.24.1", - "babel-plugin-transform-regenerator": "6.26.0", - "browserslist": "3.2.8", - "invariant": "2.2.4", - "semver": "5.5.0" - }, - "dependencies": { - "browserslist": { - "version": "3.2.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-3.2.8.tgz", - "integrity": "sha512-WHVocJYavUwVgVViC0ORikPHQquXwVh939TaelZ4WDqpWgTX/FsGhl/+P4qBUAGcRvtOgDgC+xftNWWp2RUTAQ==", - "dev": true, - "requires": { - "caniuse-lite": "1.0.30000862", - "electron-to-chromium": "1.3.51" - } - } - } - }, - "babel-preset-stage-2": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-preset-stage-2/-/babel-preset-stage-2-6.24.1.tgz", - "integrity": "sha1-2eKWD7PXEYfw5k7sYrwHdnIZvcE=", - "dev": true, - "requires": { - "babel-plugin-syntax-dynamic-import": "6.18.0", - "babel-plugin-transform-class-properties": "6.24.1", - "babel-plugin-transform-decorators": "6.24.1", - "babel-preset-stage-3": "6.24.1" - } - }, - "babel-preset-stage-3": { - "version": "6.24.1", - "resolved": "https://registry.npmjs.org/babel-preset-stage-3/-/babel-preset-stage-3-6.24.1.tgz", - "integrity": "sha1-g2raCp56f6N8sTj7kyb4eTSkg5U=", - "dev": true, - "requires": { - "babel-plugin-syntax-trailing-function-commas": "6.22.0", - "babel-plugin-transform-async-generator-functions": "6.24.1", - "babel-plugin-transform-async-to-generator": "6.24.1", - "babel-plugin-transform-exponentiation-operator": "6.24.1", - "babel-plugin-transform-object-rest-spread": "6.26.0" - } - }, - "babel-register": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-register/-/babel-register-6.26.0.tgz", - "integrity": "sha1-btAhFz4vy0htestFxgCahW9kcHE=", - "dev": true, - "requires": { - "babel-core": "6.26.3", - "babel-runtime": "6.26.0", - "core-js": "2.5.7", - "home-or-tmp": "2.0.0", - "lodash": "4.17.10", - "mkdirp": "0.5.1", - "source-map-support": "0.4.18" - } - }, - "babel-runtime": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", - "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", - "dev": true, - "requires": { - "core-js": "2.5.7", - "regenerator-runtime": "0.11.1" - } - }, - "babel-template": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-template/-/babel-template-6.26.0.tgz", - "integrity": "sha1-3gPi0WOWsGn0bdn/+FIfsaDjXgI=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-traverse": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "lodash": "4.17.10" - } - }, - "babel-traverse": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-traverse/-/babel-traverse-6.26.0.tgz", - "integrity": "sha1-RqnL1+3MYsjlwGTi0tjQ9ANXZu4=", - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "babel-messages": "6.23.0", - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "babylon": "6.18.0", - "debug": "2.6.9", - "globals": "9.18.0", - "invariant": "2.2.4", - "lodash": "4.17.10" - } - }, - "babel-types": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz", - "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "esutils": "2.0.2", - "lodash": "4.17.10", - "to-fast-properties": "1.0.3" - } - }, - "babylon": { - "version": "6.18.0", - "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz", - "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==", - "dev": true - }, - "balanced-match": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", - "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", - "dev": true - }, - "base": { - "version": "0.11.2", - "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", - "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", - "dev": true, - "requires": { - "cache-base": "1.0.1", - "class-utils": "0.3.6", - "component-emitter": "1.2.1", - "define-property": "1.0.0", - "isobject": "3.0.1", - "mixin-deep": "1.3.1", - "pascalcase": "0.1.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "base64-js": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", - "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==", - "dev": true - }, - "batch": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha1-3DQxT05nkxgJP8dgJyUl+UvyXBY=", - "dev": true - }, - "bfj-node4": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/bfj-node4/-/bfj-node4-5.3.1.tgz", - "integrity": "sha512-SOmOsowQWfXc7ybFARsK3C4MCOWzERaOMV/Fl3Tgjs+5dJWyzo3oa127jL44eMbQiAN17J7SvAs2TRxEScTUmg==", - "dev": true, - "requires": { - "bluebird": "3.5.1", - "check-types": "7.4.0", - "tryer": "1.0.1" - } - }, - "big.js": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/big.js/-/big.js-3.2.0.tgz", - "integrity": "sha512-+hN/Zh2D08Mx65pZ/4g5bsmNiZUuChDiQfTUQ7qJr4/kuopCr88xZsAXv6mBoZEsUI4OuGHlX59qE94K2mMW8Q==", - "dev": true - }, - "binary-extensions": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz", - "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=", - "dev": true - }, - "bluebird": { - "version": "3.5.1", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz", - "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==", - "dev": true - }, - "bn.js": { - "version": "4.11.8", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz", - "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==", - "dev": true - }, - "body-parser": { - "version": "1.18.2", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.2.tgz", - "integrity": "sha1-h2eKGdhLR9hZuDGZvVm84iKxBFQ=", - "dev": true, - "requires": { - "bytes": "3.0.0", - "content-type": "1.0.4", - "debug": "2.6.9", - "depd": "1.1.2", - "http-errors": "1.6.3", - "iconv-lite": "0.4.19", - "on-finished": "2.3.0", - "qs": "6.5.1", - "raw-body": "2.3.2", - "type-is": "1.6.16" - } - }, - "bonjour": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz", - "integrity": "sha1-jokKGD2O6aI5OzhExpGkK897yfU=", - "dev": true, - "requires": { - "array-flatten": "2.1.1", - "deep-equal": "1.0.1", - "dns-equal": "1.0.0", - "dns-txt": "2.0.2", - "multicast-dns": "6.2.3", - "multicast-dns-service-types": "1.1.0" - }, - "dependencies": { - "array-flatten": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-2.1.1.tgz", - "integrity": "sha1-Qmu52oQJDBg42BLIFQryCoMx4pY=", - "dev": true - } - } - }, - "boolbase": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha1-aN/1++YMUes3cl6p4+0xDcwed24=", - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", - "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "braces": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", - "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", - "dev": true, - "requires": { - "arr-flatten": "1.1.0", - "array-unique": "0.3.2", - "extend-shallow": "2.0.1", - "fill-range": "4.0.0", - "isobject": "3.0.1", - "repeat-element": "1.1.2", - "snapdragon": "0.8.2", - "snapdragon-node": "2.1.1", - "split-string": "3.1.0", - "to-regex": "3.0.2" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "brorand": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/brorand/-/brorand-1.1.0.tgz", - "integrity": "sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=", - "dev": true - }, - "browserify-aes": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", - "integrity": "sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==", - "dev": true, - "requires": { - "buffer-xor": "1.0.3", - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "evp_bytestokey": "1.0.3", - "inherits": "2.0.3", - "safe-buffer": "5.1.2" - } - }, - "browserify-cipher": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/browserify-cipher/-/browserify-cipher-1.0.1.tgz", - "integrity": "sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==", - "dev": true, - "requires": { - "browserify-aes": "1.2.0", - "browserify-des": "1.0.1", - "evp_bytestokey": "1.0.3" - } - }, - "browserify-des": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/browserify-des/-/browserify-des-1.0.1.tgz", - "integrity": "sha512-zy0Cobe3hhgpiOM32Tj7KQ3Vl91m0njwsjzZQK1L+JDf11dzP9qIvjreVinsvXrgfjhStXwUWAEpB9D7Gwmayw==", - "dev": true, - "requires": { - "cipher-base": "1.0.4", - "des.js": "1.0.0", - "inherits": "2.0.3" - } - }, - "browserify-rsa": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/browserify-rsa/-/browserify-rsa-4.0.1.tgz", - "integrity": "sha1-IeCr+vbyApzy+vsTNWenAdQTVSQ=", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "randombytes": "2.0.6" - } - }, - "browserify-sign": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.0.4.tgz", - "integrity": "sha1-qk62jl17ZYuqa/alfmMMvXqT0pg=", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "elliptic": "6.4.0", - "inherits": "2.0.3", - "parse-asn1": "5.1.1" - } - }, - "browserify-zlib": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.2.0.tgz", - "integrity": "sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==", - "dev": true, - "requires": { - "pako": "1.0.6" - } - }, - "browserslist": { - "version": "2.11.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.11.3.tgz", - "integrity": "sha512-yWu5cXT7Av6mVwzWc8lMsJMHWn4xyjSuGYi4IozbVTLUOEYPSagUB8kiMDUHA1fS3zjr8nkxkn9jdvug4BBRmA==", - "dev": true, - "requires": { - "caniuse-lite": "1.0.30000862", - "electron-to-chromium": "1.3.51" - } - }, - "buffer": { - "version": "4.9.1", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-4.9.1.tgz", - "integrity": "sha1-bRu2AbB6TvztlwlBMgkwJ8lbwpg=", - "dev": true, - "requires": { - "base64-js": "1.3.0", - "ieee754": "1.1.12", - "isarray": "1.0.0" - } - }, - "buffer-from": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz", - "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==", - "dev": true - }, - "buffer-indexof": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/buffer-indexof/-/buffer-indexof-1.1.1.tgz", - "integrity": "sha512-4/rOEg86jivtPTeOUUT61jJO1Ya1TrR/OkqCSZDyq84WJh3LuuiphBYJN+fm5xufIk4XAFcEwte/8WzC8If/1g==", - "dev": true - }, - "buffer-xor": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/buffer-xor/-/buffer-xor-1.0.3.tgz", - "integrity": "sha1-JuYe0UIvtw3ULm42cp7VHYVf6Nk=", - "dev": true - }, - "builtin-modules": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz", - "integrity": "sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8=", - "dev": true - }, - "builtin-status-codes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/builtin-status-codes/-/builtin-status-codes-3.0.0.tgz", - "integrity": "sha1-hZgoeOIbmOHGZCXgPQF0eI9Wnug=", - "dev": true - }, - "bytes": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz", - "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=", - "dev": true - }, - "cacache": { - "version": "10.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", - "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", - "dev": true, - "requires": { - "bluebird": "3.5.1", - "chownr": "1.0.1", - "glob": "7.1.2", - "graceful-fs": "4.1.11", - "lru-cache": "4.1.3", - "mississippi": "2.0.0", - "mkdirp": "0.5.1", - "move-concurrently": "1.0.1", - "promise-inflight": "1.0.1", - "rimraf": "2.6.2", - "ssri": "5.3.0", - "unique-filename": "1.1.0", - "y18n": "4.0.0" - } - }, - "cache-base": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", - "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", - "dev": true, - "requires": { - "collection-visit": "1.0.0", - "component-emitter": "1.2.1", - "get-value": "2.0.6", - "has-value": "1.0.0", - "isobject": "3.0.1", - "set-value": "2.0.0", - "to-object-path": "0.3.0", - "union-value": "1.0.0", - "unset-value": "1.0.0" - } - }, - "camel-case": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz", - "integrity": "sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M=", - "dev": true, - "requires": { - "no-case": "2.3.2", - "upper-case": "1.1.3" - } - }, - "camelcase": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz", - "integrity": "sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=", - "dev": true - }, - "camelcase-keys": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz", - "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=", - "dev": true, - "requires": { - "camelcase": "2.1.1", - "map-obj": "1.0.1" - }, - "dependencies": { - "camelcase": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz", - "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=", - "dev": true - } - } - }, - "caniuse-api": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-1.6.1.tgz", - "integrity": "sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=", - "dev": true, - "requires": { - "browserslist": "1.7.7", - "caniuse-db": "1.0.30000862", - "lodash.memoize": "4.1.2", - "lodash.uniq": "4.5.0" - }, - "dependencies": { - "browserslist": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", - "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", - "dev": true, - "requires": { - "caniuse-db": "1.0.30000862", - "electron-to-chromium": "1.3.51" - } - } - } - }, - "caniuse-db": { - "version": "1.0.30000862", - "resolved": "https://registry.npmjs.org/caniuse-db/-/caniuse-db-1.0.30000862.tgz", - "integrity": "sha1-bB4pb4u+Xl6kbwQhXouQ7Y+52o0=", - "dev": true - }, - "caniuse-lite": { - "version": "1.0.30000862", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30000862.tgz", - "integrity": "sha512-e9DBeH0Oby7EbUQN3DRWKxgbpEJO3KAZUhP0xDmPA23Qr6PmvXI7Ojy8ZthsOsz+1iSoaV9G7eWJXUOyryJ6NA==", - "dev": true - }, - "center-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz", - "integrity": "sha1-qg0yYptu6XIgBBHL1EYckHvCt60=", - "dev": true, - "requires": { - "align-text": "0.1.4", - "lazy-cache": "1.0.4" - } - }, - "chalk": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.1.tgz", - "integrity": "sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==", - "dev": true, - "requires": { - "ansi-styles": "3.2.1", - "escape-string-regexp": "1.0.5", - "supports-color": "5.4.0" - } - }, - "check-types": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/check-types/-/check-types-7.4.0.tgz", - "integrity": "sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==", - "dev": true - }, - "chokidar": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.0.4.tgz", - "integrity": "sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==", - "dev": true, - "requires": { - "anymatch": "2.0.0", - "async-each": "1.0.1", - "braces": "2.3.2", - "fsevents": "1.2.4", - "glob-parent": "3.1.0", - "inherits": "2.0.3", - "is-binary-path": "1.0.1", - "is-glob": "4.0.0", - "lodash.debounce": "4.0.8", - "normalize-path": "2.1.1", - "path-is-absolute": "1.0.1", - "readdirp": "2.1.0", - "upath": "1.1.0" - } - }, - "chownr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.0.1.tgz", - "integrity": "sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=", - "dev": true - }, - "cipher-base": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz", - "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==", - "dev": true, - "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.2" - } - }, - "clap": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/clap/-/clap-1.2.3.tgz", - "integrity": "sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==", - "dev": true, - "requires": { - "chalk": "1.1.3" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "class-utils": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", - "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", - "dev": true, - "requires": { - "arr-union": "3.1.0", - "define-property": "0.2.5", - "isobject": "3.0.1", - "static-extend": "0.1.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - } - } - }, - "clean-css": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-4.1.11.tgz", - "integrity": "sha1-Ls3xRaujj1R0DybO/Q/z4D4SXWo=", - "dev": true, - "requires": { - "source-map": "0.5.7" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "cli-cursor": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz", - "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=", - "dev": true, - "requires": { - "restore-cursor": "2.0.0" - } - }, - "cli-spinners": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-1.3.1.tgz", - "integrity": "sha512-1QL4544moEsDVH9T/l6Cemov/37iv1RtoKf7NJ04A60+4MREXNfx/QvavbH6QoGdsD4N4Mwy49cmaINR/o2mdg==", - "dev": true - }, - "cliui": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz", - "integrity": "sha1-S0dXYP+AJkx2LDoXGQMukcf+oNE=", - "dev": true, - "requires": { - "center-align": "0.1.3", - "right-align": "0.1.3", - "wordwrap": "0.0.2" - } - }, - "clone": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz", - "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=", - "dev": true - }, - "co": { - "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=", - "dev": true - }, - "coa": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/coa/-/coa-1.0.4.tgz", - "integrity": "sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=", - "dev": true, - "requires": { - "q": "1.5.1" - } - }, - "code-point-at": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz", - "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=", - "dev": true - }, - "collection-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", - "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", - "dev": true, - "requires": { - "map-visit": "1.0.0", - "object-visit": "1.0.1" - } - }, - "color": { - "version": "0.11.4", - "resolved": "https://registry.npmjs.org/color/-/color-0.11.4.tgz", - "integrity": "sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=", - "dev": true, - "requires": { - "clone": "1.0.4", - "color-convert": "1.9.2", - "color-string": "0.3.0" - } - }, - "color-convert": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz", - "integrity": "sha512-3NUJZdhMhcdPn8vJ9v2UQJoH0qqoGUkYTgFEPZaPjEtwmmKUfNV46zZmgB2M5M4DCEQHMaCfWHCxiBflLm04Tg==", - "dev": true, - "requires": { - "color-name": "1.1.1" - } - }, - "color-name": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz", - "integrity": "sha1-SxQVMEz1ACjqgWQ2Q72C6gWANok=", - "dev": true - }, - "color-string": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/color-string/-/color-string-0.3.0.tgz", - "integrity": "sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=", - "dev": true, - "requires": { - "color-name": "1.1.1" - } - }, - "colormin": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colormin/-/colormin-1.1.2.tgz", - "integrity": "sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=", - "dev": true, - "requires": { - "color": "0.11.4", - "css-color-names": "0.0.4", - "has": "1.0.3" - } - }, - "colors": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz", - "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=", - "dev": true - }, - "commander": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz", - "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==", - "dev": true - }, - "commondir": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=", - "dev": true - }, - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, - "compressible": { - "version": "2.0.14", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.14.tgz", - "integrity": "sha1-MmxfUH+7BV9UEWeCuWmoG2einac=", - "dev": true, - "requires": { - "mime-db": "1.34.0" - }, - "dependencies": { - "mime-db": { - "version": "1.34.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.34.0.tgz", - "integrity": "sha1-RS0Oz/XDA0am3B5kseruDTcZ/5o=", - "dev": true - } - } - }, - "compression": { - "version": "1.7.2", - "resolved": "http://registry.npmjs.org/compression/-/compression-1.7.2.tgz", - "integrity": "sha1-qv+81qr4VLROuygDU9WtFlH1mmk=", - "dev": true, - "requires": { - "accepts": "1.3.5", - "bytes": "3.0.0", - "compressible": "2.0.14", - "debug": "2.6.9", - "on-headers": "1.0.1", - "safe-buffer": "5.1.1", - "vary": "1.1.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - } - } - }, - "concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=", - "dev": true - }, - "concat-stream": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz", - "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==", - "dev": true, - "requires": { - "buffer-from": "1.1.0", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "typedarray": "0.0.6" - } - }, - "connect-history-api-fallback": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-1.5.0.tgz", - "integrity": "sha1-sGhzk0vF40T+9hGhlqb6rgruAVo=", - "dev": true - }, - "console-browserify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz", - "integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=", - "dev": true, - "requires": { - "date-now": "0.1.4" - } - }, - "consolidate": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.14.5.tgz", - "integrity": "sha1-WiUEe8dvcwcmZ8jLUsmJiI9JTGM=", - "dev": true, - "requires": { - "bluebird": "3.5.1" - } - }, - "constants-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz", - "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=", - "dev": true - }, - "content-disposition": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz", - "integrity": "sha1-DPaLud318r55YcOoUXjLhdunjLQ=", - "dev": true - }, - "content-type": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", - "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==", - "dev": true - }, - "convert-source-map": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.5.1.tgz", - "integrity": "sha1-uCeAl7m8IpNl3lxiz1/K7YtVmeU=", - "dev": true - }, - "cookie": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", - "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", - "dev": true - }, - "cookie-signature": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=", - "dev": true - }, - "copy-concurrently": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/copy-concurrently/-/copy-concurrently-1.0.5.tgz", - "integrity": "sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==", - "dev": true, - "requires": { - "aproba": "1.2.0", - "fs-write-stream-atomic": "1.0.10", - "iferr": "0.1.5", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "run-queue": "1.0.3" - } - }, - "copy-descriptor": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", - "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=", - "dev": true - }, - "copy-webpack-plugin": { - "version": "4.5.2", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz", - "integrity": "sha512-zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==", - "dev": true, - "requires": { - "cacache": "10.0.4", - "find-cache-dir": "1.0.0", - "globby": "7.1.1", - "is-glob": "4.0.0", - "loader-utils": "1.1.0", - "minimatch": "3.0.4", - "p-limit": "1.3.0", - "serialize-javascript": "1.5.0" - } - }, - "core-js": { - "version": "2.5.7", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", - "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==", - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", - "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=", - "dev": true - }, - "cosmiconfig": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz", - "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==", - "dev": true, - "requires": { - "is-directory": "0.3.1", - "js-yaml": "3.7.0", - "minimist": "1.2.0", - "object-assign": "4.1.1", - "os-homedir": "1.0.2", - "parse-json": "2.2.0", - "require-from-string": "1.2.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - } - } - }, - "create-ecdh": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.3.tgz", - "integrity": "sha512-GbEHQPMOswGpKXM9kCWVrremUcBmjteUaQ01T9rkKCPDXfUHX0IoP9LpHYo2NPFampa4e+/pFDc3jQdxrxQLaw==", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "elliptic": "6.4.0" - } - }, - "create-hash": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/create-hash/-/create-hash-1.2.0.tgz", - "integrity": "sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==", - "dev": true, - "requires": { - "cipher-base": "1.0.4", - "inherits": "2.0.3", - "md5.js": "1.3.4", - "ripemd160": "2.0.2", - "sha.js": "2.4.11" - } - }, - "create-hmac": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/create-hmac/-/create-hmac-1.1.7.tgz", - "integrity": "sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==", - "dev": true, - "requires": { - "cipher-base": "1.0.4", - "create-hash": "1.2.0", - "inherits": "2.0.3", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" - } - }, - "cross-spawn": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz", - "integrity": "sha1-6L0O/uWPz/b4+UUQoKVUu/ojVEk=", - "dev": true, - "requires": { - "lru-cache": "4.1.3", - "shebang-command": "1.2.0", - "which": "1.3.1" - } - }, - "crypto-browserify": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.12.0.tgz", - "integrity": "sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==", - "dev": true, - "requires": { - "browserify-cipher": "1.0.1", - "browserify-sign": "4.0.4", - "create-ecdh": "4.0.3", - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "diffie-hellman": "5.0.3", - "inherits": "2.0.3", - "pbkdf2": "3.0.16", - "public-encrypt": "4.0.2", - "randombytes": "2.0.6", - "randomfill": "1.0.4" - } - }, - "css-color-names": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz", - "integrity": "sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=", - "dev": true - }, - "css-loader": { - "version": "0.28.11", - "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.11.tgz", - "integrity": "sha512-wovHgjAx8ZIMGSL8pTys7edA1ClmzxHeY6n/d97gg5odgsxEgKjULPR0viqyC+FWMCL9sfqoC/QCUBo62tLvPg==", - "dev": true, - "requires": { - "babel-code-frame": "6.26.0", - "css-selector-tokenizer": "0.7.0", - "cssnano": "3.10.0", - "icss-utils": "2.1.0", - "loader-utils": "1.1.0", - "lodash.camelcase": "4.3.0", - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-modules-extract-imports": "1.2.0", - "postcss-modules-local-by-default": "1.2.0", - "postcss-modules-scope": "1.1.0", - "postcss-modules-values": "1.3.0", - "postcss-value-parser": "3.3.0", - "source-list-map": "2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "css-parse": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/css-parse/-/css-parse-1.7.0.tgz", - "integrity": "sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=", - "dev": true - }, - "css-select": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-1.2.0.tgz", - "integrity": "sha1-KzoRBTnFNV8c2NMUYj6HCxIeyFg=", - "dev": true, - "requires": { - "boolbase": "1.0.0", - "css-what": "2.1.0", - "domutils": "1.5.1", - "nth-check": "1.0.1" - } - }, - "css-selector-tokenizer": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz", - "integrity": "sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=", - "dev": true, - "requires": { - "cssesc": "0.1.0", - "fastparse": "1.1.1", - "regexpu-core": "1.0.0" - }, - "dependencies": { - "regexpu-core": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-1.0.0.tgz", - "integrity": "sha1-hqdj9Y7k18L2sQLkdkBQ3n7ZDGs=", - "dev": true, - "requires": { - "regenerate": "1.4.0", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" - } - } - } - }, - "css-what": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-2.1.0.tgz", - "integrity": "sha1-lGfQMsOM+u+58teVASUwYvh/ob0=", - "dev": true - }, - "cssesc": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-0.1.0.tgz", - "integrity": "sha1-yBSQPkViM3GgR3tAEJqq++6t27Q=", - "dev": true - }, - "cssnano": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-3.10.0.tgz", - "integrity": "sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=", - "dev": true, - "requires": { - "autoprefixer": "6.7.7", - "decamelize": "1.2.0", - "defined": "1.0.0", - "has": "1.0.3", - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-calc": "5.3.1", - "postcss-colormin": "2.2.2", - "postcss-convert-values": "2.6.1", - "postcss-discard-comments": "2.0.4", - "postcss-discard-duplicates": "2.1.0", - "postcss-discard-empty": "2.1.0", - "postcss-discard-overridden": "0.1.1", - "postcss-discard-unused": "2.2.3", - "postcss-filter-plugins": "2.0.3", - "postcss-merge-idents": "2.1.7", - "postcss-merge-longhand": "2.0.2", - "postcss-merge-rules": "2.1.2", - "postcss-minify-font-values": "1.0.5", - "postcss-minify-gradients": "1.0.5", - "postcss-minify-params": "1.2.2", - "postcss-minify-selectors": "2.1.1", - "postcss-normalize-charset": "1.1.1", - "postcss-normalize-url": "3.0.8", - "postcss-ordered-values": "2.2.3", - "postcss-reduce-idents": "2.4.0", - "postcss-reduce-initial": "1.0.1", - "postcss-reduce-transforms": "1.0.4", - "postcss-svgo": "2.1.6", - "postcss-unique-selectors": "2.0.2", - "postcss-value-parser": "3.3.0", - "postcss-zindex": "2.2.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "autoprefixer": { - "version": "6.7.7", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-6.7.7.tgz", - "integrity": "sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=", - "dev": true, - "requires": { - "browserslist": "1.7.7", - "caniuse-db": "1.0.30000862", - "normalize-range": "0.1.2", - "num2fraction": "1.2.2", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - } - }, - "browserslist": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", - "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", - "dev": true, - "requires": { - "caniuse-db": "1.0.30000862", - "electron-to-chromium": "1.3.51" - } - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "csso": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/csso/-/csso-2.3.2.tgz", - "integrity": "sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=", - "dev": true, - "requires": { - "clap": "1.2.3", - "source-map": "0.5.7" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "cuint": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cuint/-/cuint-0.2.2.tgz", - "integrity": "sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=", - "dev": true - }, - "currently-unhandled": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha1-mI3zP+qxke95mmE2nddsF635V+o=", - "dev": true, - "requires": { - "array-find-index": "1.0.2" - } - }, - "cyclist": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz", - "integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=", - "dev": true - }, - "d": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz", - "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=", - "dev": true, - "requires": { - "es5-ext": "0.10.45" - } - }, - "date-now": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz", - "integrity": "sha1-6vQ5/U1ISK105cx9vvIAZyueNFs=", - "dev": true - }, - "de-indent": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", - "integrity": "sha1-sgOOhG3DO6pXlhKNCAS0VbjB4h0=", - "dev": true - }, - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "decamelize": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=", - "dev": true - }, - "decode-uri-component": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", - "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", - "dev": true - }, - "deep-equal": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", - "dev": true - }, - "define-properties": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz", - "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=", - "dev": true, - "requires": { - "foreach": "2.0.5", - "object-keys": "1.0.12" - } - }, - "define-property": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", - "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", - "dev": true, - "requires": { - "is-descriptor": "1.0.2", - "isobject": "3.0.1" - }, - "dependencies": { - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "defined": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/defined/-/defined-1.0.0.tgz", - "integrity": "sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=", - "dev": true - }, - "del": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz", - "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=", - "dev": true, - "requires": { - "globby": "6.1.0", - "is-path-cwd": "1.0.0", - "is-path-in-cwd": "1.0.1", - "p-map": "1.2.0", - "pify": "3.0.0", - "rimraf": "2.6.2" - }, - "dependencies": { - "globby": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz", - "integrity": "sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=", - "dev": true, - "requires": { - "array-union": "1.0.2", - "glob": "7.1.2", - "object-assign": "4.1.1", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - } - } - }, - "depd": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=", - "dev": true - }, - "des.js": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.0.tgz", - "integrity": "sha1-wHTS4qpqipoH29YfmhXCzYPsjsw=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1" - } - }, - "destroy": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", - "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=", - "dev": true - }, - "detect-indent": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/detect-indent/-/detect-indent-4.0.0.tgz", - "integrity": "sha1-920GQ1LN9Docts5hnE7jqUdd4gg=", - "dev": true, - "requires": { - "repeating": "2.0.1" - } - }, - "detect-node": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.3.tgz", - "integrity": "sha1-ogM8CcyOFY03dI+951B4Mr1s4Sc=", - "dev": true - }, - "diffie-hellman": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz", - "integrity": "sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "miller-rabin": "4.0.1", - "randombytes": "2.0.6" - } - }, - "dir-glob": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz", - "integrity": "sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==", - "dev": true, - "requires": { - "arrify": "1.0.1", - "path-type": "3.0.0" - } - }, - "dns-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz", - "integrity": "sha1-s55/HabrCnW6nBcySzR1PEfgZU0=", - "dev": true - }, - "dns-packet": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-1.3.1.tgz", - "integrity": "sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==", - "dev": true, - "requires": { - "ip": "1.1.5", - "safe-buffer": "5.1.2" - } - }, - "dns-txt": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz", - "integrity": "sha1-uR2Ab10nGI5Ks+fRB9iBocxGQrY=", - "dev": true, - "requires": { - "buffer-indexof": "1.1.1" - } - }, - "dom-converter": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.1.4.tgz", - "integrity": "sha1-pF71cnuJDJv/5tfIduexnLDhfzs=", - "dev": true, - "requires": { - "utila": "0.3.3" - }, - "dependencies": { - "utila": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz", - "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=", - "dev": true - } - } - }, - "dom-serializer": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz", - "integrity": "sha1-BzxpdUbOB4DOI75KKOKT5AvDDII=", - "dev": true, - "requires": { - "domelementtype": "1.1.3", - "entities": "1.1.1" - }, - "dependencies": { - "domelementtype": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz", - "integrity": "sha1-vSh3PiZCiBrsUVRJJCmcXNgiGFs=", - "dev": true - } - } - }, - "domain-browser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz", - "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==", - "dev": true - }, - "domelementtype": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz", - "integrity": "sha1-sXrtguirWeUt2cGbF1bg/BhyBMI=", - "dev": true - }, - "domhandler": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.1.0.tgz", - "integrity": "sha1-0mRvXlf2w7qxHPbLBdPArPdBJZQ=", - "dev": true, - "requires": { - "domelementtype": "1.3.0" - } - }, - "domutils": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz", - "integrity": "sha1-3NhIiib1Y9YQeeSMn3t+Mjc2gs8=", - "dev": true, - "requires": { - "dom-serializer": "0.1.0", - "domelementtype": "1.3.0" - } - }, - "duplexer": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.1.tgz", - "integrity": "sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=", - "dev": true - }, - "duplexify": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/duplexify/-/duplexify-3.6.0.tgz", - "integrity": "sha512-fO3Di4tBKJpYTFHAxTU00BcfWMY9w24r/x21a6rZRbsD/ToUgGxsMbiGRmB7uVAXeGKXD9MwiLZa5E97EVgIRQ==", - "dev": true, - "requires": { - "end-of-stream": "1.4.1", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "stream-shift": "1.0.0" - } - }, - "ee-first": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=", - "dev": true - }, - "ejs": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/ejs/-/ejs-2.6.1.tgz", - "integrity": "sha512-0xy4A/twfrRCnkhfk8ErDi5DqdAsAqeGxht4xkCUrsvhhbQNs7E+4jV0CN7+NKIY0aHE72+XvqtBIXzD31ZbXQ==", - "dev": true - }, - "electron-to-chromium": { - "version": "1.3.51", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.51.tgz", - "integrity": "sha1-akK0nar38ipbN7mR2vlJ8029ubU=", - "dev": true - }, - "elliptic": { - "version": "6.4.0", - "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.4.0.tgz", - "integrity": "sha1-ysmvh2LIWDYYcAPI3+GT5eLq5d8=", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0", - "hash.js": "1.1.4", - "hmac-drbg": "1.0.1", - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" - } - }, - "emojis-list": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz", - "integrity": "sha1-TapNnbAPmBmIDHn6RXrlsJof04k=", - "dev": true - }, - "encodeurl": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=", - "dev": true - }, - "end-of-stream": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.1.tgz", - "integrity": "sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==", - "dev": true, - "requires": { - "once": "1.4.0" - } - }, - "enhanced-resolve": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-3.4.1.tgz", - "integrity": "sha1-BCHjOf1xQZs9oT0Smzl5BAIwR24=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "memory-fs": "0.4.1", - "object-assign": "4.1.1", - "tapable": "0.2.8" - } - }, - "entities": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz", - "integrity": "sha1-blwtClYhtdra7O+AuQ7ftc13cvA=", - "dev": true - }, - "errno": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.7.tgz", - "integrity": "sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==", - "dev": true, - "requires": { - "prr": "1.0.1" - } - }, - "error-ex": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", - "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", - "dev": true, - "requires": { - "is-arrayish": "0.2.1" - } - }, - "error-stack-parser": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.0.2.tgz", - "integrity": "sha512-E1fPutRDdIj/hohG0UpT5mayXNCxXP9d+snxFsPU9X0XgccOumKraa3juDMwTUyi7+Bu5+mCGagjg4IYeNbOdw==", - "dev": true, - "requires": { - "stackframe": "1.0.4" - } - }, - "es-abstract": { - "version": "1.12.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz", - "integrity": "sha512-C8Fx/0jFmV5IPoMOFPA9P9G5NtqW+4cOPit3MIuvR2t7Ag2K15EJTpxnHAYTzL+aYQJIESYeXZmDBfOBE1HcpA==", - "dev": true, - "requires": { - "es-to-primitive": "1.1.1", - "function-bind": "1.1.1", - "has": "1.0.3", - "is-callable": "1.1.4", - "is-regex": "1.0.4" - } - }, - "es-to-primitive": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz", - "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=", - "dev": true, - "requires": { - "is-callable": "1.1.4", - "is-date-object": "1.0.1", - "is-symbol": "1.0.1" - } - }, - "es5-ext": { - "version": "0.10.45", - "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.45.tgz", - "integrity": "sha512-FkfM6Vxxfmztilbxxz5UKSD4ICMf5tSpRFtDNtkAhOxZ0EKtX6qwmXNyH/sFyIbX2P/nU5AMiA9jilWsUGJzCQ==", - "dev": true, - "requires": { - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1", - "next-tick": "1.0.0" - } - }, - "es6-iterator": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz", - "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-symbol": "3.1.1" - } - }, - "es6-map": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz", - "integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-iterator": "2.0.3", - "es6-set": "0.1.5", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" - } - }, - "es6-set": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/es6-set/-/es6-set-0.1.5.tgz", - "integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1", - "event-emitter": "0.3.5" - } - }, - "es6-symbol": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz", - "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45" - } - }, - "es6-weak-map": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.2.tgz", - "integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45", - "es6-iterator": "2.0.3", - "es6-symbol": "3.1.1" - } - }, - "escape-html": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "escope": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz", - "integrity": "sha1-4Bl16BJ4GhY6ba392AOY3GTIicM=", - "dev": true, - "requires": { - "es6-map": "0.1.5", - "es6-weak-map": "2.0.2", - "esrecurse": "4.2.1", - "estraverse": "4.2.0" - } - }, - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true - }, - "esrecurse": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.2.1.tgz", - "integrity": "sha512-64RBB++fIOAXPw3P9cy89qfMlvZEXZkqqJkjqqXIvzP5ezRZjW+lPWjw35UX/3EhUPFYbg5ER4JYgDw4007/DQ==", - "dev": true, - "requires": { - "estraverse": "4.2.0" - } - }, - "estraverse": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true - }, - "esutils": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true - }, - "etag": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=", - "dev": true - }, - "event-emitter": { - "version": "0.3.5", - "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz", - "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=", - "dev": true, - "requires": { - "d": "1.0.0", - "es5-ext": "0.10.45" - } - }, - "eventemitter3": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz", - "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==", - "dev": true - }, - "events": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz", - "integrity": "sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=", - "dev": true - }, - "eventsource": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz", - "integrity": "sha1-Cs7ehJ7X3RzMMsgRuxG5RNTykjI=", - "dev": true, - "requires": { - "original": "1.0.1" - } - }, - "evp_bytestokey": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz", - "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==", - "dev": true, - "requires": { - "md5.js": "1.3.4", - "safe-buffer": "5.1.2" - } - }, - "execa": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-0.7.0.tgz", - "integrity": "sha1-lEvs00zEHuMqY6n68nrVpl/Fl3c=", - "dev": true, - "requires": { - "cross-spawn": "5.1.0", - "get-stream": "3.0.0", - "is-stream": "1.1.0", - "npm-run-path": "2.0.2", - "p-finally": "1.0.0", - "signal-exit": "3.0.2", - "strip-eof": "1.0.0" - } - }, - "expand-brackets": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", - "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", - "dev": true, - "requires": { - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "posix-character-classes": "0.1.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "expand-range": { - "version": "1.8.2", - "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz", - "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=", - "dev": true, - "requires": { - "fill-range": "2.2.4" - }, - "dependencies": { - "fill-range": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz", - "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==", - "dev": true, - "requires": { - "is-number": "2.1.0", - "isobject": "2.1.0", - "randomatic": "3.0.0", - "repeat-element": "1.1.2", - "repeat-string": "1.6.1" - } - }, - "is-number": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz", - "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } - } - } - }, - "express": { - "version": "4.16.3", - "resolved": "https://registry.npmjs.org/express/-/express-4.16.3.tgz", - "integrity": "sha1-avilAjUNsyRuzEvs9rWjTSL37VM=", - "dev": true, - "requires": { - "accepts": "1.3.5", - "array-flatten": "1.1.1", - "body-parser": "1.18.2", - "content-disposition": "0.5.2", - "content-type": "1.0.4", - "cookie": "0.3.1", - "cookie-signature": "1.0.6", - "debug": "2.6.9", - "depd": "1.1.2", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", - "finalhandler": "1.1.1", - "fresh": "0.5.2", - "merge-descriptors": "1.0.1", - "methods": "1.1.2", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "path-to-regexp": "0.1.7", - "proxy-addr": "2.0.3", - "qs": "6.5.1", - "range-parser": "1.2.0", - "safe-buffer": "5.1.1", - "send": "0.16.2", - "serve-static": "1.13.2", - "setprototypeof": "1.1.0", - "statuses": "1.4.0", - "type-is": "1.6.16", - "utils-merge": "1.0.1", - "vary": "1.1.2" - }, - "dependencies": { - "safe-buffer": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz", - "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==", - "dev": true - } - } - }, - "extend-shallow": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", - "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", - "dev": true, - "requires": { - "assign-symbols": "1.0.0", - "is-extendable": "1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "2.0.4" - } - } - } - }, - "extglob": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", - "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", - "dev": true, - "requires": { - "array-unique": "0.3.2", - "define-property": "1.0.0", - "expand-brackets": "2.1.4", - "extend-shallow": "2.0.1", - "fragment-cache": "0.2.1", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "extract-text-webpack-plugin": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extract-text-webpack-plugin/-/extract-text-webpack-plugin-3.0.2.tgz", - "integrity": "sha512-bt/LZ4m5Rqt/Crl2HiKuAl/oqg0psx1tsTLkvWbJen1CtD+fftkZhMaQ9HOtY2gWsl2Wq+sABmMVi9z3DhKWQQ==", - "dev": true, - "requires": { - "async": "2.6.1", - "loader-utils": "1.1.0", - "schema-utils": "0.3.0", - "webpack-sources": "1.1.0" - } - }, - "fast-deep-equal": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", - "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", - "dev": true - }, - "fast-json-stable-stringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", - "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=", - "dev": true - }, - "fastparse": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.1.tgz", - "integrity": "sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=", - "dev": true - }, - "faye-websocket": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz", - "integrity": "sha1-TkkvjQTftviQA1B/btvy1QHnxvQ=", - "dev": true, - "requires": { - "websocket-driver": "0.7.0" - } - }, - "file-loader": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-1.1.11.tgz", - "integrity": "sha512-TGR4HU7HUsGg6GCOPJnFk06RhWgEWFLAGWiT6rcD+GRC2keU3s9RGJ+b3Z6/U73jwwNb2gKLJ7YCrp+jvU4ALg==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "schema-utils": "0.4.5" - }, - "dependencies": { - "ajv": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", - "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "schema-utils": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz", - "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", - "dev": true, - "requires": { - "ajv": "6.5.2", - "ajv-keywords": "3.2.0" - } - } - } - }, - "filename-regex": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz", - "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=", - "dev": true - }, - "filesize": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/filesize/-/filesize-3.6.1.tgz", - "integrity": "sha512-7KjR1vv6qnicaPMi1iiTcI85CyYwRO/PSFCu6SvqL8jN2Wjt/NIYQTFtFs7fSDCYOstUkEWIQGFUg5YZQfjlcg==", - "dev": true - }, - "fill-range": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", - "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", - "dev": true, - "requires": { - "extend-shallow": "2.0.1", - "is-number": "3.0.0", - "repeat-string": "1.6.1", - "to-regex-range": "2.1.1" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "finalhandler": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.1.tgz", - "integrity": "sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==", - "dev": true, - "requires": { - "debug": "2.6.9", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "on-finished": "2.3.0", - "parseurl": "1.3.2", - "statuses": "1.4.0", - "unpipe": "1.0.0" - } - }, - "find-cache-dir": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", - "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", - "dev": true, - "requires": { - "commondir": "1.0.1", - "make-dir": "1.3.0", - "pkg-dir": "2.0.0" - } - }, - "find-up": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", - "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", - "dev": true, - "requires": { - "locate-path": "2.0.0" - } - }, - "flatten": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz", - "integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=", - "dev": true - }, - "flush-write-stream": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz", - "integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" - } - }, - "follow-redirects": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz", - "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==", - "dev": true, - "requires": { - "debug": "3.1.0" - }, - "dependencies": { - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - } - } - }, - "for-in": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", - "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", - "dev": true - }, - "for-own": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz", - "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=", - "dev": true, - "requires": { - "for-in": "1.0.2" - } - }, - "foreach": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz", - "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k=", - "dev": true - }, - "forwarded": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", - "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=", - "dev": true - }, - "fragment-cache": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", - "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", - "dev": true, - "requires": { - "map-cache": "0.2.2" - } - }, - "fresh": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=", - "dev": true - }, - "friendly-errors-webpack-plugin": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/friendly-errors-webpack-plugin/-/friendly-errors-webpack-plugin-1.7.0.tgz", - "integrity": "sha512-K27M3VK30wVoOarP651zDmb93R9zF28usW4ocaK3mfQeIEI5BPht/EzZs5E8QLLwbLRJQMwscAjDxYPb1FuNiw==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "error-stack-parser": "2.0.2", - "string-width": "2.1.1" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - } - }, - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "from2": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", - "integrity": "sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" - } - }, - "fs-write-stream-atomic": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz", - "integrity": "sha1-tH31NJPvkR33VzHnCp3tAYnbQMk=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "iferr": "0.1.5", - "imurmurhash": "0.1.4", - "readable-stream": "2.3.6" - } - }, - "fs.realpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", - "dev": true - }, - "fsevents": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", - "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", - "dev": true, - "optional": true, - "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.10.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.21", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": "2.1.2" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.11" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "minipass": { - "version": "2.2.4", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true, - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true, - "dev": true - } - } - }, - "function-bind": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", - "dev": true - }, - "get-caller-file": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz", - "integrity": "sha1-9wLmMSfn4jHBYKgMFVSstw1QR+U=", - "dev": true - }, - "get-stdin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz", - "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=", - "dev": true - }, - "get-stream": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz", - "integrity": "sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=", - "dev": true - }, - "get-value": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", - "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", - "dev": true - }, - "glob": { - "version": "7.1.2", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz", - "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "glob-base": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz", - "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=", - "dev": true, - "requires": { - "glob-parent": "2.0.0", - "is-glob": "2.0.1" - }, - "dependencies": { - "glob-parent": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz", - "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=", - "dev": true, - "requires": { - "is-glob": "2.0.1" - } - }, - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - } - } - }, - "glob-parent": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz", - "integrity": "sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=", - "dev": true, - "requires": { - "is-glob": "3.1.0", - "path-dirname": "1.0.2" - }, - "dependencies": { - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - } - } - }, - "globals": { - "version": "9.18.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz", - "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==", - "dev": true - }, - "globby": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", - "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", - "dev": true, - "requires": { - "array-union": "1.0.2", - "dir-glob": "2.0.0", - "glob": "7.1.2", - "ignore": "3.3.10", - "pify": "3.0.0", - "slash": "1.0.0" - } - }, - "graceful-fs": { - "version": "4.1.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz", - "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", - "dev": true - }, - "growly": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", - "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=", - "dev": true - }, - "gzip-size": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-4.1.0.tgz", - "integrity": "sha1-iuCWJX6r59acRb4rZ8RIEk/7UXw=", - "dev": true, - "requires": { - "duplexer": "0.1.1", - "pify": "3.0.0" - } - }, - "handle-thing": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-1.2.5.tgz", - "integrity": "sha1-/Xqtcmvxpf0W38KbL3pmAdJxOcQ=", - "dev": true - }, - "has": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", - "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", - "dev": true, - "requires": { - "function-bind": "1.1.1" - } - }, - "has-ansi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", - "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "has-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", - "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", - "dev": true, - "requires": { - "get-value": "2.0.6", - "has-values": "1.0.0", - "isobject": "3.0.1" - } - }, - "has-values": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", - "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", - "dev": true, - "requires": { - "is-number": "3.0.0", - "kind-of": "4.0.0" - }, - "dependencies": { - "kind-of": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", - "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - } - } - }, - "hash-base": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/hash-base/-/hash-base-3.0.4.tgz", - "integrity": "sha1-X8hoaEfs1zSZQDMZprCj8/auSRg=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.2" - } - }, - "hash-sum": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", - "integrity": "sha1-M7QHd3VMZDJXPBIMw4CLvRDUfwQ=", - "dev": true - }, - "hash.js": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.4.tgz", - "integrity": "sha512-A6RlQvvZEtFS5fLU43IDu0QUmBy+fDO9VMdTXvufKwIkt/rFfvICAViCax5fbDO4zdNzaC3/27ZhKUok5bAJyw==", - "dev": true, - "requires": { - "inherits": "2.0.3", - "minimalistic-assert": "1.0.1" - } - }, - "he": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", - "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", - "dev": true - }, - "hmac-drbg": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz", - "integrity": "sha1-0nRXAQJabHdabFRXk+1QL8DGSaE=", - "dev": true, - "requires": { - "hash.js": "1.1.4", - "minimalistic-assert": "1.0.1", - "minimalistic-crypto-utils": "1.0.1" - } - }, - "home-or-tmp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/home-or-tmp/-/home-or-tmp-2.0.0.tgz", - "integrity": "sha1-42w/LSyufXRqhX440Y1fMqeILbg=", - "dev": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "hosted-git-info": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.1.tgz", - "integrity": "sha512-Ba4+0M4YvIDUUsprMjhVTU1yN9F2/LJSAl69ZpzaLT4l4j5mwTS6jqqW9Ojvj6lKz/veqPzpJBqGbXspOb533A==", - "dev": true - }, - "hpack.js": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", - "integrity": "sha1-h3dMCUnlE/QuhFdbPEVoH63ioLI=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "obuf": "1.1.2", - "readable-stream": "2.3.6", - "wbuf": "1.7.3" - } - }, - "html-comment-regex": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/html-comment-regex/-/html-comment-regex-1.1.1.tgz", - "integrity": "sha1-ZouTd26q5V696POtRkswekljYl4=", - "dev": true - }, - "html-entities": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-1.2.1.tgz", - "integrity": "sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=", - "dev": true - }, - "html-minifier": { - "version": "3.5.18", - "resolved": "https://registry.npmjs.org/html-minifier/-/html-minifier-3.5.18.tgz", - "integrity": "sha512-sczoq/9zeXiKZMj8tsQzHJE7EyjrpMHvblTLuh9o8h5923a6Ts5uQ/3YdY+xIqJYRjzHQPlrHjfjh0BtwPJG0g==", - "dev": true, - "requires": { - "camel-case": "3.0.0", - "clean-css": "4.1.11", - "commander": "2.16.0", - "he": "1.1.1", - "param-case": "2.1.1", - "relateurl": "0.2.7", - "uglify-js": "3.4.3" - } - }, - "html-webpack-plugin": { - "version": "2.30.1", - "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-2.30.1.tgz", - "integrity": "sha1-f5xCG36pHsRg9WUn1430hO51N9U=", - "dev": true, - "requires": { - "bluebird": "3.5.1", - "html-minifier": "3.5.18", - "loader-utils": "0.2.17", - "lodash": "4.17.10", - "pretty-error": "2.1.1", - "toposort": "1.0.7" - }, - "dependencies": { - "loader-utils": { - "version": "0.2.17", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-0.2.17.tgz", - "integrity": "sha1-+G5jdNQyBabmxg6RlvF8Apm/s0g=", - "dev": true, - "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1", - "object-assign": "4.1.1" - } - } - } - }, - "htmlparser2": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.3.0.tgz", - "integrity": "sha1-zHDQWln2VC5D8OaFyYLhTJJKnv4=", - "dev": true, - "requires": { - "domelementtype": "1.3.0", - "domhandler": "2.1.0", - "domutils": "1.1.6", - "readable-stream": "1.0.34" - }, - "dependencies": { - "domutils": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-1.1.6.tgz", - "integrity": "sha1-vdw94Jm5ou+sxRxiPyj0FuzFdIU=", - "dev": true, - "requires": { - "domelementtype": "1.3.0" - } - }, - "isarray": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz", - "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=", - "dev": true - }, - "readable-stream": { - "version": "1.0.34", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz", - "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "0.0.1", - "string_decoder": "0.10.31" - } - }, - "string_decoder": { - "version": "0.10.31", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz", - "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=", - "dev": true - } - } - }, - "http-deceiver": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", - "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=", - "dev": true - }, - "http-errors": { - "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=", - "dev": true, - "requires": { - "depd": "1.1.2", - "inherits": "2.0.3", - "setprototypeof": "1.1.0", - "statuses": "1.4.0" - } - }, - "http-parser-js": { - "version": "0.4.13", - "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.4.13.tgz", - "integrity": "sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=", - "dev": true - }, - "http-proxy": { - "version": "1.17.0", - "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz", - "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==", - "dev": true, - "requires": { - "eventemitter3": "3.1.0", - "follow-redirects": "1.5.0", - "requires-port": "1.0.0" - } - }, - "http-proxy-middleware": { - "version": "0.17.4", - "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-0.17.4.tgz", - "integrity": "sha1-ZC6ISIUdZvCdTxJJEoRtuutBuDM=", - "dev": true, - "requires": { - "http-proxy": "1.17.0", - "is-glob": "3.1.0", - "lodash": "4.17.10", - "micromatch": "2.3.11" - }, - "dependencies": { - "arr-diff": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz", - "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=", - "dev": true, - "requires": { - "arr-flatten": "1.1.0" - } - }, - "array-unique": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz", - "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=", - "dev": true - }, - "braces": { - "version": "1.8.5", - "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz", - "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=", - "dev": true, - "requires": { - "expand-range": "1.8.2", - "preserve": "0.2.0", - "repeat-element": "1.1.2" - } - }, - "expand-brackets": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz", - "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=", - "dev": true, - "requires": { - "is-posix-bracket": "0.1.1" - } - }, - "extglob": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz", - "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - } - } - }, - "is-glob": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz", - "integrity": "sha1-e6WuJCF4BKxwcHuWkiVnSGzD6Eo=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - }, - "micromatch": { - "version": "2.3.11", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz", - "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=", - "dev": true, - "requires": { - "arr-diff": "2.0.0", - "array-unique": "0.2.1", - "braces": "1.8.5", - "expand-brackets": "0.1.5", - "extglob": "0.3.2", - "filename-regex": "2.0.1", - "is-extglob": "1.0.0", - "is-glob": "2.0.1", - "kind-of": "3.2.2", - "normalize-path": "2.1.1", - "object.omit": "2.0.1", - "parse-glob": "3.0.4", - "regex-cache": "0.4.4" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - } - } - } - } - }, - "https-browserify": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", - "integrity": "sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=", - "dev": true - }, - "iconv-lite": { - "version": "0.4.19", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.19.tgz", - "integrity": "sha512-oTZqweIP51xaGPI4uPa56/Pri/480R+mo7SeU+YETByQNhDG55ycFyNLIgta9vXhILrxXDmF7ZGhqZIcuN0gJQ==", - "dev": true - }, - "icss-replace-symbols": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz", - "integrity": "sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=", - "dev": true - }, - "icss-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-2.1.0.tgz", - "integrity": "sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=", - "dev": true, - "requires": { - "postcss": "6.0.23" - } - }, - "ieee754": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz", - "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==", - "dev": true - }, - "iferr": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz", - "integrity": "sha1-xg7taebY/bazEEofy8ocGS3FtQE=", - "dev": true - }, - "ignore": { - "version": "3.3.10", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", - "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", - "dev": true - }, - "import-local": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-1.0.0.tgz", - "integrity": "sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==", - "dev": true, - "requires": { - "pkg-dir": "2.0.0", - "resolve-cwd": "2.0.0" - } - }, - "imurmurhash": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true - }, - "indent-string": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz", - "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=", - "dev": true, - "requires": { - "repeating": "2.0.1" - } - }, - "indexes-of": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz", - "integrity": "sha1-8w9xbI4r00bHtn0985FVZqfAVgc=", - "dev": true - }, - "indexof": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz", - "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=", - "dev": true - }, - "inflight": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", - "dev": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=", - "dev": true - }, - "internal-ip": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-1.2.0.tgz", - "integrity": "sha1-rp+/k7mEh4eF1QqN4bNWlWBYz1w=", - "dev": true, - "requires": { - "meow": "3.7.0" - } - }, - "interpret": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/interpret/-/interpret-1.1.0.tgz", - "integrity": "sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=", - "dev": true - }, - "invariant": { - "version": "2.2.4", - "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", - "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", - "dev": true, - "requires": { - "loose-envify": "1.3.1" - } - }, - "invert-kv": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz", - "integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY=", - "dev": true - }, - "ip": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz", - "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=", - "dev": true - }, - "ipaddr.js": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.6.0.tgz", - "integrity": "sha1-4/o1e3c9phnybpXwSdBVxyeW+Gs=", - "dev": true - }, - "is-absolute-url": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz", - "integrity": "sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=", - "dev": true - }, - "is-accessor-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", - "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "is-arrayish": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=", - "dev": true - }, - "is-binary-path": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz", - "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=", - "dev": true, - "requires": { - "binary-extensions": "1.11.0" - } - }, - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - }, - "is-builtin-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz", - "integrity": "sha1-VAVy0096wxGfj3bDDLwbHgN6/74=", - "dev": true, - "requires": { - "builtin-modules": "1.1.1" - } - }, - "is-callable": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.4.tgz", - "integrity": "sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==", - "dev": true - }, - "is-data-descriptor": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", - "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "is-date-object": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz", - "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=", - "dev": true - }, - "is-descriptor": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", - "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "0.1.6", - "is-data-descriptor": "0.1.4", - "kind-of": "5.1.0" - }, - "dependencies": { - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } - } - }, - "is-directory": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz", - "integrity": "sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=", - "dev": true - }, - "is-dotfile": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz", - "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=", - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz", - "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=", - "dev": true, - "requires": { - "is-primitive": "2.0.0" - } - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true - }, - "is-extglob": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=", - "dev": true - }, - "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "is-glob": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.0.tgz", - "integrity": "sha1-lSHHaEXMJhCoUgPd8ICpWML/q8A=", - "dev": true, - "requires": { - "is-extglob": "2.1.1" - } - }, - "is-number": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", - "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "is-path-cwd": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", - "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=", - "dev": true - }, - "is-path-in-cwd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz", - "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==", - "dev": true, - "requires": { - "is-path-inside": "1.0.1" - } - }, - "is-path-inside": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-1.0.1.tgz", - "integrity": "sha1-jvW33lBDej/cprToZe96pVy0gDY=", - "dev": true, - "requires": { - "path-is-inside": "1.0.2" - } - }, - "is-plain-obj": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha1-caUMhCnfync8kqOQpKA7OfzVHT4=", - "dev": true - }, - "is-plain-object": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", - "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", - "dev": true, - "requires": { - "isobject": "3.0.1" - } - }, - "is-posix-bracket": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz", - "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=", - "dev": true - }, - "is-primitive": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz", - "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=", - "dev": true - }, - "is-regex": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", - "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=", - "dev": true, - "requires": { - "has": "1.0.3" - } - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true - }, - "is-svg": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-svg/-/is-svg-2.1.0.tgz", - "integrity": "sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=", - "dev": true, - "requires": { - "html-comment-regex": "1.1.1" - } - }, - "is-symbol": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", - "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI=", - "dev": true - }, - "is-utf8": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz", - "integrity": "sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=", - "dev": true - }, - "is-windows": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", - "dev": true - }, - "is-wsl": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz", - "integrity": "sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=", - "dev": true - }, - "isarray": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=", - "dev": true - }, - "isexe": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", - "dev": true - }, - "isobject": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", - "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", - "dev": true - }, - "jquery": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz", - "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==", - "dev": true - }, - "js-base64": { - "version": "2.4.5", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.4.5.tgz", - "integrity": "sha512-aUnNwqMOXw3yvErjMPSQu6qIIzUmT1e5KcU1OZxRDU1g/am6mzBvcrmLAYwzmB59BHPrh5/tKaiF4OPhqRWESQ==", - "dev": true - }, - "js-tokens": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz", - "integrity": "sha1-mGbfOVECEw449/mWvOtlRDIJwls=", - "dev": true - }, - "js-yaml": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.7.0.tgz", - "integrity": "sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=", - "dev": true, - "requires": { - "argparse": "1.0.10", - "esprima": "2.7.3" - } - }, - "jsesc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-1.3.0.tgz", - "integrity": "sha1-RsP+yMGJKxKwgz25vHYiF226s0s=", - "dev": true - }, - "json-loader": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz", - "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==", - "dev": true - }, - "json-schema-traverse": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", - "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", - "dev": true - }, - "json3": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", - "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", - "dev": true - }, - "json5": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz", - "integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE=", - "dev": true - }, - "killable": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/killable/-/killable-1.0.0.tgz", - "integrity": "sha1-2ouEvUfeU5WHj5XWTQLyRJ/gXms=", - "dev": true - }, - "kind-of": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", - "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", - "dev": true, - "requires": { - "is-buffer": "1.1.6" - } - }, - "last-call-webpack-plugin": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/last-call-webpack-plugin/-/last-call-webpack-plugin-2.1.2.tgz", - "integrity": "sha512-CZc+m2xZm51J8qSwdODeiiNeqh8CYkKEq6Rw8IkE4i/4yqf2cJhjQPsA6BtAV970ePRNhwEOXhy2U5xc5Jwh9Q==", - "dev": true, - "requires": { - "lodash": "4.17.10", - "webpack-sources": "1.1.0" - } - }, - "lazy-cache": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz", - "integrity": "sha1-odePw6UEdMuAhF07O24dpJpEbo4=", - "dev": true - }, - "lcid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz", - "integrity": "sha1-MIrMr6C8SDo4Z7S28rlQYlHRuDU=", - "dev": true, - "requires": { - "invert-kv": "1.0.0" - } - }, - "load-json-file": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", - "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "strip-bom": "3.0.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "loader-runner": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-2.3.0.tgz", - "integrity": "sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=", - "dev": true - }, - "loader-utils": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz", - "integrity": "sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=", - "dev": true, - "requires": { - "big.js": "3.2.0", - "emojis-list": "2.1.0", - "json5": "0.5.1" - } - }, - "locate-path": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", - "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", - "dev": true, - "requires": { - "p-locate": "2.0.0", - "path-exists": "3.0.0" - } - }, - "lodash": { - "version": "4.17.10", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz", - "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", - "dev": true - }, - "lodash.camelcase": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha1-soqmKIorn8ZRA1x3EfZathkDMaY=", - "dev": true - }, - "lodash.clonedeep": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", - "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", - "dev": true - }, - "lodash.debounce": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", - "integrity": "sha1-gteb/zCmfEAF/9XiUVMArZyk168=", - "dev": true - }, - "lodash.memoize": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=", - "dev": true - }, - "lodash.uniq": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=", - "dev": true - }, - "log-symbols": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz", - "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==", - "dev": true, - "requires": { - "chalk": "2.4.1" - } - }, - "loglevel": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz", - "integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=", - "dev": true - }, - "longest": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz", - "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", - "dev": true - }, - "loose-envify": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.3.1.tgz", - "integrity": "sha1-0aitM/qc4OcT1l/dCsi3SNR4yEg=", - "dev": true, - "requires": { - "js-tokens": "3.0.2" - } - }, - "loud-rejection": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz", - "integrity": "sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=", - "dev": true, - "requires": { - "currently-unhandled": "0.4.1", - "signal-exit": "3.0.2" - } - }, - "lower-case": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz", - "integrity": "sha1-miyr0bno4K6ZOkv31YdcOcQujqw=", - "dev": true - }, - "lru-cache": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", - "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==", - "dev": true, - "requires": { - "pseudomap": "1.0.2", - "yallist": "2.1.2" - } - }, - "make-dir": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", - "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", - "dev": true, - "requires": { - "pify": "3.0.0" - } - }, - "map-cache": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", - "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=", - "dev": true - }, - "map-obj": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz", - "integrity": "sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=", - "dev": true - }, - "map-visit": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", - "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", - "dev": true, - "requires": { - "object-visit": "1.0.1" - } - }, - "math-expression-evaluator": { - "version": "1.2.17", - "resolved": "https://registry.npmjs.org/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz", - "integrity": "sha1-3oGf282E3M2PrlnGrreWFbnSZqw=", - "dev": true - }, - "math-random": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz", - "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=", - "dev": true - }, - "md5.js": { - "version": "1.3.4", - "resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.4.tgz", - "integrity": "sha1-6b296UogpawYsENA/Fdk1bCdkB0=", - "dev": true, - "requires": { - "hash-base": "3.0.4", - "inherits": "2.0.3" - } - }, - "media-typer": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=", - "dev": true - }, - "mem": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/mem/-/mem-1.1.0.tgz", - "integrity": "sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=", - "dev": true, - "requires": { - "mimic-fn": "1.2.0" - } - }, - "memory-fs": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz", - "integrity": "sha1-OpoguEYlI+RHz7x+i7gO1me/xVI=", - "dev": true, - "requires": { - "errno": "0.1.7", - "readable-stream": "2.3.6" - } - }, - "meow": { - "version": "3.7.0", - "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz", - "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=", - "dev": true, - "requires": { - "camelcase-keys": "2.1.0", - "decamelize": "1.2.0", - "loud-rejection": "1.6.0", - "map-obj": "1.0.1", - "minimist": "1.2.0", - "normalize-package-data": "2.4.0", - "object-assign": "4.1.1", - "read-pkg-up": "1.0.1", - "redent": "1.0.0", - "trim-newlines": "1.0.0" - }, - "dependencies": { - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" - } - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" - } - }, - "minimist": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", - "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", - "dev": true - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "requires": { - "pinkie-promise": "2.0.1" - } - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "0.2.1" - } - } - } - }, - "merge-descriptors": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", - "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=", - "dev": true - }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "dev": true - }, - "micromatch": { - "version": "3.1.10", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", - "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", - "dev": true, - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "braces": "2.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "extglob": "2.0.4", - "fragment-cache": "0.2.1", - "kind-of": "6.0.2", - "nanomatch": "1.2.13", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "miller-rabin": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/miller-rabin/-/miller-rabin-4.0.1.tgz", - "integrity": "sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "brorand": "1.1.0" - } - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true - }, - "mime-db": { - "version": "1.33.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", - "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==", - "dev": true - }, - "mime-types": { - "version": "2.1.18", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz", - "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==", - "dev": true, - "requires": { - "mime-db": "1.33.0" - } - }, - "mimic-fn": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz", - "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==", - "dev": true - }, - "minimalistic-assert": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", - "dev": true - }, - "minimalistic-crypto-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz", - "integrity": "sha1-9sAMHAsIIkblxNmd+4x8CDsrWCo=", - "dev": true - }, - "minimatch": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", - "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==", - "dev": true, - "requires": { - "brace-expansion": "1.1.11" - } - }, - "minimist": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", - "dev": true - }, - "mississippi": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", - "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", - "dev": true, - "requires": { - "concat-stream": "1.6.2", - "duplexify": "3.6.0", - "end-of-stream": "1.4.1", - "flush-write-stream": "1.0.3", - "from2": "2.3.0", - "parallel-transform": "1.1.0", - "pump": "2.0.1", - "pumpify": "1.5.1", - "stream-each": "1.2.2", - "through2": "2.0.3" - } - }, - "mixin-deep": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.1.tgz", - "integrity": "sha512-8ZItLHeEgaqEvd5lYBXfm4EZSFCX29Jb9K+lAHhDKzReKBQKj3R+7NOF6tjqYi9t4oI8VUfaWITJQm86wnXGNQ==", - "dev": true, - "requires": { - "for-in": "1.0.2", - "is-extendable": "1.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", - "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", - "dev": true, - "requires": { - "is-plain-object": "2.0.4" - } - } - } - }, - "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "move-concurrently": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", - "integrity": "sha1-viwAX9oy4LKa8fBdfEszIUxwH5I=", - "dev": true, - "requires": { - "aproba": "1.2.0", - "copy-concurrently": "1.0.5", - "fs-write-stream-atomic": "1.0.10", - "mkdirp": "0.5.1", - "rimraf": "2.6.2", - "run-queue": "1.0.3" - } - }, - "ms": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", - "dev": true - }, - "multicast-dns": { - "version": "6.2.3", - "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-6.2.3.tgz", - "integrity": "sha512-ji6J5enbMyGRHIAkAOu3WdV8nggqviKCEKtXcOqfphZZtQrmHKycfynJ2V7eVPUA4NhJ6V7Wf4TmGbTwKE9B6g==", - "dev": true, - "requires": { - "dns-packet": "1.3.1", - "thunky": "1.0.2" - } - }, - "multicast-dns-service-types": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz", - "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=", - "dev": true - }, - "nan": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz", - "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==", - "dev": true, - "optional": true - }, - "nanomatch": { - "version": "1.2.13", - "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", - "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", - "dev": true, - "requires": { - "arr-diff": "4.0.0", - "array-unique": "0.3.2", - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "fragment-cache": "0.2.1", - "is-windows": "1.0.2", - "kind-of": "6.0.2", - "object.pick": "1.3.0", - "regex-not": "1.0.2", - "snapdragon": "0.8.2", - "to-regex": "3.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "negotiator": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz", - "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=", - "dev": true - }, - "neo-async": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.5.1.tgz", - "integrity": "sha512-3KL3fvuRkZ7s4IFOMfztb7zJp3QaVWnBeGoJlgB38XnCRPj/0tLzzLG5IB8NYOHbJ8g8UGrgZv44GLDk6CxTxA==", - "dev": true - }, - "next-tick": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz", - "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=", - "dev": true - }, - "no-case": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz", - "integrity": "sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==", - "dev": true, - "requires": { - "lower-case": "1.1.4" - } - }, - "node-forge": { - "version": "0.7.5", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.7.5.tgz", - "integrity": "sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==", - "dev": true - }, - "node-libs-browser": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/node-libs-browser/-/node-libs-browser-2.1.0.tgz", - "integrity": "sha512-5AzFzdoIMb89hBGMZglEegffzgRg+ZFoUmisQ8HI4j1KDdpx13J0taNp2y9xPbur6W61gepGDDotGBVQ7mfUCg==", - "dev": true, - "requires": { - "assert": "1.4.1", - "browserify-zlib": "0.2.0", - "buffer": "4.9.1", - "console-browserify": "1.1.0", - "constants-browserify": "1.0.0", - "crypto-browserify": "3.12.0", - "domain-browser": "1.2.0", - "events": "1.1.1", - "https-browserify": "1.0.0", - "os-browserify": "0.3.0", - "path-browserify": "0.0.0", - "process": "0.11.10", - "punycode": "1.4.1", - "querystring-es3": "0.2.1", - "readable-stream": "2.3.6", - "stream-browserify": "2.0.1", - "stream-http": "2.8.3", - "string_decoder": "1.1.1", - "timers-browserify": "2.0.10", - "tty-browserify": "0.0.0", - "url": "0.11.0", - "util": "0.10.4", - "vm-browserify": "0.0.4" - }, - "dependencies": { - "punycode": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz", - "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=", - "dev": true - } - } - }, - "node-notifier": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-5.2.1.tgz", - "integrity": "sha512-MIBs+AAd6dJ2SklbbE8RUDRlIVhU8MaNLh1A9SUZDUHPiZkWLFde6UNwG41yQHZEToHgJMXqyVZ9UcS/ReOVTg==", - "dev": true, - "requires": { - "growly": "1.3.0", - "semver": "5.5.0", - "shellwords": "0.1.1", - "which": "1.3.1" - } - }, - "normalize-package-data": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz", - "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==", - "dev": true, - "requires": { - "hosted-git-info": "2.6.1", - "is-builtin-module": "1.0.0", - "semver": "5.5.0", - "validate-npm-package-license": "3.0.3" - } - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "1.1.0" - } - }, - "normalize-range": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=", - "dev": true - }, - "normalize-url": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz", - "integrity": "sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "prepend-http": "1.0.4", - "query-string": "4.3.4", - "sort-keys": "1.1.2" - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "2.0.1" - } - }, - "nth-check": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-1.0.1.tgz", - "integrity": "sha1-mSms32KPwsQQmN6rgqxYDPFJquQ=", - "dev": true, - "requires": { - "boolbase": "1.0.0" - } - }, - "num2fraction": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz", - "integrity": "sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=", - "dev": true - }, - "number-is-nan": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", - "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=", - "dev": true - }, - "object-copy": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", - "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", - "dev": true, - "requires": { - "copy-descriptor": "0.1.1", - "define-property": "0.2.5", - "kind-of": "3.2.2" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - } - } - }, - "object-keys": { - "version": "1.0.12", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.12.tgz", - "integrity": "sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==", - "dev": true - }, - "object-visit": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", - "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", - "dev": true, - "requires": { - "isobject": "3.0.1" - } - }, - "object.omit": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz", - "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=", - "dev": true, - "requires": { - "for-own": "0.1.5", - "is-extendable": "0.1.1" - } - }, - "object.pick": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", - "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", - "dev": true, - "requires": { - "isobject": "3.0.1" - } - }, - "obuf": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", - "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", - "dev": true - }, - "on-finished": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=", - "dev": true, - "requires": { - "ee-first": "1.1.1" - } - }, - "on-headers": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz", - "integrity": "sha1-ko9dD0cNSTQmUepnlLCFfBAGk/c=", - "dev": true - }, - "once": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "onetime": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz", - "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=", - "dev": true, - "requires": { - "mimic-fn": "1.2.0" - } - }, - "opener": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/opener/-/opener-1.4.3.tgz", - "integrity": "sha1-XG2ixdflgx6P+jlklQ+NZnSskLg=", - "dev": true - }, - "opn": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/opn/-/opn-5.3.0.tgz", - "integrity": "sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==", - "dev": true, - "requires": { - "is-wsl": "1.1.0" - } - }, - "optimize-css-assets-webpack-plugin": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-3.2.0.tgz", - "integrity": "sha512-Fjn7wyyadPAriuH2DHamDQw5B8GohEWbroBkKoPeP+vSF2PIAPI7WDihi8WieMRb/At4q7Ea7zTKaMDuSoIAAg==", - "dev": true, - "requires": { - "cssnano": "3.10.0", - "last-call-webpack-plugin": "2.1.2" - } - }, - "ora": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ora/-/ora-1.4.0.tgz", - "integrity": "sha512-iMK1DOQxzzh2MBlVsU42G80mnrvUhqsMh74phHtDlrcTZPK0pH6o7l7DRshK+0YsxDyEuaOkziVdvM3T0QTzpw==", - "dev": true, - "requires": { - "chalk": "2.4.1", - "cli-cursor": "2.1.0", - "cli-spinners": "1.3.1", - "log-symbols": "2.2.0" - } - }, - "original": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/original/-/original-1.0.1.tgz", - "integrity": "sha512-IEvtB5vM5ULvwnqMxWBLxkS13JIEXbakizMSo3yoPNPCIWzg8TG3Usn/UhXoZFM/m+FuEA20KdzPSFq/0rS+UA==", - "dev": true, - "requires": { - "url-parse": "1.4.1" - } - }, - "os-browserify": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz", - "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", - "dev": true - }, - "os-homedir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz", - "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=", - "dev": true - }, - "os-locale": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-2.1.0.tgz", - "integrity": "sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==", - "dev": true, - "requires": { - "execa": "0.7.0", - "lcid": "1.0.0", - "mem": "1.1.0" - } - }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true - }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true - }, - "p-limit": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", - "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", - "dev": true, - "requires": { - "p-try": "1.0.0" - } - }, - "p-locate": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", - "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", - "dev": true, - "requires": { - "p-limit": "1.3.0" - } - }, - "p-map": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz", - "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==", - "dev": true - }, - "p-try": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", - "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", - "dev": true - }, - "pako": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz", - "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg==", - "dev": true - }, - "parallel-transform": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz", - "integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=", - "dev": true, - "requires": { - "cyclist": "0.2.2", - "inherits": "2.0.3", - "readable-stream": "2.3.6" - } - }, - "param-case": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz", - "integrity": "sha1-35T9jPZTHs915r75oIWPvHK+Ikc=", - "dev": true, - "requires": { - "no-case": "2.3.2" - } - }, - "parse-asn1": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/parse-asn1/-/parse-asn1-5.1.1.tgz", - "integrity": "sha512-KPx7flKXg775zZpnp9SxJlz00gTd4BmJ2yJufSc44gMCRrRQ7NSzAcSJQfifuOLgW6bEi+ftrALtsgALeB2Adw==", - "dev": true, - "requires": { - "asn1.js": "4.10.1", - "browserify-aes": "1.2.0", - "create-hash": "1.2.0", - "evp_bytestokey": "1.0.3", - "pbkdf2": "3.0.16" - } - }, - "parse-glob": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz", - "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=", - "dev": true, - "requires": { - "glob-base": "0.3.0", - "is-dotfile": "1.0.3", - "is-extglob": "1.0.0", - "is-glob": "2.0.1" - }, - "dependencies": { - "is-extglob": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz", - "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=", - "dev": true - }, - "is-glob": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz", - "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=", - "dev": true, - "requires": { - "is-extglob": "1.0.0" - } - } - } - }, - "parse-json": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", - "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", - "dev": true, - "requires": { - "error-ex": "1.3.2" - } - }, - "parseurl": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz", - "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=", - "dev": true - }, - "pascalcase": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", - "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", - "dev": true - }, - "path-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz", - "integrity": "sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=", - "dev": true - }, - "path-dirname": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", - "integrity": "sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=", - "dev": true - }, - "path-exists": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", - "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", - "dev": true - }, - "path-is-absolute": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=", - "dev": true - }, - "path-is-inside": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz", - "integrity": "sha1-NlQX3t5EQw0cEa9hAn+s8HS9/FM=", - "dev": true - }, - "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", - "dev": true - }, - "path-parse": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.5.tgz", - "integrity": "sha1-PBrfhx6pzWyUMbbqK9dKD/BVxME=", - "dev": true - }, - "path-to-regexp": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", - "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=", - "dev": true - }, - "path-type": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", - "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", - "dev": true, - "requires": { - "pify": "3.0.0" - } - }, - "pbkdf2": { - "version": "3.0.16", - "resolved": "https://registry.npmjs.org/pbkdf2/-/pbkdf2-3.0.16.tgz", - "integrity": "sha512-y4CXP3thSxqf7c0qmOF+9UeOTrifiVTIM+u7NWlq+PRsHbr7r7dpCmvzrZxa96JJUNi0Y5w9VqG5ZNeCVMoDcA==", - "dev": true, - "requires": { - "create-hash": "1.2.0", - "create-hmac": "1.1.7", - "ripemd160": "2.0.2", - "safe-buffer": "5.1.2", - "sha.js": "2.4.11" - } - }, - "pify": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", - "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz", - "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=", - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz", - "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=", - "dev": true, - "requires": { - "pinkie": "2.0.4" - } - }, - "pkg-dir": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", - "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", - "dev": true, - "requires": { - "find-up": "2.1.0" - } - }, - "portfinder": { - "version": "1.0.13", - "resolved": "https://registry.npmjs.org/portfinder/-/portfinder-1.0.13.tgz", - "integrity": "sha1-uzLs2HwnEErm7kS1o8y/Drsa7ek=", - "dev": true, - "requires": { - "async": "1.5.2", - "debug": "2.6.9", - "mkdirp": "0.5.1" - }, - "dependencies": { - "async": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", - "integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=", - "dev": true - } - } - }, - "posix-character-classes": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", - "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=", - "dev": true - }, - "postcss": { - "version": "6.0.23", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz", - "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==", - "dev": true, - "requires": { - "chalk": "2.4.1", - "source-map": "0.6.1", - "supports-color": "5.4.0" - } - }, - "postcss-calc": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-5.3.1.tgz", - "integrity": "sha1-d7rnypKK2FcW4v2kLyYb98HWW14=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-message-helpers": "2.0.0", - "reduce-css-calc": "1.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-colormin": { - "version": "2.2.2", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-2.2.2.tgz", - "integrity": "sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=", - "dev": true, - "requires": { - "colormin": "1.1.2", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-convert-values": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz", - "integrity": "sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-discard-comments": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz", - "integrity": "sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-discard-duplicates": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz", - "integrity": "sha1-uavye4isGIFYpesSq8riAmO5GTI=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-discard-empty": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz", - "integrity": "sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-discard-overridden": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz", - "integrity": "sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-discard-unused": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz", - "integrity": "sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "uniqs": "2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-filter-plugins": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz", - "integrity": "sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-import": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-11.1.0.tgz", - "integrity": "sha512-5l327iI75POonjxkXgdRCUS+AlzAdBx4pOvMEhTKTCjb1p8IEeVR9yx3cPbmN7LIWJLbfnIXxAhoB4jpD0c/Cw==", - "dev": true, - "requires": { - "postcss": "6.0.23", - "postcss-value-parser": "3.3.0", - "read-cache": "1.0.0", - "resolve": "1.8.1" - } - }, - "postcss-load-config": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-1.2.0.tgz", - "integrity": "sha1-U56a/J3chiASHr+djDZz4M5Q0oo=", - "dev": true, - "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1", - "postcss-load-options": "1.2.0", - "postcss-load-plugins": "2.3.0" - } - }, - "postcss-load-options": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-load-options/-/postcss-load-options-1.2.0.tgz", - "integrity": "sha1-sJixVZ3awt8EvAuzdfmaXP4rbYw=", - "dev": true, - "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1" - } - }, - "postcss-load-plugins": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/postcss-load-plugins/-/postcss-load-plugins-2.3.0.tgz", - "integrity": "sha1-dFdoEWWZrKLwCfrUJrABdQSdjZI=", - "dev": true, - "requires": { - "cosmiconfig": "2.2.2", - "object-assign": "4.1.1" - } - }, - "postcss-loader": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/postcss-loader/-/postcss-loader-2.1.5.tgz", - "integrity": "sha512-pV7kB5neJ0/1tZ8L1uGOBNTVBCSCXQoIsZMsrwvO8V2rKGa2tBl/f80GGVxow2jJnRJ2w1ocx693EKhZAb9Isg==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "postcss": "6.0.23", - "postcss-load-config": "1.2.0", - "schema-utils": "0.4.5" - }, - "dependencies": { - "ajv": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", - "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "schema-utils": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz", - "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", - "dev": true, - "requires": { - "ajv": "6.5.2", - "ajv-keywords": "3.2.0" - } - } - } - }, - "postcss-merge-idents": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz", - "integrity": "sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=", - "dev": true, - "requires": { - "has": "1.0.3", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-merge-longhand": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz", - "integrity": "sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-merge-rules": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz", - "integrity": "sha1-0d9d+qexrMO+VT8OnhDofGG19yE=", - "dev": true, - "requires": { - "browserslist": "1.7.7", - "caniuse-api": "1.6.1", - "postcss": "5.2.18", - "postcss-selector-parser": "2.2.3", - "vendors": "1.0.2" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "browserslist": { - "version": "1.7.7", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-1.7.7.tgz", - "integrity": "sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=", - "dev": true, - "requires": { - "caniuse-db": "1.0.30000862", - "electron-to-chromium": "1.3.51" - } - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-message-helpers": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz", - "integrity": "sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=", - "dev": true - }, - "postcss-minify-font-values": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz", - "integrity": "sha1-S1jttWZB66fIR0qzUmyv17vey2k=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-minify-gradients": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz", - "integrity": "sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-minify-params": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz", - "integrity": "sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=", - "dev": true, - "requires": { - "alphanum-sort": "1.0.2", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0", - "uniqs": "2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-minify-selectors": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz", - "integrity": "sha1-ssapjAByz5G5MtGkllCBFDEXNb8=", - "dev": true, - "requires": { - "alphanum-sort": "1.0.2", - "has": "1.0.3", - "postcss": "5.2.18", - "postcss-selector-parser": "2.2.3" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-modules-extract-imports": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz", - "integrity": "sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=", - "dev": true, - "requires": { - "postcss": "6.0.23" - } - }, - "postcss-modules-local-by-default": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz", - "integrity": "sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=", - "dev": true, - "requires": { - "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.23" - } - }, - "postcss-modules-scope": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz", - "integrity": "sha1-1upkmUx5+XtipytCb75gVqGUu5A=", - "dev": true, - "requires": { - "css-selector-tokenizer": "0.7.0", - "postcss": "6.0.23" - } - }, - "postcss-modules-values": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz", - "integrity": "sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=", - "dev": true, - "requires": { - "icss-replace-symbols": "1.1.0", - "postcss": "6.0.23" - } - }, - "postcss-normalize-charset": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz", - "integrity": "sha1-757nEhLX/nWceO0WL2HtYrXLk/E=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-normalize-url": { - "version": "3.0.8", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz", - "integrity": "sha1-EI90s/L82viRov+j6kWSJ5/HgiI=", - "dev": true, - "requires": { - "is-absolute-url": "2.1.0", - "normalize-url": "1.9.1", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-ordered-values": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz", - "integrity": "sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-reduce-idents": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz", - "integrity": "sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=", - "dev": true, - "requires": { - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-reduce-initial": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz", - "integrity": "sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=", - "dev": true, - "requires": { - "postcss": "5.2.18" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-reduce-transforms": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz", - "integrity": "sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=", - "dev": true, - "requires": { - "has": "1.0.3", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-selector-parser": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz", - "integrity": "sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=", - "dev": true, - "requires": { - "flatten": "1.0.2", - "indexes-of": "1.0.1", - "uniq": "1.0.1" - } - }, - "postcss-svgo": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-2.1.6.tgz", - "integrity": "sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=", - "dev": true, - "requires": { - "is-svg": "2.1.0", - "postcss": "5.2.18", - "postcss-value-parser": "3.3.0", - "svgo": "0.7.2" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-unique-selectors": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz", - "integrity": "sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=", - "dev": true, - "requires": { - "alphanum-sort": "1.0.2", - "postcss": "5.2.18", - "uniqs": "2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "postcss-url": { - "version": "7.3.2", - "resolved": "https://registry.npmjs.org/postcss-url/-/postcss-url-7.3.2.tgz", - "integrity": "sha512-QMV5mA+pCYZQcUEPQkmor9vcPQ2MT+Ipuu8qdi1gVxbNiIiErEGft+eny1ak19qALoBkccS5AHaCaCDzh7b9MA==", - "dev": true, - "requires": { - "mime": "1.6.0", - "minimatch": "3.0.4", - "mkdirp": "0.5.1", - "postcss": "6.0.23", - "xxhashjs": "0.2.2" - } - }, - "postcss-value-parser": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz", - "integrity": "sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=", - "dev": true - }, - "postcss-zindex": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/postcss-zindex/-/postcss-zindex-2.2.0.tgz", - "integrity": "sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=", - "dev": true, - "requires": { - "has": "1.0.3", - "postcss": "5.2.18", - "uniqs": "2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz", - "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=", - "dev": true - }, - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", - "dev": true, - "requires": { - "ansi-styles": "2.2.1", - "escape-string-regexp": "1.0.5", - "has-ansi": "2.0.0", - "strip-ansi": "3.0.1", - "supports-color": "2.0.0" - }, - "dependencies": { - "supports-color": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", - "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=", - "dev": true - } - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, - "postcss": { - "version": "5.2.18", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-5.2.18.tgz", - "integrity": "sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==", - "dev": true, - "requires": { - "chalk": "1.1.3", - "js-base64": "2.4.5", - "source-map": "0.5.7", - "supports-color": "3.2.3" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.2.3.tgz", - "integrity": "sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=", - "dev": true, - "requires": { - "has-flag": "1.0.0" - } - } - } - }, - "prepend-http": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz", - "integrity": "sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=", - "dev": true - }, - "preserve": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz", - "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=", - "dev": true - }, - "prettier": { - "version": "1.13.7", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.13.7.tgz", - "integrity": "sha512-KIU72UmYPGk4MujZGYMFwinB7lOf2LsDNGSOC8ufevsrPLISrZbNJlWstRi3m0AMuszbH+EFSQ/r6w56RSPK6w==", - "dev": true - }, - "pretty-error": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.1.tgz", - "integrity": "sha1-X0+HyPkeWuPzuoerTPXgOxoX8aM=", - "dev": true, - "requires": { - "renderkid": "2.0.1", - "utila": "0.4.0" - } - }, - "private": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/private/-/private-0.1.8.tgz", - "integrity": "sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==", - "dev": true - }, - "process": { - "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI=", - "dev": true - }, - "process-nextick-args": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz", - "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==", - "dev": true - }, - "promise-inflight": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha1-mEcocL8igTL8vdhoEputEsPAKeM=", - "dev": true - }, - "proxy-addr": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz", - "integrity": "sha512-jQTChiCJteusULxjBp8+jftSQE5Obdl3k4cnmLA6WXtK6XFuWRnvVL7aCiBqaLPM8c4ph0S4tKna8XvmIwEnXQ==", - "dev": true, - "requires": { - "forwarded": "0.1.2", - "ipaddr.js": "1.6.0" - } - }, - "prr": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz", - "integrity": "sha1-0/wRS6BplaRexok/SEzrHXj19HY=", - "dev": true - }, - "pseudomap": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", - "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=", - "dev": true - }, - "public-encrypt": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/public-encrypt/-/public-encrypt-4.0.2.tgz", - "integrity": "sha512-4kJ5Esocg8X3h8YgJsKAuoesBgB7mqH3eowiDzMUPKiRDDE7E/BqqZD1hnTByIaAFiwAw246YEltSq7tdrOH0Q==", - "dev": true, - "requires": { - "bn.js": "4.11.8", - "browserify-rsa": "4.0.1", - "create-hash": "1.2.0", - "parse-asn1": "5.1.1", - "randombytes": "2.0.6" - } - }, - "pump": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/pump/-/pump-2.0.1.tgz", - "integrity": "sha512-ruPMNRkN3MHP1cWJc9OWr+T/xDP0jhXYCLfJcBuX54hhfIBnaQmAUMfDcG4DM5UMWByBbJY69QSphm3jtDKIkA==", - "dev": true, - "requires": { - "end-of-stream": "1.4.1", - "once": "1.4.0" - } - }, - "pumpify": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/pumpify/-/pumpify-1.5.1.tgz", - "integrity": "sha512-oClZI37HvuUJJxSKKrC17bZ9Cu0ZYhEAGPsPUy9KlMUmv9dKX2o77RUmq7f3XjIxbwyGwYzbzQ1L2Ks8sIradQ==", - "dev": true, - "requires": { - "duplexify": "3.6.0", - "inherits": "2.0.3", - "pump": "2.0.1" - } - }, - "punycode": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true - }, - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", - "dev": true - }, - "qs": { - "version": "6.5.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.1.tgz", - "integrity": "sha512-eRzhrN1WSINYCDCbrz796z37LOe3m5tmW7RQf6oBntukAG1nmovJvhnwHHRMAfeoItc1m2Hk02WER2aQ/iqs+A==", - "dev": true - }, - "query-string": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz", - "integrity": "sha1-u7aTucqRXCMlFbIosaArYJBD2+s=", - "dev": true, - "requires": { - "object-assign": "4.1.1", - "strict-uri-encode": "1.1.0" - } - }, - "querystring": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", - "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", - "dev": true - }, - "querystring-es3": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz", - "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", - "dev": true - }, - "querystringify": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.0.0.tgz", - "integrity": "sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==", - "dev": true - }, - "randomatic": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz", - "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==", - "dev": true, - "requires": { - "is-number": "4.0.0", - "kind-of": "6.0.2", - "math-random": "1.0.1" - }, - "dependencies": { - "is-number": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", - "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==", - "dev": true - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "randombytes": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.6.tgz", - "integrity": "sha512-CIQ5OFxf4Jou6uOKe9t1AOgqpeU5fd70A8NPdHSGeYXqXsPe6peOwI0cUl88RWZ6sP1vPMV3avd/R6cZ5/sP1A==", - "dev": true, - "requires": { - "safe-buffer": "5.1.2" - } - }, - "randomfill": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/randomfill/-/randomfill-1.0.4.tgz", - "integrity": "sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==", - "dev": true, - "requires": { - "randombytes": "2.0.6", - "safe-buffer": "5.1.2" - } - }, - "range-parser": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz", - "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=", - "dev": true - }, - "raw-body": { - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz", - "integrity": "sha1-vNYMd9Prk83gBQKVw/N5OJvIj4k=", - "dev": true, - "requires": { - "bytes": "3.0.0", - "http-errors": "1.6.2", - "iconv-lite": "0.4.19", - "unpipe": "1.0.0" - }, - "dependencies": { - "depd": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz", - "integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k=", - "dev": true - }, - "http-errors": { - "version": "1.6.2", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz", - "integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=", - "dev": true, - "requires": { - "depd": "1.1.1", - "inherits": "2.0.3", - "setprototypeof": "1.0.3", - "statuses": "1.4.0" - } - }, - "setprototypeof": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz", - "integrity": "sha1-ZlZ+NwQ+608E2RvWWMDL77VbjgQ=", - "dev": true - } - } - }, - "read-cache": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", - "integrity": "sha1-5mTvMRYRZsl1HNvo28+GtftY93Q=", - "dev": true, - "requires": { - "pify": "2.3.0" - }, - "dependencies": { - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "read-pkg": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", - "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", - "dev": true, - "requires": { - "load-json-file": "2.0.0", - "normalize-package-data": "2.4.0", - "path-type": "2.0.0" - }, - "dependencies": { - "path-type": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", - "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", - "dev": true, - "requires": { - "pify": "2.3.0" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - } - } - }, - "read-pkg-up": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", - "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", - "dev": true, - "requires": { - "find-up": "2.1.0", - "read-pkg": "2.0.0" - } - }, - "readable-stream": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz", - "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==", - "dev": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.2", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" - } - }, - "readdirp": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz", - "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "minimatch": "3.0.4", - "readable-stream": "2.3.6", - "set-immediate-shim": "1.0.1" - } - }, - "rechoir": { - "version": "0.6.2", - "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", - "integrity": "sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=", - "dev": true, - "requires": { - "resolve": "1.8.1" - } - }, - "redent": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz", - "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=", - "dev": true, - "requires": { - "indent-string": "2.1.0", - "strip-indent": "1.0.1" - } - }, - "reduce-css-calc": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz", - "integrity": "sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=", - "dev": true, - "requires": { - "balanced-match": "0.4.2", - "math-expression-evaluator": "1.2.17", - "reduce-function-call": "1.0.2" - }, - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", - "dev": true - } - } - }, - "reduce-function-call": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/reduce-function-call/-/reduce-function-call-1.0.2.tgz", - "integrity": "sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=", - "dev": true, - "requires": { - "balanced-match": "0.4.2" - }, - "dependencies": { - "balanced-match": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz", - "integrity": "sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=", - "dev": true - } - } - }, - "regenerate": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz", - "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==", - "dev": true - }, - "regenerator-runtime": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", - "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", - "dev": true - }, - "regenerator-transform": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz", - "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==", - "dev": true, - "requires": { - "babel-runtime": "6.26.0", - "babel-types": "6.26.0", - "private": "0.1.8" - } - }, - "regex-cache": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz", - "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==", - "dev": true, - "requires": { - "is-equal-shallow": "0.1.3" - } - }, - "regex-not": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", - "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", - "dev": true, - "requires": { - "extend-shallow": "3.0.2", - "safe-regex": "1.1.0" - } - }, - "regexpu-core": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-2.0.0.tgz", - "integrity": "sha1-SdA4g3uNz4v6W5pCE5k45uoq4kA=", - "dev": true, - "requires": { - "regenerate": "1.4.0", - "regjsgen": "0.2.0", - "regjsparser": "0.1.5" - } - }, - "regjsgen": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.2.0.tgz", - "integrity": "sha1-bAFq3qxVT3WCP+N6wFuS1aTtsfc=", - "dev": true - }, - "regjsparser": { - "version": "0.1.5", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.1.5.tgz", - "integrity": "sha1-fuj4Tcb6eS0/0K4ijSS9lJ6tIFw=", - "dev": true, - "requires": { - "jsesc": "0.5.0" - }, - "dependencies": { - "jsesc": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz", - "integrity": "sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=", - "dev": true - } - } - }, - "relateurl": { - "version": "0.2.7", - "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz", - "integrity": "sha1-VNvzd+UUQKypCkzSdGANP/LYiKk=", - "dev": true - }, - "remove-trailing-separator": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", - "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true - }, - "renderkid": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-2.0.1.tgz", - "integrity": "sha1-iYyr/Ivt5Le5ETWj/9Mj5YwNsxk=", - "dev": true, - "requires": { - "css-select": "1.2.0", - "dom-converter": "0.1.4", - "htmlparser2": "3.3.0", - "strip-ansi": "3.0.1", - "utila": "0.3.3" - }, - "dependencies": { - "utila": { - "version": "0.3.3", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.3.3.tgz", - "integrity": "sha1-1+jn1+MJEHCSsF+NloiCTWM6QiY=", - "dev": true - } - } - }, - "repeat-element": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz", - "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=", - "dev": true - }, - "repeat-string": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", - "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", - "dev": true - }, - "repeating": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz", - "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=", - "dev": true, - "requires": { - "is-finite": "1.0.2" - } - }, - "require-directory": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=", - "dev": true - }, - "require-from-string": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-1.2.1.tgz", - "integrity": "sha1-UpyczvJzgK3+yaL5ZbZJu+5jZBg=", - "dev": true - }, - "require-main-filename": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz", - "integrity": "sha1-l/cXtp1IeE9fUmpsWqj/3aBVpNE=", - "dev": true - }, - "requires-port": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz", - "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", - "dev": true - }, - "resolve": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.8.1.tgz", - "integrity": "sha512-AicPrAC7Qu1JxPCZ9ZgCZlY35QgFnNqc+0LtbRNxnVw4TXvjQ72wnuL9JQcEBgXkI9JM8MsT9kaQoHcpCRJOYA==", - "dev": true, - "requires": { - "path-parse": "1.0.5" - } - }, - "resolve-cwd": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz", - "integrity": "sha1-AKn3OHVW4nA46uIyyqNypqWbZlo=", - "dev": true, - "requires": { - "resolve-from": "3.0.0" - } - }, - "resolve-from": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz", - "integrity": "sha1-six699nWiBvItuZTM17rywoYh0g=", - "dev": true - }, - "resolve-url": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", - "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=", - "dev": true - }, - "restore-cursor": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz", - "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=", - "dev": true, - "requires": { - "onetime": "2.0.1", - "signal-exit": "3.0.2" - } - }, - "ret": { - "version": "0.1.15", - "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", - "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", - "dev": true - }, - "right-align": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz", - "integrity": "sha1-YTObci/mo1FWiSENJOFMlhSGE+8=", - "dev": true, - "requires": { - "align-text": "0.1.4" - } - }, - "rimraf": { - "version": "2.6.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz", - "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==", - "dev": true, - "requires": { - "glob": "7.1.2" - } - }, - "ripemd160": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/ripemd160/-/ripemd160-2.0.2.tgz", - "integrity": "sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==", - "dev": true, - "requires": { - "hash-base": "3.0.4", - "inherits": "2.0.3" - } - }, - "run-queue": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", - "integrity": "sha1-6Eg5bwV9Ij8kOGkkYY4laUFh7Ec=", - "dev": true, - "requires": { - "aproba": "1.2.0" - } - }, - "safe-buffer": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", - "dev": true - }, - "safe-regex": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", - "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", - "dev": true, - "requires": { - "ret": "0.1.15" - } - }, - "sax": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", - "dev": true - }, - "schema-utils": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.3.0.tgz", - "integrity": "sha1-9YdyIs4+kx7a4DnxfrNxbnE3+M8=", - "dev": true, - "requires": { - "ajv": "5.5.2" - } - }, - "select-hose": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=", - "dev": true - }, - "selfsigned": { - "version": "1.10.3", - "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-1.10.3.tgz", - "integrity": "sha512-vmZenZ+8Al3NLHkWnhBQ0x6BkML1eCP2xEi3JE+f3D9wW9fipD9NNJHYtE9XJM4TsPaHGZJIamrSI6MTg1dU2Q==", - "dev": true, - "requires": { - "node-forge": "0.7.5" - } - }, - "semver": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz", - "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==", - "dev": true - }, - "send": { - "version": "0.16.2", - "resolved": "https://registry.npmjs.org/send/-/send-0.16.2.tgz", - "integrity": "sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==", - "dev": true, - "requires": { - "debug": "2.6.9", - "depd": "1.1.2", - "destroy": "1.0.4", - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "etag": "1.8.1", - "fresh": "0.5.2", - "http-errors": "1.6.3", - "mime": "1.4.1", - "ms": "2.0.0", - "on-finished": "2.3.0", - "range-parser": "1.2.0", - "statuses": "1.4.0" - }, - "dependencies": { - "mime": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.4.1.tgz", - "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==", - "dev": true - } - } - }, - "serialize-javascript": { - "version": "1.5.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.5.0.tgz", - "integrity": "sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==", - "dev": true - }, - "serve-index": { - "version": "1.9.1", - "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz", - "integrity": "sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=", - "dev": true, - "requires": { - "accepts": "1.3.5", - "batch": "0.6.1", - "debug": "2.6.9", - "escape-html": "1.0.3", - "http-errors": "1.6.3", - "mime-types": "2.1.18", - "parseurl": "1.3.2" - } - }, - "serve-static": { - "version": "1.13.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.13.2.tgz", - "integrity": "sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==", - "dev": true, - "requires": { - "encodeurl": "1.0.2", - "escape-html": "1.0.3", - "parseurl": "1.3.2", - "send": "0.16.2" - } - }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, - "set-immediate-shim": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", - "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=", - "dev": true - }, - "set-value": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.0.tgz", - "integrity": "sha512-hw0yxk9GT/Hr5yJEYnHNKYXkIA8mVJgd9ditYZCe16ZczcaELYYcfvaXesNACk2O8O0nTiPQcQhGUQj8JLzeeg==", - "dev": true, - "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "split-string": "3.1.0" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - } - } - }, - "setimmediate": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz", - "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=", - "dev": true - }, - "setprototypeof": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", - "dev": true - }, - "sha.js": { - "version": "2.4.11", - "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz", - "integrity": "sha512-QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==", - "dev": true, - "requires": { - "inherits": "2.0.3", - "safe-buffer": "5.1.2" - } - }, - "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", - "dev": true, - "requires": { - "shebang-regex": "1.0.0" - } - }, - "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", - "dev": true - }, - "shelljs": { - "version": "0.7.8", - "resolved": "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz", - "integrity": "sha1-3svPh0sNHl+3LhSxZKloMEjprLM=", - "dev": true, - "requires": { - "glob": "7.1.2", - "interpret": "1.1.0", - "rechoir": "0.6.2" - } - }, - "shellwords": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", - "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", - "dev": true - }, - "signal-exit": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz", - "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=", - "dev": true - }, - "slash": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", - "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", - "dev": true - }, - "snapdragon": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", - "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", - "dev": true, - "requires": { - "base": "0.11.2", - "debug": "2.6.9", - "define-property": "0.2.5", - "extend-shallow": "2.0.1", - "map-cache": "0.2.2", - "source-map": "0.5.7", - "source-map-resolve": "0.5.2", - "use": "3.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - }, - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "snapdragon-node": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", - "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", - "dev": true, - "requires": { - "define-property": "1.0.0", - "isobject": "3.0.1", - "snapdragon-util": "3.0.1" - }, - "dependencies": { - "define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", - "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", - "dev": true, - "requires": { - "is-descriptor": "1.0.2" - } - }, - "is-accessor-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", - "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-data-descriptor": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", - "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - } - }, - "is-descriptor": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", - "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", - "dev": true, - "requires": { - "is-accessor-descriptor": "1.0.0", - "is-data-descriptor": "1.0.0", - "kind-of": "6.0.2" - } - }, - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "snapdragon-util": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", - "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "sockjs": { - "version": "0.3.19", - "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.19.tgz", - "integrity": "sha512-V48klKZl8T6MzatbLlzzRNhMepEys9Y4oGFpypBFFn1gLI/QQ9HtLLyWJNbPlwGLelOVOEijUbTTJeLLI59jLw==", - "dev": true, - "requires": { - "faye-websocket": "0.10.0", - "uuid": "3.3.2" - } - }, - "sockjs-client": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.4.tgz", - "integrity": "sha1-W6vjhrd15M8U51IJEUUmVAFsixI=", - "dev": true, - "requires": { - "debug": "2.6.9", - "eventsource": "0.1.6", - "faye-websocket": "0.11.1", - "inherits": "2.0.3", - "json3": "3.3.2", - "url-parse": "1.4.1" - }, - "dependencies": { - "faye-websocket": { - "version": "0.11.1", - "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.1.tgz", - "integrity": "sha1-8O/hjE9W5PQK/H4Gxxn9XuYYjzg=", - "dev": true, - "requires": { - "websocket-driver": "0.7.0" - } - } - } - }, - "sort-keys": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz", - "integrity": "sha1-RBttTTRnmPG05J6JIK37oOVD+a0=", - "dev": true, - "requires": { - "is-plain-obj": "1.1.0" - } - }, - "source-list-map": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz", - "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==", - "dev": true - }, - "source-map": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", - "dev": true - }, - "source-map-resolve": { - "version": "0.5.2", - "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz", - "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==", - "dev": true, - "requires": { - "atob": "2.1.1", - "decode-uri-component": "0.2.0", - "resolve-url": "0.2.1", - "source-map-url": "0.4.0", - "urix": "0.1.0" - } - }, - "source-map-support": { - "version": "0.4.18", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.4.18.tgz", - "integrity": "sha512-try0/JqxPLF9nOjvSta7tVondkP5dwgyLDjVoyMDlmjugT2lRZ1OfsrYTkCd2hkDnJTKRbO/Rl3orm8vlsUzbA==", - "dev": true, - "requires": { - "source-map": "0.5.7" - }, - "dependencies": { - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - } - } - }, - "source-map-url": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", - "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=", - "dev": true - }, - "spdx-correct": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.0.0.tgz", - "integrity": "sha512-N19o9z5cEyc8yQQPukRCZ9EUmb4HUpnrmaL/fxS2pBo2jbfcFRVuFZ/oFC+vZz0MNNk0h80iMn5/S6qGZOL5+g==", - "dev": true, - "requires": { - "spdx-expression-parse": "3.0.0", - "spdx-license-ids": "3.0.0" - } - }, - "spdx-exceptions": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.1.0.tgz", - "integrity": "sha512-4K1NsmrlCU1JJgUrtgEeTVyfx8VaYea9J9LvARxhbHtVtohPs/gFGG5yy49beySjlIMhhXZ4QqujIZEfS4l6Cg==", - "dev": true - }, - "spdx-expression-parse": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz", - "integrity": "sha512-Yg6D3XpRD4kkOmTpdgbUiEJFKghJH03fiC1OPll5h/0sO6neh2jqRDVHOQ4o/LMea0tgCkbMgea5ip/e+MkWyg==", - "dev": true, - "requires": { - "spdx-exceptions": "2.1.0", - "spdx-license-ids": "3.0.0" - } - }, - "spdx-license-ids": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.0.tgz", - "integrity": "sha512-2+EPwgbnmOIl8HjGBXXMd9NAu02vLjOO1nWw4kmeRDFyHn+M/ETfHxQUK0oXg8ctgVnl9t3rosNVsZ1jG61nDA==", - "dev": true - }, - "spdy": { - "version": "3.4.7", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-3.4.7.tgz", - "integrity": "sha1-Qv9B7OXMD5mjpsKKq7c/XDsDrLw=", - "dev": true, - "requires": { - "debug": "2.6.9", - "handle-thing": "1.2.5", - "http-deceiver": "1.2.7", - "safe-buffer": "5.1.2", - "select-hose": "2.0.0", - "spdy-transport": "2.1.0" - } - }, - "spdy-transport": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-2.1.0.tgz", - "integrity": "sha512-bpUeGpZcmZ692rrTiqf9/2EUakI6/kXX1Rpe0ib/DyOzbiexVfXkw6GnvI9hVGvIwVaUhkaBojjCZwLNRGQg1g==", - "dev": true, - "requires": { - "debug": "2.6.9", - "detect-node": "2.0.3", - "hpack.js": "2.1.6", - "obuf": "1.1.2", - "readable-stream": "2.3.6", - "safe-buffer": "5.1.2", - "wbuf": "1.7.3" - } - }, - "split-string": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", - "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", - "dev": true, - "requires": { - "extend-shallow": "3.0.2" - } - }, - "sprintf-js": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", - "dev": true - }, - "ssri": { - "version": "5.3.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", - "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.2" - } - }, - "stackframe": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz", - "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==", - "dev": true - }, - "static-extend": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", - "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", - "dev": true, - "requires": { - "define-property": "0.2.5", - "object-copy": "0.1.0" - }, - "dependencies": { - "define-property": { - "version": "0.2.5", - "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", - "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", - "dev": true, - "requires": { - "is-descriptor": "0.1.6" - } - } - } - }, - "statuses": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.4.0.tgz", - "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==", - "dev": true - }, - "stream-browserify": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.1.tgz", - "integrity": "sha1-ZiZu5fm9uZQKTkUUyvtDu3Hlyds=", - "dev": true, - "requires": { - "inherits": "2.0.3", - "readable-stream": "2.3.6" - } - }, - "stream-each": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz", - "integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==", - "dev": true, - "requires": { - "end-of-stream": "1.4.1", - "stream-shift": "1.0.0" - } - }, - "stream-http": { - "version": "2.8.3", - "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.8.3.tgz", - "integrity": "sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==", - "dev": true, - "requires": { - "builtin-status-codes": "3.0.0", - "inherits": "2.0.3", - "readable-stream": "2.3.6", - "to-arraybuffer": "1.0.1", - "xtend": "4.0.1" - } - }, - "stream-shift": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/stream-shift/-/stream-shift-1.0.0.tgz", - "integrity": "sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=", - "dev": true - }, - "strict-uri-encode": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz", - "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", - "dev": true - }, - "string-width": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", - "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==", - "dev": true, - "requires": { - "is-fullwidth-code-point": "2.0.0", - "strip-ansi": "4.0.0" - }, - "dependencies": { - "ansi-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz", - "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=", - "dev": true - }, - "strip-ansi": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", - "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=", - "dev": true, - "requires": { - "ansi-regex": "3.0.0" - } - } - } - }, - "string_decoder": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", - "dev": true, - "requires": { - "safe-buffer": "5.1.2" - } - }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-bom": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", - "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", - "dev": true - }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true - }, - "strip-indent": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz", - "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=", - "dev": true, - "requires": { - "get-stdin": "4.0.1" - } - }, - "stylus": { - "version": "0.54.5", - "resolved": "https://registry.npmjs.org/stylus/-/stylus-0.54.5.tgz", - "integrity": "sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=", - "dev": true, - "requires": { - "css-parse": "1.7.0", - "debug": "2.6.9", - "glob": "7.0.6", - "mkdirp": "0.5.1", - "sax": "0.5.8", - "source-map": "0.1.43" - }, - "dependencies": { - "glob": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.0.6.tgz", - "integrity": "sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=", - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "sax": { - "version": "0.5.8", - "resolved": "https://registry.npmjs.org/sax/-/sax-0.5.8.tgz", - "integrity": "sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=", - "dev": true - }, - "source-map": { - "version": "0.1.43", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz", - "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=", - "dev": true, - "requires": { - "amdefine": "1.0.1" - } - } - } - }, - "stylus-loader": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/stylus-loader/-/stylus-loader-3.0.2.tgz", - "integrity": "sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "lodash.clonedeep": "4.5.0", - "when": "3.6.4" - } - }, - "supports-color": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", - "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", - "dev": true, - "requires": { - "has-flag": "3.0.0" - } - }, - "svgo": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-0.7.2.tgz", - "integrity": "sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=", - "dev": true, - "requires": { - "coa": "1.0.4", - "colors": "1.1.2", - "csso": "2.3.2", - "js-yaml": "3.7.0", - "mkdirp": "0.5.1", - "sax": "1.2.4", - "whet.extend": "0.9.9" - } - }, - "tapable": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-0.2.8.tgz", - "integrity": "sha1-mTcqXJmb8t8WCvwNdL7U9HlIzSI=", - "dev": true - }, - "through2": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.3.tgz", - "integrity": "sha1-AARWmzfHx0ujnEPzzteNGtlBQL4=", - "dev": true, - "requires": { - "readable-stream": "2.3.6", - "xtend": "4.0.1" - } - }, - "thunky": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.0.2.tgz", - "integrity": "sha1-qGLgGOP7HqLsP85dVWBc9X8kc3E=", - "dev": true - }, - "time-stamp": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/time-stamp/-/time-stamp-2.0.0.tgz", - "integrity": "sha1-lcakRTDhW6jW9KPsuMOj+sRto1c=", - "dev": true - }, - "timers-browserify": { - "version": "2.0.10", - "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.10.tgz", - "integrity": "sha512-YvC1SV1XdOUaL6gx5CoGroT3Gu49pK9+TZ38ErPldOWW4j49GI1HKs9DV+KGq/w6y+LZ72W1c8cKz2vzY+qpzg==", - "dev": true, - "requires": { - "setimmediate": "1.0.5" - } - }, - "to-arraybuffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz", - "integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M=", - "dev": true - }, - "to-fast-properties": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz", - "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc=", - "dev": true - }, - "to-object-path": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", - "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", - "dev": true, - "requires": { - "kind-of": "3.2.2" - } - }, - "to-regex": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", - "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", - "dev": true, - "requires": { - "define-property": "2.0.2", - "extend-shallow": "3.0.2", - "regex-not": "1.0.2", - "safe-regex": "1.1.0" - } - }, - "to-regex-range": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", - "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", - "dev": true, - "requires": { - "is-number": "3.0.0", - "repeat-string": "1.6.1" - } - }, - "toposort": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/toposort/-/toposort-1.0.7.tgz", - "integrity": "sha1-LmhELZ9k7HILjMieZEOsbKqVACk=", - "dev": true - }, - "trim-newlines": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz", - "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=", - "dev": true - }, - "trim-right": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", - "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", - "dev": true - }, - "tryer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tryer/-/tryer-1.0.1.tgz", - "integrity": "sha512-c3zayb8/kWWpycWYg87P71E1S1ZL6b6IJxfb5fvsUgsf0S2MVGaDhDXXjDMpdCpfWXqptc+4mXwmiy1ypXqRAA==", - "dev": true - }, - "tty-browserify": { - "version": "0.0.0", - "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz", - "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", - "dev": true - }, - "type-is": { - "version": "1.6.16", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz", - "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==", - "dev": true, - "requires": { - "media-typer": "0.3.0", - "mime-types": "2.1.18" - } - }, - "typedarray": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz", - "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=", - "dev": true - }, - "uglify-js": { - "version": "3.4.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.3.tgz", - "integrity": "sha512-RbOgGjF04sFUNSi8xGOTB9AmtVmMmVVAL5a7lxIgJ8urejJen+priq0ooRIHHa8AXI/dSvNF9yYMz9OP4PhybQ==", - "dev": true, - "requires": { - "commander": "2.16.0", - "source-map": "0.6.1" - } - }, - "uglify-to-browserify": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz", - "integrity": "sha1-bgkk1r2mta/jSeOabWMoUKD4grc=", - "dev": true, - "optional": true - }, - "uglifyjs-webpack-plugin": { - "version": "1.2.7", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz", - "integrity": "sha512-1VicfKhCYHLS8m1DCApqBhoulnASsEoJ/BvpUpP4zoNAPpKzdH+ghk0olGJMmwX2/jprK2j3hAHdUbczBSy2FA==", - "dev": true, - "requires": { - "cacache": "10.0.4", - "find-cache-dir": "1.0.0", - "schema-utils": "0.4.5", - "serialize-javascript": "1.5.0", - "source-map": "0.6.1", - "uglify-es": "3.3.9", - "webpack-sources": "1.1.0", - "worker-farm": "1.6.0" - }, - "dependencies": { - "ajv": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", - "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "commander": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.13.0.tgz", - "integrity": "sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==", - "dev": true - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "schema-utils": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-0.4.5.tgz", - "integrity": "sha512-yYrjb9TX2k/J1Y5UNy3KYdZq10xhYcF8nMpAW6o3hy6Q8WSIEf9lJHG/ePnOBfziPM3fvQwfOwa13U/Fh8qTfA==", - "dev": true, - "requires": { - "ajv": "6.5.2", - "ajv-keywords": "3.2.0" - } - }, - "uglify-es": { - "version": "3.3.9", - "resolved": "https://registry.npmjs.org/uglify-es/-/uglify-es-3.3.9.tgz", - "integrity": "sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==", - "dev": true, - "requires": { - "commander": "2.13.0", - "source-map": "0.6.1" - } - } - } - }, - "union-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.0.tgz", - "integrity": "sha1-XHHDTLW61dzr4+oM0IIHulqhrqQ=", - "dev": true, - "requires": { - "arr-union": "3.1.0", - "get-value": "2.0.6", - "is-extendable": "0.1.1", - "set-value": "0.4.3" - }, - "dependencies": { - "extend-shallow": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", - "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", - "dev": true, - "requires": { - "is-extendable": "0.1.1" - } - }, - "set-value": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/set-value/-/set-value-0.4.3.tgz", - "integrity": "sha1-fbCPnT0i3H945Trzw79GZuzfzPE=", - "dev": true, - "requires": { - "extend-shallow": "2.0.1", - "is-extendable": "0.1.1", - "is-plain-object": "2.0.4", - "to-object-path": "0.3.0" - } - } - } - }, - "uniq": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz", - "integrity": "sha1-sxxa6CVIRKOoKBVBzisEuGWnNP8=", - "dev": true - }, - "uniqs": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz", - "integrity": "sha1-/+3ks2slKQaW5uFl1KWe25mOawI=", - "dev": true - }, - "unique-filename": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.0.tgz", - "integrity": "sha1-0F8v5AMlYIcfMOk8vnNe6iAVFPM=", - "dev": true, - "requires": { - "unique-slug": "2.0.0" - } - }, - "unique-slug": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.0.tgz", - "integrity": "sha1-22Z258fMBimHj/GWCXx4hVrp9Ks=", - "dev": true, - "requires": { - "imurmurhash": "0.1.4" - } - }, - "unpipe": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=", - "dev": true - }, - "unset-value": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", - "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", - "dev": true, - "requires": { - "has-value": "0.3.1", - "isobject": "3.0.1" - }, - "dependencies": { - "has-value": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", - "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", - "dev": true, - "requires": { - "get-value": "2.0.6", - "has-values": "0.1.4", - "isobject": "2.1.0" - }, - "dependencies": { - "isobject": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", - "dev": true, - "requires": { - "isarray": "1.0.0" - } - } - } - }, - "has-values": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", - "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=", - "dev": true - } - } - }, - "upath": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.0.tgz", - "integrity": "sha512-bzpH/oBhoS/QI/YtbkqCg6VEiPYjSZtrHQM6/QnJS6OL9pKUFLqb3aFh4Scvwm45+7iAgiMkLhSbaZxUqmrprw==", - "dev": true - }, - "upper-case": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz", - "integrity": "sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg=", - "dev": true - }, - "uri-js": { - "version": "4.2.2", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", - "integrity": "sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ==", - "dev": true, - "requires": { - "punycode": "2.1.1" - } - }, - "urix": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", - "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=", - "dev": true - }, - "url": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", - "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", - "dev": true, - "requires": { - "punycode": "1.3.2", - "querystring": "0.2.0" - }, - "dependencies": { - "punycode": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", - "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", - "dev": true - } - } - }, - "url-loader": { - "version": "0.5.9", - "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz", - "integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==", - "dev": true, - "requires": { - "loader-utils": "1.1.0", - "mime": "1.3.6" - }, - "dependencies": { - "mime": { - "version": "1.3.6", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.3.6.tgz", - "integrity": "sha1-WR2E02U6awtKO5343lqoEI5y5eA=", - "dev": true - } - } - }, - "url-parse": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.1.tgz", - "integrity": "sha512-x95Td74QcvICAA0+qERaVkRpTGKyBHHYdwL2LXZm5t/gBtCB9KQSO/0zQgSTYEV1p0WcvSg79TLNPSvd5IDJMQ==", - "dev": true, - "requires": { - "querystringify": "2.0.0", - "requires-port": "1.0.0" - } - }, - "use": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/use/-/use-3.1.0.tgz", - "integrity": "sha512-6UJEQM/L+mzC3ZJNM56Q4DFGLX/evKGRg15UJHGB9X5j5Z3AFbgZvjUh2yq/UJUY4U5dh7Fal++XbNg1uzpRAw==", - "dev": true, - "requires": { - "kind-of": "6.0.2" - }, - "dependencies": { - "kind-of": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz", - "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==", - "dev": true - } - } - }, - "util": { - "version": "0.10.4", - "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz", - "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==", - "dev": true, - "requires": { - "inherits": "2.0.3" - } - }, - "util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=", - "dev": true - }, - "utila": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz", - "integrity": "sha1-ihagXURWV6Oupe7MWxKk+lN5dyw=", - "dev": true - }, - "utils-merge": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=", - "dev": true - }, - "uuid": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz", - "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==", - "dev": true - }, - "validate-npm-package-license": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.3.tgz", - "integrity": "sha512-63ZOUnL4SIXj4L0NixR3L1lcjO38crAbgrTpl28t8jjrfuiOBL5Iygm+60qPs/KsZGzPNg6Smnc/oY16QTjF0g==", - "dev": true, - "requires": { - "spdx-correct": "3.0.0", - "spdx-expression-parse": "3.0.0" - } - }, - "vary": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", - "dev": true - }, - "vendors": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz", - "integrity": "sha512-w/hry/368nO21AN9QljsaIhb9ZiZtZARoVH5f3CsFbawdLdayCgKRPup7CggujvySMxx0I91NOyxdVENohprLQ==", - "dev": true - }, - "vm-browserify": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz", - "integrity": "sha1-XX6kW7755Kb/ZflUOOCofDV9WnM=", - "dev": true, - "requires": { - "indexof": "0.0.1" - } - }, - "vue": { - "version": "2.5.16", - "resolved": "https://registry.npmjs.org/vue/-/vue-2.5.16.tgz", - "integrity": "sha512-/ffmsiVuPC8PsWcFkZngdpas19ABm5mh2wA7iDqcltyCTwlgZjHGeJYOXkBMo422iPwIcviOtrTCUpSfXmToLQ==" - }, - "vue-hot-reload-api": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.0.tgz", - "integrity": "sha512-2j/t+wIbyVMP5NvctQoSUvLkYKoWAAk2QlQiilrM2a6/ulzFgdcLUJfTvs4XQ/3eZhHiBmmEojbjmM4AzZj8JA==", - "dev": true - }, - "vue-loader": { - "version": "13.7.2", - "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-13.7.2.tgz", - "integrity": "sha512-pgFWFsUjYO1v+J+3r7K0Q4lCp0eOyI24/q9j+cCudWyCTjgpjpcAa1MdwjlDUUettt9xkkUBbQ9fkAN1NC8t9w==", - "dev": true, - "requires": { - "consolidate": "0.14.5", - "hash-sum": "1.0.2", - "loader-utils": "1.1.0", - "lru-cache": "4.1.3", - "postcss": "6.0.23", - "postcss-load-config": "1.2.0", - "postcss-selector-parser": "2.2.3", - "prettier": "1.13.7", - "resolve": "1.8.1", - "source-map": "0.6.1", - "vue-hot-reload-api": "2.3.0", - "vue-style-loader": "3.1.2", - "vue-template-es2015-compiler": "1.6.0" - } - }, - "vue-router": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.0.1.tgz", - "integrity": "sha512-vLLoY452L+JBpALMP5UHum9+7nzR9PeIBCghU9ZtJ1eWm6ieUI8Zb/DI3MYxH32bxkjzYV1LRjNv4qr8d+uX/w==" - }, - "vue-style-loader": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-3.1.2.tgz", - "integrity": "sha512-ICtVdK/p+qXWpdSs2alWtsXt9YnDoYjQe0w5616j9+/EhjoxZkbun34uWgsMFnC1MhrMMwaWiImz3K2jK1Yp2Q==", - "dev": true, - "requires": { - "hash-sum": "1.0.2", - "loader-utils": "1.1.0" - } - }, - "vue-template-compiler": { - "version": "2.5.16", - "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.5.16.tgz", - "integrity": "sha512-ZbuhCcF/hTYmldoUOVcu2fcbeSAZnfzwDskGduOrnjBiIWHgELAd+R8nAtX80aZkceWDKGQ6N9/0/EUpt+l22A==", - "dev": true, - "requires": { - "de-indent": "1.0.2", - "he": "1.1.1" - } - }, - "vue-template-es2015-compiler": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.6.0.tgz", - "integrity": "sha512-x3LV3wdmmERhVCYy3quqA57NJW7F3i6faas++pJQWtknWT+n7k30F4TVdHvCLn48peTJFRvCpxs3UuFPqgeELg==", - "dev": true - }, - "watchpack": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz", - "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==", - "dev": true, - "requires": { - "chokidar": "2.0.4", - "graceful-fs": "4.1.11", - "neo-async": "2.5.1" - } - }, - "wbuf": { - "version": "1.7.3", - "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", - "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", - "dev": true, - "requires": { - "minimalistic-assert": "1.0.1" - } - }, - "webpack": { - "version": "3.12.0", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-3.12.0.tgz", - "integrity": "sha512-Sw7MdIIOv/nkzPzee4o0EdvCuPmxT98+vVpIvwtcwcF1Q4SDSNp92vwcKc4REe7NItH9f1S4ra9FuQ7yuYZ8bQ==", - "dev": true, - "requires": { - "acorn": "5.7.1", - "acorn-dynamic-import": "2.0.2", - "ajv": "6.5.2", - "ajv-keywords": "3.2.0", - "async": "2.6.1", - "enhanced-resolve": "3.4.1", - "escope": "3.6.0", - "interpret": "1.1.0", - "json-loader": "0.5.7", - "json5": "0.5.1", - "loader-runner": "2.3.0", - "loader-utils": "1.1.0", - "memory-fs": "0.4.1", - "mkdirp": "0.5.1", - "node-libs-browser": "2.1.0", - "source-map": "0.5.7", - "supports-color": "4.5.0", - "tapable": "0.2.8", - "uglifyjs-webpack-plugin": "0.4.6", - "watchpack": "1.6.0", - "webpack-sources": "1.1.0", - "yargs": "8.0.2" - }, - "dependencies": { - "ajv": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.5.2.tgz", - "integrity": "sha512-hOs7GfvI6tUI1LfZddH82ky6mOMyTuY0mk7kE2pWpmhhUSkumzaTO5vbVwij39MdwPQWCV4Zv57Eo06NtL/GVA==", - "dev": true, - "requires": { - "fast-deep-equal": "2.0.1", - "fast-json-stable-stringify": "2.0.0", - "json-schema-traverse": "0.4.1", - "uri-js": "4.2.2" - } - }, - "fast-deep-equal": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz", - "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", - "dev": true - }, - "has-flag": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-2.0.0.tgz", - "integrity": "sha1-6CB68cx7MNRGzHC3NLXovhj4jVE=", - "dev": true - }, - "json-schema-traverse": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", - "dev": true - }, - "source-map": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", - "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", - "dev": true - }, - "supports-color": { - "version": "4.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.5.0.tgz", - "integrity": "sha1-vnoN5ITexcXN34s9WRJQRJEvY1s=", - "dev": true, - "requires": { - "has-flag": "2.0.0" - } - }, - "uglify-js": { - "version": "2.8.29", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.29.tgz", - "integrity": "sha1-KcVzMUgFe7Th913zW3qcty5qWd0=", - "dev": true, - "requires": { - "source-map": "0.5.7", - "uglify-to-browserify": "1.0.2", - "yargs": "3.10.0" - }, - "dependencies": { - "yargs": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz", - "integrity": "sha1-9+572FfdfB0tOMDnTvvWgdFDH9E=", - "dev": true, - "requires": { - "camelcase": "1.2.1", - "cliui": "2.1.0", - "decamelize": "1.2.0", - "window-size": "0.1.0" - } - } - } - }, - "uglifyjs-webpack-plugin": { - "version": "0.4.6", - "resolved": "https://registry.npmjs.org/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-0.4.6.tgz", - "integrity": "sha1-uVH0q7a9YX5m9j64kUmOORdj4wk=", - "dev": true, - "requires": { - "source-map": "0.5.7", - "uglify-js": "2.8.29", - "webpack-sources": "1.1.0" - } - } - } - }, - "webpack-bundle-analyzer": { - "version": "2.13.1", - "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz", - "integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==", - "dev": true, - "requires": { - "acorn": "5.7.1", - "bfj-node4": "5.3.1", - "chalk": "2.4.1", - "commander": "2.16.0", - "ejs": "2.6.1", - "express": "4.16.3", - "filesize": "3.6.1", - "gzip-size": "4.1.0", - "lodash": "4.17.10", - "mkdirp": "0.5.1", - "opener": "1.4.3", - "ws": "4.1.0" - } - }, - "webpack-dev-middleware": { - "version": "1.12.2", - "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-1.12.2.tgz", - "integrity": "sha512-FCrqPy1yy/sN6U/SaEZcHKRXGlqU0DUaEBL45jkUYoB8foVb6wCnbIJ1HKIx+qUFTW+3JpVcCJCxZ8VATL4e+A==", - "dev": true, - "requires": { - "memory-fs": "0.4.1", - "mime": "1.6.0", - "path-is-absolute": "1.0.1", - "range-parser": "1.2.0", - "time-stamp": "2.0.0" - } - }, - "webpack-dev-server": { - "version": "2.11.2", - "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-2.11.2.tgz", - "integrity": "sha512-zrPoX97bx47vZiAXfDrkw8pe9QjJ+lunQl3dypojyWwWr1M5I2h0VSrMPfTjopHQPRNn+NqfjcMmhoLcUJe2gA==", - "dev": true, - "requires": { - "ansi-html": "0.0.7", - "array-includes": "3.0.3", - "bonjour": "3.5.0", - "chokidar": "2.0.4", - "compression": "1.7.2", - "connect-history-api-fallback": "1.5.0", - "debug": "3.1.0", - "del": "3.0.0", - "express": "4.16.3", - "html-entities": "1.2.1", - "http-proxy-middleware": "0.17.4", - "import-local": "1.0.0", - "internal-ip": "1.2.0", - "ip": "1.1.5", - "killable": "1.0.0", - "loglevel": "1.6.1", - "opn": "5.3.0", - "portfinder": "1.0.13", - "selfsigned": "1.10.3", - "serve-index": "1.9.1", - "sockjs": "0.3.19", - "sockjs-client": "1.1.4", - "spdy": "3.4.7", - "strip-ansi": "3.0.1", - "supports-color": "5.4.0", - "webpack-dev-middleware": "1.12.2", - "yargs": "6.6.0" - }, - "dependencies": { - "camelcase": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz", - "integrity": "sha1-MvxLn82vhF/N9+c7uXysImHwqwo=", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - } - }, - "debug": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", - "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "find-up": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz", - "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=", - "dev": true, - "requires": { - "path-exists": "2.1.0", - "pinkie-promise": "2.0.1" - } - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "load-json-file": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz", - "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "parse-json": "2.2.0", - "pify": "2.3.0", - "pinkie-promise": "2.0.1", - "strip-bom": "2.0.0" - } - }, - "os-locale": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz", - "integrity": "sha1-IPnxeuKe00XoveWDsT0gCYA8FNk=", - "dev": true, - "requires": { - "lcid": "1.0.0" - } - }, - "path-exists": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz", - "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=", - "dev": true, - "requires": { - "pinkie-promise": "2.0.1" - } - }, - "path-type": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz", - "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=", - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "pify": "2.3.0", - "pinkie-promise": "2.0.1" - } - }, - "pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", - "dev": true - }, - "read-pkg": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz", - "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=", - "dev": true, - "requires": { - "load-json-file": "1.1.0", - "normalize-package-data": "2.4.0", - "path-type": "1.1.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz", - "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=", - "dev": true, - "requires": { - "find-up": "1.1.2", - "read-pkg": "1.1.0" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "strip-bom": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz", - "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=", - "dev": true, - "requires": { - "is-utf8": "0.2.1" - } - }, - "which-module": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz", - "integrity": "sha1-u6Y8qGGUiZT/MHc2CJ47lgJsKk8=", - "dev": true - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - }, - "yargs": { - "version": "6.6.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz", - "integrity": "sha1-eC7CHvQDNF+DCoCMo9UTr1YGUgg=", - "dev": true, - "requires": { - "camelcase": "3.0.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "1.4.0", - "read-pkg-up": "1.0.1", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "1.0.2", - "which-module": "1.0.0", - "y18n": "3.2.1", - "yargs-parser": "4.2.1" - } - }, - "yargs-parser": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz", - "integrity": "sha1-KczqwNxPA8bIe0qfIX3RjJ90hxw=", - "dev": true, - "requires": { - "camelcase": "3.0.0" - } - } - } - }, - "webpack-merge": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-4.1.3.tgz", - "integrity": "sha512-zxwAIGK7nKdu5CIZL0BjTQoq3elV0t0MfB7rUC1zj668geid52abs6hN/ACwZdK6LeMS8dC9B6WmtF978zH5mg==", - "dev": true, - "requires": { - "lodash": "4.17.10" - } - }, - "webpack-sources": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.1.0.tgz", - "integrity": "sha512-aqYp18kPphgoO5c/+NaUvEeACtZjMESmDChuD3NBciVpah3XpMEU9VAAtIaB1BsfJWWTSdv8Vv1m3T0aRk2dUw==", - "dev": true, - "requires": { - "source-list-map": "2.0.0", - "source-map": "0.6.1" - } - }, - "websocket-driver": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.0.tgz", - "integrity": "sha1-DK+dLXVdk67gSdS90NP+LMoqJOs=", - "dev": true, - "requires": { - "http-parser-js": "0.4.13", - "websocket-extensions": "0.1.3" - } - }, - "websocket-extensions": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.3.tgz", - "integrity": "sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==", - "dev": true - }, - "when": { - "version": "3.6.4", - "resolved": "https://registry.npmjs.org/when/-/when-3.6.4.tgz", - "integrity": "sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=", - "dev": true - }, - "whet.extend": { - "version": "0.9.9", - "resolved": "https://registry.npmjs.org/whet.extend/-/whet.extend-0.9.9.tgz", - "integrity": "sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=", - "dev": true - }, - "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", - "dev": true, - "requires": { - "isexe": "2.0.0" - } - }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, - "window-size": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz", - "integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=", - "dev": true - }, - "wordwrap": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz", - "integrity": "sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=", - "dev": true - }, - "worker-farm": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/worker-farm/-/worker-farm-1.6.0.tgz", - "integrity": "sha512-6w+3tHbM87WnSWnENBUvA2pxJPLhQUg5LKwUQHq3r+XPhIM+Gh2R5ycbwPCyuGbNg+lPgdcnQUhuC02kJCvffQ==", - "dev": true, - "requires": { - "errno": "0.1.7" - } - }, - "wrap-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz", - "integrity": "sha1-2Pw9KE3QV5T+hJc8rs3Rz4JP3YU=", - "dev": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1" - }, - "dependencies": { - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - } - } - }, - "wrappy": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true - }, - "ws": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz", - "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==", - "dev": true, - "requires": { - "async-limiter": "1.0.0", - "safe-buffer": "5.1.2" - } - }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true - }, - "xxhashjs": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/xxhashjs/-/xxhashjs-0.2.2.tgz", - "integrity": "sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==", - "dev": true, - "requires": { - "cuint": "0.2.2" - } - }, - "y18n": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz", - "integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==", - "dev": true - }, - "yallist": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", - "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=", - "dev": true - }, - "yargs": { - "version": "8.0.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-8.0.2.tgz", - "integrity": "sha1-YpmpBVsc78lp/355wdkY3Osiw2A=", - "dev": true, - "requires": { - "camelcase": "4.1.0", - "cliui": "3.2.0", - "decamelize": "1.2.0", - "get-caller-file": "1.0.2", - "os-locale": "2.1.0", - "read-pkg-up": "2.0.0", - "require-directory": "2.1.1", - "require-main-filename": "1.0.1", - "set-blocking": "2.0.0", - "string-width": "2.1.1", - "which-module": "2.0.0", - "y18n": "3.2.1", - "yargs-parser": "7.0.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - }, - "cliui": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz", - "integrity": "sha1-EgYBU3qRbSmUD5NNo7SNWFo5IT0=", - "dev": true, - "requires": { - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wrap-ansi": "2.1.0" - }, - "dependencies": { - "string-width": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz", - "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=", - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - } - } - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz", - "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=", - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "y18n": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz", - "integrity": "sha1-bRX7qITAhnnA136I53WegR4H+kE=", - "dev": true - } - } - }, - "yargs-parser": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz", - "integrity": "sha1-jQrELxbqVd69MyyvTEA4s+P139k=", - "dev": true, - "requires": { - "camelcase": "4.1.0" - }, - "dependencies": { - "camelcase": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz", - "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=", - "dev": true - } - } - } - } -} diff --git a/jobx-webapp/package.json b/jobx-webapp/package.json deleted file mode 100644 index bfde3720..00000000 --- a/jobx-webapp/package.json +++ /dev/null @@ -1,66 +0,0 @@ -{ - "name": "jobx-webapp", - "version": "1.0.0", - "description": "jobx's webUI ", - "author": "benjobs", - "private": true, - "scripts": { - "dev": "webpack-dev-server --inline --progress --config build/webpack.dev.conf.js", - "start": "npm run dev", - "build": "node build/build.js" - }, - "dependencies": { - "vue": "^2.5.2", - "vue-router": "^3.0.1" - }, - "devDependencies": { - "autoprefixer": "^7.1.2", - "babel-core": "^6.22.1", - "babel-helper-vue-jsx-merge-props": "^2.0.3", - "babel-loader": "^7.1.4", - "babel-plugin-syntax-jsx": "^6.18.0", - "babel-plugin-transform-runtime": "^6.22.0", - "babel-plugin-transform-vue-jsx": "^3.5.0", - "babel-preset-env": "^1.3.2", - "babel-preset-stage-2": "^6.22.0", - "chalk": "^2.0.1", - "copy-webpack-plugin": "^4.0.1", - "css-loader": "^0.28.11", - "extract-text-webpack-plugin": "^3.0.0", - "file-loader": "^1.1.4", - "friendly-errors-webpack-plugin": "^1.6.1", - "html-webpack-plugin": "^2.30.1", - "jquery": "^3.3.1", - "node-notifier": "^5.1.2", - "optimize-css-assets-webpack-plugin": "^3.2.0", - "ora": "^1.2.0", - "portfinder": "^1.0.13", - "postcss-import": "^11.0.0", - "postcss-loader": "^2.0.8", - "postcss-url": "^7.2.1", - "rimraf": "^2.6.0", - "semver": "^5.3.0", - "shelljs": "^0.7.6", - "stylus": "^0.54.5", - "stylus-loader": "^3.0.2", - "uglifyjs-webpack-plugin": "^1.1.1", - "url-loader": "^0.5.8", - "vue": "^2.5.16", - "vue-loader": "^13.7.2", - "vue-style-loader": "^3.0.1", - "vue-template-compiler": "^2.5.2", - "webpack": "^3.6.0", - "webpack-bundle-analyzer": "^2.9.0", - "webpack-dev-server": "^2.9.1", - "webpack-merge": "^4.1.0" - }, - "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" - }, - "browserslist": [ - "> 1%", - "last 2 versions", - "not ie <= 8" - ] -} diff --git a/jobx-webapp/src/App.vue b/jobx-webapp/src/App.vue deleted file mode 100644 index 5e162c34..00000000 --- a/jobx-webapp/src/App.vue +++ /dev/null @@ -1,33 +0,0 @@ - - - - - diff --git a/jobx-webapp/src/assets/logo.png b/jobx-webapp/src/assets/logo.png deleted file mode 100644 index f3d2503fc2a44b5053b0837ebea6e87a2d339a43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6849 zcmaKRcUV(fvo}bjDT-7nLI_nlK}sT_69H+`qzVWDA|yaU?}j417wLi^B1KB1SLsC& zL0ag7$U(XW5YR7p&Ux?sP$d4lvMt8C^+TcQu4F zQqv!UF!I+kw)c0jhd6+g6oCr9P?7)?!qX1ui*iL{p}sKCAGuJ{{W)0z1pLF|=>h}& zt(2Lr0Z`2ig8<5i%Zk}cO5Fm=LByqGWaS`oqChZdEFmc`0hSb#gg|Aap^{+WKOYcj zHjINK)KDG%&s?Mt4CL(T=?;~U@bU2x_mLKN!#GJuK_CzbNw5SMEJorG!}_5;?R>@1 zSl)jns3WlU7^J%=(hUtfmuUCU&C3%8B5C^f5>W2Cy8jW3#{Od{lF1}|?c61##3dzA zsPlFG;l_FzBK}8>|H_Ru_H#!_7$UH4UKo3lKOA}g1(R&|e@}GINYVzX?q=_WLZCgh z)L|eJMce`D0EIwgRaNETDsr+?vQknSGAi=7H00r`QnI%oQnFxm`G2umXso9l+8*&Q z7WqF|$p49js$mdzo^BXpH#gURy=UO;=IMrYc5?@+sR4y_?d*~0^YP7d+y0{}0)zBM zIKVM(DBvICK#~7N0a+PY6)7;u=dutmNqK3AlsrUU9U`d;msiucB_|8|2kY=(7XA;G zwDA8AR)VCA#JOkxm#6oHNS^YVuOU;8p$N)2{`;oF|rQ?B~K$%rHDxXs+_G zF5|-uqHZvSzq}L;5Kcy_P+x0${33}Ofb6+TX&=y;;PkEOpz%+_bCw_{<&~ zeLV|!bP%l1qxywfVr9Z9JI+++EO^x>ZuCK);=$VIG1`kxK8F2M8AdC$iOe3cj1fo(ce4l-9 z7*zKy3={MixvUk=enQE;ED~7tv%qh&3lR<0m??@w{ILF|e#QOyPkFYK!&Up7xWNtL zOW%1QMC<3o;G9_S1;NkPB6bqbCOjeztEc6TsBM<(q9((JKiH{01+Ud=uw9B@{;(JJ z-DxI2*{pMq`q1RQc;V8@gYAY44Z!%#W~M9pRxI(R?SJ7sy7em=Z5DbuDlr@*q|25V)($-f}9c#?D%dU^RS<(wz?{P zFFHtCab*!rl(~j@0(Nadvwg8q|4!}L^>d?0al6}Rrv9$0M#^&@zjbfJy_n!%mVHK4 z6pLRIQ^Uq~dnyy$`ay51Us6WaP%&O;@49m&{G3z7xV3dLtt1VTOMYl3UW~Rm{Eq4m zF?Zl_v;?7EFx1_+#WFUXxcK78IV)FO>42@cm@}2I%pVbZqQ}3;p;sDIm&knay03a^ zn$5}Q$G!@fTwD$e(x-~aWP0h+4NRz$KlnO_H2c< z(XX#lPuW_%H#Q+c&(nRyX1-IadKR-%$4FYC0fsCmL9ky3 zKpxyjd^JFR+vg2!=HWf}2Z?@Td`0EG`kU?{8zKrvtsm)|7>pPk9nu@2^z96aU2<#` z2QhvH5w&V;wER?mopu+nqu*n8p~(%QkwSs&*0eJwa zMXR05`OSFpfyRb!Y_+H@O%Y z0=K^y6B8Gcbl?SA)qMP3Z+=C(?8zL@=74R=EVnE?vY!1BQy2@q*RUgRx4yJ$k}MnL zs!?74QciNb-LcG*&o<9=DSL>1n}ZNd)w1z3-0Pd^4ED1{qd=9|!!N?xnXjM!EuylY z5=!H>&hSofh8V?Jofyd!h`xDI1fYAuV(sZwwN~{$a}MX^=+0TH*SFp$vyxmUv7C*W zv^3Gl0+eTFgBi3FVD;$nhcp)ka*4gSskYIqQ&+M}xP9yLAkWzBI^I%zR^l1e?bW_6 zIn{mo{dD=)9@V?s^fa55jh78rP*Ze<3`tRCN4*mpO$@7a^*2B*7N_|A(Ve2VB|)_o z$=#_=aBkhe(ifX}MLT()@5?OV+~7cXC3r!%{QJxriXo9I%*3q4KT4Xxzyd{ z9;_%=W%q!Vw$Z7F3lUnY+1HZ*lO;4;VR2+i4+D(m#01OYq|L_fbnT;KN<^dkkCwtd zF7n+O7KvAw8c`JUh6LmeIrk4`F3o|AagKSMK3))_5Cv~y2Bb2!Ibg9BO7Vkz?pAYX zoI=B}+$R22&IL`NCYUYjrdhwjnMx_v=-Qcx-jmtN>!Zqf|n1^SWrHy zK|MwJ?Z#^>)rfT5YSY{qjZ&`Fjd;^vv&gF-Yj6$9-Dy$<6zeP4s+78gS2|t%Z309b z0^fp~ue_}i`U9j!<|qF92_3oB09NqgAoehQ`)<)dSfKoJl_A6Ec#*Mx9Cpd-p#$Ez z={AM*r-bQs6*z$!*VA4|QE7bf@-4vb?Q+pPKLkY2{yKsw{&udv_2v8{Dbd zm~8VAv!G~s)`O3|Q6vFUV%8%+?ZSVUa(;fhPNg#vab@J*9XE4#D%)$UU-T5`fwjz! z6&gA^`OGu6aUk{l*h9eB?opVdrHK>Q@U>&JQ_2pR%}TyOXGq_6s56_`U(WoOaAb+K zXQr#6H}>a-GYs9^bGP2Y&hSP5gEtW+GVC4=wy0wQk=~%CSXj=GH6q z-T#s!BV`xZVxm{~jr_ezYRpqqIcXC=Oq`b{lu`Rt(IYr4B91hhVC?yg{ol4WUr3v9 zOAk2LG>CIECZ-WIs0$N}F#eoIUEtZudc7DPYIjzGqDLWk_A4#(LgacooD z2K4IWs@N`Bddm-{%oy}!k0^i6Yh)uJ1S*90>|bm3TOZxcV|ywHUb(+CeX-o1|LTZM zwU>dY3R&U)T(}5#Neh?-CWT~@{6Ke@sI)uSuzoah8COy)w)B)aslJmp`WUcjdia-0 zl2Y}&L~XfA`uYQboAJ1;J{XLhYjH){cObH3FDva+^8ioOQy%Z=xyjGLmWMrzfFoH; zEi3AG`_v+%)&lDJE;iJWJDI@-X9K5O)LD~j*PBe(wu+|%ar~C+LK1+-+lK=t# z+Xc+J7qp~5q=B~rD!x78)?1+KUIbYr^5rcl&tB-cTtj+e%{gpZZ4G~6r15+d|J(ky zjg@@UzMW0k9@S#W(1H{u;Nq(7llJbq;;4t$awM;l&(2s+$l!Ay9^Ge|34CVhr7|BG z?dAR83smef^frq9V(OH+a+ki#q&-7TkWfFM=5bsGbU(8mC;>QTCWL5ydz9s6k@?+V zcjiH`VI=59P-(-DWXZ~5DH>B^_H~;4$)KUhnmGo*G!Tq8^LjfUDO)lASN*=#AY_yS zqW9UX(VOCO&p@kHdUUgsBO0KhXxn1sprK5h8}+>IhX(nSXZKwlNsjk^M|RAaqmCZB zHBolOHYBas@&{PT=R+?d8pZu zUHfyucQ`(umXSW7o?HQ3H21M`ZJal+%*)SH1B1j6rxTlG3hx1IGJN^M7{$j(9V;MZ zRKybgVuxKo#XVM+?*yTy{W+XHaU5Jbt-UG33x{u(N-2wmw;zzPH&4DE103HV@ER86 z|FZEmQb|&1s5#`$4!Cm}&`^{(4V}OP$bk`}v6q6rm;P!H)W|2i^e{7lTk2W@jo_9q z*aw|U7#+g59Fv(5qI`#O-qPj#@_P>PC#I(GSp3DLv7x-dmYK=C7lPF8a)bxb=@)B1 zUZ`EqpXV2dR}B&r`uM}N(TS99ZT0UB%IN|0H%DcVO#T%L_chrgn#m6%x4KE*IMfjX zJ%4veCEqbXZ`H`F_+fELMC@wuy_ch%t*+Z+1I}wN#C+dRrf2X{1C8=yZ_%Pt6wL_~ zZ2NN-hXOT4P4n$QFO7yYHS-4wF1Xfr-meG9Pn;uK51?hfel`d38k{W)F*|gJLT2#T z<~>spMu4(mul-8Q3*pf=N4DcI)zzjqAgbE2eOT7~&f1W3VsdD44Ffe;3mJp-V@8UC z)|qnPc12o~$X-+U@L_lWqv-RtvB~%hLF($%Ew5w>^NR82qC_0FB z)=hP1-OEx?lLi#jnLzH}a;Nvr@JDO-zQWd}#k^an$Kwml;MrD&)sC5b`s0ZkVyPkb zt}-jOq^%_9>YZe7Y}PhW{a)c39G`kg(P4@kxjcYfgB4XOOcmezdUI7j-!gs7oAo2o zx(Ph{G+YZ`a%~kzK!HTAA5NXE-7vOFRr5oqY$rH>WI6SFvWmahFav!CfRMM3%8J&c z*p+%|-fNS_@QrFr(at!JY9jCg9F-%5{nb5Bo~z@Y9m&SHYV`49GAJjA5h~h4(G!Se zZmK{Bo7ivCfvl}@A-ptkFGcWXAzj3xfl{evi-OG(TaCn1FAHxRc{}B|x+Ua1D=I6M z!C^ZIvK6aS_c&(=OQDZfm>O`Nxsw{ta&yiYPA~@e#c%N>>#rq)k6Aru-qD4(D^v)y z*>Rs;YUbD1S8^D(ps6Jbj0K3wJw>L4m)0e(6Pee3Y?gy9i0^bZO?$*sv+xKV?WBlh zAp*;v6w!a8;A7sLB*g-^<$Z4L7|5jXxxP1}hQZ<55f9<^KJ>^mKlWSGaLcO0=$jem zWyZkRwe~u{{tU63DlCaS9$Y4CP4f?+wwa(&1ou)b>72ydrFvm`Rj-0`kBJgK@nd(*Eh!(NC{F-@=FnF&Y!q`7){YsLLHf0_B6aHc# z>WIuHTyJwIH{BJ4)2RtEauC7Yq7Cytc|S)4^*t8Va3HR zg=~sN^tp9re@w=GTx$;zOWMjcg-7X3Wk^N$n;&Kf1RgVG2}2L-(0o)54C509C&77i zrjSi{X*WV=%C17((N^6R4Ya*4#6s_L99RtQ>m(%#nQ#wrRC8Y%yxkH;d!MdY+Tw@r zjpSnK`;C-U{ATcgaxoEpP0Gf+tx);buOMlK=01D|J+ROu37qc*rD(w`#O=3*O*w9?biwNoq3WN1`&Wp8TvKj3C z3HR9ssH7a&Vr<6waJrU zdLg!ieYz%U^bmpn%;(V%%ugMk92&?_XX1K@mwnVSE6!&%P%Wdi7_h`CpScvspMx?N zQUR>oadnG17#hNc$pkTp+9lW+MBKHRZ~74XWUryd)4yd zj98$%XmIL4(9OnoeO5Fnyn&fpQ9b0h4e6EHHw*l68j;>(ya`g^S&y2{O8U>1*>4zR zq*WSI_2o$CHQ?x0!wl9bpx|Cm2+kFMR)oMud1%n2=qn5nE&t@Fgr#=Zv2?}wtEz^T z9rrj=?IH*qI5{G@Rn&}^Z{+TW}mQeb9=8b<_a`&Cm#n%n~ zU47MvCBsdXFB1+adOO)03+nczfWa#vwk#r{o{dF)QWya9v2nv43Zp3%Ps}($lA02*_g25t;|T{A5snSY?3A zrRQ~(Ygh_ebltHo1VCbJb*eOAr;4cnlXLvI>*$-#AVsGg6B1r7@;g^L zFlJ_th0vxO7;-opU@WAFe;<}?!2q?RBrFK5U{*ai@NLKZ^};Ul}beukveh?TQn;$%9=R+DX07m82gP$=}Uo_%&ngV`}Hyv8g{u z3SWzTGV|cwQuFIs7ZDOqO_fGf8Q`8MwL}eUp>q?4eqCmOTcwQuXtQckPy|4F1on8l zP*h>d+cH#XQf|+6c|S{7SF(Lg>bR~l(0uY?O{OEVlaxa5@e%T&xju=o1`=OD#qc16 zSvyH*my(dcp6~VqR;o(#@m44Lug@~_qw+HA=mS#Z^4reBy8iV?H~I;{LQWk3aKK8$bLRyt$g?- -
- - - - -
- - - - diff --git a/jobx-webapp/src/components/header/Header.vue b/jobx-webapp/src/components/header/Header.vue deleted file mode 100644 index c9827781..00000000 --- a/jobx-webapp/src/components/header/Header.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - diff --git a/jobx-webapp/src/components/nav/Nav.vue b/jobx-webapp/src/components/nav/Nav.vue deleted file mode 100644 index b34bfe17..00000000 --- a/jobx-webapp/src/components/nav/Nav.vue +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - diff --git a/jobx-webapp/src/main.js b/jobx-webapp/src/main.js deleted file mode 100644 index 417390e2..00000000 --- a/jobx-webapp/src/main.js +++ /dev/null @@ -1,15 +0,0 @@ -// The Vue build version to load with the `import` command -// (runtime-only or standalone) has been set in webpack.base.conf with an alias. -import Vue from 'vue' -import App from './App' -import router from './router' - -Vue.config.productionTip = false - -/* eslint-disable no-new */ -new Vue({ - el: '#app', - router, - components: { App }, - template: '' -}) diff --git a/jobx-webapp/src/router/index.js b/jobx-webapp/src/router/index.js deleted file mode 100644 index 065954dd..00000000 --- a/jobx-webapp/src/router/index.js +++ /dev/null @@ -1,10 +0,0 @@ -import Vue from 'vue' -import Router from 'vue-router' - -Vue.use(Router) - -export default new Router({ - routes: [ - - ] -}) From 93de4f46b3e6873263be3520f20a53980d668d72 Mon Sep 17 00:00:00 2001 From: benjobs Date: Mon, 27 Aug 2018 11:35:36 +0800 Subject: [PATCH 13/46] fix bug --- deployment | 1 - 1 file changed, 1 deletion(-) delete mode 100644 deployment diff --git a/deployment b/deployment deleted file mode 100644 index 8b137891..00000000 --- a/deployment +++ /dev/null @@ -1 +0,0 @@ - From 8870c012cc9e0f304b117c687321102bbb259382 Mon Sep 17 00:00:00 2001 From: benjobs Date: Mon, 27 Aug 2018 11:36:13 +0800 Subject: [PATCH 14/46] fix bug --- deployment/agent.sh | 126 +++++++++++++++++++ deployment/build.bat | 143 ++++++++++++++++++++++ deployment/build.sh | 223 ++++++++++++++++++++++++++++++++++ deployment/conf.properties | 29 +++++ deployment/executor.c | 132 ++++++++++++++++++++ deployment/server.bat | 179 +++++++++++++++++++++++++++ deployment/server.sh | 243 +++++++++++++++++++++++++++++++++++++ 7 files changed, 1075 insertions(+) create mode 100644 deployment/agent.sh create mode 100644 deployment/build.bat create mode 100644 deployment/build.sh create mode 100644 deployment/conf.properties create mode 100644 deployment/executor.c create mode 100644 deployment/server.bat create mode 100644 deployment/server.sh diff --git a/deployment/agent.sh b/deployment/agent.sh new file mode 100644 index 00000000..0ac70e4e --- /dev/null +++ b/deployment/agent.sh @@ -0,0 +1,126 @@ +#!/bin/bash +# +# Copyright (c) 2015 The JobX Project +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +#echo color +RED_COLOR="\E[1;31m"; +BLUE_COLOR='\E[1;34m'; +RES="\E[0m"; + +echo_r () { + # Color red: Error, Failed + [ $# -ne 1 ] && return 1 + printf "[${BLUE_COLOR}jobx${RES}] ${RED_COLOR}$1${RES}\n" +} + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +darwin=false +os400=false +case "`uname`" in +CYGWIN*) cygwin=true;; +Darwin*) darwin=true;; +OS400*) os400=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +# Get standard environment variables +PRGDIR=`dirname "$PRG"` + +WORKDIR=`cd "$PRGDIR" >/dev/null; pwd`; +WORKBASE=`cd "$PRGDIR"/../ >/dev/null; pwd`; + +# Get standard environment variables +############################################################################################### +APP_ARTIFACT=jobx-agent +APP_VERSION="1.2.0-RELEASE"; +APP_TAR_NAME=${APP_ARTIFACT}-${APP_VERSION}.tar.gz +MAVEN_TARGET_TAR="${WORKBASE}"/${APP_ARTIFACT}/target/${APP_TAR_NAME} +DEPLOY_PATH=${WORKDIR}/jobx-agent +CONFIG_TEMPLATE=${WORKDIR}/conf.properties +CONFIG_PATH=${DEPLOY_PATH}/conf/conf.properties +############################################################################################### + +#先检查dist下是否有war包 +if [ ! -f "${WORKDIR}/${APP_TAR_NAME}" ] ; then + #dist下没有tar包则检查agent的target下是否有tar包. + if [ ! -f "${MAVEN_TARGET_TAR}" ] ; then + echo_r "[JobX] please build project first!" + exit 0; + else + cp ${MAVEN_TARGET_TAR} ${WORKDIR}; + fi +fi + +[ -d "${DEPLOY_PATH}" ] && rm -rf ${DEPLOY_PATH}/* || mkdir -p ${DEPLOY_PATH} + +#untar.. +tar -xzvf ${WORKDIR}/${APP_TAR_NAME} && chmod +x ${DEPLOY_PATH}/bin/* >/dev/null 2>&1 + +#read user config... +config_registry="`awk -F '=' '{if($1~/jobx.registry/) print}' ${CONFIG_TEMPLATE}`" +config_password="`awk -F '=' '{if($1~/jobx.password/) print}' ${CONFIG_TEMPLATE}`" +config_port="`awk -F '=' '{if($1~/jobx.port/) print}' ${CONFIG_TEMPLATE}`" + + +if [ ${darwin} ] ; then + config_registry=$(echo ${config_registry}|sed 's/\//\\\//g'|sed 's/\=/\\=/g'|sed 's/&/\\&/g') + sed -i "" "s/^jobx\.registry.*$/${config_registry}/g" ${CONFIG_PATH} + sed -i "" "s/^jobx\.password.*$/${config_password}/g" ${CONFIG_PATH} + sed -i "" "s/^jobx\.port.*$/${config_port}/g" ${CONFIG_PATH} +else + config_registry=$(echo ${config_registry}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') + sed -i "s/^jobx\.password.*$/${config_password}/g" ${CONFIG_PATH} + sed -i "s/^jobx\.port.*$/${config_port}/g" ${CONFIG_PATH} + sed -i "s/^jobx\.registry.*$/${config_registry}/g" ${CONFIG_PATH} +fi + +EXECUTABLE=${DEPLOY_PATH}/bin/startup.sh + +# Check that target executable exists +if $os400; then + # -x will Only work on the os400 if the files are: + # 1. owned by the user + # 2. owned by the PRIMARY group of the user + # this will not work if the user belongs in secondary groups + eval +else + if [ ! -x "$EXECUTABLE" ]; then + echo "Cannot find $EXECUTABLE" + echo "The file is absent or does not have execute permission" + echo "This file is needed to run this program" + exit 1 + fi +fi + +exec "$EXECUTABLE" "$@" diff --git a/deployment/build.bat b/deployment/build.bat new file mode 100644 index 00000000..396282f9 --- /dev/null +++ b/deployment/build.bat @@ -0,0 +1,143 @@ +@echo off +@REM +@REM Copyright (c) 2015 The JobX Project +@REM +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM +@REM --------------------------------------------------------------------------- +@REM Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings +@REM are valid and consistent with the selected start-up options and set up the +@REM endorsed directory. +@REM --------------------------------------------------------------------------- +@REM Make sure prerequisite environment variables are set + +@REM In debug mode we need a real JDK (JAVA_HOME) + +echo\ +echo _______ +echo /\ _________ ______ _____ / / +echo (()) ______ / ________ / ___ \/ / +echo \/ ___ _ / _ __ \_ __ \ ___ / +echo / /_/ / / /_/ / /_/ / __ . \ +echo \____/ \____/ /_.___/ __ / \_\__ +echo _____ / +echo\ + +if ""%1"" == ""debug"" goto needJavaHome +@REM Otherwise either JRE or JDK are fine +if not "%JRE_HOME%" == "" goto gotJreHome +if not "%JAVA_HOME%" == "" goto gotJavaHome +echo Neither the JAVA_HOME nor the JRE_HOME environment variable is defined +echo At least one of these environment variable is needed to run this program +goto exit + +:needJavaHome +@REM Check if we have a usable JDK +if "%JAVA_HOME%" == "" goto noJavaHome +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome +if not exist "%JAVA_HOME%\bin\javaw.exe" goto noJavaHome +if not exist "%JAVA_HOME%\bin\jdb.exe" goto noJavaHome +if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavaHome +set "JRE_HOME=%JAVA_HOME%" +goto okJava + +:noJavaHome +echo The JAVA_HOME environment variable is not defined correctly. +echo It is needed to run this program in debug mode. +echo NB: JAVA_HOME should point to a JDK not a JRE. +goto exit + +:gotJavaHome +@REM No JRE given, use JAVA_HOME as JRE_HOME +set "JRE_HOME=%JAVA_HOME%" + +:gotJreHome +@REM Check if we have a usable JRE +if not exist "%JRE_HOME%\bin\java.exe" goto noJreHome +if not exist "%JRE_HOME%\bin\javaw.exe" goto noJreHome +goto okJava + +:noJreHome +@REM Needed at least a JRE +echo The JRE_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +goto exit + +:okJava +@REM Don't override the endorsed dir if the user has set it previously +if not "%JAVA_ENDORSED_DIRS%" == "" goto gotEndorseddir +@REM Java 9 no longer supports the java.endorsed.dirs +@REM system property. Only try to use it if +@REM JOBX_HOME/endorsed exists. +if not exist "%JOBX_HOME%\endorsed" goto gotEndorseddir +set "JAVA_ENDORSED_DIRS=%JOBX_HOME%\endorsed" +:gotEndorseddir + +@REM Don't override _RUNJAVA if the user has set it previously +if not "%_RUNJAVA%" == "" goto gotRunJava +@REM Set standard command for invoking Java. +@REM Also note the quoting as JRE_HOME may contain spaces. +set _RUNJAVA="%JRE_HOME%\bin\java.exe" +:gotRunJava + +@REM Don't override _RUNJDB if the user has set it previously +@REM Also note the quoting as JAVA_HOME may contain spaces. +if not "%_RUNJDB%" == "" goto gotRunJdb +set _RUNJDB="%JAVA_HOME%\bin\jdb.exe" +:gotRunJdb + +setlocal + +@REM Guess JOBX_HOME if not defined + +set "WORK_DIR=%~dp0" +set "JOBX_HOME=%WORK_DIR%" +set "JOBX_BASE=%JOBX_HOME%" + +@REM ################################################################################################# +set JOBX_VERSION=1.2.0-RELEASE +set DIST_HOME=%JOBX_HOME%\dist +set JOBX_AGENT=%JOBX_HOME%\jobx-agent\target\jobx-agent-%JOBX_VERSION%.tar.gz +set JOBX_SERVER=%JOBX_HOME%\jobx-server\target\jobx-server-%JOBX_VERSION%.war +set "EXECUTABLE=%JOBX_HOME%\.mvn\mvnw.cmd" +@REM ################################################################################################# + +if exist "%EXECUTABLE%" goto okExec +echo Cannot find "%EXECUTABLE%" +echo This file is needed to run this program +goto exit + +:okExec +call "%EXECUTABLE%" "clean" "install" "-Dmaven.test.skip=true" +if %errorlevel%==0 goto toDist +goto exit + +:toDist +if exist "%DIST_HOME%" rd /s /q %DIST_HOME% +if not exist "%DIST_HOME%" mkdir %DIST_HOME% +copy %JOBX_AGENT% %DIST_HOME% +copy %JOBX_SERVER% %DIST_HOME% +echo [JobX] build jobx @Version %JOBX_VERSION% successfully! please goto %DIST_HOME% +pause + +:exit +exit /b 1 + +:end +exit /b 0 + diff --git a/deployment/build.sh b/deployment/build.sh new file mode 100644 index 00000000..c800a113 --- /dev/null +++ b/deployment/build.sh @@ -0,0 +1,223 @@ +#!/bin/bash +# +# Copyright (c) 2015 The JobX Project +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +#echo color +WHITE_COLOR="\E[1;37m"; +RED_COLOR="\E[1;31m"; +BLUE_COLOR='\E[1;34m'; +GREEN_COLOR="\E[1;32m"; +YELLOW_COLOR="\E[1;33m"; +RES="\E[0m"; + + +printf "${GREEN_COLOR} _______ ${RES}\n" +printf "${GREEN_COLOR} /\ _________ ______ _____ / / ${RES}\n" +printf "${GREEN_COLOR} (()) ______ / ________ / ___ \/ / ${RES}\n" +printf "${GREEN_COLOR} \/ ___ _ / _ __ \_ __ \ ___ / ${RES}\n" +printf "${GREEN_COLOR} / /_/ / / /_/ / /_/ / __ . \ ${RES}\n" +printf "${GREEN_COLOR} \____/ \____/ /_.___/ __ / \_\__ ${RES}\n" +printf "${GREEN_COLOR} _____ / ${RES}\n\n" + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +PRGDIR=`dirname "$PRG"` + +WORKDIR=`cd "$PRGDIR" >/dev/null; pwd`; +WORKBASE=`cd "$PRGDIR"/../ >/dev/null; pwd`; + +# Get standard environment variables +############################################################################################## +JOBX_VERSION="1.2.0-RELEASE"; ## +JOBX_AGENT=${WORKBASE}/jobx-agent/target/jobx-agent-${JOBX_VERSION}.tar.gz ## +JOBX_SERVER=${WORKBASE}/jobx-server/target/jobx-server-${JOBX_VERSION}.war ## +EXEC_LIB=${WORKDIR}/executor.c ## +JOBX_AGENT_BIN_DIR=${WORKBASE}/jobx-agent/src/assembly/bin ## +############################################################################################## + +echo_r () { + # Color red: Error, Failed + [ $# -ne 1 ] && return 1 + printf "[${BLUE_COLOR}jobx${RES}] ${RED_COLOR}$1${RES}\n" +} + +echo_g () { + # Color green: Success + [ $# -ne 1 ] && return 1 + printf "[${BLUE_COLOR}jobx${RES}] ${GREEN_COLOR}$1${RES}\n" +} + +echo_y () { + # Color yellow: Warning + [ $# -ne 1 ] && return 1 + printf "[${BLUE_COLOR}jobx${RES}] ${YELLOW_COLOR}$1${RES}\n" +} + +echo_w () { + # Color yellow: White + [ $# -ne 1 ] && return 1 + printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR}$1${RES}\n" +} + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +darwin=false +os400=false +case "`uname`" in +CYGWIN*) cygwin=true;; +Darwin*) darwin=true;; +OS400*) os400=true;; +esac + +# Make sure prerequisite environment variables are set +if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then + if $darwin; then + # Bugzilla 54390 + if [ -x '/usr/libexec/java_home' ] ; then + export JAVA_HOME=`/usr/libexec/java_home` + # Bugzilla 37284 (reviewed). + elif [ -d "/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" ]; then + export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Versions/CurrentJDK/Home" + fi + else + JAVA_PATH=`which java 2>/dev/null` + if [ "x$JAVA_PATH" != "x" ]; then + JAVA_PATH=`dirname $JAVA_PATH 2>/dev/null` + JRE_HOME=`dirname $JAVA_PATH 2>/dev/null` + fi + if [ "x$JRE_HOME" = "x" ]; then + # XXX: Should we try other locations? + if [ -x /usr/bin/java ]; then + JRE_HOME=/usr + fi + fi + fi + if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then + echo "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined" + echo "At least one of these environment variable is needed to run this program" + exit 1 + fi +fi +if [ -z "$JAVA_HOME" -a "$1" = "debug" ]; then + echo "JAVA_HOME should point to a JDK in order to run in debug mode." + exit 1 +fi +if [ -z "$JRE_HOME" ]; then + JRE_HOME="$JAVA_HOME" +fi + +# If we're running under jdb, we need a full jdk. +if [ "$1" = "debug" ] ; then + if [ "$os400" = "true" ]; then + if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/javac ]; then + echo "The JAVA_HOME environment variable is not defined correctly" + echo "This environment variable is needed to run this program" + echo "NB: JAVA_HOME should point to a JDK not a JRE" + exit 1 + fi + else + if [ ! -x "$JAVA_HOME"/bin/java -o ! -x "$JAVA_HOME"/bin/jdb -o ! -x "$JAVA_HOME"/bin/javac ]; then + echo "The JAVA_HOME environment variable is not defined correctly" + echo "This environment variable is needed to run this program" + echo "NB: JAVA_HOME should point to a JDK not a JRE" + exit 1 + fi + fi +fi +# Don't override the endorsed dir if the user has set it previously +if [ -z "$JAVA_ENDORSED_DIRS" ]; then + # Set the default -Djava.endorsed.dirs argument + JAVA_ENDORSED_DIRS="$JOBX_HOME"/endorsed +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`which java`" + fi +fi +#check java exists. +$JAVACMD >/dev/null 2>&1 +if [ $? -ne 1 ];then + echo_r "ERROR: java is not install,please install java first!" + exit 1; +fi +#check openjdk +if [ "`$JAVACMD -version 2>&1 | head -1|grep "openjdk"|wc -l`"x == "1"x ]; then + echo_r "ERROR: please uninstall OpenJDK and install JDK 1.7+ first" + exit 1; +fi +echo_w "build jobx Starting..."; +if [ ! -f "${WORKBASE}/.mvn/mvnw" ];then + echo_r "ERROR: ${WORKBASE}/.mvn/mvnw is not exists,This file is needed to run this program!" + exit 1; +fi + +#gcc compile executor.c +exec_retval=0 +if [ -z "$GCCCMD" ] ; then + GCCCMD="`which gcc`" +fi +if [ "$GCCCMD" ] ; then + echo_g "compile executor.c starting..." + ${GCCCMD} ${EXEC_LIB} -o executor.so + ret_val=$? + if [ ${ret_val} -eq 0 ] ; then + exec_retval=0 + mv executor.so ${JOBX_AGENT_BIN_DIR} + else + exec_retval=1 + fi +fi + +${WORKBASE}/.mvn/mvnw -f ${WORKBASE}/pom.xml clean install -Dmaven.test.skip=true; +ret_val=$? +if [ ${ret_val} -eq 0 ] ; then + cp ${JOBX_AGENT} ${WORKDIR} + cp ${JOBX_SERVER} ${WORKDIR} + printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR}build jobx @Version ${JOBX_VERSION} successfully! please goto${RES} ${GREEN_COLOR}${WORKDIR}${RES}\n" + if [ ${exec_retval} -eq 1 ]; then + echo_w "WARN: compile executor.c error,please compile executor.c by yourself." + else + rm -rf ${JOBX_AGENT_BIN_DIR}/executor.so >/dev/null 2>&1 + fi + exit 0 +else + echo_r "build jobx failed! please try again " + exit 1 +fi \ No newline at end of file diff --git a/deployment/conf.properties b/deployment/conf.properties new file mode 100644 index 00000000..a099eec2 --- /dev/null +++ b/deployment/conf.properties @@ -0,0 +1,29 @@ +################################################################################################## +# # +# agent # +# # +################################################################################################## +jobx.password=jobx +jobx.port=1577 +jobx.registry=zookeeper://10.1.1.116:2181 + +#jobx.host= +################################################################################################### +# # +# server # +# # +################################################################################################### +jdbc.driver=com.mysql.jdbc.Driver +jdbc.url=jdbc:mysql://localhost:3306/jobx?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&autoReconnect=true&failOverReadOnly=false&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai +jdbc.username=root +jdbc.password=123322242 + +jobx.cluster=false +jobx.cached=memcached + +redis.host=10.20.10.111 +redis.password=123456 +redis.port=6379 + +memcached.servers=10.1.1.116:11211 +memcached.protocol=BINARY diff --git a/deployment/executor.c b/deployment/executor.c new file mode 100644 index 00000000..42eddf58 --- /dev/null +++ b/deployment/executor.c @@ -0,0 +1,132 @@ +/** + * Copyright (c) 2015 The JobX Project + *

+ * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *

+ * http://www.apache.org/licenses/LICENSE-2.0 + *

+ * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +FILE *LOGFILE = NULL; +FILE *ERRORFILE = NULL; +int SETUID_OPER_FAILED = 10; +int USER_NOT_FOUND = 20; +int INVALID_INPUT = 30; + +/* + * Change the real and effective user and group from super user to the specified user + * + */ + +int change_user(char *username, uid_t user, gid_t group) { + if (user == getuid() && user == geteuid() && + group == getgid() && group == getegid()) { + return 0; + } + + if (initgroups(username, group) != 0) { + fprintf(LOGFILE, "Error setting supplementary groups for user %s: %s\n", + username, strerror(errno)); + return SETUID_OPER_FAILED; + } + if (seteuid(0) != 0) { + fprintf(LOGFILE, "unable to reacquire root - %s\n", strerror(errno)); + fprintf(LOGFILE, "Real: %d:%d; Effective: %d:%d\n", + getuid(), getgid(), geteuid(), getegid()); + return SETUID_OPER_FAILED; + } + if (setgid(group) != 0) { + fprintf(LOGFILE, "unable to set group to %d - %s\n", group, + strerror(errno)); + fprintf(LOGFILE, "Real: %d:%d; Effective: %d:%d\n", + getuid(), getgid(), geteuid(), getegid()); + return SETUID_OPER_FAILED; + } + if (setuid(user) != 0) { + fprintf(LOGFILE, "unable to set user to %d - %s\n", user, strerror(errno)); + fprintf(LOGFILE, "Real: %d:%d; Effective: %d:%d\n", + getuid(), getgid(), geteuid(), getegid()); + return SETUID_OPER_FAILED; + } + + return 0; +} + +int main(int argc, char **argv){ + + // set up the logging stream + if (!LOGFILE){ + LOGFILE=stdout; + } + if (!ERRORFILE){ + ERRORFILE=stderr; + } + + if (argc < 3) { + fprintf(ERRORFILE, "Requires at least 3 variables: ./execute-as-user username command [args]"); + return INVALID_INPUT; + } + + char *username = argv[1]; + + // gather information about user + struct passwd *user_info = getpwnam(username); + if (user_info == NULL){ + fprintf(LOGFILE, "user does not exist: %s", username); + return USER_NOT_FOUND; + } + + // try to change user + fprintf(LOGFILE, "Changing user: user: %s, uid: %d, gid: %d\n", username, user_info->pw_uid, user_info->pw_gid); + int retval = change_user(username, user_info->pw_uid, user_info->pw_gid); + if (retval != 0){ + fprintf(LOGFILE, "Error changing user to %s\n", username); + return SETUID_OPER_FAILED; + } + + // execute the command + char **user_argv = &argv[2]; + fprintf(LOGFILE, "user command starting from: %s\n", user_argv[0]); + fflush(LOGFILE); + retval = execvp(*user_argv, user_argv); + fprintf(LOGFILE, "system call return value: %d\n", retval); + + // sometimes system(cmd) returns 256, which is interpreted to 0, making a failed job a successful job + // hence this goofy piece of if statement. + if (retval != 0){ + return 1; + } + else{ + return 0; + } + +} \ No newline at end of file diff --git a/deployment/server.bat b/deployment/server.bat new file mode 100644 index 00000000..36d18168 --- /dev/null +++ b/deployment/server.bat @@ -0,0 +1,179 @@ +@echo off +@REM +@REM Copyright (c) 2015 The JobX Project +@REM +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM +@REM --------------------------------------------------------------------------- +@REM Set JAVA_HOME or JRE_HOME if not already set, ensure any provided settings +@REM are valid and consistent with the selected start-up options and set up the +@REM endorsed directory. +@REM --------------------------------------------------------------------------- +@REM Make sure prerequisite environment variables are set + +@REM In debug mode we need a real JDK (JAVA_HOME) + +if ""%1"" == ""debug"" goto needJavaHome +@REM Otherwise either JRE or JDK are fine +if not "%JRE_HOME%" == "" goto gotJreHome +if not "%JAVA_HOME%" == "" goto gotJavaHome +echo Neither the JAVA_HOME nor the JRE_HOME environment variable is defined +echo At least one of these environment variable is needed to run this program +goto exit + +:needJavaHome +@REM Check if we have a usable JDK +if "%JAVA_HOME%" == "" goto noJavaHome +if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome +if not exist "%JAVA_HOME%\bin\javaw.exe" goto noJavaHome +if not exist "%JAVA_HOME%\bin\jdb.exe" goto noJavaHome +if not exist "%JAVA_HOME%\bin\javac.exe" goto noJavaHome +set "JRE_HOME=%JAVA_HOME%" +goto okJava + +:noJavaHome +echo The JAVA_HOME environment variable is not defined correctly. +echo It is needed to run this program in debug mode. +echo NB: JAVA_HOME should point to a JDK not a JRE. +goto exit + +:gotJavaHome +@REM No JRE given, use JAVA_HOME as JRE_HOME +set "JRE_HOME=%JAVA_HOME%" + +:gotJreHome +@REM Check if we have a usable JRE +if not exist "%JRE_HOME%\bin\java.exe" goto noJreHome +if not exist "%JRE_HOME%\bin\javaw.exe" goto noJreHome +goto okJava + +:noJreHome +@REM Needed at least a JRE +echo The JRE_HOME environment variable is not defined correctly +echo This environment variable is needed to run this program +goto exit + +:okJava +@REM Don't override the endorsed dir if the user has set it previously +if not "%JAVA_ENDORSED_DIRS%" == "" goto gotEndorseddir +@REM Java 9 no longer supports the java.endorsed.dirs +@REM system property. Only try to use it if +@REM JOBX_HOME/endorsed exists. +if not exist "%JOBX_HOME%\endorsed" goto gotEndorseddir +set "JAVA_ENDORSED_DIRS=%JOBX_HOME%\endorsed" +:gotEndorseddir + +@REM Don't override _RUNJAVA if the user has set it previously +if not "%_RUNJAVA%" == "" goto gotRunJava +@REM Set standard command for invoking Java. +@REM Also note the quoting as JRE_HOME may contain spaces. +set _RUNJAVA="%JRE_HOME%\bin\java.exe" +:gotRunJava + +@REM Don't override _RUNJDB if the user has set it previously +@REM Also note the quoting as JAVA_HOME may contain spaces. +if not "%_RUNJDB%" == "" goto gotRunJdb +set _RUNJDB="%JAVA_HOME%\bin\jdb.exe" +:gotRunJdb + +@REM Don't override _RUNJAR if the user has set it previously +if not "%_RUNJAR%" == "" goto gotRunJar +@REM Set standard command for invoking Java. +@REM Also note the quoting as JRE_HOME may contain spaces. +set _RUNJAR="%JRE_HOME%\bin\jar.exe" +:gotRunJar + +setlocal + +@REM Guess JOBX_HOME if not defined + +set "WORK_DIR=%~dp0" +set "JOBX_HOME=%WORK_DIR%" +set "JOBX_BASE=%JOBX_HOME%" + +@REM ################################################################################################# +set APP_ARTIFACT=jobx-server +set APP_VERSION=1.2.0-RELEASE +set APP_WAR_NAME=%APP_ARTIFACT%-%APP_VERSION%.war +set MAVEN_TARGET_WAR=%JOBX_HOME%%APP_ARTIFACT%\target\%APP_WAR_NAME% +set DIST_PATH=%JOBX_HOME%dist +set DEPLOY_PATH=%DIST_PATH%\%APP_ARTIFACT% +set CONTAINER_PATH=%DEPLOY_PATH%\container +@REM ################################################################################################# + +if exist "%DIST_PATH%\%APP_WAR_NAME%" goto initEnv +if not exist %DIST_PATH% mkdir %DIST_PATH% +if exist "%MAVEN_TARGET_WAR%" ( + copy %MAVEN_TARGET_WAR% %DIST_PATH% + goto initEnv +) else ( + echo [JobX] please build project first! + goto exit +) + +:initEnv +if not exist "%DEPLOY_PATH%" ( + mkdir %DEPLOY_PATH% + copy %DIST_PATH%\%APP_WAR_NAME% %DEPLOY_PATH% + cd %DEPLOY_PATH% + %_RUNJAR% xvf %APP_WAR_NAME% 1>nul + del %DEPLOY_PATH%\%APP_WAR_NAME% +) + +@REM cd to DEPLOY_PATH +cd %DEPLOY_PATH% + +@REM copy container to deploy_path +if not exist "%CONTAINER_PATH%" ( + mkdir %CONTAINER_PATH% + xcopy %JOBX_HOME%%APP_ARTIFACT%\container %CONTAINER_PATH% /E 1>nul +) +@REM create log +set LOG_PATH=%CONTAINER_PATH%\logs +if exist %LOG_PATH% ( + set LOG_PATH=%LOG_PATH%\jobx.out +)else ( + md %LOG_PATH% + set LOG_PATH=%LOG_PATH%\jobx.out +) +@REM set classpath +set jar_dir=%DEPLOY_PATH%\WEB-INF\lib +setLocal EnableDelayedExpansion +set CLASSPATH="%CLASSPATH%; +for /R %jar_dir% %%a in (*.jar) do set CLASSPATH=!CLASSPATH!;%%a +set CLASSPATH=!CLASSPATH!;%DEPLOY_PATH%\WEB-INF\classes" +goto doStart + +:doStart +if "%TITLE%" == "" set TITLE=JobX-Server +set EXECJAVA=start "%TITLE%" %_RUNJAVA% +set MAIN="com.jobxhub.server.bootstrap.Startup" +set JOBX_LAUNCHER=tomcat +set JOBX_PORT=8090 +%EXECJAVA% ^ + -classpath "%CLASSPATH%" ^ + -Dserver.launcher="%JOBX_LAUNCHER%" ^ + -Dserver.port="%JOBX_PORT%" ^ + %MAIN% start >> %LOG_PATH% +goto end + +:exit +exit 1 + +:end +exit 0 diff --git a/deployment/server.sh b/deployment/server.sh new file mode 100644 index 00000000..1d816e9a --- /dev/null +++ b/deployment/server.sh @@ -0,0 +1,243 @@ +#!/bin/bash +# +# Copyright (c) 2015 The JobX Project +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +#echo color +WHITE_COLOR="\E[1;37m"; +RED_COLOR="\E[1;31m"; +BLUE_COLOR='\E[1;34m'; +GREEN_COLOR="\E[1;32m"; +YELLOW_COLOR="\E[1;33m"; +RES="\E[0m"; + +echo_r () { + # Color red: Error, Failed + [ $# -ne 1 ] && return 1 + printf "[${BLUE_COLOR}jobx${RES}] ${RED_COLOR}$1${RES}\n" +} + +echo_g () { + # Color green: Success + [ $# -ne 1 ] && return 1 + printf "[${BLUE_COLOR}jobx${RES}] ${GREEN_COLOR}$1${RES}\n" +} + +echo_y () { + # Color yellow: Warning + [ $# -ne 1 ] && return 1 + printf "[${BLUE_COLOR}jobx${RES}] ${YELLOW_COLOR}$1${RES}\n" +} + +echo_w () { + # Color yellow: White + [ $# -ne 1 ] && return 1 + printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR}$1${RES}\n" +} + +if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then + echo_r "Neither the JAVA_HOME nor the JRE_HOME environment variable is defined" + echo_r "At least one of these environment variable is needed to run this program" + exit 1 +fi + +# Set standard commands for invoking Java, if not already set. +if [ -z "$RUNJAVA" ]; then + RUNJAVA="$JAVA_HOME"/bin/java +fi + +if [ -z "$RUNJAR" ]; then + RUNJAR="$JAVA_HOME"/bin/jar +fi + +#check java exists. +$RUNJAVA >/dev/null 2>&1 + +if [ $? -ne 1 ];then + echo_r "ERROR: java is not install,please install java first!" + exit 1; +fi + +#check openjdk +if [ "`${RUNJAVA} -version 2>&1 | head -1|grep "openjdk"|wc -l`"x == "1"x ]; then + echo_r "ERROR: please uninstall OpenJDK and install jdk first" + exit 1; +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false +darwin=false +os400=false +case "`uname`" in +CYGWIN*) cygwin=true;; +Darwin*) darwin=true;; +OS400*) os400=true;; +esac + +# resolve links - $0 may be a softlink +PRG="$0" + +while [ -h "$PRG" ]; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`/"$link" + fi +done + +# Get standard environment variables +PRGDIR=`dirname "$PRG"` + +WORKDIR=`cd "$PRGDIR" >/dev/null; pwd`; +WORKBASE=`cd "$PRGDIR"/../ >/dev/null; pwd`; + +# Get standard environment variables +############################################################################################### +APP_ARTIFACT=jobx-server +APP_VERSION="1.2.0-RELEASE"; +APP_WAR_NAME=${APP_ARTIFACT}-${APP_VERSION}.war +MAVEN_TARGET_WAR=${WORKBASE}/${APP_ARTIFACT}/target/${APP_WAR_NAME} +DEPLOY_PATH=${WORKDIR}/${APP_ARTIFACT} +LIB_PATH=${DEPLOY_PATH}/WEB-INF/lib +CONTAINER_PATH=${DEPLOY_PATH}/container +LOG_PATH=${CONTAINER_PATH}/logs +CONFIG_TEMPLATE=${WORKDIR}/conf.properties +CONFIG_PATH=${DEPLOY_PATH}/WEB-INF/classes/config.properties +############################################################################################### + +#先检查dist下是否有war包 +if [ ! -f "${WORKDIR}/${APP_WAR_NAME}" ] ; then + #dist下没有war包则检查server的target下是否有war包. + if [ ! -f "${MAVEN_TARGET_WAR}" ] ; then + echo_w "[JobX] please build project first!" + exit 0; + else + cp ${MAVEN_TARGET_WAR} ${WORKDIR}; + fi +fi +if [ ! -f "${DEPLOY_PATH}" ] ; then + mkdir -p ${DEPLOY_PATH} + # unpackage war to dist + cp ${WORKDIR}/${APP_WAR_NAME} ${DEPLOY_PATH} && + cd ${DEPLOY_PATH} && + ${RUNJAR} xvf ${APP_WAR_NAME} >/dev/null 2>&1 && + rm -rf ${DEPLOY_PATH}/${APP_WAR_NAME} && + #copy jars... + cp -r ${WORKBASE}/${APP_ARTIFACT}/container ${DEPLOY_PATH} +fi +if [ ! -d "${LOG_PATH}" ] ; then + mkdir -p ${LOG_PATH} +fi +LOG_PATH=${LOG_PATH}/jobx.out + +# Add jars to classpath +if [ ! -z "$CLASSPATH" ] ; then + CLASSPATH="$CLASSPATH": +fi + +for jar in ${LIB_PATH}/* +do + CLASSPATH="$CLASSPATH":"$jar" +done +CLASSPATH="$CLASSPATH":${DEPLOY_PATH}/WEB-INF/classes + +#read user config... +config_registry="`awk -F '=' '{if($1~/jobx.registry/) print}' ${CONFIG_TEMPLATE}`" +config_jdbc_url="`awk -F '=' '{if($1~/jdbc.url/) print}' ${CONFIG_TEMPLATE}`" +config_jdbc_username="`awk -F '=' '{if($1~/jdbc.username/) print}' ${CONFIG_TEMPLATE}`" +config_jdbc_password="`awk -F '=' '{if($1~/jdbc.password/) print}' ${CONFIG_TEMPLATE}`" +config_cluster="`awk -F '=' '{if($1~/jobx.cluster/) print}' ${CONFIG_TEMPLATE}`" +config_cached="`awk -F '=' '{if($1~/jobx.cached/) print}' ${CONFIG_TEMPLATE}`" +config_redis_host="`awk -F '=' '{if($1~/redis.host/) print}' ${CONFIG_TEMPLATE}`" +config_redis_password="`awk -F '=' '{if($1~/redis.password/) print}' ${CONFIG_TEMPLATE}`" +config_redis_port="`awk -F '=' '{if($1~/redis.port/) print}' ${CONFIG_TEMPLATE}`" +config_memcached_servers="`awk -F '=' '{if($1~/memcached.servers/) print}' ${CONFIG_TEMPLATE}`" +config_memcached_protocol="`awk -F '=' '{if($1~/memcached.protocol/) print}' ${CONFIG_TEMPLATE}`" +if [ ${darwin} ] ; then + config_registry=$(echo ${config_registry}|sed 's/\//\\\//g'|sed 's/\=/\\=/g'|sed 's/&/\\&/g') + config_jdbc_url=$(echo ${config_jdbc_url}|sed 's/\//\\\//g'|sed 's/\=/\\=/g'|sed 's/&/\\&/g') + config_jdbc_password=$(echo ${config_jdbc_password}|sed 's/\//\\\//g'|sed 's/\=/\\=/g'|sed 's/&/\\&/g') + config_redis_password=$(echo ${config_redis_password}|sed 's/\//\\\//g'|sed 's/\=/\\=/g'|sed 's/&/\\&/g') + config_memcached_servers=$(echo ${config_memcached_servers}|sed 's/\//\\\//g'|sed 's/\=/\\=/g'|sed 's/&/\\&/g') + sed -i "" "s/^jobx\.registry.*$/${config_registry}/g" ${CONFIG_PATH} + sed -i "" "s/^jdbc\.url.*$/${config_jdbc_url}/g" ${CONFIG_PATH} + sed -i "" "s/^jdbc\.username.*$/${config_jdbc_username}/g" ${CONFIG_PATH} + sed -i "" "s/^jdbc\.password.*$/${config_jdbc_password}/g" ${CONFIG_PATH} + sed -i "" "s/^jobx\.cluster.*$/${config_cluster}/g" ${CONFIG_PATH} + sed -i "" "s/^jobx\.cached.*$/${config_cached}/g" ${CONFIG_PATH} + sed -i "" "s/^redis\.host.*$/${config_redis_host}/g" ${CONFIG_PATH} + sed -i "" "s/^redis\.password.*$/${config_redis_password}/g" ${CONFIG_PATH} + sed -i "" "s/^redis\.port.*$/${config_redis_port}/g" ${CONFIG_PATH} + sed -i "" "s/^memcached\.servers.*$/${config_memcached_servers}/g" ${CONFIG_PATH} + sed -i "" "s/^memcached\.protocol.*$/${config_memcached_protocol}/g" ${CONFIG_PATH} +else + config_registry=$(echo ${config_registry}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') + config_jdbc_url=$(echo ${config_jdbc_url}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') + config_jdbc_password=$(echo ${config_jdbc_password}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') + config_redis_password=$(echo ${config_redis_password}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') + config_memcached_servers=$(echo ${config_memcached_servers}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') + sed -i "" "s/^jobx\.registry.*$/${config_registry}/g" ${CONFIG_PATH} + sed -i "s/^jdbc\.url.*$/${config_jdbc_url}/g" ${CONFIG_PATH} + sed -i "s/^jdbc\.username.*$/${config_jdbc_username}/g" ${CONFIG_PATH} + sed -i "s/^jdbc\.password.*$/${config_jdbc_password}/g" ${CONFIG_PATH} + sed -i "s/^jobx\.cluster.*$/${config_cluster}/g" ${CONFIG_PATH} + sed -i "s/^jobx\.cached.*$/${config_cached}/g" ${CONFIG_PATH} + sed -i "s/^redis\.host.*$/${config_redis_host}/g" ${CONFIG_PATH} + sed -i "s/^redis\.password.*$/${config_redis_password}/g" ${CONFIG_PATH} + sed -i "s/^redis\.port.*$/${config_redis_port}/g" ${CONFIG_PATH} + sed -i "s/^memcached\.servers.*$/${config_memcached_servers}/g" ${CONFIG_PATH} + sed -i "s/^memcached\.protocol.*$/${config_memcached_protocol}/g" ${CONFIG_PATH} +fi + + +#default launcher +[ -z "${JOBX_LAUNCHER}" ] && JOBX_LAUNCHER="tomcat"; + +#server'port +if [ $# -gt 0 ] ;then + JOBX_PORT=$1 + if [ "$JOBX_PORT" -gt 0 ] 2>/dev/null ;then + if [ $JOBX_PORT -lt 0 ] || [ $JOBX_PORT -gt 65535 ];then + echo_r "server'port error,muse be between 0 and 65535!" + fi + else + echo_r "server'port bust be number." + exit 1; + fi +fi +[ -z "${JOBX_PORT}" ] && JOBX_PORT="20501"; + +#start server.... +printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR} server Starting @ [${GREEN_COLOR}${JOBX_PORT}${RES}].... ${RES}\n" + +MAIN="com.jobxhub.server.bootstrap.Startup" +cd ${DEPLOY_PATH} +eval "$RUNJAVA" \ + -classpath "$CLASSPATH" \ + -Dserver.launcher=${JOBX_LAUNCHER} \ + -Dserver.port=${JOBX_PORT} \ + ${MAIN} $1 >> ${LOG_PATH} 2>&1 & + +printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR} please see log for more detail:${RES}${GREEN_COLOR} $LOG_PATH ${RES}\n" + +exit $? + From f7ee080f247736758c6b93ae7df407a8fec01cc5 Mon Sep 17 00:00:00 2001 From: benjobs Date: Mon, 27 Aug 2018 15:10:52 +0800 Subject: [PATCH 15/46] fix bug --- jobx-agent/assembly.xml | 11 ++++++----- jobx-agent/pom.xml | 5 ----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/jobx-agent/assembly.xml b/jobx-agent/assembly.xml index 979c2611..586affe8 100644 --- a/jobx-agent/assembly.xml +++ b/jobx-agent/assembly.xml @@ -13,31 +13,32 @@ src/assembly/bin bin - - - ${project.build.directory}/bin - bin + 0755 src/assembly/lib lib + 0644 src/assembly/native native + 0644 src/assembly/conf conf + 0644 src/assembly/logs logs + 0644 - src/assembly/temp temp + 0755 \ No newline at end of file diff --git a/jobx-agent/pom.xml b/jobx-agent/pom.xml index 4347754f..fb9bd13d 100644 --- a/jobx-agent/pom.xml +++ b/jobx-agent/pom.xml @@ -10,10 +10,6 @@ jar jobx-agent - - src/main/c - - com.jobxhub @@ -39,7 +35,6 @@ net.java.dev.jna jna - net.java.dev.jna jna-platform From aaf8b0dcfc7d78db6bb119a53421e9c50bff58db Mon Sep 17 00:00:00 2001 From: jobxhub <39736850+jobxhub@users.noreply.github.com> Date: Mon, 27 Aug 2018 15:47:33 +0800 Subject: [PATCH 16/46] Update README.md --- README.md | 217 ++++++++++-------------------------------------------- 1 file changed, 37 insertions(+), 180 deletions(-) diff --git a/README.md b/README.md index 804f031e..62221d36 100755 --- a/README.md +++ b/README.md @@ -112,179 +112,44 @@ Browser IE10+ 1)下载源码: > git clone https://github.com/jobxhub/jobx.git -2):修改server端的配置信息 - 1:创建数据,数据库名字可以是jobx或者其他 - 2:进入jobx-server/src/main/resources 修改config.properties里的jdbc连接信息 - - #jdbc - jdbc.driver=com.mysql.jdbc.Driver - jdbc.url=jdbc:mysql://${mysql_host}:3306/jobx?useUnicode=true&characterEncoding=UTF-8 - jdbc.username=${user} - jdbc.password=${password} - - #redis - redis.host=${redis.host} - redis.password=${redis.password} - redis.port=${redis.port} - - #zookeeper - jobx.registry=zookeeper://${zookeeper_host}:2181?bakup=${zookeeper_host1}:2181,${zookeeper_host2}:2181 - -3):修改agent端配置信息 - cd JobX/jobx-agent/src/conf/conf - - #zookepper注册中心 - jobx.registry=zookeeper://127.0.0.1:2181 - -4):进入源码目录执行编译: - *nix平台执行 sh build.sh - window平台双击 build.bat - 编译完成的文件在build/dist下 - -5):启动agent - 1）自动化部署 +2):编译: + 进入deployment + > cd deployment + 修改配置信息 + jobx.password=jobx + jobx.port=1577 + jobx.registry=zookeeper://${zookeeper_host}:2181?bakup=${zookeeper_host1}:2181,${zookeeper_host2}:2181 + + #jobx.host= + jdbc.driver=com.mysql.jdbc.Driver + jdbc.url=jdbc:mysql://localhost:3306/jobx + jdbc.username=root + jdbc.password=${password} + + jobx.cluster=false + jobx.cached=memcached + + redis.host=${redis.host} + redis.password=${redis.password} + redis.port=6379 + + memcached.servers=${memcached.servers} + memcached.protocol=BINARY + + *nix平台执行 sh build.sh + window平台双击 build.bat + +3):启动 + 1）agent *nix平台: 执行 sh agent.sh window平台: 需要进入jobx-agent/target下,解包jobx-agent-${version}.tar.gz到指定的位置,进入bin,执行startup.bat - - 2) 手动部署agent步骤 - - 将jobx-agent-${version}.tar.gz包拷贝到要管理任务的目标服务器,解包,会看到以下目录 - ---bin/ - | startup.sh #agent的启动脚本,调用的是jobx.sh来完成 - | shutdown.sh #agent停止脚本，调用的是jobx.sh来完成 - | jobx.sh #agent控制启动|停止的脚本 - | monitor.sh #实时监控获取数据需要的脚本,由系统调度 - | kill.sh #kill任务时需要的脚本,由系统调度 - ---conf/ - conf.properties #agent配置文件 - | log4j.properties #log4j配置文件 - ---lib/ - | *.jar #agent运行需要的jar文件 - ---temp/ - | *.sh #用于存放项目生成的零时文件的目录 - ---logs - | jobx.out #项目启动会产生的Log文件 - - > tar -xzvf jobx-agent-${version}.tar.gz - 1)修改conf/conf.properties里的配置信息 - #zookepper注册中心 - jobx.registry=zookeeper://${zookeeper_host}:2181 - #agent Ip,确保server可以通过此ip访问到该agent(主要实现agent自动注册) - jobx.host=127.0.0.1 - 2)启动jobx-agent 进入jobx-agent/bin - > cd jobx-agent/bin - > sh startup.sh - 这里可以接受两个参数，分别是服务启动的端口和密码(默认端口是:1577,默认密码:jobx)以及agent自动注册的url和密码 - 如要指定参数启动命令如下: - > sh startup.sh -P10001 -p123456 - 参数说明: - -P (大写的p)为agent启动的端口，选填，如果不输入默认启动端口是1577 - -p (小写的p)为当前agent的连接密码,选填，如果不输入默认连接该机器的密码是jobx - 以下两个参数为agent自动注册需要的两个参数（选填） - 该脚本启动之后agent就自动注册到server端了 - 更多详细的启动信息请查看logs/jobx.out - - 3)停止jobx-agent 进入jobx-agent/bin 执行： - > cd jobx-agent/bin - > sh shutdown.sh - - -6):启动server - 1) 自动化部署 - *nix平台执行 server.sh - window平台执行server.bat即可完成启动 - - 2) 手动发布 tomcat或者其他web服务器 - tomcat发布项目步骤: - 找到build/dist/jobx-server.war - tomcat部署有两种部署方式 - 1):直接部署到webapps下: - 1:下载tomcat8或者以上版本(http://tomcat.apache.org) - 2:解压tomcat,删除webapps目录下的全部文件 - > rm -rf ${tomcat_home}/webapps/* - 3:在webapps下新建ROOT文件夹 - > mkdir ${tomcat_home}/webapps/ROOT - 4:将war解包到ROOT下并删除war文件(注意解包完毕一定要删除war包) - > mv server.war ${tomcat_home}/webapps/ROOT - > cd ${tomcat_home}/webapps/ROOT - > jar -xvf server.war - > rm -rf server.war - 5:更改jdbc和zookeeper配置信息 - > vi ${tomcat_home}/webapps/ROOT/WEB-INF/classes/config.properties - 6:完成启动 - 2):通过配置server.xml外部指向 - 1:将war包解压到指定的路径,如 /data/www/jobx,并删除war包 - 2:更改jdbc配置文件 - vi /data/www/jobx/WEB-INF/classes/config.properties - 3:进入tomcat的conf中修改server.xml配置文件 - 下面附上我的完整的server.xml配置: - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 配置里Host里的appBase和Context的docBase即为外部解压的项目的路径 - 推荐第二种外部部署的方式 - - 启动tomcat,打开浏览器以$ip:$port的方式访问,如: http://192.168.0.188:8080 - - 不论哪种方式部署,第一次会自动创建表,默认初始用户名jobx,密码jobx,第一次登陆会提示修改密码. - - 3):进入到jobx的管理端,如果agent也启动了,应该可以直接在server的执行器页面看到agent,则添加任务即可... + 2) server + *nix平台: 执行 sh server.sh 8080 + window平台 双击 + ---conf/server.bat + + 3):进入到jobx的管理端,如果agent也启动了,应该可以直接在server的执行器页面看到agent,则添加任务即可... ``` @@ -293,12 +158,10 @@ Browser IE10+ 1):如果自行编译项目的,有可能agent端的脚本执行失败,这时请更改agent/bin下所有的脚本的字符集 a) vim *.sh b) :set ff=unix 保存退出即可 - -2):如果脚本字符编码已经是unix,还是启动失败,请尝试给启动脚本添加权限 chmod 777 bin/* -3):如果agent已经成功启动server还是连接不上,请检查agent端口是否开放(如很多云服务器得开放端口才能访问) +2):如果agent已经成功启动server还是连接不上,请检查agent端口是否开放(如很多云服务器得开放端口才能访问) -4):如果server端用nginx做反向代理,配置如下: +3):如果server端用nginx做反向代理,配置如下: upstream jobx { @@ -349,12 +212,6 @@ server { 由于考虑到权限的问题,当前登录的用户不能随便指定任务的执行身份,需要超级管理员权限的用户(jobx)登录,在设置页面统一设置运行身份,多个运行身份用","分割,然后超级管理员在编辑用户 为该用户指定可以执行的身份(可选择多个),这样用户在创建任务的时候就可以选择指定身份去执行了 - 2) executor.so:cannot execute binary file - 需要授权agent/bin下面的所有文件777权限 - > chmod 777 jobx-agent/bin/* - 如果授权完还提示这个错,则需要进入源码目录(JobX/jobx-executor/src/main/c/executor.c),手动gcc编译下executor.c文件,然后将编译完的文件命名成executor.so,放到jobx-agent/bin下 - 并且授777权限 - ``` 更多问题请加入jobx交流群156429713,欢迎大家加入 From 92e9511a7897ac6765ae2ba204dd640a0ec8f34f Mon Sep 17 00:00:00 2001 From: jobxhub <39736850+jobxhub@users.noreply.github.com> Date: Mon, 27 Aug 2018 15:50:19 +0800 Subject: [PATCH 17/46] Update README.md --- README.md | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/README.md b/README.md index 62221d36..9632a949 100755 --- a/README.md +++ b/README.md @@ -103,8 +103,9 @@ Browser IE10+ ## 安装说明 - jobx分为两个jobx-server端和jobx-agent端,jobx-server端即为一个web可视化的中央管理调度平台,jobx-agent为要管理的任务的机器 - agent和server都依赖zookeeper,安装部署jobx之前必须先安装和启动zookeeper,server和agent必须连接同一个zookeeper,server端依赖redis + jobx分为两个jobx-server端和jobx-agent端,jobx-server端即为一个web可视化的中央管理调度平台, + jobx-agent为要管理的任务的机器,agent和server都依赖zookeeper,安装部署jobx之前必须先安装和启动zookeeper + server和agent必须连接同一个zookeeper,server端依赖redis ## 编译步骤: @@ -115,7 +116,7 @@ Browser IE10+ 2):编译: 进入deployment > cd deployment - 修改配置信息 + #修改配置信息 jobx.password=jobx jobx.port=1577 jobx.registry=zookeeper://${zookeeper_host}:2181?bakup=${zookeeper_host1}:2181,${zookeeper_host2}:2181 @@ -140,16 +141,15 @@ Browser IE10+ window平台双击 build.bat 3):启动 - 1）agent + 1） agent *nix平台: 执行 sh agent.sh - window平台: 需要进入jobx-agent/target下,解包jobx-agent-${version}.tar.gz到指定的位置,进入bin,执行startup.bat + window平台: 需要进入jobx-agent/target下,解包jobx-agent-${version}.tar.gz 双击bin/startup.bat - 2) server + 2) server *nix平台: 执行 sh server.sh 8080 - window平台 双击 - ---conf/server.bat + window平台 双击 server.bat - 3):进入到jobx的管理端,如果agent也启动了,应该可以直接在server的执行器页面看到agent,则添加任务即可... + 3) 进入到jobx的管理端,如果agent也启动了,应该可以直接在server的执行器页面看到agent,则添加任务即可... ``` @@ -209,8 +209,9 @@ server { ## 常见问题: ``` 1)创建作业运行身份无法选择？ - 由于考虑到权限的问题,当前登录的用户不能随便指定任务的执行身份,需要超级管理员权限的用户(jobx)登录,在设置页面统一设置运行身份,多个运行身份用","分割,然后超级管理员在编辑用户 - 为该用户指定可以执行的身份(可选择多个),这样用户在创建任务的时候就可以选择指定身份去执行了 + 由于考虑到权限的问题,当前登录的用户不能随便指定任务的执行身份,需要超级管理员权限的用户(jobx)登录,在设置页面统一设置运行身份, + 多个运行身份用","分割,然后超级管理员在编辑用户,为该用户指定可以执行的身份(可选择多个) + 这样用户在创建任务的时候就可以选择指定身份去执行了 ``` From 59940f224fd3b004b89036cd5824fc77a0eec071 Mon Sep 17 00:00:00 2001 From: benjobs Date: Tue, 28 Aug 2018 18:09:06 +0800 Subject: [PATCH 18/46] fix bug --- .../com/jobxhub/server/service/NoticeService.java | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/jobx-server/src/main/java/com/jobxhub/server/service/NoticeService.java b/jobx-server/src/main/java/com/jobxhub/server/service/NoticeService.java index a11ba1eb..91128797 100755 --- a/jobx-server/src/main/java/com/jobxhub/server/service/NoticeService.java +++ b/jobx-server/src/main/java/com/jobxhub/server/service/NoticeService.java @@ -105,13 +105,12 @@ public void notice(Job job, String msg) { } else { message = String.format(message, "[" + msg + "]"); } - String content = null;//getMessage(agent, message); + String content = getMessage(agent, message); if (logger.isInfoEnabled()) { logger.info(content); } try { - - //sendMessage(null, agent.getAgentId(),job.getEmail(), job.getMobile(),content); + sendMessage(null, agent.getAgentId(),job.getEmail(), job.getMobile(),content); } catch (Exception e) { e.printStackTrace(); } @@ -124,10 +123,6 @@ private String getMessage(Agent agent, String message) { } public void sendMessage(List users, Long workId, String email,String mobile, String content) { - - - - Log log = new Log(); log.setIsread(false); log.setAgentId(workId); @@ -143,6 +138,7 @@ public void sendMessage(List users, Long workId, String email,String m HtmlEmail htmlEmail = new HtmlEmail(); htmlEmail.setCharset("UTF-8"); htmlEmail.setHostName(config.getSmtpHost()); + htmlEmail.setSSLOnConnect(true); htmlEmail.setSslSmtpPort(config.getSmtpPort().toString()); htmlEmail.setAuthentication(config.getSenderEmail(), config.getEmailPassword()); htmlEmail.setFrom(config.getSenderEmail()); @@ -178,7 +174,6 @@ public void sendMessage(List users, Long workId, String email,String m e.printStackTrace(System.err); } - //发送站内信 log.setType(Constants.MsgType.WEBSITE.getValue()); for (UserBean user : users) { @@ -188,7 +183,6 @@ public void sendMessage(List users, Long workId, String email,String m logService.save(log); } - } private String msgToHtml(String content) throws Exception { From b9b302d4de1d38b59ecace4f372f529735970904 Mon Sep 17 00:00:00 2001 From: benjobs Date: Thu, 30 Aug 2018 16:25:14 +0800 Subject: [PATCH 19/46] fix bug --- .../jobxhub/agent/process/ExecuteUser.java | 39 +++++++------ .../jobxhub/agent/process/JobXProcess.java | 58 +++++++++---------- .../com/jobxhub/common/util/CommandUtils.java | 4 +- .../com/jobxhub/common/util/CommonUtils.java | 1 - .../com/jobxhub/common/util/ReflectUtils.java | 8 +++ 5 files changed, 59 insertions(+), 51 deletions(-) diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java b/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java index c8009ec5..e5d74d37 100644 --- a/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java +++ b/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java @@ -69,26 +69,29 @@ public static int execute(final String user, final File file, final String comma public static String buildCommand(final String proxyUser, final File execFile, final String command) { AssertUtils.notNull(command); - if (CommonUtils.isUnix()) { - //写入命令到文件 - write(execFile, command); - String execCmd = String.format("/bin/bash +x %s", execFile.getAbsolutePath()); - if (CommonUtils.notEmpty(proxyUser)) { - //授权文件... - try { - chown(false,proxyUser, proxyUser,execFile); - } catch (Exception e) { - throw new RuntimeException("[JobX] chown command file error,{}", e.getCause()); - } - return Constants.JOBX_EXECUTE_AS_USER_LIB - .concat(IOUtils.BLANK_CHAR) - .concat(proxyUser) - .concat(IOUtils.BLANK_CHAR) - .concat(execCmd); + //写入命令到文件 + write(execFile, command); + if (CommonUtils.isWindows()) { + return String.format("call %s",execFile.getAbsoluteFile()); + } + + String execCmd = String.format("/bin/bash +x %s", execFile.getAbsolutePath()); + if ( CommonUtils.notEmpty(proxyUser)) { + //授权文件... + try { + chown(false, proxyUser, proxyUser, execFile); + } catch (Exception e) { + throw new RuntimeException("[JobX] chown command file error,{}", e.getCause()); } - return execCmd; + return Constants.JOBX_EXECUTE_AS_USER_LIB + .concat(IOUtils.BLANK_CHAR) + .concat(proxyUser) + .concat(IOUtils.BLANK_CHAR) + .concat(execCmd); + } - return command; + + return execCmd; } } diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java b/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java index dd2e7627..b0f40106 100644 --- a/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java +++ b/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java @@ -28,7 +28,7 @@ import com.jobxhub.common.util.CommandUtils; import com.jobxhub.common.util.CommonUtils; import com.jobxhub.common.util.IOUtils; -import com.jobxhub.common.util.ReflectUtils; +import com.sun.jna.Platform; import com.sun.jna.Pointer; import com.sun.jna.platform.win32.Kernel32; import com.sun.jna.platform.win32.WinNT; @@ -47,12 +47,10 @@ public class JobXProcess { - private org.slf4j.Logger logger = LoggerFactory.getLogger(JobXProcess.class); private Logger processLogger; - public static String KILL_COMMAND = "kill"; private final String command; @@ -74,12 +72,8 @@ public JobXProcess(String command, int timeout, String pid, String execUser) { this.startupLatch = new CountDownLatch(1); this.completeLatch = new CountDownLatch(1); this.execUser = execUser; - if (CommonUtils.isUnix()) { - this.execShell = getExecShell(pid); - this.command = ExecuteUser.buildCommand(execUser, execShell, command); - } else { - this.command = command; - } + this.execShell = getExecShell(pid); + this.command = ExecuteUser.buildCommand(execUser, execShell, command); } /** @@ -183,7 +177,6 @@ public void deleteExecShell() { } } - /** * Await the completion of this process * @@ -217,7 +210,7 @@ public void kill(ExitCode kill) { } } }catch (Exception e) { - logger.info("[JobX]Kill attempt failed：{}",e.getMessage()); + logger.info("[JobX]Kill failed：{}",e.getMessage()); } } } @@ -247,10 +240,10 @@ private boolean softKill(long time, TimeUnit unit) throws InterruptedException { Process process = Runtime.getRuntime().exec(cmd); process.waitFor(); process.destroy(); - this.processLogger.error("[JobX]hardKill attempt successful."); + this.processLogger.error("[JobX]hardKill successful,pid:" + this.processId); return this.completeLatch.await(time, unit); } catch (IOException e) { - this.processLogger.error("[JobX]softKill attempt failed.", e); + this.processLogger.error("[JobX]softKill failed.pid:" + this.processId); } return false; } @@ -279,9 +272,9 @@ private void hardKill() { Process process = Runtime.getRuntime().exec(cmd); process.waitFor(); process.destroy(); - this.processLogger.error("[JobX]hardKill attempt successful."); + this.processLogger.error("[JobX]hardKill successful."); }catch (Exception e) { - this.processLogger.error("[JobX]hardKill attempt failed.", e); + this.processLogger.error("[JobX]hardKill failed.", e); } this.processId = null; } @@ -294,24 +287,26 @@ private void hardKill() { */ private Integer getProcessId() { try { - if (this.process == null) return null; - if (CommonUtils.isUnix()) { - Field field = ReflectUtils.getField(this.process.getClass(), "pid"); - Integer pid = field.getInt(this.process); - return CommandUtils.getPIDByPPID(pid); - }else if(CommonUtils.isWindows()) { - Field field = ReflectUtils.getField(this.process.getClass(), "handle"); + Field field; + if (Platform.isWindows()) { + field = process.getClass().getDeclaredField("handle"); field.setAccessible(true); - Kernel32 kernel = Kernel32.INSTANCE; - WinNT.HANDLE handle = new WinNT.HANDLE(); - long handl = field.getLong(this.process); - handle.setPointer(Pointer.createConstant(handl)); - return kernel.GetProcessId(handle); + int pid = Kernel32.INSTANCE.GetProcessId(new WinNT.HANDLE(new Pointer(field.getLong(process)))); + if (pid == 0 && logger.isDebugEnabled()) { + int lastError = Kernel32.INSTANCE.GetLastError(); + logger.debug("[JobX]KERNEL32.getProcessId() failed with error {}", lastError); + } + return pid; } - }catch (Exception e) { - e.printStackTrace(); + field = process.getClass().getDeclaredField("pid"); + field.setAccessible(true); + Integer PPID = field.getInt(process); + return CommandUtils.getPIDByPPID(PPID); + } catch (Exception e) { + logger.warn("[JobX]Failed to get process id for process \"{}\": {}", process, e.getMessage()); + logger.trace("", e); + return 0; } - return null; } /** @@ -366,7 +361,8 @@ private Logger getLogger(String name) { } private File getExecShell(String pid) { - return new File(Constants.JOBX_TMP_PATH + "/." + pid + ".sh"); + String ext = CommonUtils.isUnix()?".sh":".bat"; + return new File(Constants.JOBX_TMP_PATH + "/." + pid + ext); } private File getLogFile(String pid) { diff --git a/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java b/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java index 8099a350..75335271 100644 --- a/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java +++ b/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java @@ -55,6 +55,8 @@ public abstract class CommandUtils implements Serializable { public static String BASH_SCHEAM = "#!/bin/bash"; + public static String BAT_SCHEAM = "@echo off"; + public static File createShellFile(String command, String shellFileName) { String dirPath = IOUtils.getTmpdir(); File dir = new File(dirPath); @@ -271,7 +273,7 @@ public static void write(File shellFile, String command) { try { if (!shellFile.exists()) { PrintWriter out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(shellFile))); - out.write(BASH_SCHEAM); + out.write(CommonUtils.isWindows()?BAT_SCHEAM:BASH_SCHEAM); out.write("\n\n"); out.write(command); out.flush(); diff --git a/jobx-common/src/main/java/com/jobxhub/common/util/CommonUtils.java b/jobx-common/src/main/java/com/jobxhub/common/util/CommonUtils.java index 234944ca..f6e32700 100644 --- a/jobx-common/src/main/java/com/jobxhub/common/util/CommonUtils.java +++ b/jobx-common/src/main/java/com/jobxhub/common/util/CommonUtils.java @@ -21,7 +21,6 @@ package com.jobxhub.common.util; -import com.jobxhub.common.Constants; import com.jobxhub.common.util.collection.HashMap; import java.io.File; diff --git a/jobx-common/src/main/java/com/jobxhub/common/util/ReflectUtils.java b/jobx-common/src/main/java/com/jobxhub/common/util/ReflectUtils.java index c6c26939..fa679cc3 100644 --- a/jobx-common/src/main/java/com/jobxhub/common/util/ReflectUtils.java +++ b/jobx-common/src/main/java/com/jobxhub/common/util/ReflectUtils.java @@ -1622,4 +1622,12 @@ public static boolean isPrototype(Class clazz) { return clazz.getClassLoader() == null; } + public static Object getFieldValue(Object obj, String fieldName) throws NoSuchFieldException, IllegalAccessException { + Field field = getField(obj.getClass(),fieldName); + if (field!=null) { + return field.get(obj); + } + return null; + } + } From ad02f0590ca1e90a5c870bbf439c28f8647559b3 Mon Sep 17 00:00:00 2001 From: benjobs Date: Thu, 30 Aug 2018 18:06:13 +0800 Subject: [PATCH 20/46] fix bug --- deployment/build.bat | 20 ++++++++++---------- deployment/server.bat | 18 ++++++++---------- deployment/server.sh | 18 +++++++++--------- 3 files changed, 27 insertions(+), 29 deletions(-) diff --git a/deployment/build.bat b/deployment/build.bat index 396282f9..66c18d39 100644 --- a/deployment/build.bat +++ b/deployment/build.bat @@ -106,14 +106,14 @@ setlocal @REM Guess JOBX_HOME if not defined set "WORK_DIR=%~dp0" -set "JOBX_HOME=%WORK_DIR%" -set "JOBX_BASE=%JOBX_HOME%" +set "JOBX_HOME=%WORK_DIR%\..\" @REM ################################################################################################# set JOBX_VERSION=1.2.0-RELEASE -set DIST_HOME=%JOBX_HOME%\dist set JOBX_AGENT=%JOBX_HOME%\jobx-agent\target\jobx-agent-%JOBX_VERSION%.tar.gz set JOBX_SERVER=%JOBX_HOME%\jobx-server\target\jobx-server-%JOBX_VERSION%.war +set JOBX_AGENT_TAR=%WORK_DIR%\jobx-agent-%JOBX_VERSION%.tar.gz +set JOBX_SERVER_WAR=%WORK_DIR%\jobx-server-%JOBX_VERSION%.war set "EXECUTABLE=%JOBX_HOME%\.mvn\mvnw.cmd" @REM ################################################################################################# @@ -124,15 +124,15 @@ goto exit :okExec call "%EXECUTABLE%" "clean" "install" "-Dmaven.test.skip=true" -if %errorlevel%==0 goto toDist +if %errorlevel%==0 goto toCopy goto exit -:toDist -if exist "%DIST_HOME%" rd /s /q %DIST_HOME% -if not exist "%DIST_HOME%" mkdir %DIST_HOME% -copy %JOBX_AGENT% %DIST_HOME% -copy %JOBX_SERVER% %DIST_HOME% -echo [JobX] build jobx @Version %JOBX_VERSION% successfully! please goto %DIST_HOME% +:toCopy +if exist "%JOBX_AGENT_TAR%" rd /s /q %JOBX_AGENT_TAR% +if exist "%JOBX_SERVER_WAR%" rd /s /q %JOBX_SERVER_WAR% +copy %JOBX_AGENT% %WORK_DIR% +copy %JOBX_SERVER% %WORK_DIR% +echo [JobX] build jobx @Version %JOBX_VERSION% successfully! please goto %WORK_DIR% pause :exit diff --git a/deployment/server.bat b/deployment/server.bat index 36d18168..5d923e96 100644 --- a/deployment/server.bat +++ b/deployment/server.bat @@ -103,23 +103,21 @@ setlocal @REM Guess JOBX_HOME if not defined set "WORK_DIR=%~dp0" -set "JOBX_HOME=%WORK_DIR%" -set "JOBX_BASE=%JOBX_HOME%" +set "WORK_BASE=%WORK_DIR%\..\" @REM ################################################################################################# set APP_ARTIFACT=jobx-server set APP_VERSION=1.2.0-RELEASE set APP_WAR_NAME=%APP_ARTIFACT%-%APP_VERSION%.war -set MAVEN_TARGET_WAR=%JOBX_HOME%%APP_ARTIFACT%\target\%APP_WAR_NAME% -set DIST_PATH=%JOBX_HOME%dist -set DEPLOY_PATH=%DIST_PATH%\%APP_ARTIFACT% +set MAVEN_TARGET_WAR=%WORK_BASE%%APP_ARTIFACT%\target\%APP_WAR_NAME% +set DEPLOY_PATH=%WORK_BASE%\%APP_ARTIFACT% set CONTAINER_PATH=%DEPLOY_PATH%\container @REM ################################################################################################# -if exist "%DIST_PATH%\%APP_WAR_NAME%" goto initEnv -if not exist %DIST_PATH% mkdir %DIST_PATH% +if exist "%WORK_BASE%\%APP_WAR_NAME%" goto initEnv +if not exist %WORK_BASE% mkdir %WORK_BASE% if exist "%MAVEN_TARGET_WAR%" ( - copy %MAVEN_TARGET_WAR% %DIST_PATH% + copy %MAVEN_TARGET_WAR% %WORK_BASE% goto initEnv ) else ( echo [JobX] please build project first! @@ -129,7 +127,7 @@ if exist "%MAVEN_TARGET_WAR%" ( :initEnv if not exist "%DEPLOY_PATH%" ( mkdir %DEPLOY_PATH% - copy %DIST_PATH%\%APP_WAR_NAME% %DEPLOY_PATH% + copy %WORK_BASE%\%APP_WAR_NAME% %DEPLOY_PATH% cd %DEPLOY_PATH% %_RUNJAR% xvf %APP_WAR_NAME% 1>nul del %DEPLOY_PATH%\%APP_WAR_NAME% @@ -141,7 +139,7 @@ cd %DEPLOY_PATH% @REM copy container to deploy_path if not exist "%CONTAINER_PATH%" ( mkdir %CONTAINER_PATH% - xcopy %JOBX_HOME%%APP_ARTIFACT%\container %CONTAINER_PATH% /E 1>nul + xcopy %WORK_BASE%%APP_ARTIFACT%\container %CONTAINER_PATH% /E 1>nul ) @REM create log set LOG_PATH=%CONTAINER_PATH%\logs diff --git a/deployment/server.sh b/deployment/server.sh index 1d816e9a..b3217e67 100644 --- a/deployment/server.sh +++ b/deployment/server.sh @@ -107,42 +107,42 @@ done # Get standard environment variables PRGDIR=`dirname "$PRG"` -WORKDIR=`cd "$PRGDIR" >/dev/null; pwd`; -WORKBASE=`cd "$PRGDIR"/../ >/dev/null; pwd`; +WORK_DIR=`cd "$PRGDIR" >/dev/null; pwd`; +WORK_BASE=`cd "$PRGDIR"/../ >/dev/null; pwd`; # Get standard environment variables ############################################################################################### APP_ARTIFACT=jobx-server APP_VERSION="1.2.0-RELEASE"; APP_WAR_NAME=${APP_ARTIFACT}-${APP_VERSION}.war -MAVEN_TARGET_WAR=${WORKBASE}/${APP_ARTIFACT}/target/${APP_WAR_NAME} -DEPLOY_PATH=${WORKDIR}/${APP_ARTIFACT} +MAVEN_TARGET_WAR=${WORK_BASE}/${APP_ARTIFACT}/target/${APP_WAR_NAME} +DEPLOY_PATH=${WORK_DIR}/${APP_ARTIFACT} LIB_PATH=${DEPLOY_PATH}/WEB-INF/lib CONTAINER_PATH=${DEPLOY_PATH}/container LOG_PATH=${CONTAINER_PATH}/logs -CONFIG_TEMPLATE=${WORKDIR}/conf.properties +CONFIG_TEMPLATE=${WORK_DIR}/conf.properties CONFIG_PATH=${DEPLOY_PATH}/WEB-INF/classes/config.properties ############################################################################################### #先检查dist下是否有war包 -if [ ! -f "${WORKDIR}/${APP_WAR_NAME}" ] ; then +if [ ! -f "${WORK_DIR}/${APP_WAR_NAME}" ] ; then #dist下没有war包则检查server的target下是否有war包. if [ ! -f "${MAVEN_TARGET_WAR}" ] ; then echo_w "[JobX] please build project first!" exit 0; else - cp ${MAVEN_TARGET_WAR} ${WORKDIR}; + cp ${MAVEN_TARGET_WAR} ${WORK_DIR}; fi fi if [ ! -f "${DEPLOY_PATH}" ] ; then mkdir -p ${DEPLOY_PATH} # unpackage war to dist - cp ${WORKDIR}/${APP_WAR_NAME} ${DEPLOY_PATH} && + cp ${WORK_DIR}/${APP_WAR_NAME} ${DEPLOY_PATH} && cd ${DEPLOY_PATH} && ${RUNJAR} xvf ${APP_WAR_NAME} >/dev/null 2>&1 && rm -rf ${DEPLOY_PATH}/${APP_WAR_NAME} && #copy jars... - cp -r ${WORKBASE}/${APP_ARTIFACT}/container ${DEPLOY_PATH} + cp -r ${WORK_BASE}/${APP_ARTIFACT}/container ${DEPLOY_PATH} fi if [ ! -d "${LOG_PATH}" ] ; then mkdir -p ${LOG_PATH} From 475142ffec91de913f75959b6871953133844a18 Mon Sep 17 00:00:00 2001 From: benjobs Date: Thu, 30 Aug 2018 18:56:38 +0800 Subject: [PATCH 21/46] fix bug --- deployment/build.bat | 15 +++++++-------- deployment/build.sh | 26 +++++++++++++------------- deployment/server.bat | 2 +- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/deployment/build.bat b/deployment/build.bat index 66c18d39..7142f691 100644 --- a/deployment/build.bat +++ b/deployment/build.bat @@ -29,13 +29,13 @@ @REM In debug mode we need a real JDK (JAVA_HOME) echo\ -echo _______ -echo /\ _________ ______ _____ / / -echo (()) ______ / ________ / ___ \/ / -echo \/ ___ _ / _ __ \_ __ \ ___ / -echo / /_/ / / /_/ / /_/ / __ . \ +echo _______ +echo /\ _________ ______ _____ / / +echo (()) ______ / ________ / ___ \/ / +echo \/ ___ _ / _ __ \_ __ \ ___ / +echo / /_/ / / /_/ / /_/ / __ . \ echo \____/ \____/ /_.___/ __ / \_\__ -echo _____ / +echo _____ / echo\ if ""%1"" == ""debug"" goto needJavaHome @@ -123,7 +123,7 @@ echo This file is needed to run this program goto exit :okExec -call "%EXECUTABLE%" "clean" "install" "-Dmaven.test.skip=true" +call "%EXECUTABLE%" "-f" "%JOBX_HOME%\pom.xml" "clean" "install" "-Dmaven.test.skip=true" if %errorlevel%==0 goto toCopy goto exit @@ -140,4 +140,3 @@ exit /b 1 :end exit /b 0 - diff --git a/deployment/build.sh b/deployment/build.sh index c800a113..eeabdf12 100644 --- a/deployment/build.sh +++ b/deployment/build.sh @@ -52,16 +52,16 @@ done PRGDIR=`dirname "$PRG"` -WORKDIR=`cd "$PRGDIR" >/dev/null; pwd`; -WORKBASE=`cd "$PRGDIR"/../ >/dev/null; pwd`; +WORK_DIR=`cd "$PRGDIR" >/dev/null; pwd`; +WORK_BASE=`cd "$PRGDIR"/../ >/dev/null; pwd`; # Get standard environment variables ############################################################################################## JOBX_VERSION="1.2.0-RELEASE"; ## -JOBX_AGENT=${WORKBASE}/jobx-agent/target/jobx-agent-${JOBX_VERSION}.tar.gz ## -JOBX_SERVER=${WORKBASE}/jobx-server/target/jobx-server-${JOBX_VERSION}.war ## -EXEC_LIB=${WORKDIR}/executor.c ## -JOBX_AGENT_BIN_DIR=${WORKBASE}/jobx-agent/src/assembly/bin ## +JOBX_AGENT=${WORK_BASE}/jobx-agent/target/jobx-agent-${JOBX_VERSION}.tar.gz ## +JOBX_SERVER=${WORK_BASE}/jobx-server/target/jobx-server-${JOBX_VERSION}.war ## +EXEC_LIB=${WORK_DIR}/executor.c ## +JOBX_AGENT_BIN_DIR=${WORK_BASE}/jobx-agent/src/assembly/bin ## ############################################################################################## echo_r () { @@ -183,8 +183,8 @@ if [ "`$JAVACMD -version 2>&1 | head -1|grep "openjdk"|wc -l`"x == "1"x ]; then exit 1; fi echo_w "build jobx Starting..."; -if [ ! -f "${WORKBASE}/.mvn/mvnw" ];then - echo_r "ERROR: ${WORKBASE}/.mvn/mvnw is not exists,This file is needed to run this program!" +if [ ! -f "${WORK_BASE}/.mvn/mvnw" ];then + echo_r "ERROR: ${WORK_BASE}/.mvn/mvnw is not exists,This file is needed to run this program!" exit 1; fi @@ -205,12 +205,12 @@ if [ "$GCCCMD" ] ; then fi fi -${WORKBASE}/.mvn/mvnw -f ${WORKBASE}/pom.xml clean install -Dmaven.test.skip=true; +${WORK_BASE}/.mvn/mvnw -f ${WORK_BASE}/pom.xml clean install -Dmaven.test.skip=true; ret_val=$? if [ ${ret_val} -eq 0 ] ; then - cp ${JOBX_AGENT} ${WORKDIR} - cp ${JOBX_SERVER} ${WORKDIR} - printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR}build jobx @Version ${JOBX_VERSION} successfully! please goto${RES} ${GREEN_COLOR}${WORKDIR}${RES}\n" + cp ${JOBX_AGENT} ${WORK_DIR} + cp ${JOBX_SERVER} ${WORK_DIR} + printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR}build jobx @Version ${JOBX_VERSION} successfully! please goto${RES} ${GREEN_COLOR}${WORK_DIR}${RES}\n" if [ ${exec_retval} -eq 1 ]; then echo_w "WARN: compile executor.c error,please compile executor.c by yourself." else @@ -220,4 +220,4 @@ if [ ${ret_val} -eq 0 ] ; then else echo_r "build jobx failed! please try again " exit 1 -fi \ No newline at end of file +fi diff --git a/deployment/server.bat b/deployment/server.bat index 5d923e96..acefe31c 100644 --- a/deployment/server.bat +++ b/deployment/server.bat @@ -110,7 +110,7 @@ set APP_ARTIFACT=jobx-server set APP_VERSION=1.2.0-RELEASE set APP_WAR_NAME=%APP_ARTIFACT%-%APP_VERSION%.war set MAVEN_TARGET_WAR=%WORK_BASE%%APP_ARTIFACT%\target\%APP_WAR_NAME% -set DEPLOY_PATH=%WORK_BASE%\%APP_ARTIFACT% +set DEPLOY_PATH=%WORK_DIR%\%APP_ARTIFACT% set CONTAINER_PATH=%DEPLOY_PATH%\container @REM ################################################################################################# From 1ad9cee23907ee956ab39446c9ec7eda9f7185d5 Mon Sep 17 00:00:00 2001 From: benjobs Date: Thu, 30 Aug 2018 19:02:15 +0800 Subject: [PATCH 22/46] fix bug --- jobx-server/src/main/resources/mapper/AgentDao.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/jobx-server/src/main/resources/mapper/AgentDao.xml b/jobx-server/src/main/resources/mapper/AgentDao.xml index e394a3b6..27ed266d 100644 --- a/jobx-server/src/main/resources/mapper/AgentDao.xml +++ b/jobx-server/src/main/resources/mapper/AgentDao.xml @@ -238,8 +238,7 @@ update t_agent - set - status = #{status} + set status = #{status} where agent_id = #{agentId} From e1149840265f41d84e94f0f07ed97863ec4de8d1 Mon Sep 17 00:00:00 2001 From: benjobs Date: Fri, 31 Aug 2018 00:32:38 +0800 Subject: [PATCH 23/46] exec bug fix! --- jobx-agent/src/assembly/bin/kill.sh | 76 +++++++++++++++++ .../jobxhub/agent/process/JobXProcess.java | 85 +++++++------------ .../java/com/jobxhub/common/Constants.java | 5 ++ .../com/jobxhub/registry/RegistryTest.java | 1 - .../com/jobxhub/server/job/JobXRegistry.java | 2 +- 5 files changed, 115 insertions(+), 54 deletions(-) create mode 100644 jobx-agent/src/assembly/bin/kill.sh diff --git a/jobx-agent/src/assembly/bin/kill.sh b/jobx-agent/src/assembly/bin/kill.sh new file mode 100644 index 00000000..550f260c --- /dev/null +++ b/jobx-agent/src/assembly/bin/kill.sh @@ -0,0 +1,76 @@ +#!/bin/bash +# +# Copyright (c) 2015 The JobX Project +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +# +#kill_model +# 0) soft kill +# 1) force kill +# +kill_model=$1 + +#this process id +pid=$2 + +if [ !"${kill_model}" == "0"x ] ||[ !"${kill_model}" == "1"x ]; then + echo "[JobX] the first args must be [0|1]" + exit 1; +fi + +if [ "${pid}"x == ""x ];then + echo "[JobX] pid is null" + exit 1; +fi + + +# if pstree exists +if [ -n "`which pstree`" ];then + array=$(pstree -p ${pid}| sed 's/[^0-9]/ /g'); + for id in ${array} + do + if [ ${pid} -gt 300 ];then + if [ "${kill_model}" == "0"x ];then + echo kill ${id} >/dev/null 2>&1; + else + echo kill -9 ${id} >/dev/null 2>&1; + fi + fi + done +else + while true + do + #find pid by ppid + cmd="ps -ef|awk '{if(\$3~/${pid}/) print \$2}'" + pid=$(eval ${cmd}) + if [ "${pid}"x == ""x ] || [ ${pid} -lt 300 ] ; then + break; + fi + if [ "${kill_model}"x == "0"x ];then + kill ${pid} >/dev/null 2>&1; + else + kill -9 ${pid} >/dev/null 2>&1; + fi + done +fi + +echo "[JobX] kill done"; + +exit 0; \ No newline at end of file diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java b/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java index b0f40106..a64e1386 100644 --- a/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java +++ b/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java @@ -25,10 +25,9 @@ import com.jobxhub.common.Constants; import com.jobxhub.common.Constants.ExitCode ; import com.jobxhub.common.logging.LoggerFactory; -import com.jobxhub.common.util.CommandUtils; import com.jobxhub.common.util.CommonUtils; import com.jobxhub.common.util.IOUtils; -import com.sun.jna.Platform; +import com.jobxhub.common.util.ReflectUtils; import com.sun.jna.Pointer; import com.sun.jna.platform.win32.Kernel32; import com.sun.jna.platform.win32.WinNT; @@ -51,8 +50,6 @@ public class JobXProcess { private Logger processLogger; - public static String KILL_COMMAND = "kill"; - private final String command; private final int timeout; private final CountDownLatch startupLatch; @@ -201,16 +198,16 @@ public void kill(ExitCode kill) { if (isStarted()) { this.kill = kill; try { - if (CommonUtils.isWindows()) { - hardKill(); - }else { - boolean flag = softKill(1000,TimeUnit.SECONDS); - if (!flag) { - hardKill(); + if (CommonUtils.isUnix()) { + boolean killed = this.softKill(1000*5,TimeUnit.SECONDS); + if (!killed) { + this.hardKill(); } + }else { + this.hardKill(); } }catch (Exception e) { - logger.info("[JobX]Kill failed：{}",e.getMessage()); + e.printStackTrace(); } } } @@ -225,19 +222,16 @@ public void kill(ExitCode kill) { private boolean softKill(long time, TimeUnit unit) throws InterruptedException { if (this.processId != 0 && isStarted()) { try { - String cmd; + String KillCMD = String.format("/bin/bash +x %s %d %d",Constants.JOBX_KILL_FILE.getAbsolutePath(),0,this.processId); if (isExecAsUser()) { - cmd = String.format( - "%s %s %s %d", + KillCMD = String.format( + "%s %s %s", Constants.JOBX_EXECUTE_AS_USER_LIB, this.execUser, - KILL_COMMAND, - this.processId + KillCMD ); - } else { - cmd = String.format("%s %d", KILL_COMMAND, this.processId); } - Process process = Runtime.getRuntime().exec(cmd); + Process process = Runtime.getRuntime().exec(KillCMD); process.waitFor(); process.destroy(); this.processLogger.error("[JobX]hardKill successful,pid:" + this.processId); @@ -256,20 +250,18 @@ private boolean softKill(long time, TimeUnit unit) throws InterruptedException { private void hardKill() { if ( isRunning() && this.processId != null ) { try { - String cmd = ""; + String killCMD = String.format("/bin/bash +x %s %d %d",Constants.JOBX_KILL_FILE.getAbsolutePath(),1,this.processId); if (CommonUtils.isUnix()) { if (isExecAsUser()) { - cmd = String.format("%s %s %s -9 %d", + killCMD = String.format("%s %s %s", Constants.JOBX_EXECUTE_AS_USER_LIB, - this.execUser, KILL_COMMAND, - this.processId); - } else { - cmd = String.format("%s -9 %d", KILL_COMMAND, this.processId); + this.execUser, + killCMD); } }else if(CommonUtils.isWindows()) { - cmd = String.format("cmd.exe /c taskkill /PID %s /F /T ",this.processId) ; + killCMD = String.format("cmd.exe /c taskkill /PID %s /F /T ",this.processId) ; } - Process process = Runtime.getRuntime().exec(cmd); + Process process = Runtime.getRuntime().exec(killCMD); process.waitFor(); process.destroy(); this.processLogger.error("[JobX]hardKill successful."); @@ -280,33 +272,23 @@ private void hardKill() { } } - /** - * Attempt to get the process id for this process - * - * @return The id of the process - */ private Integer getProcessId() { try { - Field field; - if (Platform.isWindows()) { - field = process.getClass().getDeclaredField("handle"); - field.setAccessible(true); - int pid = Kernel32.INSTANCE.GetProcessId(new WinNT.HANDLE(new Pointer(field.getLong(process)))); - if (pid == 0 && logger.isDebugEnabled()) { - int lastError = Kernel32.INSTANCE.GetLastError(); - logger.debug("[JobX]KERNEL32.getProcessId() failed with error {}", lastError); - } - return pid; + if (this.process == null) return null; + if (CommonUtils.isUnix()) { + Field field = ReflectUtils.getField(this.process.getClass(), "pid"); + return field.getInt(this.process); + }else if(CommonUtils.isWindows()) { + Field field = ReflectUtils.getField(this.process.getClass(), "handle"); + WinNT.HANDLE handle = new WinNT.HANDLE(); + long handl = field.getLong(this.process); + handle.setPointer(Pointer.createConstant(handl)); + return Kernel32.INSTANCE.GetProcessId(handle); } - field = process.getClass().getDeclaredField("pid"); - field.setAccessible(true); - Integer PPID = field.getInt(process); - return CommandUtils.getPIDByPPID(PPID); - } catch (Exception e) { - logger.warn("[JobX]Failed to get process id for process \"{}\": {}", process, e.getMessage()); - logger.trace("", e); - return 0; + }catch (Exception e) { + e.printStackTrace(); } + return null; } /** @@ -361,8 +343,7 @@ private Logger getLogger(String name) { } private File getExecShell(String pid) { - String ext = CommonUtils.isUnix()?".sh":".bat"; - return new File(Constants.JOBX_TMP_PATH + "/." + pid + ext); + return new File(String.format("%s/.%s.%s",Constants.JOBX_TMP_PATH,pid,CommonUtils.isUnix()?"sh":"bat")); } private File getLogFile(String pid) { diff --git a/jobx-common/src/main/java/com/jobxhub/common/Constants.java b/jobx-common/src/main/java/com/jobxhub/common/Constants.java index fd8a553a..abc3d3ec 100644 --- a/jobx-common/src/main/java/com/jobxhub/common/Constants.java +++ b/jobx-common/src/main/java/com/jobxhub/common/Constants.java @@ -186,6 +186,11 @@ public class Constants { */ public static final File JOBX_PID_FILE = new File(SystemPropertyUtils.get("jobx.pid", JOBX_HOME + "/jobx.pid")); + /** + * kill + */ + public static final File JOBX_KILL_FILE = new File(JOBX_HOME + "/bin/kill.sh"); + /** * monitor file */ diff --git a/jobx-registry/src/test/java/com/jobxhub/registry/RegistryTest.java b/jobx-registry/src/test/java/com/jobxhub/registry/RegistryTest.java index 56c8b8f3..fb1f5489 100644 --- a/jobx-registry/src/test/java/com/jobxhub/registry/RegistryTest.java +++ b/jobx-registry/src/test/java/com/jobxhub/registry/RegistryTest.java @@ -36,7 +36,6 @@ public void delete() throws IOException { @Test public void lister() throws IOException { - zookeeperClient.addChildListener("/jobx/agent",new ChildListener(){ @Override public void childChanged(String path, List children) { diff --git a/jobx-server/src/main/java/com/jobxhub/server/job/JobXRegistry.java b/jobx-server/src/main/java/com/jobxhub/server/job/JobXRegistry.java index 4dba1cc5..ba008d8d 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/job/JobXRegistry.java +++ b/jobx-server/src/main/java/com/jobxhub/server/job/JobXRegistry.java @@ -22,12 +22,12 @@ package com.jobxhub.server.job; import com.jobxhub.common.util.collection.HashMap; +import com.jobxhub.registry.URL; import com.jobxhub.server.dto.Agent; import com.jobxhub.common.Constants; import com.jobxhub.common.ext.ExtensionLoader; import com.jobxhub.common.logging.LoggerFactory; import com.jobxhub.common.util.*; -import com.jobxhub.registry.URL; import com.jobxhub.registry.api.Registry; import com.jobxhub.registry.zookeeper.ChildListener; import com.jobxhub.registry.zookeeper.ZookeeperClient; From 3ba82d97453129262eca459d4eec55d015e262c4 Mon Sep 17 00:00:00 2001 From: benjobs Date: Fri, 31 Aug 2018 09:04:45 +0800 Subject: [PATCH 24/46] exec bug fix! --- .../server/controller/JobController.java | 6 + .../server/service/ExecuteService.java | 6 +- .../src/main/webapp/WEB-INF/view/job/add.jsp | 469 ++----------- .../main/webapp/WEB-INF/view/job/addflow.jsp | 663 ------------------ .../src/main/webapp/static/js/job.validata.js | 13 +- 5 files changed, 52 insertions(+), 1105 deletions(-) delete mode 100755 jobx-server/src/main/webapp/WEB-INF/view/job/addflow.jsp diff --git a/jobx-server/src/main/java/com/jobxhub/server/controller/JobController.java b/jobx-server/src/main/java/com/jobxhub/server/controller/JobController.java index d38e7293..2ce254b6 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/controller/JobController.java +++ b/jobx-server/src/main/java/com/jobxhub/server/controller/JobController.java @@ -191,6 +191,12 @@ public String save(HttpSession session, Job jobParam, HttpServletRequest request jobParam.setUserId(JobXTools.getUserId(session)); jobParam.setCreateType(Constants.CreateType.NORMAL.getValue()); jobParam.setToken(CommonUtils.uuid()); + Agent agent = agentService.getAgent(jobParam.getAgentId()); + if (agent!=null) { + if (agent.getPlatform() != 1 ) { + jobParam.setExecUser(null); + } + } jobParam.setPause(false); jobService.merge(jobParam); } else { //流程任务 diff --git a/jobx-server/src/main/java/com/jobxhub/server/service/ExecuteService.java b/jobx-server/src/main/java/com/jobxhub/server/service/ExecuteService.java index 41ec98b5..509adaaf 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/service/ExecuteService.java +++ b/jobx-server/src/main/java/com/jobxhub/server/service/ExecuteService.java @@ -503,7 +503,9 @@ public KillCallback(Job job,Record record) { @Override public void done(Response response) { + record = recordService.getById(record.getRecordId()); record.setStatus(RunStatus.STOPED.getStatus()); + record.setSuccess(ResultStatus.KILLED.getStatus()); record.setEndTime(new Date()); recordService.merge(record); printLog("killed successful :jobName:{} at host:{},port:{},pid:{}", job, record.getPid()); @@ -511,9 +513,7 @@ public void done(Response response) { @Override public void caught(Throwable err) { - record.setStatus(RunStatus.STOPED.getStatus()); - recordService.merge(record); - printLog("killed successful :jobName:{} at host:{},port:{},pid:{}", job, record.getPid()); + printLog("killed error :jobName:{} at host:{},port:{},pid:{}", job, record.getPid()); } } } \ No newline at end of file diff --git a/jobx-server/src/main/webapp/WEB-INF/view/job/add.jsp b/jobx-server/src/main/webapp/WEB-INF/view/job/add.jsp index 34ee2c85..53e4b521 100755 --- a/jobx-server/src/main/webapp/WEB-INF/view/job/add.jsp +++ b/jobx-server/src/main/webapp/WEB-INF/view/job/add.jsp @@ -117,8 +117,6 @@ - - - - @@ -370,109 +194,53 @@

- +
- + + + + + + + + +
* 要执行作业的目标机器

-
- -
-
- -
- - - - - - - - -
* 要执行作业的目标机器

-
-
- -
- -
- - 请采用unix/linux的shell支持的命令 -
-
- -
- -
- -
* 执行该作业的用户身份

-
-
- -
- -
- - 自定义作业执行成功的返回标识(默认执行成功是0) -
-
+
+ +
+ + 请采用unix/linux的shell支持的命令
+
-
-
- - -
-
- - -
-
-
-
    -
    -     -
    - -
    - -
    -
    - -
    -
    -
    - -
    - - - -
    +
    + +
    + +
    * 执行该作业的用户身份

    +
    + +
    + + 自定义作业执行成功的返回标识(默认执行成功是0) +
    +
    + +
    @@ -541,169 +309,10 @@
    - - <%--添加流程作业弹窗--%> - - - <%--选择已有作业弹窗--%> - - - <%--选择已有作业弹窗--%> - - - - diff --git a/jobx-server/src/main/webapp/WEB-INF/view/job/addflow.jsp b/jobx-server/src/main/webapp/WEB-INF/view/job/addflow.jsp deleted file mode 100755 index e256e43a..00000000 --- a/jobx-server/src/main/webapp/WEB-INF/view/job/addflow.jsp +++ /dev/null @@ -1,663 +0,0 @@ -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> -<%@ taglib prefix="cron" uri="http://www.jobx.org" %> -<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> - - - - - - - - - - - - - - - - - - -
    - - - - - - -

     添加作业

    - -
    -  返回 -
    - -
    -
    - -
    - -
    -

    - -
    - -
    - - 必填项,该作业流的名称 -
    -
    - -
    - -
    - - 请采用quartz框架的时间格式表达式 -
    -
    - - -
    - -
    - - -
    -
    - - -
    -
    -
    -
      -
      -       -
      - -
      - -
      -
      - -
      -
      -
      - -
      - - - -
      - -
      - -
      - -     -
      执行失败时是否自动重新执行 -
      -
      - -
      - -
      - - 执行失败时自动重新执行的截止次数 -
      -
      - -
      - -
      - - 执行作业允许的最大时间,超过则为超时(0:忽略超时时间,分钟为单位) -
      -
      - -
      - -
      - -        -
      任务执行失败时是否发信息报警 -
      -
      - -
      - -
      - - 任务执行失败时将发送短信给此手机,多个请以逗号(英文)隔开 -
      -
      - -
      - -
      - - 任务执行失败时将发送报告给此邮箱,多个请以逗号(英文)隔开 -
      -
      -
      - -
      - -
      - -
      -
      - -
      -
      -    - -
      -
      -
      -
      -
      - - <%--添加流程作业弹窗--%> - - - <%--选择已有作业弹窗--%> - - - <%--选择已有作业弹窗--%> - - -
      - - - - diff --git a/jobx-server/src/main/webapp/static/js/job.validata.js b/jobx-server/src/main/webapp/static/js/job.validata.js index 8fe4ac7c..ccdf233c 100755 --- a/jobx-server/src/main/webapp/static/js/job.validata.js +++ b/jobx-server/src/main/webapp/static/js/job.validata.js @@ -238,15 +238,10 @@ function Validata() { this.runCount(); this.timeout(); this.warning(); - var jobType = $("#jobType").val(); - if (jobType == 0) { - this.command(); - this.platform(); - this.agentId(); - this.successExit(); - } else { - - } + this.command(); + this.platform(); + this.agentId(); + this.successExit(); return this.status; } }; From 0b1e3b7fea4b92e3e1586bc99dc0452437a370c4 Mon Sep 17 00:00:00 2001 From: benjobs Date: Fri, 31 Aug 2018 09:19:09 +0800 Subject: [PATCH 25/46] fixbug --- .../src/main/java/com/jobxhub/agent/process/JobXProcess.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java b/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java index a64e1386..46352c81 100644 --- a/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java +++ b/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java @@ -343,7 +343,7 @@ private Logger getLogger(String name) { } private File getExecShell(String pid) { - return new File(String.format("%s/.%s.%s",Constants.JOBX_TMP_PATH,pid,CommonUtils.isUnix()?"sh":"bat")); + return new File(String.format("%s/.%s.%s",Constants.JOBX_TMP_PATH,pid,CommonUtils.isWindows()?"bat":"sh")); } private File getLogFile(String pid) { From 933299c7e09dbd07ca98d8184706ea3eb85f9b70 Mon Sep 17 00:00:00 2001 From: benjobs Date: Fri, 31 Aug 2018 14:21:17 +0800 Subject: [PATCH 26/46] fix bug --- .../main/java/com/jobxhub/agent/process/ExecuteUser.java | 2 +- .../main/java/com/jobxhub/common/util/CommandUtils.java | 2 +- .../java/com/jobxhub/server/service/AgentService.java | 8 +++++--- jobx-server/src/main/resources/mapper/AgentDao.xml | 2 +- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java b/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java index e5d74d37..05538947 100644 --- a/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java +++ b/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java @@ -73,7 +73,7 @@ public static String buildCommand(final String proxyUser, final File execFile, f write(execFile, command); if (CommonUtils.isWindows()) { - return String.format("call %s",execFile.getAbsoluteFile()); + return String.format("call %s",execFile.getAbsolutePath()); } String execCmd = String.format("/bin/bash +x %s", execFile.getAbsolutePath()); diff --git a/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java b/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java index 75335271..ec2193e2 100644 --- a/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java +++ b/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java @@ -274,7 +274,7 @@ public static void write(File shellFile, String command) { if (!shellFile.exists()) { PrintWriter out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(shellFile))); out.write(CommonUtils.isWindows()?BAT_SCHEAM:BASH_SCHEAM); - out.write("\n\n"); + out.write("\n\r\n\r"); out.write(command); out.flush(); out.close(); diff --git a/jobx-server/src/main/java/com/jobxhub/server/service/AgentService.java b/jobx-server/src/main/java/com/jobxhub/server/service/AgentService.java index 17b4757f..15d644e4 100755 --- a/jobx-server/src/main/java/com/jobxhub/server/service/AgentService.java +++ b/jobx-server/src/main/java/com/jobxhub/server/service/AgentService.java @@ -60,6 +60,9 @@ public class AgentService { @Autowired private UserAgentService userAgentService; + @Autowired + private NoticeService noticeService; + @Autowired private JobXRegistry jobxRegistry; @@ -218,12 +221,11 @@ public Agent getByMacId(String machineId) { public void doDisconnect(Agent agent) { if (CommonUtils.isEmpty(agent.getNotifyTime()) || new Date().getTime() - agent.getNotifyTime().getTime() >= configService.getSysConfig().getSpaceTime() * 60 * 1000) { - //noticeService.notice(agent); + noticeService.notice(agent); //记录本次任务失败的时间 agent.setNotifyTime(new Date()); } - agent.setStatus(Constants.ConnStatus.DISCONNECTED.getValue()); - merge(agent); + agentDao.updateStatus(agent.getAgentId(),Constants.ConnStatus.DISCONNECTED.getValue()); } public void doDisconnect(String info) { diff --git a/jobx-server/src/main/resources/mapper/AgentDao.xml b/jobx-server/src/main/resources/mapper/AgentDao.xml index 27ed266d..bfaaa044 100644 --- a/jobx-server/src/main/resources/mapper/AgentDao.xml +++ b/jobx-server/src/main/resources/mapper/AgentDao.xml @@ -231,7 +231,7 @@ `name` = #{name}, notify_time = #{notifyTime}, password = #{password}, - port = #{port}, + port = #{port}, proxy_id = #{proxyId} where agent_id = #{agentId} From 478e98f35b8b793b599682c25844afab4b4b5577 Mon Sep 17 00:00:00 2001 From: benjobs Date: Fri, 31 Aug 2018 15:24:27 +0800 Subject: [PATCH 27/46] fix bug --- .../main/java/com/jobxhub/agent/bootstrap/JobXAgent.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/bootstrap/JobXAgent.java b/jobx-agent/src/main/java/com/jobxhub/agent/bootstrap/JobXAgent.java index 3c566f2e..7fb627f3 100755 --- a/jobx-agent/src/main/java/com/jobxhub/agent/bootstrap/JobXAgent.java +++ b/jobx-agent/src/main/java/com/jobxhub/agent/bootstrap/JobXAgent.java @@ -39,7 +39,6 @@ import java.lang.management.ManagementFactory; import java.lang.management.RuntimeMXBean; import java.lang.reflect.InvocationTargetException; -import java.net.ConnectException; import java.net.ServerSocket; import java.net.Socket; import java.net.SocketTimeoutException; @@ -397,7 +396,7 @@ private void await() throws Exception { * @throws Exception */ - private void shutdown() throws Exception { + private void shutdown() { String address = "localhost"; @@ -412,11 +411,6 @@ private void shutdown() throws Exception { } stream.flush(); socket.close(); - } catch (ConnectException ce) { - if (logger.isErrorEnabled()) { - logger.error("[JobX] Agent.stop error:{} ", ce); - } - System.exit(1); } catch (Exception e) { if (logger.isErrorEnabled()) { logger.error("[JobX] Agent.stop error:{} ", e); From 4da793c80359c68ebefd72108f69c84a97883e52 Mon Sep 17 00:00:00 2001 From: benjobs Date: Fri, 31 Aug 2018 15:26:01 +0800 Subject: [PATCH 28/46] fix bug --- .../src/main/resources/mapper/RecordDao.xml | 218 +++++++++--------- 1 file changed, 111 insertions(+), 107 deletions(-) diff --git a/jobx-server/src/main/resources/mapper/RecordDao.xml b/jobx-server/src/main/resources/mapper/RecordDao.xml index 56d222be..64c3c2d4 100644 --- a/jobx-server/src/main/resources/mapper/RecordDao.xml +++ b/jobx-server/src/main/resources/mapper/RecordDao.xml @@ -3,29 +3,29 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -49,8 +49,9 @@ select - sum(case r.success when 0 then 1 else 0 end) failed, - sum(case r.success when 1 then 1 else 0 end) success, - sum(case r.success when 2 then 1 else 0 end) killed, - sum(case r.success when 3 then 1 else 0 end) timeout, - sum(case r.success when 4 then 1 else 0 end) lost, - sum(case r.job_type when 0 then 1 else 0 end) singleton, - sum(case r.job_type when 1 then 1 else 0 end) flow, - sum(case r.exec_type when 0 then 1 else 0 end) auto, - sum(case r.exec_type when 1 then 1 else 0 end) operator - from t_record r + sum(case r.success when 0 then 1 else 0 end) failed, + sum(case r.success when 1 then 1 else 0 end) success, + sum(case r.success when 2 then 1 else 0 end) killed, + sum(case r.success when 3 then 1 else 0 end) timeout, + sum(case r.success when 4 then 1 else 0 end) lost, + sum(case r.job_type when 0 then 1 else 0 end) singleton, + sum(case r.job_type when 1 then 1 else 0 end) flow, + sum(case r.exec_type when 0 then 1 else 0 end) auto, + sum(case r.exec_type when 1 then 1 else 0 end) operator + from t_record r left join t_job j - on r.job_id=j.job_id - + on r.job_id=j.job_id + where r.user_id = #{filter.userId} @@ -225,19 +228,19 @@ @@ -247,7 +250,7 @@ from t_record where success=#{filter.success} and exec_type=#{filter.execType} - + and user_id = #{filter.userId} @@ -258,111 +261,112 @@ - + insert into t_record - - + + agent_id, - + command, - + start_time, - + end_time, - + exec_type, - + group_id, - + user_id, - + job_id, - + job_type, - + job_name, - + exec_user, - + parent_id, - + pid, - + redo_num, - + return_code, - + status, - + success - - + + #{agentId}, - + #{command}, - + #{startTime}, - + #{endTime}, - + #{execType}, - + #{groupId}, - + #{userId}, - + #{jobId}, - + #{jobType}, - + #{jobName}, - + #{execUser}, - + #{parentId}, - + #{pid}, - + #{redoNum}, - + #{returnCode}, - + #{status}, - + #{success} From 3ad66cd497af5d5318e90d98710ac216fa82de8c Mon Sep 17 00:00:00 2001 From: benjobs Date: Fri, 31 Aug 2018 16:49:13 +0800 Subject: [PATCH 29/46] fix bug --- .../com/jobxhub/agent/process/ExecuteUser.java | 7 ++++--- .../com/jobxhub/agent/process/JobXProcess.java | 18 ++++++++++++------ .../com/jobxhub/common/util/CommandUtils.java | 4 +--- .../server/controller/VerifyController.java | 2 +- .../com/jobxhub/server/job/JobXRegistry.java | 4 +--- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java b/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java index 05538947..2176454b 100644 --- a/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java +++ b/jobx-agent/src/main/java/com/jobxhub/agent/process/ExecuteUser.java @@ -69,13 +69,14 @@ public static int execute(final String user, final File file, final String comma public static String buildCommand(final String proxyUser, final File execFile, final String command) { AssertUtils.notNull(command); - //写入命令到文件 - write(execFile, command); if (CommonUtils.isWindows()) { - return String.format("call %s",execFile.getAbsolutePath()); + return command; } + //写入命令到文件 + write(execFile, command); + String execCmd = String.format("/bin/bash +x %s", execFile.getAbsolutePath()); if ( CommonUtils.notEmpty(proxyUser)) { //授权文件... diff --git a/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java b/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java index 46352c81..337f24c3 100644 --- a/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java +++ b/jobx-agent/src/main/java/com/jobxhub/agent/process/JobXProcess.java @@ -277,13 +277,16 @@ private Integer getProcessId() { if (this.process == null) return null; if (CommonUtils.isUnix()) { Field field = ReflectUtils.getField(this.process.getClass(), "pid"); - return field.getInt(this.process); + if (field!=null) { + return field.getInt(this.process); + } }else if(CommonUtils.isWindows()) { Field field = ReflectUtils.getField(this.process.getClass(), "handle"); - WinNT.HANDLE handle = new WinNT.HANDLE(); - long handl = field.getLong(this.process); - handle.setPointer(Pointer.createConstant(handl)); - return Kernel32.INSTANCE.GetProcessId(handle); + if (field!=null) { + WinNT.HANDLE handle = new WinNT.HANDLE(); + handle.setPointer(Pointer.createConstant(field.getLong(this.process))); + return Kernel32.INSTANCE.GetProcessId(handle); + } } }catch (Exception e) { e.printStackTrace(); @@ -343,7 +346,10 @@ private Logger getLogger(String name) { } private File getExecShell(String pid) { - return new File(String.format("%s/.%s.%s",Constants.JOBX_TMP_PATH,pid,CommonUtils.isWindows()?"bat":"sh")); + if (CommonUtils.isUnix()) { + return new File(String.format("%s/.%s.%s",Constants.JOBX_TMP_PATH,pid,"sh")); + } + return null; } private File getLogFile(String pid) { diff --git a/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java b/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java index ec2193e2..ca818381 100644 --- a/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java +++ b/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java @@ -55,8 +55,6 @@ public abstract class CommandUtils implements Serializable { public static String BASH_SCHEAM = "#!/bin/bash"; - public static String BAT_SCHEAM = "@echo off"; - public static File createShellFile(String command, String shellFileName) { String dirPath = IOUtils.getTmpdir(); File dir = new File(dirPath); @@ -273,7 +271,7 @@ public static void write(File shellFile, String command) { try { if (!shellFile.exists()) { PrintWriter out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(shellFile))); - out.write(CommonUtils.isWindows()?BAT_SCHEAM:BASH_SCHEAM); + out.write(BASH_SCHEAM); out.write("\n\r\n\r"); out.write(command); out.flush(); diff --git a/jobx-server/src/main/java/com/jobxhub/server/controller/VerifyController.java b/jobx-server/src/main/java/com/jobxhub/server/controller/VerifyController.java index 37c0b3d7..c93315a8 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/controller/VerifyController.java +++ b/jobx-server/src/main/java/com/jobxhub/server/controller/VerifyController.java @@ -70,7 +70,7 @@ public List getRecentTriggerTime(String cronExp) { public Map validatePing(Agent agent) { Map result = new HashMap(0); if (hasProxy(agent, result)) return result; - Constants.ConnStatus connStatus = executeService.ping(agent,false); + Constants.ConnStatus connStatus = executeService.ping(agent,true); result.put("status",connStatus.getValue()); return result; } diff --git a/jobx-server/src/main/java/com/jobxhub/server/job/JobXRegistry.java b/jobx-server/src/main/java/com/jobxhub/server/job/JobXRegistry.java index ba008d8d..b1317ddf 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/job/JobXRegistry.java +++ b/jobx-server/src/main/java/com/jobxhub/server/job/JobXRegistry.java @@ -103,9 +103,7 @@ public void initialize() { List agentList = this.agentService.getAll(); if (CommonUtils.notEmpty(agentList)) { for (Agent agent : agentList) { - if(agent.getStatus() == Constants.ConnStatus.DISCONNECTED.getValue()) { - executeService.ping(agent,true); - } + executeService.ping(agent,true); } } From 59b279347e36c508fd797d6a41e1d14e7b39bd4a Mon Sep 17 00:00:00 2001 From: benjobs Date: Fri, 31 Aug 2018 16:51:38 +0800 Subject: [PATCH 30/46] fix bug --- jobx-server/src/main/webapp/WEB-INF/view/config/edit.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobx-server/src/main/webapp/WEB-INF/view/config/edit.jsp b/jobx-server/src/main/webapp/WEB-INF/view/config/edit.jsp index 9a234784..cb7e9d8b 100755 --- a/jobx-server/src/main/webapp/WEB-INF/view/config/edit.jsp +++ b/jobx-server/src/main/webapp/WEB-INF/view/config/edit.jsp @@ -126,7 +126,7 @@
      - + * 短信发送服务所需的URL

      From 1fc607c4fe326c3c1eda93c5324368c6ad667a79 Mon Sep 17 00:00:00 2001 From: benjobs Date: Fri, 31 Aug 2018 17:39:36 +0800 Subject: [PATCH 31/46] fix bug --- .../java/com/jobxhub/server/dao/AgentDao.java | 3 +++ .../java/com/jobxhub/server/domain/LogBean.java | 16 +++++++++------- .../com/jobxhub/server/service/AgentService.java | 2 +- .../src/main/resources/mapper/AgentDao.xml | 16 +++++++++++----- 4 files changed, 24 insertions(+), 13 deletions(-) diff --git a/jobx-server/src/main/java/com/jobxhub/server/dao/AgentDao.java b/jobx-server/src/main/java/com/jobxhub/server/dao/AgentDao.java index 45ae8540..1520ec66 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/dao/AgentDao.java +++ b/jobx-server/src/main/java/com/jobxhub/server/dao/AgentDao.java @@ -24,6 +24,7 @@ import com.jobxhub.server.tag.PageBean; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; import java.util.Map; @@ -52,4 +53,6 @@ public interface AgentDao { List getByGroup(Long groupId); void updateStatus(@Param("agentId") Long agentId,@Param("status") Integer status); + + void updateNotifyTime(@Param("agentId") Long agentId,@Param("notifyTime") Date date); } diff --git a/jobx-server/src/main/java/com/jobxhub/server/domain/LogBean.java b/jobx-server/src/main/java/com/jobxhub/server/domain/LogBean.java index 985a387d..9d71419a 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/domain/LogBean.java +++ b/jobx-server/src/main/java/com/jobxhub/server/domain/LogBean.java @@ -51,7 +51,7 @@ public class LogBean { private Date sendTime; - private Boolean isread; + private Boolean isRead; private Long userId; @@ -132,12 +132,12 @@ public void setSendTime(Date sendTime) { this.sendTime = sendTime; } - public Boolean getIsread() { - return isread; + public Boolean getRead() { + return isRead; } - public void setIsread(Boolean isread) { - this.isread = isread; + public void setRead(Boolean read) { + isRead = read; } public Long getUserId() { @@ -150,15 +150,17 @@ public void setUserId(Long userId) { @Override public String toString() { - return "Log{" + + return "LogBean{" + "logId=" + logId + ", agentId=" + agentId + + ", agentName='" + agentName + '\'' + ", type=" + type + ", receiver='" + receiver + '\'' + ", message='" + message + '\'' + ", result='" + result + '\'' + ", sendTime=" + sendTime + - ", isread=" + isread + + ", isRead=" + isRead + + ", userId=" + userId + '}'; } } diff --git a/jobx-server/src/main/java/com/jobxhub/server/service/AgentService.java b/jobx-server/src/main/java/com/jobxhub/server/service/AgentService.java index 15d644e4..63a0b777 100755 --- a/jobx-server/src/main/java/com/jobxhub/server/service/AgentService.java +++ b/jobx-server/src/main/java/com/jobxhub/server/service/AgentService.java @@ -223,7 +223,7 @@ public void doDisconnect(Agent agent) { if (CommonUtils.isEmpty(agent.getNotifyTime()) || new Date().getTime() - agent.getNotifyTime().getTime() >= configService.getSysConfig().getSpaceTime() * 60 * 1000) { noticeService.notice(agent); //记录本次任务失败的时间 - agent.setNotifyTime(new Date()); + agentDao.updateNotifyTime(agent.getAgentId(),new Date()); } agentDao.updateStatus(agent.getAgentId(),Constants.ConnStatus.DISCONNECTED.getValue()); } diff --git a/jobx-server/src/main/resources/mapper/AgentDao.xml b/jobx-server/src/main/resources/mapper/AgentDao.xml index bfaaa044..5b645981 100644 --- a/jobx-server/src/main/resources/mapper/AgentDao.xml +++ b/jobx-server/src/main/resources/mapper/AgentDao.xml @@ -223,14 +223,14 @@ update t_agent set - comment = #{comment}, - email = #{email}, + warning = #{warning}, + comment = #{comment}, + email = #{email}, + mobile = #{mobile}, host = #{host}, machine_id = #{machineId}, - mobile = #{mobile}, `name` = #{name}, - notify_time = #{notifyTime}, - password = #{password}, + password = #{password}, port = #{port}, proxy_id = #{proxyId} where agent_id = #{agentId} @@ -242,6 +242,12 @@ where agent_id = #{agentId} + + update t_agent + set notify_time = #{notifyTime} + where agent_id = #{agentId} + + delete from t_agent where agent_id=#{id} From 2bfdb3ee4ef0e42a7827c26fc582a3067e78ec1a Mon Sep 17 00:00:00 2001 From: benjobs Date: Fri, 31 Aug 2018 17:51:21 +0800 Subject: [PATCH 32/46] fix bug --- .../src/main/java/com/jobxhub/server/dto/Log.java | 10 +++++----- .../java/com/jobxhub/server/service/NoticeService.java | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/jobx-server/src/main/java/com/jobxhub/server/dto/Log.java b/jobx-server/src/main/java/com/jobxhub/server/dto/Log.java index f8185658..a99a9899 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/dto/Log.java +++ b/jobx-server/src/main/java/com/jobxhub/server/dto/Log.java @@ -52,7 +52,7 @@ public class Log implements Serializable { private String agentName; - private Boolean isread; + private Boolean isRead; public Log() { @@ -143,11 +143,11 @@ public void setAgentName(String agentName) { this.agentName = agentName; } - public Boolean getIsread() { - return isread; + public Boolean getRead() { + return isRead; } - public void setIsread(Boolean isread) { - this.isread = isread; + public void setRead(Boolean read) { + isRead = read; } } \ No newline at end of file diff --git a/jobx-server/src/main/java/com/jobxhub/server/service/NoticeService.java b/jobx-server/src/main/java/com/jobxhub/server/service/NoticeService.java index 91128797..ef8b6b02 100755 --- a/jobx-server/src/main/java/com/jobxhub/server/service/NoticeService.java +++ b/jobx-server/src/main/java/com/jobxhub/server/service/NoticeService.java @@ -124,7 +124,7 @@ private String getMessage(Agent agent, String message) { public void sendMessage(List users, Long workId, String email,String mobile, String content) { Log log = new Log(); - log.setIsread(false); + log.setRead(false); log.setAgentId(workId); log.setMessage(content); log.setSendTime(new Date()); From 7a692177ed5a3136660e4f47b8a55035b71c9416 Mon Sep 17 00:00:00 2001 From: benjobs Date: Fri, 31 Aug 2018 19:00:42 +0800 Subject: [PATCH 33/46] fix bug --- .../java/com/jobxhub/common/util/StringUtils.java | 12 ++++++++++++ .../jobxhub/server/controller/ConfigController.java | 5 +++++ .../main/java/com/jobxhub/server/tag/CronTag.java | 4 ++++ .../src/main/webapp/WEB-INF/view/config/view.jsp | 2 +- 4 files changed, 22 insertions(+), 1 deletion(-) diff --git a/jobx-common/src/main/java/com/jobxhub/common/util/StringUtils.java b/jobx-common/src/main/java/com/jobxhub/common/util/StringUtils.java index da1c8c21..f3538ca9 100644 --- a/jobx-common/src/main/java/com/jobxhub/common/util/StringUtils.java +++ b/jobx-common/src/main/java/com/jobxhub/common/util/StringUtils.java @@ -354,6 +354,17 @@ public static String htmlEncode(String source) { } + public static String htmlDecode(String html) { + if (html!=null) { + return html.replaceAll("<","<") + .replaceAll(">",">") + .replaceAll("&","&") + .replaceAll(""","\""); + + } + return html; + } + /** * 取字符串的前toCount个字符 * @@ -992,5 +1003,6 @@ public static void main(String[] args) { System.out.println(camelToSplitName("getName","_")); } + } diff --git a/jobx-server/src/main/java/com/jobxhub/server/controller/ConfigController.java b/jobx-server/src/main/java/com/jobxhub/server/controller/ConfigController.java index 8ee22bdd..6dc05ec4 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/controller/ConfigController.java +++ b/jobx-server/src/main/java/com/jobxhub/server/controller/ConfigController.java @@ -22,6 +22,8 @@ package com.jobxhub.server.controller; import com.jobxhub.common.Constants; +import com.jobxhub.common.util.CommonUtils; +import com.jobxhub.common.util.DigestUtils; import com.jobxhub.server.annotation.RequestRepeat; import com.jobxhub.server.dto.Config; import com.jobxhub.server.service.ConfigService; @@ -64,6 +66,9 @@ public String editPage(Model model) { @RequestMapping(value = "edit.do", method = RequestMethod.POST) @RequestRepeat(view = true) public String edit(Config config) { + if (CommonUtils.notEmpty(config.getSendUrl())) { + config.setSendUrl(DigestUtils.unescapeHtml(config.getSendUrl())); + } configService.update(config); return "redirect:/config/view.htm"; } diff --git a/jobx-server/src/main/java/com/jobxhub/server/tag/CronTag.java b/jobx-server/src/main/java/com/jobxhub/server/tag/CronTag.java index f4779392..2967e7b0 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/tag/CronTag.java +++ b/jobx-server/src/main/java/com/jobxhub/server/tag/CronTag.java @@ -74,6 +74,10 @@ public static String escapeHtml(String html) { return StringUtils.htmlEncode(html); } + public static String unescapeHtml(String html) { + return StringUtils.htmlDecode(html); + } + public static String toBase64(String text) { return DigestUtils.toBase64(text); } diff --git a/jobx-server/src/main/webapp/WEB-INF/view/config/view.jsp b/jobx-server/src/main/webapp/WEB-INF/view/config/view.jsp index 99a9d470..f4753d48 100755 --- a/jobx-server/src/main/webapp/WEB-INF/view/config/view.jsp +++ b/jobx-server/src/main/webapp/WEB-INF/view/config/view.jsp @@ -85,7 +85,7 @@  发信URL - ${cron:escapeHtml(config.sendUrl)} + ${cron:escapeHtml(config.sendUrl)}  发送间隔 From f3f61b02f3e4391a98ce58e905cdfad13bbaf413 Mon Sep 17 00:00:00 2001 From: benjobs Date: Wed, 5 Sep 2018 16:39:36 +0800 Subject: [PATCH 34/46] fix bug --- deployment/server.sh | 2 +- .../src/main/java/com/jobxhub/common/util/CommandUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/server.sh b/deployment/server.sh index b3217e67..2e37c8d9 100644 --- a/deployment/server.sh +++ b/deployment/server.sh @@ -195,7 +195,7 @@ else config_jdbc_password=$(echo ${config_jdbc_password}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') config_redis_password=$(echo ${config_redis_password}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') config_memcached_servers=$(echo ${config_memcached_servers}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') - sed -i "" "s/^jobx\.registry.*$/${config_registry}/g" ${CONFIG_PATH} + sed -i "s/^jobx\.registry.*$/${config_registry}/g" ${CONFIG_PATH} sed -i "s/^jdbc\.url.*$/${config_jdbc_url}/g" ${CONFIG_PATH} sed -i "s/^jdbc\.username.*$/${config_jdbc_username}/g" ${CONFIG_PATH} sed -i "s/^jdbc\.password.*$/${config_jdbc_password}/g" ${CONFIG_PATH} diff --git a/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java b/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java index ca818381..244bc85c 100644 --- a/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java +++ b/jobx-common/src/main/java/com/jobxhub/common/util/CommandUtils.java @@ -272,7 +272,7 @@ public static void write(File shellFile, String command) { if (!shellFile.exists()) { PrintWriter out = new PrintWriter(new OutputStreamWriter(new FileOutputStream(shellFile))); out.write(BASH_SCHEAM); - out.write("\n\r\n\r"); + out.write("\n"); out.write(command); out.flush(); out.close(); From 2bbec9efd9bd4be730e3bef9aa484db5a722637b Mon Sep 17 00:00:00 2001 From: benjobs Date: Thu, 6 Sep 2018 15:17:54 +0800 Subject: [PATCH 35/46] fix bug --- deployment/build.sh | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/deployment/build.sh b/deployment/build.sh index eeabdf12..1487b521 100644 --- a/deployment/build.sh +++ b/deployment/build.sh @@ -190,12 +190,12 @@ fi #gcc compile executor.c exec_retval=0 -if [ -z "$GCCCMD" ] ; then - GCCCMD="`which gcc`" -fi -if [ "$GCCCMD" ] ; then +GCC_CMD="`which gcc`" >/dev/null 2>&1 +if [ $? eq 1 ];then + exec_retval=-1 +else echo_g "compile executor.c starting..." - ${GCCCMD} ${EXEC_LIB} -o executor.so + ${GCC_CMD} ${EXEC_LIB} -o executor.so ret_val=$? if [ ${ret_val} -eq 0 ] ; then exec_retval=0 @@ -205,6 +205,7 @@ if [ "$GCCCMD" ] ; then fi fi + ${WORK_BASE}/.mvn/mvnw -f ${WORK_BASE}/pom.xml clean install -Dmaven.test.skip=true; ret_val=$? if [ ${ret_val} -eq 0 ] ; then @@ -213,6 +214,8 @@ if [ ${ret_val} -eq 0 ] ; then printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR}build jobx @Version ${JOBX_VERSION} successfully! please goto${RES} ${GREEN_COLOR}${WORK_DIR}${RES}\n" if [ ${exec_retval} -eq 1 ]; then echo_w "WARN: compile executor.c error,please compile executor.c by yourself." + elif [ ${exec_retval} -eq -1 ]; then + echo_w "WARN: compile executor.c error,not found gcc,please compile executor.c by yourself." else rm -rf ${JOBX_AGENT_BIN_DIR}/executor.so >/dev/null 2>&1 fi From 65303d2ba8c6a40a2be83e7c74c690fa1e052536 Mon Sep 17 00:00:00 2001 From: benjobs Date: Thu, 6 Sep 2018 15:24:59 +0800 Subject: [PATCH 36/46] fix bug --- deployment/build.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deployment/build.sh b/deployment/build.sh index 1487b521..c8114dfc 100644 --- a/deployment/build.sh +++ b/deployment/build.sh @@ -190,12 +190,12 @@ fi #gcc compile executor.c exec_retval=0 -GCC_CMD="`which gcc`" >/dev/null 2>&1 +GCCCMD="`which gcc`" >/dev/null 2>&1 if [ $? eq 1 ];then exec_retval=-1 else echo_g "compile executor.c starting..." - ${GCC_CMD} ${EXEC_LIB} -o executor.so + ${GCCCMD} ${EXEC_LIB} -o executor.so ret_val=$? if [ ${ret_val} -eq 0 ] ; then exec_retval=0 From 9e8338d3cc36078379e510f132f64a6258dd35df Mon Sep 17 00:00:00 2001 From: benjobs Date: Tue, 11 Sep 2018 09:58:06 +0800 Subject: [PATCH 37/46] fix bug --- jobx-server/src/main/webapp/WEB-INF/view/job/add.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobx-server/src/main/webapp/WEB-INF/view/job/add.jsp b/jobx-server/src/main/webapp/WEB-INF/view/job/add.jsp index 53e4b521..c6594469 100755 --- a/jobx-server/src/main/webapp/WEB-INF/view/job/add.jsp +++ b/jobx-server/src/main/webapp/WEB-INF/view/job/add.jsp @@ -199,7 +199,7 @@ From dee9565a64fec9cbebb9d86a0223e0d571edd7f6 Mon Sep 17 00:00:00 2001 From: benjobs Date: Wed, 28 Nov 2018 12:07:14 +0800 Subject: [PATCH 38/46] fix bug(job add error) --- .../server/controller/AgentController.java | 4 +- .../server/controller/JobController.java | 20 +++--- .../server/controller/VerifyController.java | 4 +- .../jobxhub/server/service/AgentService.java | 62 ++++++++++--------- .../server/service/ExecuteService.java | 2 +- .../src/main/resources/mapper/AgentDao.xml | 23 ++++--- 6 files changed, 60 insertions(+), 55 deletions(-) diff --git a/jobx-server/src/main/java/com/jobxhub/server/controller/AgentController.java b/jobx-server/src/main/java/com/jobxhub/server/controller/AgentController.java index d1ec9338..5d500ce0 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/controller/AgentController.java +++ b/jobx-server/src/main/java/com/jobxhub/server/controller/AgentController.java @@ -119,7 +119,7 @@ public String add(Agent agent) { } agent.setPassword(DigestUtils.md5Hex(agent.getPassword())); agent.setStatus(Constants.ConnStatus.CONNECTED.getValue()); - agentService.merge(agent); + agentService.saveOrUpdate(agent); return "redirect:/agent/view.htm"; } @@ -155,7 +155,7 @@ public Status edit(Agent agentParam) { agent.setEmail(agentParam.getEmail()); } agent.setComment(agentParam.getComment()); - agentService.merge(agent); + agentService.saveOrUpdate(agent); return Status.TRUE; } diff --git a/jobx-server/src/main/java/com/jobxhub/server/controller/JobController.java b/jobx-server/src/main/java/com/jobxhub/server/controller/JobController.java index 2ce254b6..d066fd0d 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/controller/JobController.java +++ b/jobx-server/src/main/java/com/jobxhub/server/controller/JobController.java @@ -104,7 +104,7 @@ public Status checkName(Long jobId, Long agentId, String name) { @ResponseBody public Status checkDelete(Long id) { boolean status = jobService.checkDelete(id); - return Status.create(status); + return Status.create(status); } @RequestMapping(value = "delete.do", method = RequestMethod.POST) @@ -128,7 +128,7 @@ public String add(HttpSession session, Model model, Long id) { } List agents = agentService.getOwnerAgents(session); model.addAttribute("agents", agents); - model.addAttribute("execUser",userService.getExecUser(JobXTools.getUserId(session))); + model.addAttribute("execUser", userService.getExecUser(JobXTools.getUserId(session))); return "/job/add"; } @@ -145,13 +145,13 @@ public String addflow(HttpSession session, Model model, Long id) { @RequestMapping(value = "search.do", method = RequestMethod.POST) @ResponseBody - public PageBean search(HttpSession session, Long agentId,String jobName, Integer pageNo) { + public PageBean search(HttpSession session, Long agentId, String jobName, Integer pageNo) { PageBean pageBean = new PageBean(6); - pageBean.setPageNo(pageNo == null?1:pageNo); + pageBean.setPageNo(pageNo == null ? 1 : pageNo); if (agentId == null && CommonUtils.isEmpty(jobName)) { return pageBean; } - return jobService.search(session,pageBean,agentId,jobName); + return jobService.search(session, pageBean, agentId, jobName); } @RequestMapping(value = "save.do", method = RequestMethod.POST) @@ -192,8 +192,8 @@ public String save(HttpSession session, Job jobParam, HttpServletRequest request jobParam.setCreateType(Constants.CreateType.NORMAL.getValue()); jobParam.setToken(CommonUtils.uuid()); Agent agent = agentService.getAgent(jobParam.getAgentId()); - if (agent!=null) { - if (agent.getPlatform() != 1 ) { + if (agent != null) { + if (agent.getPlatform() == null || agent.getPlatform() != 1) { jobParam.setExecUser(null); } } @@ -334,12 +334,12 @@ public Status jobIsRunning(Long jobId) { @RequestMapping(value = "execute.do", method = RequestMethod.POST) @ResponseBody - public Status remoteExecute(HttpSession session, Long id,String param) { + public Status remoteExecute(HttpSession session, Long id, String param) { final Job job = jobService.getById(id);//找到要执行的任务 if (!jobService.checkJobOwner(session, job.getUserId())) return Status.FALSE; //手动执行 Long userId = JobXTools.getUserId(session); - if(StringUtils.isNotEmpty(param)){ + if (StringUtils.isNotEmpty(param)) { job.setInputParam(param); } job.setUserId(userId); @@ -383,7 +383,7 @@ public ParamsMap token(Long jobId) { String token = CommonUtils.uuid(); if (job != null) { job.setToken(CommonUtils.uuid()); - jobService.updateToken(jobId,token); + jobService.updateToken(jobId, token); } return ParamsMap.map().set("token", token); } diff --git a/jobx-server/src/main/java/com/jobxhub/server/controller/VerifyController.java b/jobx-server/src/main/java/com/jobxhub/server/controller/VerifyController.java index c93315a8..d2ba9524 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/controller/VerifyController.java +++ b/jobx-server/src/main/java/com/jobxhub/server/controller/VerifyController.java @@ -61,8 +61,8 @@ public Status validateCronExp(String cronExp) { public List getRecentTriggerTime(String cronExp) { return PageUtils.getRecentTriggerTime(cronExp); } + /** - * 仅检查是否可以连接 * @return */ @RequestMapping(value = "ping.do", method = RequestMethod.POST) @@ -70,7 +70,7 @@ public List getRecentTriggerTime(String cronExp) { public Map validatePing(Agent agent) { Map result = new HashMap(0); if (hasProxy(agent, result)) return result; - Constants.ConnStatus connStatus = executeService.ping(agent,true); + Constants.ConnStatus connStatus = executeService.ping(agent,false); result.put("status",connStatus.getValue()); return result; } diff --git a/jobx-server/src/main/java/com/jobxhub/server/service/AgentService.java b/jobx-server/src/main/java/com/jobxhub/server/service/AgentService.java index 63a0b777..567f9f91 100755 --- a/jobx-server/src/main/java/com/jobxhub/server/service/AgentService.java +++ b/jobx-server/src/main/java/com/jobxhub/server/service/AgentService.java @@ -70,11 +70,11 @@ public List getOwnerByConnType(HttpSession session) { List list; if (!JobXTools.isPermission(session)) { User user = JobXTools.getUser(session); - list = agentDao.getByConnType(user.getUserId(),Constants.ConnStatus.CONNECTED.getValue()); - }else { - list = agentDao.getByConnType(null,Constants.ConnStatus.CONNECTED.getValue()); + list = agentDao.getByConnType(user.getUserId(), Constants.ConnStatus.CONNECTED.getValue()); + } else { + list = agentDao.getByConnType(null, Constants.ConnStatus.CONNECTED.getValue()); } - return Lists.transform(list,Agent.transfer); + return Lists.transform(list, Agent.transfer); } public List getAll() { @@ -88,21 +88,22 @@ public List getAll() { private synchronized void flushLocalAgent() { JobXTools.CACHE.put( Constants.PARAM_CACHED_AGENT_KEY, - Lists.transform(agentDao.getAll(),Agent.transfer) + Lists.transform(agentDao.getAll(), Agent.transfer) ); } public int getCountByStatus(HttpSession session, Constants.ConnStatus status) { - Map map = new HashMap(0); + Map map = new HashMap(0); if (!JobXTools.isPermission(session)) { - map.put("userId",JobXTools.getUserId(session)); + map.put("userId", JobXTools.getUserId(session)); } - map.put("status",status.getValue()); + map.put("status", status.getValue()); return agentDao.getCount(map); } /** * 获取所属用户的agent + * * @param session * @param pageBean */ @@ -112,12 +113,12 @@ public void getPageBean(HttpSession session, Agent agent, PageBean pageBean) { pageBean.put("userId", user.getUserId()); } pageBean.put("agentName", agent.getName()); - pageBean.put("status",agent.getStatus()); + pageBean.put("status", agent.getStatus()); pageBean.verifyOrderBy("name", "name", "host", "port"); List agentList = agentDao.getByPageBean(pageBean); if (CommonUtils.notEmpty(agentList)) { int count = agentDao.getCount(pageBean.getFilter()); - List agents = Lists.transform(agentList,Agent.transfer); + List agents = Lists.transform(agentList, Agent.transfer); pageBean.setResult(agents); pageBean.setTotalCount(count); } @@ -131,12 +132,12 @@ public Agent getAgent(Long id) { return null; } - public void merge(Agent agent) { + public void saveOrUpdate(Agent agent) { AgentBean agentBean = AgentBean.transfer.apply(agent); if (agentBean.getAgentId() == null) { agentDao.save(agentBean); agent.setAgentId(agentBean.getAgentId()); - }else { + } else { agentDao.update(agentBean); } flushLocalAgent(); @@ -145,6 +146,7 @@ public void merge(Agent agent) { /** * true can delete * false can't delete + * * @param id * @return */ @@ -165,11 +167,11 @@ public void delete(Long id) { } public boolean existsName(Long id, String name) { - return agentDao.existsCount(id,"name",name) > 0; + return agentDao.existsCount(id, "name", name) > 0; } public boolean existsHost(Long id, String host) { - return agentDao.existsCount(id,"host", host) > 0; + return agentDao.existsCount(id, "host", host) > 0; } public String editPassword(Long id, Boolean type, String pwd0, String pwd1, String pwd2) { @@ -177,7 +179,7 @@ public String editPassword(Long id, Boolean type, String pwd0, String pwd1, Stri boolean verify; if (type) {//直接输入的密钥 agent.setPassword(pwd0); - verify = executeService.ping(agent,false).equals(Constants.ConnStatus.CONNECTED); + verify = executeService.ping(agent, false).equals(Constants.ConnStatus.CONNECTED); } else {//密码... verify = DigestUtils.md5Hex(pwd0).equals(agent.getPassword()); } @@ -187,7 +189,7 @@ public String editPassword(Long id, Boolean type, String pwd0, String pwd1, Stri Boolean flag = executeService.password(agent, pwd1); if (flag) { agent.setPassword(pwd1); - executeService.ping(agent,true); + executeService.ping(agent, true); return "true"; } else { return "false"; @@ -205,15 +207,15 @@ public List getOwnerAgents(HttpSession session) { pageBean.setPageNo(0); if (!JobXTools.isPermission(session)) { User userDto = JobXTools.getUser(session); - pageBean.put("user_id",userDto.getUserId()); + pageBean.put("user_id", userDto.getUserId()); } List agentList = agentDao.getByPageBean(pageBean); - return Lists.transform(agentList,Agent.transfer); + return Lists.transform(agentList, Agent.transfer); } public Agent getByMacId(String machineId) { AgentBean agent = agentDao.getByMacId(machineId); - if (agent!=null) { + if (agent != null) { return Agent.transfer.apply(agent); } return null; @@ -223,17 +225,17 @@ public void doDisconnect(Agent agent) { if (CommonUtils.isEmpty(agent.getNotifyTime()) || new Date().getTime() - agent.getNotifyTime().getTime() >= configService.getSysConfig().getSpaceTime() * 60 * 1000) { noticeService.notice(agent); //记录本次任务失败的时间 - agentDao.updateNotifyTime(agent.getAgentId(),new Date()); + agentDao.updateNotifyTime(agent.getAgentId(), new Date()); } - agentDao.updateStatus(agent.getAgentId(),Constants.ConnStatus.DISCONNECTED.getValue()); + agentDao.updateStatus(agent.getAgentId(), Constants.ConnStatus.DISCONNECTED.getValue()); } public void doDisconnect(String info) { if (CommonUtils.notEmpty(info)) { String macId = info.split("_")[0]; - String password = info.split("_")[1]; + String password = info.split("_")[1]; Agent agent = getByMacId(macId); - if ( CommonUtils.notEmpty(agent,password) && password.equals(agent.getPassword()) ) { + if (CommonUtils.notEmpty(agent, password) && password.equals(agent.getPassword())) { doDisconnect(agent); } } @@ -250,7 +252,7 @@ public void doConnect(String agentInfo) { Agent agent = transfers.get(1); //exists in db... - if ( agent!=null ) { + if (agent != null) { //agent和server密码一致则连接... if (registry.getPassword().equals(agent.getPassword())) { executeService.ping(agent, true); @@ -270,9 +272,9 @@ public void doConnect(String agentInfo) { registry.setMobile(null); registry.setEmail(null); registry.setProxyId(null); - if (executeService.ping(registry,false).equals(Constants.ConnStatus.CONNECTED)) { + if (executeService.ping(registry, false).equals(Constants.ConnStatus.CONNECTED)) { registry.setStatus(Constants.ConnStatus.CONNECTED.getValue()); - merge(registry); + saveOrUpdate(registry); } } @@ -304,13 +306,13 @@ private List transfer(String registryInfo) { public List getByGroup(Long groupId) { List list = agentDao.getByGroup(groupId); - return Lists.transform(list,Agent.transfer); + return Lists.transform(list, Agent.transfer); } public void updateStatus(Agent agent) { - if (agent!=null) { - if (agent.getAgentId()!=null&&agent.getStatus()!=null) { - agentDao.updateStatus(agent.getAgentId(),agent.getStatus()); + if (agent != null) { + if (agent.getAgentId() != null && agent.getStatus() != null) { + agentDao.updateStatus(agent.getAgentId(), agent.getStatus()); } } } diff --git a/jobx-server/src/main/java/com/jobxhub/server/service/ExecuteService.java b/jobx-server/src/main/java/com/jobxhub/server/service/ExecuteService.java index 509adaaf..a3f633a2 100644 --- a/jobx-server/src/main/java/com/jobxhub/server/service/ExecuteService.java +++ b/jobx-server/src/main/java/com/jobxhub/server/service/ExecuteService.java @@ -294,7 +294,7 @@ public Constants.ConnStatus ping(Agent agent, boolean update) { if (update) { agent.setStatus(status.getValue()); - agentService.updateStatus(agent); + agentService.saveOrUpdate(agent); } return status; diff --git a/jobx-server/src/main/resources/mapper/AgentDao.xml b/jobx-server/src/main/resources/mapper/AgentDao.xml index 5b645981..ae73a2f3 100644 --- a/jobx-server/src/main/resources/mapper/AgentDao.xml +++ b/jobx-server/src/main/resources/mapper/AgentDao.xml @@ -223,16 +223,19 @@ update t_agent set - warning = #{warning}, - comment = #{comment}, - email = #{email}, - mobile = #{mobile}, - host = #{host}, - machine_id = #{machineId}, - `name` = #{name}, - password = #{password}, - port = #{port}, - proxy_id = #{proxyId} + comment = #{comment}, + email = #{email}, + host = #{host}, + platform = #{platform}, + machine_id = #{machineId}, + mobile = #{mobile}, + `name` = #{name}, + notify_time = #{notifyTime}, + password = #{password}, + port = #{port}, + proxy_id = #{proxyId}, + status = #{status}, + warning = #{warning} where agent_id = #{agentId} From f8351766e3ee8be6d7d040b4f9ed6044efcee328 Mon Sep 17 00:00:00 2001 From: benjobs Date: Mon, 3 Dec 2018 10:49:01 +0800 Subject: [PATCH 39/46] Update server.sh --- deployment/server.sh | 88 ++++++-------------------------------------- 1 file changed, 12 insertions(+), 76 deletions(-) diff --git a/deployment/server.sh b/deployment/server.sh index 2e37c8d9..8cca8635 100644 --- a/deployment/server.sh +++ b/deployment/server.sh @@ -107,47 +107,39 @@ done # Get standard environment variables PRGDIR=`dirname "$PRG"` -WORK_DIR=`cd "$PRGDIR" >/dev/null; pwd`; -WORK_BASE=`cd "$PRGDIR"/../ >/dev/null; pwd`; +WORKDIR=`cd "$PRGDIR" >/dev/null; pwd`; +WORKBASE=`cd "$PRGDIR"/../ >/dev/null; pwd`; # Get standard environment variables ############################################################################################### APP_ARTIFACT=jobx-server APP_VERSION="1.2.0-RELEASE"; APP_WAR_NAME=${APP_ARTIFACT}-${APP_VERSION}.war -MAVEN_TARGET_WAR=${WORK_BASE}/${APP_ARTIFACT}/target/${APP_WAR_NAME} -DEPLOY_PATH=${WORK_DIR}/${APP_ARTIFACT} +MAVEN_TARGET_WAR=${WORKBASE}/${APP_ARTIFACT}/target/${APP_WAR_NAME} +DEPLOY_PATH=${WORKDIR}/${APP_ARTIFACT} LIB_PATH=${DEPLOY_PATH}/WEB-INF/lib -CONTAINER_PATH=${DEPLOY_PATH}/container -LOG_PATH=${CONTAINER_PATH}/logs -CONFIG_TEMPLATE=${WORK_DIR}/conf.properties +CONFIG_TEMPLATE=${WORKDIR}/conf.properties CONFIG_PATH=${DEPLOY_PATH}/WEB-INF/classes/config.properties ############################################################################################### #先检查dist下是否有war包 -if [ ! -f "${WORK_DIR}/${APP_WAR_NAME}" ] ; then +if [ ! -f "${WORKDIR}/${APP_WAR_NAME}" ] ; then #dist下没有war包则检查server的target下是否有war包. if [ ! -f "${MAVEN_TARGET_WAR}" ] ; then echo_w "[JobX] please build project first!" exit 0; else - cp ${MAVEN_TARGET_WAR} ${WORK_DIR}; + cp ${MAVEN_TARGET_WAR} ${WORKDIR}; fi fi if [ ! -f "${DEPLOY_PATH}" ] ; then mkdir -p ${DEPLOY_PATH} # unpackage war to dist - cp ${WORK_DIR}/${APP_WAR_NAME} ${DEPLOY_PATH} && + cp ${WORKDIR}/${APP_WAR_NAME} ${DEPLOY_PATH} && cd ${DEPLOY_PATH} && ${RUNJAR} xvf ${APP_WAR_NAME} >/dev/null 2>&1 && - rm -rf ${DEPLOY_PATH}/${APP_WAR_NAME} && - #copy jars... - cp -r ${WORK_BASE}/${APP_ARTIFACT}/container ${DEPLOY_PATH} + rm -rf ${DEPLOY_PATH}/${APP_WAR_NAME} fi -if [ ! -d "${LOG_PATH}" ] ; then - mkdir -p ${LOG_PATH} -fi -LOG_PATH=${LOG_PATH}/jobx.out # Add jars to classpath if [ ! -z "$CLASSPATH" ] ; then @@ -159,59 +151,8 @@ do CLASSPATH="$CLASSPATH":"$jar" done CLASSPATH="$CLASSPATH":${DEPLOY_PATH}/WEB-INF/classes - -#read user config... -config_registry="`awk -F '=' '{if($1~/jobx.registry/) print}' ${CONFIG_TEMPLATE}`" -config_jdbc_url="`awk -F '=' '{if($1~/jdbc.url/) print}' ${CONFIG_TEMPLATE}`" -config_jdbc_username="`awk -F '=' '{if($1~/jdbc.username/) print}' ${CONFIG_TEMPLATE}`" -config_jdbc_password="`awk -F '=' '{if($1~/jdbc.password/) print}' ${CONFIG_TEMPLATE}`" -config_cluster="`awk -F '=' '{if($1~/jobx.cluster/) print}' ${CONFIG_TEMPLATE}`" -config_cached="`awk -F '=' '{if($1~/jobx.cached/) print}' ${CONFIG_TEMPLATE}`" -config_redis_host="`awk -F '=' '{if($1~/redis.host/) print}' ${CONFIG_TEMPLATE}`" -config_redis_password="`awk -F '=' '{if($1~/redis.password/) print}' ${CONFIG_TEMPLATE}`" -config_redis_port="`awk -F '=' '{if($1~/redis.port/) print}' ${CONFIG_TEMPLATE}`" -config_memcached_servers="`awk -F '=' '{if($1~/memcached.servers/) print}' ${CONFIG_TEMPLATE}`" -config_memcached_protocol="`awk -F '=' '{if($1~/memcached.protocol/) print}' ${CONFIG_TEMPLATE}`" -if [ ${darwin} ] ; then - config_registry=$(echo ${config_registry}|sed 's/\//\\\//g'|sed 's/\=/\\=/g'|sed 's/&/\\&/g') - config_jdbc_url=$(echo ${config_jdbc_url}|sed 's/\//\\\//g'|sed 's/\=/\\=/g'|sed 's/&/\\&/g') - config_jdbc_password=$(echo ${config_jdbc_password}|sed 's/\//\\\//g'|sed 's/\=/\\=/g'|sed 's/&/\\&/g') - config_redis_password=$(echo ${config_redis_password}|sed 's/\//\\\//g'|sed 's/\=/\\=/g'|sed 's/&/\\&/g') - config_memcached_servers=$(echo ${config_memcached_servers}|sed 's/\//\\\//g'|sed 's/\=/\\=/g'|sed 's/&/\\&/g') - sed -i "" "s/^jobx\.registry.*$/${config_registry}/g" ${CONFIG_PATH} - sed -i "" "s/^jdbc\.url.*$/${config_jdbc_url}/g" ${CONFIG_PATH} - sed -i "" "s/^jdbc\.username.*$/${config_jdbc_username}/g" ${CONFIG_PATH} - sed -i "" "s/^jdbc\.password.*$/${config_jdbc_password}/g" ${CONFIG_PATH} - sed -i "" "s/^jobx\.cluster.*$/${config_cluster}/g" ${CONFIG_PATH} - sed -i "" "s/^jobx\.cached.*$/${config_cached}/g" ${CONFIG_PATH} - sed -i "" "s/^redis\.host.*$/${config_redis_host}/g" ${CONFIG_PATH} - sed -i "" "s/^redis\.password.*$/${config_redis_password}/g" ${CONFIG_PATH} - sed -i "" "s/^redis\.port.*$/${config_redis_port}/g" ${CONFIG_PATH} - sed -i "" "s/^memcached\.servers.*$/${config_memcached_servers}/g" ${CONFIG_PATH} - sed -i "" "s/^memcached\.protocol.*$/${config_memcached_protocol}/g" ${CONFIG_PATH} -else - config_registry=$(echo ${config_registry}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') - config_jdbc_url=$(echo ${config_jdbc_url}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') - config_jdbc_password=$(echo ${config_jdbc_password}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') - config_redis_password=$(echo ${config_redis_password}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') - config_memcached_servers=$(echo ${config_memcached_servers}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') - sed -i "s/^jobx\.registry.*$/${config_registry}/g" ${CONFIG_PATH} - sed -i "s/^jdbc\.url.*$/${config_jdbc_url}/g" ${CONFIG_PATH} - sed -i "s/^jdbc\.username.*$/${config_jdbc_username}/g" ${CONFIG_PATH} - sed -i "s/^jdbc\.password.*$/${config_jdbc_password}/g" ${CONFIG_PATH} - sed -i "s/^jobx\.cluster.*$/${config_cluster}/g" ${CONFIG_PATH} - sed -i "s/^jobx\.cached.*$/${config_cached}/g" ${CONFIG_PATH} - sed -i "s/^redis\.host.*$/${config_redis_host}/g" ${CONFIG_PATH} - sed -i "s/^redis\.password.*$/${config_redis_password}/g" ${CONFIG_PATH} - sed -i "s/^redis\.port.*$/${config_redis_port}/g" ${CONFIG_PATH} - sed -i "s/^memcached\.servers.*$/${config_memcached_servers}/g" ${CONFIG_PATH} - sed -i "s/^memcached\.protocol.*$/${config_memcached_protocol}/g" ${CONFIG_PATH} -fi - - #default launcher [ -z "${JOBX_LAUNCHER}" ] && JOBX_LAUNCHER="tomcat"; - #server'port if [ $# -gt 0 ] ;then JOBX_PORT=$1 @@ -225,19 +166,14 @@ if [ $# -gt 0 ] ;then fi fi [ -z "${JOBX_PORT}" ] && JOBX_PORT="20501"; - #start server.... printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR} server Starting @ [${GREEN_COLOR}${JOBX_PORT}${RES}].... ${RES}\n" - -MAIN="com.jobxhub.server.bootstrap.Startup" +MAIN="com.jobxhub.server.JobXServer" cd ${DEPLOY_PATH} eval "$RUNJAVA" \ -classpath "$CLASSPATH" \ -Dserver.launcher=${JOBX_LAUNCHER} \ -Dserver.port=${JOBX_PORT} \ - ${MAIN} $1 >> ${LOG_PATH} 2>&1 & - -printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR} please see log for more detail:${RES}${GREEN_COLOR} $LOG_PATH ${RES}\n" - + ${MAIN} $1 >> /dev/null 2>&1 & +printf "[${BLUE_COLOR}jobx${RES}] ${WHITE_COLOR} please see log for more detail:${RES}${GREEN_COLOR} ${DEPLOY_PATH}/jobx.out ${RES}\n" exit $? - From c4cc3d8942f721d6b032d7182e21dfe9f29aaea5 Mon Sep 17 00:00:00 2001 From: benjobs Date: Mon, 3 Dec 2018 10:49:35 +0800 Subject: [PATCH 40/46] Delete conf.properties --- deployment/conf.properties | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 deployment/conf.properties diff --git a/deployment/conf.properties b/deployment/conf.properties deleted file mode 100644 index a099eec2..00000000 --- a/deployment/conf.properties +++ /dev/null @@ -1,29 +0,0 @@ -################################################################################################## -# # -# agent # -# # -################################################################################################## -jobx.password=jobx -jobx.port=1577 -jobx.registry=zookeeper://10.1.1.116:2181 - -#jobx.host= -################################################################################################### -# # -# server # -# # -################################################################################################### -jdbc.driver=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://localhost:3306/jobx?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&autoReconnect=true&failOverReadOnly=false&useSSL=false&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=Asia/Shanghai -jdbc.username=root -jdbc.password=123322242 - -jobx.cluster=false -jobx.cached=memcached - -redis.host=10.20.10.111 -redis.password=123456 -redis.port=6379 - -memcached.servers=10.1.1.116:11211 -memcached.protocol=BINARY From 4d08bd63e0731b2f550d2fcce1a656c358918acf Mon Sep 17 00:00:00 2001 From: benjobs Date: Mon, 3 Dec 2018 10:50:28 +0800 Subject: [PATCH 41/46] Update agent.sh --- deployment/agent.sh | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/deployment/agent.sh b/deployment/agent.sh index 0ac70e4e..e7c004e9 100644 --- a/deployment/agent.sh +++ b/deployment/agent.sh @@ -83,30 +83,9 @@ if [ ! -f "${WORKDIR}/${APP_TAR_NAME}" ] ; then fi [ -d "${DEPLOY_PATH}" ] && rm -rf ${DEPLOY_PATH}/* || mkdir -p ${DEPLOY_PATH} - #untar.. tar -xzvf ${WORKDIR}/${APP_TAR_NAME} && chmod +x ${DEPLOY_PATH}/bin/* >/dev/null 2>&1 - -#read user config... -config_registry="`awk -F '=' '{if($1~/jobx.registry/) print}' ${CONFIG_TEMPLATE}`" -config_password="`awk -F '=' '{if($1~/jobx.password/) print}' ${CONFIG_TEMPLATE}`" -config_port="`awk -F '=' '{if($1~/jobx.port/) print}' ${CONFIG_TEMPLATE}`" - - -if [ ${darwin} ] ; then - config_registry=$(echo ${config_registry}|sed 's/\//\\\//g'|sed 's/\=/\\=/g'|sed 's/&/\\&/g') - sed -i "" "s/^jobx\.registry.*$/${config_registry}/g" ${CONFIG_PATH} - sed -i "" "s/^jobx\.password.*$/${config_password}/g" ${CONFIG_PATH} - sed -i "" "s/^jobx\.port.*$/${config_port}/g" ${CONFIG_PATH} -else - config_registry=$(echo ${config_registry}|sed -r 's/\//\\\//g'|sed -r 's/\=/\\=/g'|sed -r 's/&/\\&/g') - sed -i "s/^jobx\.password.*$/${config_password}/g" ${CONFIG_PATH} - sed -i "s/^jobx\.port.*$/${config_port}/g" ${CONFIG_PATH} - sed -i "s/^jobx\.registry.*$/${config_registry}/g" ${CONFIG_PATH} -fi - EXECUTABLE=${DEPLOY_PATH}/bin/startup.sh - # Check that target executable exists if $os400; then # -x will Only work on the os400 if the files are: @@ -122,5 +101,4 @@ else exit 1 fi fi - exec "$EXECUTABLE" "$@" From 726860742e1a0065cb19547e25b3bf2efe2c9dac Mon Sep 17 00:00:00 2001 From: benjobs Date: Mon, 3 Dec 2018 10:53:22 +0800 Subject: [PATCH 42/46] Update build.sh --- deployment/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployment/build.sh b/deployment/build.sh index c8114dfc..424cc513 100644 --- a/deployment/build.sh +++ b/deployment/build.sh @@ -191,7 +191,7 @@ fi #gcc compile executor.c exec_retval=0 GCCCMD="`which gcc`" >/dev/null 2>&1 -if [ $? eq 1 ];then +if [ $? -eq 1 ];then exec_retval=-1 else echo_g "compile executor.c starting..." From 0be297e0adb0d421bb681c351899fd36d16cebb5 Mon Sep 17 00:00:00 2001 From: huoli Date: Thu, 20 Dec 2018 11:32:54 +0800 Subject: [PATCH 43/46] kill bug fix --- jobx-agent/src/assembly/bin/kill.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jobx-agent/src/assembly/bin/kill.sh b/jobx-agent/src/assembly/bin/kill.sh index 550f260c..2526e627 100644 --- a/jobx-agent/src/assembly/bin/kill.sh +++ b/jobx-agent/src/assembly/bin/kill.sh @@ -48,9 +48,9 @@ if [ -n "`which pstree`" ];then do if [ ${pid} -gt 300 ];then if [ "${kill_model}" == "0"x ];then - echo kill ${id} >/dev/null 2>&1; + kill ${id} >/dev/null 2>&1; else - echo kill -9 ${id} >/dev/null 2>&1; + kill -9 ${id} >/dev/null 2>&1; fi fi done From 6f3f0d6b9205bdf95bfa4d6e911c1e9ac664489c Mon Sep 17 00:00:00 2001 From: huoli Date: Tue, 25 Dec 2018 10:49:10 +0800 Subject: [PATCH 44/46] timeout bug fix --- jobx-common/src/main/java/com/jobxhub/common/job/Request.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jobx-common/src/main/java/com/jobxhub/common/job/Request.java b/jobx-common/src/main/java/com/jobxhub/common/job/Request.java index 5df58a4c..644b6c65 100755 --- a/jobx-common/src/main/java/com/jobxhub/common/job/Request.java +++ b/jobx-common/src/main/java/com/jobxhub/common/job/Request.java @@ -91,8 +91,8 @@ public Request setAction(Action action) { } public Integer getTimeOut() { - //如果timeOut为设置,则返回24小时(1440分钟) - if ( timeOut == null || timeOut<=0 ) { + //如果timeOut未设置,则返回24小时(1440分钟) + if ( timeOut == null || timeOut<0 ) { return 60 * 24; } return timeOut; From c00dd89b9a90877cdf0f968e01f0953a32776579 Mon Sep 17 00:00:00 2001 From: Autorun <20293349@qq.com> Date: Mon, 6 Jan 2020 13:30:40 +0800 Subject: [PATCH 45/46] Refactor the RPC engineering structure --- jobx-agent/pom.xml | 2 +- jobx-rpc/jobx-rpc-api/pom.xml | 24 ++ .../main/java/com.jobxhub.rpc}/Client.java | 0 .../java/com.jobxhub.rpc}/InvokeCallback.java | 0 .../main/java/com.jobxhub.rpc}/Invoker.java | 0 .../main/java/com.jobxhub.rpc}/RpcFuture.java | 4 +- .../main/java/com.jobxhub.rpc}/Server.java | 0 .../java/com.jobxhub.rpc}/ServerHandler.java | 0 .../support/ChannelWrapper.java | 0 .../META-INF/jobx/com.jobxhub.rpc.Client | 0 .../META-INF/jobx/com.jobxhub.rpc.Server | 0 jobx-rpc/jobx-rpc-mina/pom.xml | 24 ++ .../java/com/jobxhub/rpc/mina/MinaClient.java | 94 ++++++++ .../jobxhub/rpc/mina/MinaClientHandler.java | 4 +- .../jobxhub/rpc/mina/MinaCodecAdapter.java | 6 +- .../jobxhub/rpc/mina/MinaConnectWrapper.java | 0 .../java/com/jobxhub/rpc/mina/MinaServer.java | 6 +- .../jobxhub/rpc/mina/MinaServerHandler.java | 4 +- .../rpc/mina/support/AbstractClient.java | 117 ++++++++++ jobx-rpc/jobx-rpc-netty4/pom.xml | 23 ++ .../rpc/netty/NettyChannelWrapper.java | 0 .../com/jobxhub/rpc/netty/NettyClient.java | 107 +++++++++ .../jobxhub/rpc/netty/NettyClientHandler.java | 4 +- .../jobxhub/rpc/netty/NettyCodecAdapter.java | 6 +- .../com/jobxhub/rpc/netty/NettyServer.java | 17 +- .../jobxhub/rpc/netty/NettyServerHandler.java | 4 +- .../rpc/netty/support/AbstractClient.java | 149 +++++++++++++ .../src/test/java/NettyFileTest.java | 37 +++ .../src/test/java/SPITest.java | 2 +- jobx-rpc/pom.xml | 45 +--- .../java/com/jobxhub/rpc/mina/MinaClient.java | 93 -------- .../com/jobxhub/rpc/netty/NettyClient.java | 105 --------- .../jobxhub/rpc/support/AbstractClient.java | 210 ------------------ jobx-rpc/src/test/java/NettyFileTest.java | 37 --- jobx-server/pom.xml | 2 +- pom.xml | 7 + 36 files changed, 623 insertions(+), 510 deletions(-) create mode 100644 jobx-rpc/jobx-rpc-api/pom.xml rename jobx-rpc/{src/main/java/com/jobxhub/rpc => jobx-rpc-api/src/main/java/com.jobxhub.rpc}/Client.java (100%) rename jobx-rpc/{src/main/java/com/jobxhub/rpc => jobx-rpc-api/src/main/java/com.jobxhub.rpc}/InvokeCallback.java (100%) rename jobx-rpc/{src/main/java/com/jobxhub/rpc => jobx-rpc-api/src/main/java/com.jobxhub.rpc}/Invoker.java (100%) rename jobx-rpc/{src/main/java/com/jobxhub/rpc => jobx-rpc-api/src/main/java/com.jobxhub.rpc}/RpcFuture.java (98%) rename jobx-rpc/{src/main/java/com/jobxhub/rpc => jobx-rpc-api/src/main/java/com.jobxhub.rpc}/Server.java (100%) rename jobx-rpc/{src/main/java/com/jobxhub/rpc => jobx-rpc-api/src/main/java/com.jobxhub.rpc}/ServerHandler.java (100%) rename jobx-rpc/{src/main/java/com/jobxhub/rpc => jobx-rpc-api/src/main/java/com.jobxhub.rpc}/support/ChannelWrapper.java (100%) rename jobx-rpc/{ => jobx-rpc-api}/src/main/resources/META-INF/jobx/com.jobxhub.rpc.Client (100%) rename jobx-rpc/{ => jobx-rpc-api}/src/main/resources/META-INF/jobx/com.jobxhub.rpc.Server (100%) create mode 100644 jobx-rpc/jobx-rpc-mina/pom.xml create mode 100644 jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaClient.java rename jobx-rpc/{ => jobx-rpc-mina}/src/main/java/com/jobxhub/rpc/mina/MinaClientHandler.java (100%) rename jobx-rpc/{ => jobx-rpc-mina}/src/main/java/com/jobxhub/rpc/mina/MinaCodecAdapter.java (100%) rename jobx-rpc/{ => jobx-rpc-mina}/src/main/java/com/jobxhub/rpc/mina/MinaConnectWrapper.java (100%) rename jobx-rpc/{ => jobx-rpc-mina}/src/main/java/com/jobxhub/rpc/mina/MinaServer.java (100%) rename jobx-rpc/{ => jobx-rpc-mina}/src/main/java/com/jobxhub/rpc/mina/MinaServerHandler.java (100%) create mode 100644 jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/support/AbstractClient.java create mode 100644 jobx-rpc/jobx-rpc-netty4/pom.xml rename jobx-rpc/{ => jobx-rpc-netty4}/src/main/java/com/jobxhub/rpc/netty/NettyChannelWrapper.java (100%) create mode 100755 jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyClient.java rename jobx-rpc/{ => jobx-rpc-netty4}/src/main/java/com/jobxhub/rpc/netty/NettyClientHandler.java (100%) rename jobx-rpc/{ => jobx-rpc-netty4}/src/main/java/com/jobxhub/rpc/netty/NettyCodecAdapter.java (100%) rename jobx-rpc/{ => jobx-rpc-netty4}/src/main/java/com/jobxhub/rpc/netty/NettyServer.java (96%) rename jobx-rpc/{ => jobx-rpc-netty4}/src/main/java/com/jobxhub/rpc/netty/NettyServerHandler.java (100%) create mode 100644 jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/support/AbstractClient.java create mode 100644 jobx-rpc/jobx-rpc-netty4/src/test/java/NettyFileTest.java rename jobx-rpc/{ => jobx-rpc-netty4}/src/test/java/SPITest.java (100%) delete mode 100644 jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaClient.java delete mode 100755 jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyClient.java delete mode 100644 jobx-rpc/src/main/java/com/jobxhub/rpc/support/AbstractClient.java delete mode 100644 jobx-rpc/src/test/java/NettyFileTest.java diff --git a/jobx-agent/pom.xml b/jobx-agent/pom.xml index fb9bd13d..95ac552f 100644 --- a/jobx-agent/pom.xml +++ b/jobx-agent/pom.xml @@ -17,7 +17,7 @@ com.jobxhub - jobx-rpc + jobx-rpc-api com.corundumstudio.socketio diff --git a/jobx-rpc/jobx-rpc-api/pom.xml b/jobx-rpc/jobx-rpc-api/pom.xml new file mode 100644 index 00000000..75adf1e3 --- /dev/null +++ b/jobx-rpc/jobx-rpc-api/pom.xml @@ -0,0 +1,24 @@ + + + + jobx-rpc + com.jobxhub + 1.2.0-RELEASE + + 4.0.0 + jar + jobx-rpc-api + + + + com.jobxhub + jobx-common + + + org.apache.zookeeper + zookeeper + + + \ No newline at end of file diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/Client.java b/jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/Client.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/Client.java rename to jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/Client.java diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/InvokeCallback.java b/jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/InvokeCallback.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/InvokeCallback.java rename to jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/InvokeCallback.java diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/Invoker.java b/jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/Invoker.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/Invoker.java rename to jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/Invoker.java diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/RpcFuture.java b/jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/RpcFuture.java similarity index 98% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/RpcFuture.java rename to jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/RpcFuture.java index 257ed224..53931aee 100644 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/RpcFuture.java +++ b/jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/RpcFuture.java @@ -31,7 +31,9 @@ import java.text.SimpleDateFormat; import java.util.Date; import java.util.Map; -import java.util.concurrent.*; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/Server.java b/jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/Server.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/Server.java rename to jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/Server.java diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/ServerHandler.java b/jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/ServerHandler.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/ServerHandler.java rename to jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/ServerHandler.java diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/support/ChannelWrapper.java b/jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/support/ChannelWrapper.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/support/ChannelWrapper.java rename to jobx-rpc/jobx-rpc-api/src/main/java/com.jobxhub.rpc/support/ChannelWrapper.java diff --git a/jobx-rpc/src/main/resources/META-INF/jobx/com.jobxhub.rpc.Client b/jobx-rpc/jobx-rpc-api/src/main/resources/META-INF/jobx/com.jobxhub.rpc.Client similarity index 100% rename from jobx-rpc/src/main/resources/META-INF/jobx/com.jobxhub.rpc.Client rename to jobx-rpc/jobx-rpc-api/src/main/resources/META-INF/jobx/com.jobxhub.rpc.Client diff --git a/jobx-rpc/src/main/resources/META-INF/jobx/com.jobxhub.rpc.Server b/jobx-rpc/jobx-rpc-api/src/main/resources/META-INF/jobx/com.jobxhub.rpc.Server similarity index 100% rename from jobx-rpc/src/main/resources/META-INF/jobx/com.jobxhub.rpc.Server rename to jobx-rpc/jobx-rpc-api/src/main/resources/META-INF/jobx/com.jobxhub.rpc.Server diff --git a/jobx-rpc/jobx-rpc-mina/pom.xml b/jobx-rpc/jobx-rpc-mina/pom.xml new file mode 100644 index 00000000..43a272b6 --- /dev/null +++ b/jobx-rpc/jobx-rpc-mina/pom.xml @@ -0,0 +1,24 @@ + + + + jobx-rpc + com.jobxhub + 1.2.0-RELEASE + + 4.0.0 + jar + jobx-rpc-mina + + + com.jobxhub + jobx-rpc-api + + + + org.apache.mina + mina-core + + + \ No newline at end of file diff --git a/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaClient.java b/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaClient.java new file mode 100644 index 00000000..5138b078 --- /dev/null +++ b/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaClient.java @@ -0,0 +1,94 @@ +/** + * Copyright (c) 2015 The JobX Project + *

      + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *

      + * http://www.apache.org/licenses/LICENSE-2.0 + *

      + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.jobxhub.rpc.mina; + +import com.jobxhub.common.job.Request; +import com.jobxhub.common.job.Response; +import com.jobxhub.common.logging.LoggerFactory; +import com.jobxhub.rpc.InvokeCallback; +import com.jobxhub.rpc.RpcFuture; +import com.jobxhub.rpc.mina.support.AbstractClient; +import org.apache.mina.core.future.ConnectFuture; +import org.apache.mina.core.session.IoSession; +import org.apache.mina.filter.codec.ProtocolCodecFilter; +import org.apache.mina.transport.socket.DefaultSocketSessionConfig; +import org.apache.mina.transport.socket.nio.NioSocketConnector; +import org.slf4j.Logger; + +public class MinaClient extends AbstractClient { + + private static Logger logger = LoggerFactory.getLogger(MinaClient.class); + + @Override + public void connect(Request request) { + if (connector == null) { + connector = new NioSocketConnector(); + connector.getFilterChain().addLast("codec", new ProtocolCodecFilter(new MinaCodecAdapter(Request.class, Response.class))); + connector.setHandler(new MinaClientHandler(this)); + connector.setConnectTimeoutMillis(5000); + DefaultSocketSessionConfig sessionConfiguration = (DefaultSocketSessionConfig) connector.getSessionConfig(); + sessionConfiguration.setTcpNoDelay(true); + sessionConfiguration.setKeepAlive(true); + sessionConfiguration.setWriteTimeout(5); + } + } + + @Override + public Response sentSync(final Request request) throws Exception { + final ConnectFuture connect = super.getConnect(request); + if (connect != null && connect.isConnected()) { + RpcFuture rpcFuture = new RpcFuture(request); + //写数据 +// connect.addListener(new AbstractClient.FutureListener(rpcFuture)); + IoSession session = connect.getSession(); + session.write(request); + return rpcFuture.get(); + } else { + throw new IllegalArgumentException("[JobX] MinaRPC channel not active. request id:" + request.getId()); + } + } + + @Override + public void sentAsync(final Request request, final InvokeCallback callback) throws Exception { + final ConnectFuture connect = super.getConnect(request); + if (connect != null && connect.isConnected()) { + RpcFuture rpcFuture = new RpcFuture(request, callback); +// connect.addListener(new AbstractClient.FutureListener(rpcFuture)); + connect.getSession().write(request); + } else { + throw new IllegalArgumentException("[JobX] MinaRPC invokeAsync channel not active. request id:" + request.getId()); + } + } + + @Override + public void sentOneWay(final Request request) throws Exception { + ConnectFuture connect = super.getConnect(request); + if (connect != null && connect.isConnected()) { + RpcFuture rpcFuture = new RpcFuture(request); +// connect.addListener(new AbstractClient.FutureListener(rpcFuture)); + connect.getSession().write(request); + } else { + throw new IllegalArgumentException("[JobX] MinaRPC channel not active. request id:" + request.getId()); + } + } + + +} diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaClientHandler.java b/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaClientHandler.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaClientHandler.java rename to jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaClientHandler.java index af490221..71d2b814 100644 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaClientHandler.java +++ b/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaClientHandler.java @@ -20,11 +20,11 @@ */ package com.jobxhub.rpc.mina; -import org.apache.mina.core.service.IoHandlerAdapter; -import org.apache.mina.core.session.IoSession; import com.jobxhub.common.job.Response; import com.jobxhub.common.logging.LoggerFactory; import com.jobxhub.rpc.RpcFuture; +import org.apache.mina.core.service.IoHandlerAdapter; +import org.apache.mina.core.session.IoSession; import org.slf4j.Logger; /** diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaCodecAdapter.java b/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaCodecAdapter.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaCodecAdapter.java rename to jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaCodecAdapter.java index 93a59cee..317a5e08 100644 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaCodecAdapter.java +++ b/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaCodecAdapter.java @@ -20,12 +20,12 @@ */ package com.jobxhub.rpc.mina; -import org.apache.mina.core.buffer.IoBuffer; -import org.apache.mina.core.session.IoSession; -import org.apache.mina.filter.codec.*; import com.jobxhub.common.Constants; import com.jobxhub.common.ext.ExtensionLoader; import com.jobxhub.common.serialize.Serializer; +import org.apache.mina.core.buffer.IoBuffer; +import org.apache.mina.core.session.IoSession; +import org.apache.mina.filter.codec.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaConnectWrapper.java b/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaConnectWrapper.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaConnectWrapper.java rename to jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaConnectWrapper.java diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaServer.java b/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaServer.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaServer.java rename to jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaServer.java index 159c5b6d..3125dd63 100644 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaServer.java +++ b/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaServer.java @@ -21,13 +21,13 @@ package com.jobxhub.rpc.mina; -import org.apache.mina.filter.codec.ProtocolCodecFilter; -import org.apache.mina.filter.executor.ExecutorFilter; -import org.apache.mina.transport.socket.nio.NioSocketAcceptor; import com.jobxhub.common.job.Request; import com.jobxhub.common.job.Response; import com.jobxhub.rpc.Server; import com.jobxhub.rpc.ServerHandler; +import org.apache.mina.filter.codec.ProtocolCodecFilter; +import org.apache.mina.filter.executor.ExecutorFilter; +import org.apache.mina.transport.socket.nio.NioSocketAcceptor; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaServerHandler.java b/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaServerHandler.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaServerHandler.java rename to jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaServerHandler.java index 61d2eb20..d770183d 100644 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaServerHandler.java +++ b/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/MinaServerHandler.java @@ -20,12 +20,12 @@ */ package com.jobxhub.rpc.mina; -import org.apache.mina.core.service.IoHandlerAdapter; -import org.apache.mina.core.session.IoSession; import com.jobxhub.common.job.Request; import com.jobxhub.common.job.Response; import com.jobxhub.common.logging.LoggerFactory; import com.jobxhub.rpc.ServerHandler; +import org.apache.mina.core.service.IoHandlerAdapter; +import org.apache.mina.core.session.IoSession; import org.slf4j.Logger; public class MinaServerHandler extends IoHandlerAdapter { diff --git a/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/support/AbstractClient.java b/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/support/AbstractClient.java new file mode 100644 index 00000000..12b9cec8 --- /dev/null +++ b/jobx-rpc/jobx-rpc-mina/src/main/java/com/jobxhub/rpc/mina/support/AbstractClient.java @@ -0,0 +1,117 @@ +/** + * Copyright (c) 2015 The JobX Project + *

      + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *

      + * http://www.apache.org/licenses/LICENSE-2.0 + *

      + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.jobxhub.rpc.mina.support; + +import com.jobxhub.common.Constants; +import com.jobxhub.common.job.Request; +import com.jobxhub.common.util.HttpUtils; +import com.jobxhub.common.util.collection.HashMap; +import com.jobxhub.rpc.Client; +import com.jobxhub.rpc.RpcFuture; +import com.jobxhub.rpc.mina.MinaConnectWrapper; +import com.jobxhub.rpc.support.ChannelWrapper; +import org.apache.mina.core.future.ConnectFuture; +import org.apache.mina.transport.socket.nio.NioSocketConnector; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +/** + * @author benjobs + */ +public abstract class AbstractClient implements Client { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + protected NioSocketConnector connector; + + private final Lock connectLock = new ReentrantLock(); + + protected final ConcurrentHashMap channelTable = new ConcurrentHashMap(); + + public final Map futureTable = new HashMap(256); + + public ConnectFuture getConnect(Request request) { + connectLock.lock(); + try { + MinaConnectWrapper minaConnectWrapper = (MinaConnectWrapper) this.channelTable.get(request.getAddress()); + if (minaConnectWrapper != null && minaConnectWrapper.isActive()) { + return minaConnectWrapper.getConnectFuture(); + } + this.doConnect(request); + ConnectFuture connectFuture = connector.connect(HttpUtils.parseSocketAddress(request.getAddress())); + minaConnectWrapper = new MinaConnectWrapper(connectFuture); + if (connectFuture.awaitUninterruptibly(Constants.RPC_TIMEOUT)) { + if (minaConnectWrapper.isActive()) { + if (logger.isInfoEnabled()) { + logger.info("[JobX] MinaRPC getConnect: connect remote host[{}] success, {}", request.getAddress(), connectFuture.toString()); + } + this.channelTable.put(request.getAddress(), minaConnectWrapper); + return connectFuture; + } else { + if (logger.isWarnEnabled()) { + logger.warn("[JobX] MinaRPC getConnect: connect remote host[" + request.getAddress() + "] failed, " + connectFuture.toString(), connectFuture.getException()); + } + } + } else { + if (logger.isWarnEnabled()) { + logger.warn("[JobX] MinaRPC getConnect: connect remote host[{}] timeout {}ms, {}", request.getAddress(), Constants.RPC_TIMEOUT, connectFuture); + } + } + } finally { + connectLock.unlock(); + } + return null; + } + + + private void doConnect(Request request) { +// if (this.bootstrap == null) { +// this.connect(request); +// } + } + + @Override + public abstract void connect(Request request); + + @Override + public void disconnect() throws Throwable { + connectLock.lock(); + try { + for (Map.Entry entry : channelTable.entrySet()) { + ChannelWrapper channelWrapper = entry.getValue(); + if (channelWrapper != null) { + channelWrapper.close(); + } + } + } finally { + connectLock.unlock(); + } + } + + public RpcFuture getRpcFuture(Long id) { + return this.futureTable.get(id); + } +} diff --git a/jobx-rpc/jobx-rpc-netty4/pom.xml b/jobx-rpc/jobx-rpc-netty4/pom.xml new file mode 100644 index 00000000..0e14510f --- /dev/null +++ b/jobx-rpc/jobx-rpc-netty4/pom.xml @@ -0,0 +1,23 @@ + + + + jobx-rpc + com.jobxhub + 1.2.0-RELEASE + + 4.0.0 + jobx-rpc-netty4 + jar + + + com.jobxhub + jobx-rpc-api + + + io.netty + netty-all + + + \ No newline at end of file diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyChannelWrapper.java b/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyChannelWrapper.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyChannelWrapper.java rename to jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyChannelWrapper.java diff --git a/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyClient.java b/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyClient.java new file mode 100755 index 00000000..8e8d4c94 --- /dev/null +++ b/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyClient.java @@ -0,0 +1,107 @@ +/** + * Copyright (c) 2015 The JobX Project + *

      + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *

      + * http://www.apache.org/licenses/LICENSE-2.0 + *

      + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package com.jobxhub.rpc.netty; + +import com.jobxhub.common.Constants; +import com.jobxhub.common.job.Request; +import com.jobxhub.common.job.Response; +import com.jobxhub.rpc.InvokeCallback; +import com.jobxhub.rpc.RpcFuture; +import com.jobxhub.rpc.netty.support.AbstractClient; +import io.netty.bootstrap.Bootstrap; +import io.netty.buffer.PooledByteBufAllocator; +import io.netty.channel.Channel; +import io.netty.channel.ChannelInitializer; +import io.netty.channel.ChannelOption; +import io.netty.channel.nio.NioEventLoopGroup; +import io.netty.channel.socket.SocketChannel; +import io.netty.channel.socket.nio.NioSocketChannel; +import io.netty.util.concurrent.DefaultThreadFactory; + +import java.util.concurrent.TimeoutException; + +/** + * @author B e n + * @version 1.0 + * @date 2016-03-27 + */ + +public class NettyClient extends AbstractClient { + + private static final NioEventLoopGroup NIO_EVENT_LOOP_GROUP = new NioEventLoopGroup(Constants.DEFAULT_IO_THREADS, new DefaultThreadFactory("NettyClientWorker", true)); + + @Override + public void connect(final Request request) { + int timeout = 3000; + this.bootstrap = new Bootstrap().group(NIO_EVENT_LOOP_GROUP) + .option(ChannelOption.SO_KEEPALIVE, true) + .option(ChannelOption.TCP_NODELAY, true) + .option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT) + .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, timeout < 3000 ? 3000 : timeout) + .channel(NioSocketChannel.class) + .handler(new ChannelInitializer() { + @Override + public void initChannel(SocketChannel channel) throws Exception { + channel.pipeline().addLast( + NettyCodecAdapter.getCodecAdapter().getDecoder(Response.class), + NettyCodecAdapter.getCodecAdapter().getEncoder(Request.class), + new NettyClientHandler(NettyClient.this, request) + ); + } + }); + } + + @Override + public Response sentSync(Request request) throws TimeoutException { + Channel channel = getChannel(request); + if (channel != null && channel.isActive()) { + RpcFuture rpcFuture = new RpcFuture(request); + channel.writeAndFlush(request).addListener(new FutureListener(rpcFuture)); + return rpcFuture.get(); + } else { + throw new IllegalArgumentException("[JobX] NettyRPC invokeSync channel not active. request id:" + request.getId()); + } + } + + @Override + public void sentAsync(Request request, final InvokeCallback callback) throws Exception { + Channel channel = getChannel(request); + if (channel != null && channel.isActive()) { + RpcFuture rpcFuture = new RpcFuture(request, callback); + channel.writeAndFlush(request).addListener(new FutureListener(rpcFuture)); + } else { + throw new IllegalArgumentException("[JobX] NettyRPC invokeAsync channel not active. request id:" + request.getId()); + } + } + + @Override + public void sentOneWay(Request request) throws Exception { + Channel channel = getChannel(request); + if (channel != null && channel.isActive()) { + RpcFuture rpcFuture = new RpcFuture(request); + channel.writeAndFlush(request).addListener(new FutureListener(rpcFuture)); + } else { + throw new IllegalArgumentException("[JobX] NettyRPC invokeAsync invokeOneway channel not active. request id:" + request.getId()); + } + } + +} diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyClientHandler.java b/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyClientHandler.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyClientHandler.java rename to jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyClientHandler.java index c069c5ac..1084f699 100644 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyClientHandler.java +++ b/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyClientHandler.java @@ -20,12 +20,12 @@ */ package com.jobxhub.rpc.netty; -import io.netty.channel.ChannelHandlerContext; -import io.netty.channel.SimpleChannelInboundHandler; import com.jobxhub.common.Constants; import com.jobxhub.common.job.*; import com.jobxhub.common.logging.LoggerFactory; import com.jobxhub.common.util.CommonUtils; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; import org.slf4j.Logger; import java.io.RandomAccessFile; diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyCodecAdapter.java b/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyCodecAdapter.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyCodecAdapter.java rename to jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyCodecAdapter.java index e68662ca..ecab7805 100644 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyCodecAdapter.java +++ b/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyCodecAdapter.java @@ -20,13 +20,13 @@ */ package com.jobxhub.rpc.netty; +import com.jobxhub.common.Constants; +import com.jobxhub.common.ext.ExtensionLoader; +import com.jobxhub.common.serialize.Serializer; import io.netty.buffer.ByteBuf; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.ByteToMessageDecoder; import io.netty.handler.codec.MessageToByteEncoder; -import com.jobxhub.common.Constants; -import com.jobxhub.common.ext.ExtensionLoader; -import com.jobxhub.common.serialize.Serializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyServer.java b/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyServer.java similarity index 96% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyServer.java rename to jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyServer.java index ed3c1e36..fc3617fb 100644 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyServer.java +++ b/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyServer.java @@ -21,6 +21,12 @@ package com.jobxhub.rpc.netty; +import com.jobxhub.common.Constants; +import com.jobxhub.common.job.Request; +import com.jobxhub.common.job.Response; +import com.jobxhub.common.logging.LoggerFactory; +import com.jobxhub.rpc.Server; +import com.jobxhub.rpc.ServerHandler; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.PooledByteBufAllocator; import io.netty.channel.*; @@ -30,15 +36,12 @@ import io.netty.handler.codec.LengthFieldBasedFrameDecoder; import io.netty.util.HashedWheelTimer; import io.netty.util.concurrent.DefaultThreadFactory; -import com.jobxhub.common.Constants; -import com.jobxhub.common.job.Request; -import com.jobxhub.common.job.Response; -import com.jobxhub.common.logging.LoggerFactory; -import com.jobxhub.rpc.ServerHandler; -import com.jobxhub.rpc.Server; import org.slf4j.Logger; -import java.util.concurrent.*; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import static com.jobxhub.common.util.ExceptionUtils.stackTrace; diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyServerHandler.java b/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyServerHandler.java similarity index 100% rename from jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyServerHandler.java rename to jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyServerHandler.java index 62baa550..63bec82a 100644 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyServerHandler.java +++ b/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/NettyServerHandler.java @@ -20,13 +20,13 @@ */ package com.jobxhub.rpc.netty; -import com.jobxhub.common.exception.RpcException; -import io.netty.channel.*; import com.jobxhub.common.Constants; +import com.jobxhub.common.exception.RpcException; import com.jobxhub.common.job.*; import com.jobxhub.common.logging.LoggerFactory; import com.jobxhub.common.util.IOUtils; import com.jobxhub.rpc.ServerHandler; +import io.netty.channel.*; import org.slf4j.Logger; import java.io.File; diff --git a/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/support/AbstractClient.java b/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/support/AbstractClient.java new file mode 100644 index 00000000..57c474cc --- /dev/null +++ b/jobx-rpc/jobx-rpc-netty4/src/main/java/com/jobxhub/rpc/netty/support/AbstractClient.java @@ -0,0 +1,149 @@ +/** + * Copyright (c) 2015 The JobX Project + *

      + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + *

      + * http://www.apache.org/licenses/LICENSE-2.0 + *

      + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package com.jobxhub.rpc.netty.support; + +import com.jobxhub.common.Constants; +import com.jobxhub.common.job.Request; +import com.jobxhub.common.util.HttpUtils; +import com.jobxhub.common.util.collection.HashMap; +import com.jobxhub.rpc.Client; +import com.jobxhub.rpc.RpcFuture; +import com.jobxhub.rpc.netty.NettyChannelWrapper; +import com.jobxhub.rpc.support.ChannelWrapper; +import io.netty.bootstrap.Bootstrap; +import io.netty.channel.Channel; +import io.netty.channel.ChannelFuture; +import io.netty.channel.ChannelFutureListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.locks.Lock; +import java.util.concurrent.locks.ReentrantLock; + +/** + * @author benjobs + */ +public abstract class AbstractClient implements Client { + + private final Logger logger = LoggerFactory.getLogger(this.getClass()); + + protected Bootstrap bootstrap; + + private final Lock connectLock = new ReentrantLock(); + + protected final ConcurrentHashMap channelTable = new ConcurrentHashMap(); + + public final Map futureTable = new HashMap(256); + + public Channel getChannel(Request request) { + connectLock.lock(); + try { + NettyChannelWrapper nettyChannelWrapper = (NettyChannelWrapper) this.channelTable.get(request.getAddress()); + if (nettyChannelWrapper != null && nettyChannelWrapper.isActive()) { + return nettyChannelWrapper.getChannel(); + } + // 发起异步连接操作 + this.doConnect(request); + ChannelFuture channelFuture = this.bootstrap.connect(HttpUtils.parseSocketAddress(request.getAddress())); + nettyChannelWrapper = new NettyChannelWrapper(channelFuture); + if (channelFuture.awaitUninterruptibly(Constants.RPC_TIMEOUT)) { + if (nettyChannelWrapper.isActive()) { + if (logger.isInfoEnabled()) { + logger.info("[JobX] NettyRPC getChannel: connect remote host[{}] success, {}", request.getAddress(), channelFuture.toString()); + } + this.channelTable.put(request.getAddress(), nettyChannelWrapper); + return nettyChannelWrapper.getChannel(); + } else { + if (logger.isWarnEnabled()) { + logger.warn("[JobX] NettyRPC getChannel: connect remote host[" + request.getAddress() + "] failed, " + channelFuture.toString(), channelFuture.cause()); + } + } + } else { + if (logger.isWarnEnabled()) { + logger.warn("[JobX] NettyRPC getChannel: connect remote host[{}] timeout {}ms, {}", request.getAddress(), Constants.RPC_TIMEOUT, channelFuture); + } + } + } finally { + connectLock.unlock(); + } + return null; + } + + private void doConnect(Request request) { + if (this.bootstrap == null) { + this.connect(request); + } + } + + @Override + public abstract void connect(Request request); + + @Override + public void disconnect() throws Throwable { + connectLock.lock(); + try { + for (Map.Entry entry : channelTable.entrySet()) { + ChannelWrapper channelWrapper = entry.getValue(); + if (channelWrapper != null) { + channelWrapper.close(); + } + } + } finally { + connectLock.unlock(); + } + } + + public RpcFuture getRpcFuture(Long id) { + return this.futureTable.get(id); + } + + public class FutureListener implements ChannelFutureListener { + + private RpcFuture rpcFuture; + + public FutureListener(RpcFuture rpcFuture) { + if (rpcFuture != null) { + this.rpcFuture = rpcFuture; + futureTable.put(rpcFuture.getFutureId(), rpcFuture); + } + } + + @Override + public void operationComplete(ChannelFuture future) throws Exception { + if (future.isSuccess()) { + if (logger.isInfoEnabled()) { + logger.info("[JobX] NettyRPC sent success, request id:{}", rpcFuture.getRequest().getId()); + } + return; + } else { + if (logger.isInfoEnabled()) { + logger.info("[JobX] NettyRPC sent failure, request id:{}", rpcFuture.getRequest().getId()); + } + if (this.rpcFuture != null) { + rpcFuture.caught(future.cause()); + } + } + futureTable.remove(rpcFuture.getFutureId()); + } + } +} diff --git a/jobx-rpc/jobx-rpc-netty4/src/test/java/NettyFileTest.java b/jobx-rpc/jobx-rpc-netty4/src/test/java/NettyFileTest.java new file mode 100644 index 00000000..ed934ee4 --- /dev/null +++ b/jobx-rpc/jobx-rpc-netty4/src/test/java/NettyFileTest.java @@ -0,0 +1,37 @@ +//import com.jobxhub.common.ext.ExtensionLoader; +//import com.jobxhub.common.job.*; +//import com.jobxhub.common.util.IdGenerator; +//import com.jobxhub.rpc.Client; +//import com.jobxhub.rpc.Server; +//import org.junit.Test; +// +//import java.io.File; +// +//public class NettyFileTest { +// +// +// @Test +// public void server() { +// Server server = ExtensionLoader.load(Server.class); +// server.start(8089, null); +// } +// +// @Test +// public void client() throws Exception { +// Client client = ExtensionLoader.load(Client.class); +// Request request = new Request(); +// request.setId(IdGenerator.getId()); +// request.setAction(Action.UPLOAD); +// request.setRpcType(RpcType.SYNC); +// request.setHost("127.0.0.1"); +// request.setPort(8089); +// File file = new File("/Users/benjobs/movie/盗梦空间.mkv"); +// RequestFile requestFile = new RequestFile(file); +// requestFile.setSavePath("/Users/benjobs/Desktop"); +// request.setUploadFile(requestFile); +// Response response = client.sentSync(request); +// System.out.println(response.getAction()); +// +// } +// +//} diff --git a/jobx-rpc/src/test/java/SPITest.java b/jobx-rpc/jobx-rpc-netty4/src/test/java/SPITest.java similarity index 100% rename from jobx-rpc/src/test/java/SPITest.java rename to jobx-rpc/jobx-rpc-netty4/src/test/java/SPITest.java index f958e61c..a073c812 100644 --- a/jobx-rpc/src/test/java/SPITest.java +++ b/jobx-rpc/jobx-rpc-netty4/src/test/java/SPITest.java @@ -1,5 +1,5 @@ -import org.junit.Test; import com.jobxhub.common.util.SystemPropertyUtils; +import org.junit.Test; import java.io.IOException; diff --git a/jobx-rpc/pom.xml b/jobx-rpc/pom.xml index 17bded85..03d1d630 100644 --- a/jobx-rpc/pom.xml +++ b/jobx-rpc/pom.xml @@ -6,44 +6,15 @@ jobx com.jobxhub 1.2.0-RELEASE + + 4.0.0 jobx-rpc - - - - org.apache.maven.plugins - maven-compiler-plugin - - 7 - 7 - - - - - - - - - com.jobxhub - jobx-common - - - - io.netty - netty-all - - - - org.apache.mina - mina-core - - - - org.apache.zookeeper - zookeeper - - - - + pom + + jobx-rpc-netty4 + jobx-rpc-mina + jobx-rpc-api + \ No newline at end of file diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaClient.java b/jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaClient.java deleted file mode 100644 index 86a121e5..00000000 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/mina/MinaClient.java +++ /dev/null @@ -1,93 +0,0 @@ -/** - * Copyright (c) 2015 The JobX Project - *

      - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - *

      - * http://www.apache.org/licenses/LICENSE-2.0 - *

      - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package com.jobxhub.rpc.mina; - -import org.apache.mina.core.future.ConnectFuture; -import org.apache.mina.core.session.IoSession; -import org.apache.mina.filter.codec.ProtocolCodecFilter; -import org.apache.mina.transport.socket.DefaultSocketSessionConfig; -import org.apache.mina.transport.socket.nio.NioSocketConnector; -import com.jobxhub.common.job.Request; -import com.jobxhub.common.job.Response; -import com.jobxhub.common.logging.LoggerFactory; -import com.jobxhub.rpc.InvokeCallback; -import com.jobxhub.rpc.RpcFuture; -import com.jobxhub.rpc.support.AbstractClient; -import org.slf4j.Logger; - -public class MinaClient extends AbstractClient { - - private static Logger logger = LoggerFactory.getLogger(MinaClient.class); - - @Override - public void connect(Request request) { - if (connector == null) { - connector = new NioSocketConnector(); - connector.getFilterChain().addLast("codec", new ProtocolCodecFilter(new MinaCodecAdapter(Request.class, Response.class))); - connector.setHandler(new MinaClientHandler(this)); - connector.setConnectTimeoutMillis(5000); - DefaultSocketSessionConfig sessionConfiguration = (DefaultSocketSessionConfig) connector.getSessionConfig(); - sessionConfiguration.setTcpNoDelay(true); - sessionConfiguration.setKeepAlive(true); - sessionConfiguration.setWriteTimeout(5); - } - } - @Override - public Response sentSync(final Request request) throws Exception { - final ConnectFuture connect = super.getConnect(request); - if (connect != null && connect.isConnected()) { - RpcFuture rpcFuture = new RpcFuture(request); - //写数据 - connect.addListener(new AbstractClient.FutureListener(rpcFuture)); - IoSession session = connect.getSession(); - session.write(request); - return rpcFuture.get(); - } else { - throw new IllegalArgumentException("[JobX] MinaRPC channel not active. request id:" + request.getId()); - } - } - - @Override - public void sentAsync(final Request request, final InvokeCallback callback) throws Exception { - final ConnectFuture connect = super.getConnect(request); - if (connect != null && connect.isConnected()) { - RpcFuture rpcFuture = new RpcFuture(request,callback); - connect.addListener(new AbstractClient.FutureListener(rpcFuture)); - connect.getSession().write(request); - } else { - throw new IllegalArgumentException("[JobX] MinaRPC invokeAsync channel not active. request id:" + request.getId()); - } - } - - @Override - public void sentOneWay(final Request request) throws Exception { - ConnectFuture connect = super.getConnect(request); - if (connect != null && connect.isConnected()) { - RpcFuture rpcFuture = new RpcFuture(request); - connect.addListener(new AbstractClient.FutureListener(rpcFuture)); - connect.getSession().write(request); - } else { - throw new IllegalArgumentException("[JobX] MinaRPC channel not active. request id:" + request.getId()); - } - } - - -} diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyClient.java b/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyClient.java deleted file mode 100755 index b90e870f..00000000 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/netty/NettyClient.java +++ /dev/null @@ -1,105 +0,0 @@ -/** - * Copyright (c) 2015 The JobX Project - *

      - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - *

      - * http://www.apache.org/licenses/LICENSE-2.0 - *

      - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ - -package com.jobxhub.rpc.netty; - -import com.jobxhub.common.Constants; -import com.jobxhub.common.job.Request; -import com.jobxhub.common.job.Response; -import com.jobxhub.rpc.InvokeCallback; -import com.jobxhub.rpc.RpcFuture; -import com.jobxhub.rpc.support.AbstractClient; -import io.netty.bootstrap.Bootstrap; -import io.netty.buffer.PooledByteBufAllocator; -import io.netty.channel.*; -import io.netty.channel.nio.NioEventLoopGroup; -import io.netty.channel.socket.SocketChannel; -import io.netty.channel.socket.nio.NioSocketChannel; -import io.netty.util.concurrent.DefaultThreadFactory; - -import java.util.concurrent.TimeoutException; - -/** - * @author B e n - * @version 1.0 - * @date 2016-03-27 - */ - -public class NettyClient extends AbstractClient { - - private static final NioEventLoopGroup NIO_EVENT_LOOP_GROUP = new NioEventLoopGroup(Constants.DEFAULT_IO_THREADS, new DefaultThreadFactory("NettyClientWorker", true)); - - @Override - public void connect(final Request request) { - int timeout = 3000; - this.bootstrap = new Bootstrap().group(NIO_EVENT_LOOP_GROUP) - .option(ChannelOption.SO_KEEPALIVE, true) - .option(ChannelOption.TCP_NODELAY, true) - .option(ChannelOption.ALLOCATOR, PooledByteBufAllocator.DEFAULT) - .option(ChannelOption.CONNECT_TIMEOUT_MILLIS, timeout < 3000 ? 3000 : timeout) - .channel(NioSocketChannel.class) - .handler(new ChannelInitializer() { - @Override - public void initChannel(SocketChannel channel) throws Exception { - channel.pipeline().addLast( - NettyCodecAdapter.getCodecAdapter().getDecoder(Response.class), - NettyCodecAdapter.getCodecAdapter().getEncoder(Request.class), - new NettyClientHandler(NettyClient.this, request) - ); - } - }); - } - - @Override - public Response sentSync(Request request) throws TimeoutException { - Channel channel = getChannel(request); - if (channel != null && channel.isActive()) { - RpcFuture rpcFuture = new RpcFuture(request); - channel.writeAndFlush(request).addListener(new FutureListener(rpcFuture)); - return rpcFuture.get(); - } else { - throw new IllegalArgumentException("[JobX] NettyRPC invokeSync channel not active. request id:" + request.getId()); - } - } - - @Override - public void sentAsync(Request request, final InvokeCallback callback) throws Exception { - Channel channel = getChannel(request); - if (channel != null && channel.isActive()) { - RpcFuture rpcFuture = new RpcFuture(request, callback); - channel.writeAndFlush(request).addListener(new FutureListener(rpcFuture)); - } else { - throw new IllegalArgumentException("[JobX] NettyRPC invokeAsync channel not active. request id:" + request.getId()); - } - } - - @Override - public void sentOneWay(Request request) throws Exception { - Channel channel = getChannel(request); - if (channel != null && channel.isActive()) { - RpcFuture rpcFuture = new RpcFuture(request); - channel.writeAndFlush(request).addListener(new FutureListener(rpcFuture)); - } else { - throw new IllegalArgumentException("[JobX] NettyRPC invokeAsync invokeOneway channel not active. request id:" + request.getId()); - } - } - -} diff --git a/jobx-rpc/src/main/java/com/jobxhub/rpc/support/AbstractClient.java b/jobx-rpc/src/main/java/com/jobxhub/rpc/support/AbstractClient.java deleted file mode 100644 index 1f48d89f..00000000 --- a/jobx-rpc/src/main/java/com/jobxhub/rpc/support/AbstractClient.java +++ /dev/null @@ -1,210 +0,0 @@ -/** - * Copyright (c) 2015 The JobX Project - *

      - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - *

      - * http://www.apache.org/licenses/LICENSE-2.0 - *

      - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package com.jobxhub.rpc.support; - -import com.jobxhub.rpc.mina.MinaConnectWrapper; -import com.jobxhub.rpc.netty.NettyChannelWrapper; -import io.netty.bootstrap.Bootstrap; -import io.netty.channel.Channel; -import io.netty.channel.ChannelFuture; -import io.netty.channel.ChannelFutureListener; -import org.apache.mina.core.future.ConnectFuture; -import org.apache.mina.core.future.IoFuture; -import org.apache.mina.core.future.IoFutureListener; -import org.apache.mina.transport.socket.nio.NioSocketConnector; -import com.jobxhub.common.Constants; -import com.jobxhub.common.job.Request; -import com.jobxhub.common.util.HttpUtils; -import com.jobxhub.rpc.Client; -import com.jobxhub.rpc.RpcFuture; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; - -import com.jobxhub.common.util.collection.HashMap; - -/** - * @author benjobs - */ -public abstract class AbstractClient implements Client { - - private final Logger logger = LoggerFactory.getLogger(this.getClass()); - - protected NioSocketConnector connector; - - protected Bootstrap bootstrap; - - private final Lock connectLock = new ReentrantLock(); - - protected final ConcurrentHashMap channelTable = new ConcurrentHashMap(); - - public final Map futureTable = new HashMap(256); - - public ConnectFuture getConnect(Request request) { - connectLock.lock(); - try { - MinaConnectWrapper minaConnectWrapper = (MinaConnectWrapper) this.channelTable.get(request.getAddress()); - if (minaConnectWrapper != null && minaConnectWrapper.isActive()) { - return minaConnectWrapper.getConnectFuture(); - } - this.doConnect(request); - ConnectFuture connectFuture = connector.connect(HttpUtils.parseSocketAddress(request.getAddress())); - minaConnectWrapper = new MinaConnectWrapper(connectFuture); - if (connectFuture.awaitUninterruptibly(Constants.RPC_TIMEOUT)) { - if (minaConnectWrapper.isActive()) { - if (logger.isInfoEnabled()) { - logger.info("[JobX] MinaRPC getConnect: connect remote host[{}] success, {}", request.getAddress(), connectFuture.toString()); - } - this.channelTable.put(request.getAddress(), minaConnectWrapper); - return connectFuture; - } else { - if (logger.isWarnEnabled()) { - logger.warn("[JobX] MinaRPC getConnect: connect remote host[" + request.getAddress() + "] failed, " + connectFuture.toString(), connectFuture.getException()); - } - } - } else { - if (logger.isWarnEnabled()) { - logger.warn("[JobX] MinaRPC getConnect: connect remote host[{}] timeout {}ms, {}", request.getAddress(), Constants.RPC_TIMEOUT, connectFuture); - } - } - }finally { - connectLock.unlock(); - } - return null; - } - - public Channel getChannel(Request request) { - connectLock.lock(); - try { - NettyChannelWrapper nettyChannelWrapper = (NettyChannelWrapper) this.channelTable.get(request.getAddress()); - if (nettyChannelWrapper != null && nettyChannelWrapper.isActive()) { - return nettyChannelWrapper.getChannel(); - } - // 发起异步连接操作 - this.doConnect(request); - ChannelFuture channelFuture = this.bootstrap.connect(HttpUtils.parseSocketAddress(request.getAddress())); - nettyChannelWrapper = new NettyChannelWrapper(channelFuture); - if (channelFuture.awaitUninterruptibly(Constants.RPC_TIMEOUT)) { - if (nettyChannelWrapper.isActive()) { - if (logger.isInfoEnabled()) { - logger.info("[JobX] NettyRPC getChannel: connect remote host[{}] success, {}", request.getAddress(), channelFuture.toString()); - } - this.channelTable.put(request.getAddress(), nettyChannelWrapper); - return nettyChannelWrapper.getChannel(); - } else { - if (logger.isWarnEnabled()) { - logger.warn("[JobX] NettyRPC getChannel: connect remote host[" + request.getAddress() + "] failed, " + channelFuture.toString(), channelFuture.cause()); - } - } - } else { - if (logger.isWarnEnabled()) { - logger.warn("[JobX] NettyRPC getChannel: connect remote host[{}] timeout {}ms, {}", request.getAddress(), Constants.RPC_TIMEOUT, channelFuture); - } - } - }finally { - connectLock.unlock(); - } - return null; - } - - private void doConnect(Request request) { - if (this.bootstrap == null) { - this.connect(request); - } - } - - @Override - public abstract void connect(Request request); - - @Override - public void disconnect() throws Throwable { - connectLock.lock(); - try { - for(Map.Entry entry:channelTable.entrySet()) { - ChannelWrapper channelWrapper = entry.getValue(); - if (channelWrapper !=null) { - channelWrapper.close(); - } - } - } finally { - connectLock.unlock(); - } - } - - public RpcFuture getRpcFuture(Long id) { - return this.futureTable.get(id); - } - - public class FutureListener implements ChannelFutureListener, IoFutureListener { - - private RpcFuture rpcFuture; - - public FutureListener(RpcFuture rpcFuture) { - if (rpcFuture != null) { - this.rpcFuture = rpcFuture; - futureTable.put(rpcFuture.getFutureId(), rpcFuture); - } - } - - @Override - public void operationComplete(ChannelFuture future) throws Exception { - if (future.isSuccess()) { - if (logger.isInfoEnabled()) { - logger.info("[JobX] NettyRPC sent success, request id:{}", rpcFuture.getRequest().getId()); - } - return; - } else { - if (logger.isInfoEnabled()) { - logger.info("[JobX] NettyRPC sent failure, request id:{}", rpcFuture.getRequest().getId()); - } - if (this.rpcFuture != null) { - rpcFuture.caught(future.cause()); - } - } - futureTable.remove(rpcFuture.getFutureId()); - } - - @Override - public void operationComplete(IoFuture future) { - if (future.isDone()) { - if (logger.isInfoEnabled()) { - logger.info("[JobX] MinaRPC sent success, request id:{}", rpcFuture.getRequest().getId()); - } - return; - } else { - if (logger.isInfoEnabled()) { - logger.info("[JobX] MinaRPC sent failure, request id:{}", rpcFuture.getRequest().getId()); - } - if (rpcFuture != null) { - rpcFuture.caught(getConnect(rpcFuture.getRequest()).getException()); - } - } - futureTable.remove(rpcFuture.getRequest().getId()); - } - - } - - -} diff --git a/jobx-rpc/src/test/java/NettyFileTest.java b/jobx-rpc/src/test/java/NettyFileTest.java deleted file mode 100644 index aef1ff2c..00000000 --- a/jobx-rpc/src/test/java/NettyFileTest.java +++ /dev/null @@ -1,37 +0,0 @@ -import org.junit.Test; -import com.jobxhub.common.ext.ExtensionLoader; -import com.jobxhub.common.job.*; -import com.jobxhub.common.util.IdGenerator; -import com.jobxhub.rpc.Client; -import com.jobxhub.rpc.Server; - -import java.io.File; - -public class NettyFileTest { - - - @Test - public void server() { - Server server = ExtensionLoader.load(Server.class); - server.start(8089, null); - } - - @Test - public void client() throws Exception { - Client client = ExtensionLoader.load(Client.class); - Request request = new Request(); - request.setId(IdGenerator.getId()); - request.setAction(Action.UPLOAD); - request.setRpcType(RpcType.SYNC); - request.setHost("127.0.0.1"); - request.setPort(8089); - File file = new File("/Users/benjobs/movie/盗梦空间.mkv"); - RequestFile requestFile = new RequestFile(file); - requestFile.setSavePath("/Users/benjobs/Desktop"); - request.setUploadFile(requestFile); - Response response = client.sentSync(request); - System.out.println(response.getAction()); - - } - -} diff --git a/jobx-server/pom.xml b/jobx-server/pom.xml index 50079763..3d5a8ef9 100644 --- a/jobx-server/pom.xml +++ b/jobx-server/pom.xml @@ -24,7 +24,7 @@ com.jobxhub - jobx-rpc + jobx-rpc-api diff --git a/pom.xml b/pom.xml index e1fa9a51..a3c668e9 100644 --- a/pom.xml +++ b/pom.xml @@ -80,6 +80,7 @@ 8.5.2 5.2 3.2.5 + 1.2.0-RELEASE @@ -117,6 +118,12 @@ ${project.version} + + com.jobxhub + jobx-rpc-api + ${project.version} + + com.jobxhub jobx-agent From d01ecb98e9573e5c9702382eb3136b86198d40be Mon Sep 17 00:00:00 2001 From: Autorun <20293349@qq.com> Date: Tue, 7 Jan 2020 12:40:37 +0800 Subject: [PATCH 46/46] maven revision add --- jobx-agent/pom.xml | 2 +- jobx-api/pom.xml | 2 +- jobx-common/pom.xml | 2 +- jobx-examples/pom.xml | 2 +- jobx-registry/pom.xml | 2 +- jobx-rpc/jobx-rpc-api/pom.xml | 2 +- jobx-rpc/jobx-rpc-mina/pom.xml | 2 +- jobx-rpc/jobx-rpc-netty4/pom.xml | 2 +- jobx-rpc/pom.xml | 4 +--- jobx-server/pom.xml | 2 +- pom.xml | 2 +- 11 files changed, 11 insertions(+), 13 deletions(-) diff --git a/jobx-agent/pom.xml b/jobx-agent/pom.xml index 95ac552f..50339595 100644 --- a/jobx-agent/pom.xml +++ b/jobx-agent/pom.xml @@ -3,7 +3,7 @@ jobx com.jobxhub - 1.2.0-RELEASE + ${revision} 4.0.0 jobx-agent diff --git a/jobx-api/pom.xml b/jobx-api/pom.xml index 11392d70..a3131851 100644 --- a/jobx-api/pom.xml +++ b/jobx-api/pom.xml @@ -5,7 +5,7 @@ jobx com.jobxhub - 1.2.0-RELEASE + ${revision} 4.0.0 jobx-api diff --git a/jobx-common/pom.xml b/jobx-common/pom.xml index ac8497b9..bd83887c 100644 --- a/jobx-common/pom.xml +++ b/jobx-common/pom.xml @@ -5,7 +5,7 @@ jobx com.jobxhub - 1.2.0-RELEASE + ${revision} 4.0.0 jobx-common diff --git a/jobx-examples/pom.xml b/jobx-examples/pom.xml index c49cfa70..9679154b 100755 --- a/jobx-examples/pom.xml +++ b/jobx-examples/pom.xml @@ -3,7 +3,7 @@ jobx com.jobxhub - 1.2.0-RELEASE + ${revision} 4.0.0 jobx-examples diff --git a/jobx-registry/pom.xml b/jobx-registry/pom.xml index 93d48cba..81072675 100644 --- a/jobx-registry/pom.xml +++ b/jobx-registry/pom.xml @@ -5,7 +5,7 @@ jobx com.jobxhub - 1.2.0-RELEASE + ${revision} 4.0.0 jobx-registry diff --git a/jobx-rpc/jobx-rpc-api/pom.xml b/jobx-rpc/jobx-rpc-api/pom.xml index 75adf1e3..1d9d397b 100644 --- a/jobx-rpc/jobx-rpc-api/pom.xml +++ b/jobx-rpc/jobx-rpc-api/pom.xml @@ -5,7 +5,7 @@ jobx-rpc com.jobxhub - 1.2.0-RELEASE + ${revision} 4.0.0 jar diff --git a/jobx-rpc/jobx-rpc-mina/pom.xml b/jobx-rpc/jobx-rpc-mina/pom.xml index 43a272b6..733befdf 100644 --- a/jobx-rpc/jobx-rpc-mina/pom.xml +++ b/jobx-rpc/jobx-rpc-mina/pom.xml @@ -5,7 +5,7 @@ jobx-rpc com.jobxhub - 1.2.0-RELEASE + ${revision} 4.0.0 jar diff --git a/jobx-rpc/jobx-rpc-netty4/pom.xml b/jobx-rpc/jobx-rpc-netty4/pom.xml index 0e14510f..147324cd 100644 --- a/jobx-rpc/jobx-rpc-netty4/pom.xml +++ b/jobx-rpc/jobx-rpc-netty4/pom.xml @@ -5,7 +5,7 @@ jobx-rpc com.jobxhub - 1.2.0-RELEASE + ${revision} 4.0.0 jobx-rpc-netty4 diff --git a/jobx-rpc/pom.xml b/jobx-rpc/pom.xml index 03d1d630..d9c9aa61 100644 --- a/jobx-rpc/pom.xml +++ b/jobx-rpc/pom.xml @@ -5,9 +5,7 @@ jobx com.jobxhub - 1.2.0-RELEASE - - + ${revision} 4.0.0 jobx-rpc diff --git a/jobx-server/pom.xml b/jobx-server/pom.xml index 3d5a8ef9..6796b93e 100644 --- a/jobx-server/pom.xml +++ b/jobx-server/pom.xml @@ -3,7 +3,7 @@ jobx com.jobxhub - 1.2.0-RELEASE + ${revision} 4.0.0 jobx-server diff --git a/pom.xml b/pom.xml index a3c668e9..2ee8a00d 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ com.jobxhub jobx - 1.2.0-RELEASE + ${revision} jobx-common jobx-registry