diff --git a/bin/common/utils.js b/bin/common/utils.js index 4f352ff2e6..27c4fb138b 100644 --- a/bin/common/utils.js +++ b/bin/common/utils.js @@ -1,6 +1,8 @@ -const { Utils } = require('../..') + const { resolve } = require('path') const { existsSync } = require('fs') + +const { Utils } = require('../..') const { requireModule } = require('../../lib/common/module') const getRootDir = argv => resolve(argv._[0] || '.') diff --git a/bin/nuxt-start b/bin/nuxt-start index 7033e1711f..ca9c2e63e9 100755 --- a/bin/nuxt-start +++ b/bin/nuxt-start @@ -2,8 +2,8 @@ /* eslint-disable no-console */ const fs = require('fs') -const parseArgs = require('minimist') const { resolve } = require('path') +const parseArgs = require('minimist') const { Nuxt, Utils } = require('..') const { loadNuxtConfig, getLatestHost } = require('./common/utils') diff --git a/examples/with-ava/test/index.test.js b/examples/with-ava/test/index.test.js index 47ce1fadec..431f98f41f 100755 --- a/examples/with-ava/test/index.test.js +++ b/examples/with-ava/test/index.test.js @@ -1,6 +1,7 @@ +import { resolve } from 'path' + import test from 'ava' import { Nuxt, Builder } from 'nuxt' -import { resolve } from 'path' // We keep the nuxt and server instance // So we can close them at the end of the test diff --git a/examples/with-sockets/server.js b/examples/with-sockets/server.js index 017d62a609..0e668f3ccb 100644 --- a/examples/with-sockets/server.js +++ b/examples/with-sockets/server.js @@ -1,6 +1,7 @@ +import http from 'http' + import { Nuxt, Builder } from 'nuxt' import express from 'express' -import http from 'http' import SocketIO from 'socket.io' const port = process.env.PORT || 3000 diff --git a/examples/with-vux/nuxt.config.js b/examples/with-vux/nuxt.config.js index a2133ab74a..4c9aaa4e4d 100644 --- a/examples/with-vux/nuxt.config.js +++ b/examples/with-vux/nuxt.config.js @@ -1,6 +1,7 @@ -import vuxLoader from 'vux-loader' import path from 'path' +import vuxLoader from 'vux-loader' + export default { head: { meta: [ diff --git a/lib/builder/builder.mjs b/lib/builder/builder.mjs index b9b4a8b21b..02060e9af7 100644 --- a/lib/builder/builder.mjs +++ b/lib/builder/builder.mjs @@ -1,22 +1,25 @@ import util from 'util' +import path from 'path' +import fs from 'fs' + import _ from 'lodash' import chokidar from 'chokidar' import fsExtra from 'fs-extra' -import fs from 'fs' import hash from 'hash-sum' import webpack from 'webpack' import serialize from 'serialize-javascript' -import path from 'path' import MFS from 'memory-fs' import webpackDevMiddleware from 'webpack-dev-middleware' import webpackHotMiddleware from 'webpack-hot-middleware' import Debug from 'debug' import Glob from 'glob' +import upath from 'upath' + import { r, wp, wChunk, createRoutes, parallel, relativeTo, waitFor, createSpinner } from '../common/utils' import Options from '../common/options' + import clientWebpackConfig from './webpack/client.config' import serverWebpackConfig from './webpack/server.config' -import upath from 'upath' const debug = Debug('nuxt:build') debug.color = 2 // Force green color diff --git a/lib/builder/generator.mjs b/lib/builder/generator.mjs index 675e86529d..063370d87f 100644 --- a/lib/builder/generator.mjs +++ b/lib/builder/generator.mjs @@ -1,5 +1,5 @@ -import _ from 'lodash' import path from 'path' +import _ from 'lodash' import htmlMinifier from 'html-minifier' import Chalk from 'chalk' import fsExtra from 'fs-extra' @@ -247,6 +247,8 @@ export default class Generator { } } + path = 123 + let _path if (this.options.generate.subFolders) { diff --git a/lib/builder/webpack/base.config.mjs b/lib/builder/webpack/base.config.mjs index 9cfc79c933..2400199c90 100644 --- a/lib/builder/webpack/base.config.mjs +++ b/lib/builder/webpack/base.config.mjs @@ -1,14 +1,14 @@ +import path from 'path' + import ExtractTextPlugin from 'extract-text-webpack-plugin' import TimeFixPlugin from 'time-fix-plugin' -import WarnFixPlugin from './plugins/warnfix' -import ProgressPlugin from './plugins/progress' - import webpack from 'webpack' import _ from 'lodash' -import path from 'path' import { isUrl, urlJoin } from '../../common/utils' +import WarnFixPlugin from './plugins/warnfix' +import ProgressPlugin from './plugins/progress' import vueLoader from './vue-loader' import styleLoader from './style-loader' diff --git a/lib/builder/webpack/client.config.mjs b/lib/builder/webpack/client.config.mjs index f5ec4a0248..be3ef6dc01 100644 --- a/lib/builder/webpack/client.config.mjs +++ b/lib/builder/webpack/client.config.mjs @@ -1,15 +1,18 @@ +import path from 'path' + import _ from 'lodash' import webpack from 'webpack' -// import VueSSRClientPlugin from 'vue-server-renderer/client-plugin' -import VueSSRClientPlugin from './plugins/vue/client' import HTMLPlugin from 'html-webpack-plugin' import FriendlyErrorsWebpackPlugin from '@nuxtjs/friendly-errors-webpack-plugin' import StylishPlugin from 'webpack-stylish' import BundleAnalyzer from 'webpack-bundle-analyzer' -import path from 'path' + import Debug from 'debug' import base from './base.config' +// import VueSSRClientPlugin from 'vue-server-renderer/client-plugin' +import VueSSRClientPlugin from './plugins/vue/client' + const debug = Debug('nuxt:build') debug.color = 2 // Force green color diff --git a/lib/builder/webpack/postcss.mjs b/lib/builder/webpack/postcss.mjs index b789f1fd99..9c3904aeb1 100644 --- a/lib/builder/webpack/postcss.mjs +++ b/lib/builder/webpack/postcss.mjs @@ -1,9 +1,11 @@ import fs from 'fs' import path from 'path' + import ـ from 'lodash' -import { isPureObject } from '../../common/utils' import createResolver from 'postcss-import-resolver' +import { isPureObject } from '../../common/utils' + export default function postcssConfig() { let config = ـ.cloneDeep(this.options.build.postcss) diff --git a/lib/builder/webpack/server.config.mjs b/lib/builder/webpack/server.config.mjs index a92b6d7a18..4cc202c866 100644 --- a/lib/builder/webpack/server.config.mjs +++ b/lib/builder/webpack/server.config.mjs @@ -1,12 +1,15 @@ -import webpack from 'webpack' -// import VueSSRServerPlugin from 'vue-server-renderer/server-plugin' -import VueSSRServerPlugin from './plugins/vue/server' -import nodeExternals from 'webpack-node-externals' -import _ from 'lodash' import path from 'path' import fs from 'fs' + +import webpack from 'webpack' +import nodeExternals from 'webpack-node-externals' +import _ from 'lodash' + import base from './base.config' +// import VueSSRServerPlugin from 'vue-server-renderer/server-plugin' +import VueSSRServerPlugin from './plugins/vue/server' + /* |-------------------------------------------------------------------------- | Webpack Server Config diff --git a/lib/builder/webpack/style-loader.js b/lib/builder/webpack/style-loader.js index c7f15e3797..2bbfc771ed 100644 --- a/lib/builder/webpack/style-loader.js +++ b/lib/builder/webpack/style-loader.js @@ -1,5 +1,7 @@ -import ExtractTextPlugin from 'extract-text-webpack-plugin' import path from 'path' + +import ExtractTextPlugin from 'extract-text-webpack-plugin' + import postcssConfig from './postcss' export default function styleLoader(ext, loaders = [], isVueLoader = false) { diff --git a/lib/common/options.mjs b/lib/common/options.mjs index e97411b773..ed5b0c8135 100644 --- a/lib/common/options.mjs +++ b/lib/common/options.mjs @@ -1,8 +1,9 @@ -import _ from 'lodash' -import Debug from 'debug' import path from 'path' import fs from 'fs' +import _ from 'lodash' +import Debug from 'debug' + import { isUrl, isPureObject } from '../common/utils' import modes from './modes' diff --git a/lib/core/middleware/error.mjs b/lib/core/middleware/error.mjs index 39a8d60738..b877c8406d 100644 --- a/lib/core/middleware/error.mjs +++ b/lib/core/middleware/error.mjs @@ -1,5 +1,6 @@ -import Youch from '@nuxtjs/youch' import path from 'path' + +import Youch from '@nuxtjs/youch' import fs from 'fs-extra' export default function errorMiddleware(err, req, res, next) { diff --git a/lib/core/nuxt.mjs b/lib/core/nuxt.mjs index 97add02345..321200498b 100644 --- a/lib/core/nuxt.mjs +++ b/lib/core/nuxt.mjs @@ -1,16 +1,19 @@ +import Module from 'module' +import path from 'path' + import Debug from 'debug' import enableDestroy from 'server-destroy' -import Module from 'module' import _ from 'lodash' import chalk from 'chalk' import fs from 'fs-extra' -import path from 'path' + import Options from '../common/options' import { sequence, printError } from '../common/utils' import packageJSON from '../../package.json' +import moduleUtil from '../common/module' + import ModuleContainer from './module' import Renderer from './renderer' -import moduleUtil from '../common/module' const debug = Debug('nuxt:') debug.color = 5 diff --git a/lib/core/renderer.mjs b/lib/core/renderer.mjs index 203e6cbfa2..ea2bb08f1f 100644 --- a/lib/core/renderer.mjs +++ b/lib/core/renderer.mjs @@ -1,15 +1,16 @@ +import path from 'path' +import crypto from 'crypto' + import ansiHTML from 'ansi-html' import serialize from 'serialize-javascript' import serveStatic from 'serve-static' import compression from 'compression' import _ from 'lodash' -import path from 'path' import fs from 'fs-extra' import vueServerRenderer from 'vue-server-renderer' import Debug from 'debug' import connect from 'connect' import launchMiddleware from 'launch-editor-middleware' -import crypto from 'crypto' import { setAnsiColors, isUrl, waitFor, timeout } from '../common/utils' import defaults from '../common/nuxt.config' diff --git a/test/basic.config.defaults.test.js b/test/basic.config.defaults.test.js index 5f7136119c..efdb391a6f 100644 --- a/test/basic.config.defaults.test.js +++ b/test/basic.config.defaults.test.js @@ -1,5 +1,7 @@ -import test from 'ava' import { resolve } from 'path' + +import test from 'ava' + import { Nuxt, Options } from '..' import { version } from '../package.json' diff --git a/test/basic.csr.test.js b/test/basic.csr.test.js index eb430a62a0..26aae84b20 100644 --- a/test/basic.csr.test.js +++ b/test/basic.csr.test.js @@ -1,6 +1,9 @@ -import test from 'ava' import { resolve } from 'path' + +import test from 'ava' + import { Nuxt, Builder } from '..' + import * as browser from './helpers/browser' import { interceptLog } from './helpers/console' diff --git a/test/basic.fail.generate.test.js b/test/basic.fail.generate.test.js index 799bbfb3d4..606e2dbd9c 100644 --- a/test/basic.fail.generate.test.js +++ b/test/basic.fail.generate.test.js @@ -1,6 +1,9 @@ -import test from 'ava' import { resolve } from 'path' + +import test from 'ava' + import { Nuxt, Builder, Generator } from '..' + import { intercept } from './helpers/console' test('Fail with routes() which throw an error', async t => { diff --git a/test/basic.generate.test.js b/test/basic.generate.test.js index 072067bac6..cd2a4cc494 100644 --- a/test/basic.generate.test.js +++ b/test/basic.generate.test.js @@ -1,13 +1,16 @@ -import test from 'ava' -import { resolve } from 'path' import { existsSync } from 'fs' -import { remove } from 'fs-extra' import http from 'http' +import { resolve } from 'path' + +import test from 'ava' +import { remove } from 'fs-extra' import serveStatic from 'serve-static' import finalhandler from 'finalhandler' import rp from 'request-promise-native' -import { interceptLog, release } from './helpers/console' + import { Nuxt, Builder, Generator } from '..' + +import { interceptLog, release } from './helpers/console' import { loadConfig } from './helpers/config' const port = 4002 diff --git a/test/basic.ssr.csp.test.js b/test/basic.ssr.csp.test.js index 2cad0acee2..471e46a258 100644 --- a/test/basic.ssr.csp.test.js +++ b/test/basic.ssr.csp.test.js @@ -1,7 +1,10 @@ -import test from 'ava' import { resolve } from 'path' + +import test from 'ava' import rp from 'request-promise-native' + import { Nuxt, Builder } from '..' + import { interceptLog } from './helpers/console' const port = 4005 diff --git a/test/basic.ssr.test.js b/test/basic.ssr.test.js index de32607100..1d4415e73c 100644 --- a/test/basic.ssr.test.js +++ b/test/basic.ssr.test.js @@ -1,7 +1,10 @@ -import test from 'ava' import { resolve } from 'path' + +import test from 'ava' import rp from 'request-promise-native' + import { Nuxt, Builder } from '..' + import { interceptLog, interceptError, release } from './helpers/console' const port = 4004 diff --git a/test/children.patch.test.js b/test/children.patch.test.js index 6258152442..befcb646b8 100644 --- a/test/children.patch.test.js +++ b/test/children.patch.test.js @@ -1,6 +1,9 @@ -import test from 'ava' import { resolve } from 'path' + +import test from 'ava' + import { Nuxt, Builder, Utils } from '..' + import * as browser from './helpers/browser' import { interceptLog } from './helpers/console' diff --git a/test/children.test.js b/test/children.test.js index 165ee19b09..8e15e8168d 100644 --- a/test/children.test.js +++ b/test/children.test.js @@ -1,6 +1,9 @@ -import test from 'ava' import { resolve } from 'path' + +import test from 'ava' + import { Nuxt, Builder } from '..' + import { interceptLog } from './helpers/console' const port = 4013 diff --git a/test/dynamic-routes.test.js b/test/dynamic-routes.test.js index 675c43141c..166b642e81 100644 --- a/test/dynamic-routes.test.js +++ b/test/dynamic-routes.test.js @@ -1,8 +1,11 @@ -import test from 'ava' import { resolve } from 'path' import fs from 'fs' -import { Nuxt, Builder } from '..' import { promisify } from 'util' + +import test from 'ava' + +import { Nuxt, Builder } from '..' + import { interceptLog } from './helpers/console' const readFile = promisify(fs.readFile) diff --git a/test/express.test.js b/test/express.test.js index 46907a820c..7e0a0af82d 100644 --- a/test/express.test.js +++ b/test/express.test.js @@ -1,8 +1,10 @@ -import test from 'ava' import { resolve } from 'path' -import { Nuxt, Builder } from '..' + +import test from 'ava' import express from 'express' import rp from 'request-promise-native' + +import { Nuxt, Builder } from '..' import { interceptLog } from './helpers/console' const port = 4000 diff --git a/test/fallback.generate.test.js b/test/fallback.generate.test.js index 68d68b8fa4..7477be5451 100644 --- a/test/fallback.generate.test.js +++ b/test/fallback.generate.test.js @@ -1,12 +1,15 @@ -import test from 'ava' -import { resolve } from 'path' -import { existsSync } from 'fs' import http from 'http' +import { existsSync } from 'fs' +import { resolve } from 'path' + +import test from 'ava' import serveStatic from 'serve-static' import finalhandler from 'finalhandler' import rp from 'request-promise-native' -import { intercept, interceptLog } from './helpers/console' + import { Nuxt, Builder, Generator, Options } from '..' + +import { intercept, interceptLog } from './helpers/console' import { loadConfig } from './helpers/config' const port = 4015 diff --git a/test/module.test.js b/test/module.test.js index 85444d0218..475061d37a 100644 --- a/test/module.test.js +++ b/test/module.test.js @@ -1,7 +1,10 @@ -import test from 'ava' import { normalize } from 'path' + +import test from 'ava' import rp from 'request-promise-native' + import { Nuxt, Builder } from '..' + import { intercept } from './helpers/console' import { loadConfig } from './helpers/config' diff --git a/test/with-config.test.js b/test/with-config.test.js index 4ace3bd8d2..94eb1ac3d3 100644 --- a/test/with-config.test.js +++ b/test/with-config.test.js @@ -1,8 +1,11 @@ -import test from 'ava' import { resolve } from 'path' + +import test from 'ava' import rp from 'request-promise-native' + import { Nuxt, Builder } from '..' import styleLoader from '../lib/builder/webpack/style-loader' + import { interceptLog, release } from './helpers/console' import { loadConfig } from './helpers/config'