refactor(@embark/utils): move unitRegex into utils package

This commit is contained in:
Pascal Precht 2019-04-29 16:26:20 +02:00 committed by Pascal Precht
parent b9fe741585
commit 93568ad911
4 changed files with 4 additions and 4 deletions

View File

@ -7,6 +7,7 @@ const {canonicalHost, defaultCorsHost, defaultHost, dockerHostSwap, isDocker} =
const {findNextPort} = require('./network');
const logUtils = require('./log-utils');
const toposortGraph = require('./toposort');
import { unitRegex } from './constants';
import { last, recursiveMerge } from './collections';
@ -145,6 +146,7 @@ const Utils = {
recursiveMerge,
sha512,
timer,
unitRegex,
runCmd,
escapeHtml: logUtils.escapeHtml,
normalizeInput: logUtils.normalizeInput,

View File

@ -5,10 +5,9 @@ const path = require('path');
const deepEqual = require('deep-equal');
const web3 = require('web3');
const constants = require('embark-core/constants');
import {canonicalHost, defaultHost, recursiveMerge, AddressUtils} from 'embark-utils';
import {canonicalHost, defaultHost, recursiveMerge, AddressUtils, unitRegex} from 'embark-utils';
const cloneDeep = require('lodash.clonedeep');
const { replaceZeroAddressShorthand } = AddressUtils;
import { unitRegex } from "../utils/regexConstants";
import * as utilsContractsConfig from "../utils/contractsConfig";
import { File, Types } from "./file";

View File

@ -1,5 +1,4 @@
import { AddressUtils } from "embark-utils";
import { unitRegex } from "./regexConstants";
import { AddressUtils, unitRegex } from "embark-utils";
const { extendZeroAddressShorthand, replaceZeroAddressShorthand } = AddressUtils;
const web3 = require("web3");