From f8e9cbba7bfed6ca6554759fe970071be17d1ffc Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Fri, 31 May 2019 02:27:56 -0700 Subject: [PATCH] Consolidate import statements --- packages/next-server/server/next-server.ts | 8 +++++--- packages/next/server/next-dev-server.js | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/packages/next-server/server/next-server.ts b/packages/next-server/server/next-server.ts index 4559a796b6..77b79079e8 100644 --- a/packages/next-server/server/next-server.ts +++ b/packages/next-server/server/next-server.ts @@ -14,9 +14,11 @@ import { PHASE_PRODUCTION_SERVER, SERVER_DIRECTORY, } from '../lib/constants' -import { getRouteMatcher } from '../lib/router/utils/route-matcher' -import { getRouteRegex } from '../lib/router/utils/route-regex' -import { getSortedRoutes } from '../lib/router/utils/sorted-routes' +import { + getRouteMatcher, + getRouteRegex, + getSortedRoutes, +} from '../lib/router/utils' import * as envConfig from '../lib/runtime-config' import loadConfig from './config' import { recursiveReadDirSync } from './lib/recursive-readdir-sync' diff --git a/packages/next/server/next-dev-server.js b/packages/next/server/next-dev-server.js index 5408d95d61..f673a069ee 100644 --- a/packages/next/server/next-dev-server.js +++ b/packages/next/server/next-dev-server.js @@ -9,9 +9,11 @@ import { ampValidation } from '../build/output/index' import * as Log from '../build/output/log' import { verifyTypeScriptSetup } from '../lib/verifyTypeScriptSetup' import Watchpack from 'watchpack' -import { getRouteMatcher } from 'next-server/dist/lib/router/utils/route-matcher' -import { getRouteRegex } from 'next-server/dist/lib/router/utils/route-regex' -import { getSortedRoutes } from 'next-server/dist/lib/router/utils/sorted-routes' +import { + getRouteMatcher, + getRouteRegex, + getSortedRoutes +} from 'next-server/dist/lib/router/utils' const React = require('react')