Revert ncc webpack (#7370)

* Revert "Add retrying to CircleCi and fixes for ncc'ed webpack (#7366)"

This reverts commit 5beb365d12.

* Revert "ncc Webpack build (#7301)"

This reverts commit bd8f3c625f.

# Conflicts:
#	packages/next/package.json
This commit is contained in:
Tim Neutkens 2019-05-17 13:25:46 +02:00 committed by GitHub
parent 3dea1a5b15
commit 6feca310d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
35 changed files with 194 additions and 333 deletions

View file

@ -46,7 +46,7 @@ commands:
- run: - run:
name: Run All Tests name: Run All Tests
command: > command: >
yarn testall $(circleci tests glob "test/**/*.test.*" | circleci tests split --split-by=timings --timings-type=classname) || (yarn git-clean; yarn git-reset; yarn testall $(circleci tests glob "test/**/*.test.*" | circleci tests split --split-by=timings --timings-type=classname)) yarn testall $(circleci tests glob "test/**/*.test.*" | circleci tests split --split-by=timings --timings-type=classname)
environment: environment:
JEST_JUNIT_OUTPUT: 'reports/junit/js-test-results.xml' JEST_JUNIT_OUTPUT: 'reports/junit/js-test-results.xml'
JEST_JUNIT_CLASSNAME: '{filepath}' JEST_JUNIT_CLASSNAME: '{filepath}'

View file

@ -1,4 +1,4 @@
import webpack, {Stats} from 'next/dist/compiled/webpack' import webpack, {Stats} from 'webpack'
export type CompilerResult = { export type CompilerResult = {
errors: Error[] errors: Error[]

View file

@ -9,7 +9,7 @@ import {
import resolve from 'next/dist/compiled/resolve/index.js' import resolve from 'next/dist/compiled/resolve/index.js'
import path from 'path' import path from 'path'
import { promisify } from 'util' import { promisify } from 'util'
import webpack from 'next/dist/compiled/webpack' import webpack from 'webpack'
import { import {
DOT_NEXT_ALIAS, DOT_NEXT_ALIAS,

View file

@ -1,4 +1,4 @@
import {loader} from 'next/dist/compiled/webpack' import {loader} from 'webpack'
import loaderUtils from 'loader-utils' import loaderUtils from 'loader-utils'
export type ClientPagesLoaderOptions = { export type ClientPagesLoaderOptions = {

View file

@ -1,4 +1,4 @@
import {loader} from 'next/dist/compiled/webpack' import {loader} from 'webpack'
import hash from 'string-hash' import hash from 'string-hash'
import {basename} from 'path' import {basename} from 'path'
const nextDataLoader: loader.Loader = function (source) { const nextDataLoader: loader.Loader = function (source) {

View file

@ -1,5 +1,5 @@
import loaderUtils from 'loader-utils' import loaderUtils from 'loader-utils'
import { loader } from 'next/dist/compiled/webpack' import { loader } from 'webpack'
import minify from '../plugins/terser-webpack-plugin/src/minify' import minify from '../plugins/terser-webpack-plugin/src/minify'
const nextMiniferLoader: loader.Loader = function(source) { const nextMiniferLoader: loader.Loader = function(source) {

View file

@ -1,4 +1,4 @@
import {loader} from 'next/dist/compiled/webpack' import {loader} from 'webpack'
import {join} from 'path' import {join} from 'path'
import {parse} from 'querystring' import {parse} from 'querystring'
import { BUILD_MANIFEST, REACT_LOADABLE_MANIFEST } from 'next-server/constants' import { BUILD_MANIFEST, REACT_LOADABLE_MANIFEST } from 'next-server/constants'
@ -59,8 +59,8 @@ const nextServerlessLoader: loader.Loader = function () {
{ {
Component, Component,
dataOnly: req.headers && (req.headers.accept || '').indexOf('application/amp.bind+json') !== -1, dataOnly: req.headers && (req.headers.accept || '').indexOf('application/amp.bind+json') !== -1,
}, },
options, options,
)) ))
return result return result
} catch (err) { } catch (err) {

View file

@ -1,4 +1,4 @@
import { loader } from 'next/dist/compiled/webpack' import { loader } from 'webpack'
const NoopLoader: loader.Loader = (source) => source const NoopLoader: loader.Loader = (source) => source
export default NoopLoader export default NoopLoader

View file

@ -1,4 +1,4 @@
import { Compiler, Plugin } from 'next/dist/compiled/webpack' import { Compiler, Plugin } from 'webpack'
import { createHash } from 'crypto' import { createHash } from 'crypto'
import path from 'path' import path from 'path'

View file

@ -1,4 +1,4 @@
import { Compiler } from 'next/dist/compiled/webpack' import { Compiler } from 'webpack'
import { RawSource } from 'webpack-sources' import { RawSource } from 'webpack-sources'
import { import {
BUILD_MANIFEST, BUILD_MANIFEST,

View file

@ -4,7 +4,7 @@ import { CLIENT_STATIC_FILES_RUNTIME_MAIN } from 'next-server/constants'
import { EOL } from 'os' import { EOL } from 'os'
import path from 'path' import path from 'path'
import { parse } from 'querystring' import { parse } from 'querystring'
import { Compiler, Plugin } from 'next/dist/compiled/webpack' import { Compiler, Plugin } from 'webpack'
type StringDictionary = { [pageName: string]: string[] } type StringDictionary = { [pageName: string]: string[] }
const manifest: { const manifest: {

View file

@ -1,4 +1,4 @@
import { Compiler } from 'next/dist/compiled/webpack' import { Compiler } from 'webpack'
// This plugin mirrors webpack 3 `filename` and `chunkfilename` behavior // This plugin mirrors webpack 3 `filename` and `chunkfilename` behavior
// This fixes https://github.com/webpack/webpack/issues/6598 // This fixes https://github.com/webpack/webpack/issues/6598
// This plugin is based on https://github.com/researchgate/webpack/commit/2f28947fa0c63ccbb18f39c0098bd791a2c37090 // This plugin is based on https://github.com/researchgate/webpack/commit/2f28947fa0c63ccbb18f39c0098bd791a2c37090

View file

@ -1,8 +1,9 @@
import path from 'path' import path from 'path'
export function importAutoDllPlugin({ distDir }: { distDir: string }) { export function importAutoDllPlugin({ distDir }: { distDir: string }) {
const autodllPaths = require.resolve( const autodllPaths = path.join(
'next/dist/compiled/autodll-webpack-plugin/paths' path.dirname(require.resolve('autodll-webpack-plugin')),
'paths.js'
) )
require(autodllPaths) require(autodllPaths)
@ -17,6 +18,6 @@ export function importAutoDllPlugin({ distDir }: { distDir: string }) {
}), }),
}) })
const AutoDllPlugin = require('next/dist/compiled/autodll-webpack-plugin') const AutoDllPlugin = require('autodll-webpack-plugin')
return AutoDllPlugin return AutoDllPlugin
} }

View file

@ -1,9 +1,9 @@
import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin' import ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin'
import { NormalizedMessage } from 'fork-ts-checker-webpack-plugin/lib/NormalizedMessage' import { NormalizedMessage } from 'fork-ts-checker-webpack-plugin/lib/NormalizedMessage'
import webpack from 'next/dist/compiled/webpack' import webpack from 'webpack'
export function Apply(compiler: webpack.Compiler) { export function Apply(compiler: webpack.Compiler) {
const hooks = ForkTsCheckerWebpackPlugin.getCompilerHooks(compiler as any) const hooks = ForkTsCheckerWebpackPlugin.getCompilerHooks(compiler)
let additionalFiles: string[] = [] let additionalFiles: string[] = []

View file

@ -1,4 +1,4 @@
import { Compiler, Plugin } from 'next/dist/compiled/webpack' import { Compiler, Plugin } from 'webpack'
import { createHash } from 'crypto' import { createHash } from 'crypto'
export class HashedChunkIdsPlugin implements Plugin { export class HashedChunkIdsPlugin implements Plugin {

View file

@ -1,4 +1,4 @@
import { Compiler, Plugin } from 'next/dist/compiled/webpack' import { Compiler, Plugin } from 'webpack'
import { extname } from 'path' import { extname } from 'path'
// Prevents outputting client pages when they are not needed // Prevents outputting client pages when they are not needed

View file

@ -1,4 +1,4 @@
import { Compiler, Plugin } from 'next/dist/compiled/webpack' import { Compiler, Plugin } from 'webpack'
import { realpathSync } from 'fs' import { realpathSync } from 'fs'
function deleteCache (path: string) { function deleteCache (path: string) {

View file

@ -1,5 +1,5 @@
import { join, resolve, relative, dirname } from 'path' import { join, resolve, relative, dirname } from 'path'
import { Compiler } from 'next/dist/compiled/webpack' import { Compiler } from 'webpack'
// This plugin modifies the require-ensure code generated by Webpack // This plugin modifies the require-ensure code generated by Webpack
// to work with Next.js SSR // to work with Next.js SSR

View file

@ -1,4 +1,4 @@
import webpack from 'next/dist/compiled/webpack' import webpack from 'webpack'
import { RawSource } from 'webpack-sources' import { RawSource } from 'webpack-sources'
import { join, relative, dirname } from 'path' import { join, relative, dirname } from 'path'
import { IS_BUNDLED_PAGE_REGEX } from 'next-server/constants' import { IS_BUNDLED_PAGE_REGEX } from 'next-server/constants'

View file

@ -1,4 +1,4 @@
import {Compiler, Plugin} from 'next/dist/compiled/webpack' import {Compiler, Plugin} from 'webpack'
import { RawSource } from 'webpack-sources' import { RawSource } from 'webpack-sources'
import { PAGES_MANIFEST, ROUTE_NAME_REGEX } from 'next-server/constants' import { PAGES_MANIFEST, ROUTE_NAME_REGEX } from 'next-server/constants'

View file

@ -22,7 +22,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAR
// Modified to strip out unneeded results for Next's specific use case // Modified to strip out unneeded results for Next's specific use case
import url from 'url' import url from 'url'
import { Compiler, compilation } from 'next/dist/compiled/webpack' import { Compiler, compilation } from 'webpack'
function buildManifest (compiler: Compiler, compilation: compilation.Compilation) { function buildManifest (compiler: Compiler, compilation: compilation.Compilation) {
let context = compiler.options.context let context = compiler.options.context

View file

@ -1,5 +1,5 @@
import { Compiler } from 'next/dist/compiled/webpack' import { Compiler } from 'webpack'
import { connectChunkAndModule } from 'next/dist/compiled/webpack/lib/GraphHelpers' import { connectChunkAndModule } from 'webpack/lib/GraphHelpers'
/** /**
* Makes sure there are no dynamic chunks when the target is serverless * Makes sure there are no dynamic chunks when the target is serverless

View file

@ -1,4 +1,4 @@
import { Compiler, Plugin } from 'next/dist/compiled/webpack' import { Compiler, Plugin } from 'webpack'
export class SharedRuntimePlugin implements Plugin { export class SharedRuntimePlugin implements Plugin {
apply(compiler: Compiler) { apply(compiler: Compiler) {

View file

@ -4,7 +4,7 @@
import stringHash from 'string-hash' import stringHash from 'string-hash'
import { SourceMapConsumer } from 'source-map' import { SourceMapConsumer } from 'source-map'
import { SourceMapSource, RawSource } from 'webpack-sources' import { SourceMapSource, RawSource } from 'webpack-sources'
import { RequestShortener } from 'next/dist/compiled/webpack'; import { RequestShortener } from 'webpack';
import TaskRunner from './TaskRunner' import TaskRunner from './TaskRunner'
const warningRegex = /\[.+:([0-9]+),([0-9]+)\]/ const warningRegex = /\[.+:([0-9]+),([0-9]+)\]/

View file

@ -2,7 +2,7 @@ import { join } from 'path'
import { promisify } from 'util' import { promisify } from 'util'
import fs from 'fs' import fs from 'fs'
import { IS_BUNDLED_PAGE_REGEX } from 'next-server/constants' import { IS_BUNDLED_PAGE_REGEX } from 'next-server/constants'
import {Compiler} from 'next/dist/compiled/webpack' import {Compiler} from 'webpack'
const unlink = promisify(fs.unlink) const unlink = promisify(fs.unlink)

View file

@ -68,6 +68,7 @@
"@babel/runtime-corejs2": "7.1.2", "@babel/runtime-corejs2": "7.1.2",
"amphtml-validator": "1.0.23", "amphtml-validator": "1.0.23",
"async-sema": "2.2.0", "async-sema": "2.2.0",
"autodll-webpack-plugin": "0.4.2",
"babel-core": "7.0.0-bridge.0", "babel-core": "7.0.0-bridge.0",
"babel-loader": "8.0.5", "babel-loader": "8.0.5",
"babel-plugin-react-require": "3.0.0", "babel-plugin-react-require": "3.0.0",
@ -81,7 +82,6 @@
"loader-utils": "1.1.0", "loader-utils": "1.1.0",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
"next-server": "8.1.1-canary.31", "next-server": "8.1.1-canary.31",
"node-libs-browser": "2.2.0",
"prop-types": "15.6.2", "prop-types": "15.6.2",
"prop-types-exact": "1.2.0", "prop-types-exact": "1.2.0",
"react-error-overlay": "5.1.4", "react-error-overlay": "5.1.4",
@ -96,6 +96,9 @@
"tty-aware-progress": "1.0.3", "tty-aware-progress": "1.0.3",
"unfetch": "4.1.0", "unfetch": "4.1.0",
"url": "0.11.0", "url": "0.11.0",
"webpack": "4.30.0",
"webpack-dev-middleware": "3.6.0",
"webpack-hot-middleware": "2.24.3",
"webpack-sources": "1.3.0", "webpack-sources": "1.3.0",
"worker-farm": "1.5.2" "worker-farm": "1.5.2"
}, },
@ -127,19 +130,15 @@
"@types/styled-jsx": "2.2.8", "@types/styled-jsx": "2.2.8",
"@types/text-table": "0.2.0", "@types/text-table": "0.2.0",
"@types/webpack-sources": "0.1.5", "@types/webpack-sources": "0.1.5",
"@zeit/ncc": "0.19.0-beta.1", "@zeit/ncc": "0.15.2",
"arg": "4.1.0", "arg": "4.1.0",
"autodll-webpack-plugin": "0.4.2",
"babel-plugin-dynamic-import-node": "2.2.0", "babel-plugin-dynamic-import-node": "2.2.0",
"nanoid": "2.0.1", "nanoid": "2.0.1",
"resolve": "1.5.0", "resolve": "1.5.0",
"taskr": "1.1.0", "taskr": "1.1.0",
"text-table": "0.2.0", "text-table": "0.2.0",
"typescript": "3.1.6", "typescript": "3.1.6",
"unistore": "3.2.1", "unistore": "3.2.1"
"webpack": "4.29.0",
"webpack-dev-middleware": "3.6.0",
"webpack-hot-middleware": "2.24.3"
}, },
"engines": { "engines": {
"node": ">= 8.0.0" "node": ">= 8.0.0"

View file

@ -1,9 +1,9 @@
import { relative as relativePath, join, normalize, sep } from 'path' import { relative as relativePath, join, normalize, sep } from 'path'
import WebpackDevMiddleware from 'next/dist/compiled/webpack-dev-middleware' import WebpackDevMiddleware from 'webpack-dev-middleware'
import WebpackHotMiddleware from 'next/dist/compiled/webpack-hot-middleware' import WebpackHotMiddleware from 'webpack-hot-middleware'
import errorOverlayMiddleware from './lib/error-overlay-middleware' import errorOverlayMiddleware from './lib/error-overlay-middleware'
import onDemandEntryHandler, { normalizePage } from './on-demand-entry-handler' import onDemandEntryHandler, { normalizePage } from './on-demand-entry-handler'
import webpack from 'next/dist/compiled/webpack' import webpack from 'webpack'
import getBaseWebpackConfig from '../build/webpack-config' import getBaseWebpackConfig from '../build/webpack-config'
import { IS_BUNDLED_PAGE_REGEX, ROUTE_NAME_REGEX, BLOCKED_PAGES, CLIENT_STATIC_FILES_RUNTIME_AMP } from 'next-server/constants' import { IS_BUNDLED_PAGE_REGEX, ROUTE_NAME_REGEX, BLOCKED_PAGES, CLIENT_STATIC_FILES_RUNTIME_AMP } from 'next-server/constants'
import { NEXT_PROJECT_ROOT_DIST_CLIENT } from '../lib/constants' import { NEXT_PROJECT_ROOT_DIST_CLIENT } from '../lib/constants'

View file

@ -1,4 +1,4 @@
import webpack from 'next/dist/compiled/webpack' import DynamicEntryPlugin from 'webpack/lib/DynamicEntryPlugin'
import { EventEmitter } from 'events' import { EventEmitter } from 'events'
import { join, posix } from 'path' import { join, posix } from 'path'
import { parse } from 'url' import { parse } from 'url'
@ -17,8 +17,7 @@ const BUILT = Symbol('built')
// Based on https://github.com/webpack/webpack/blob/master/lib/DynamicEntryPlugin.js#L29-L37 // Based on https://github.com/webpack/webpack/blob/master/lib/DynamicEntryPlugin.js#L29-L37
function addEntry (compilation, context, name, entry) { function addEntry (compilation, context, name, entry) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const dep = webpack.SingleEntryPlugin.createDependency(entry, name) const dep = DynamicEntryPlugin.createDependency(entry, name)
compilation.addEntry(context, dep, name, (err) => { compilation.addEntry(context, dep, name, (err) => {
if (err) return reject(err) if (err) return reject(err)
resolve() resolve()
@ -29,10 +28,13 @@ function addEntry (compilation, context, name, entry) {
export default function onDemandEntryHandler (devMiddleware, multiCompiler, { export default function onDemandEntryHandler (devMiddleware, multiCompiler, {
buildId, buildId,
dir, dir,
distDir,
reload, reload,
pageExtensions, pageExtensions,
maxInactiveAge, maxInactiveAge,
pagesBufferLength pagesBufferLength,
publicRuntimeConfig,
serverRuntimeConfig
}) { }) {
const pagesDir = join(dir, 'pages') const pagesDir = join(dir, 'pages')
const { compilers } = multiCompiler const { compilers } = multiCompiler
@ -59,7 +61,7 @@ export default function onDemandEntryHandler (devMiddleware, multiCompiler, {
} }
entries[page].status = BUILDING entries[page].status = BUILDING
return addEntry(compilation, compiler.context, name, compiler.name === 'client' ? `next-client-pages-loader?${stringify({ page, absolutePagePath })}!` : absolutePagePath) return addEntry(compilation, compiler.context, name, [compiler.name === 'client' ? `next-client-pages-loader?${stringify({ page, absolutePagePath })}!` : absolutePagePath])
}) })
return Promise.all(allEntries) return Promise.all(allEntries)

View file

@ -1,7 +1,4 @@
'use strict' 'use strict'
// this fixes Azure on node 10 with ncc
// without exits with: error Command failed with exit code 3221225477.
process.pkg = true
const ncc = require('@zeit/ncc') const ncc = require('@zeit/ncc')
const { existsSync, readFileSync } = require('fs') const { existsSync, readFileSync } = require('fs')
@ -25,13 +22,6 @@ module.exports = function (task) {
if (options && options.packageName) { if (options && options.packageName) {
writePackageManifest.call(this, options.packageName) writePackageManifest.call(this, options.packageName)
} }
// make sure to use our compiled version of webpack
code = code
.replace(/require\(('|")webpack('|")\)/g, 'require("next/dist/compiled/webpack")')
.replace(
/webpack\/lib\/node\/NodeOutputFileSystem/g,
'next/dist/compiled/webpack/lib/node/NodeOutputFileSystem'
)
file.data = Buffer.from(code, 'utf8') file.data = Buffer.from(code, 'utf8')
}) })

View file

@ -1,5 +1,5 @@
const notifier = require('node-notifier') const notifier = require('node-notifier')
const { relative } = require('path') const relative = require('path').relative
const babelClientOpts = { const babelClientOpts = {
presets: [ presets: [
@ -42,92 +42,6 @@ const babelServerOpts = {
] ]
} }
// eslint-disable-next-line camelcase
export async function ncc_webpack (task, opts) {
await task
.source(opts.src || relative(__dirname, require.resolve('webpack')))
.ncc({
packageName: 'webpack',
externals: ['node-libs-browser']
})
.target('dist/compiled/webpack')
notify('Compiled webpack')
}
// eslint-disable-next-line camelcase
export async function ncc_webpack_NodeOutputFileSystem (task, opts) {
await task
.source(opts.src || relative(__dirname, require.resolve('webpack/lib/node/NodeOutputFileSystem')))
.ncc({
externals: ['webpack']
})
.target('dist/compiled/webpack/lib/node/NodeOutputFileSystem')
notify('Compiled webpack NodeOutputFileSystem')
}
// eslint-disable-next-line camelcase
export async function ncc_webpack_graph_helpers (task, opts) {
await task
.source(opts.src || relative(__dirname, require.resolve('webpack/lib/GraphHelpers')))
.ncc()
.target('dist/compiled/webpack/lib')
notify('Compiled webpack/lib/GraphHelpers')
}
// eslint-disable-next-line camelcase
export async function ncc_webpack_hot_middleware (task, opts) {
await task
.source(opts.src || relative(__dirname, require.resolve('webpack-hot-middleware')))
.ncc({
externals: ['chokidar', 'webpack'],
packageName: 'webpack-hot-middleware'
})
.target('dist/compiled/webpack-hot-middleware')
notify('Compiled webpack-hot-middleware')
}
// eslint-disable-next-line camelcase
export async function ncc_autodll_webpack_plugin (task, opts) {
await task
.source(opts.src || relative(__dirname, require.resolve('autodll-webpack-plugin')))
.ncc({
externals: ['chokidar', 'webpack', './paths'],
packageName: 'autodll-webpack-plugin'
})
.target('dist/compiled/autodll-webpack-plugin')
notify('Compiled autodll-webpack-plugin')
}
// eslint-disable-next-line camelcase
export async function ncc_autodll_webpack_plugin_paths (task, opts) {
await task
.source(opts.src || relative(__dirname, require.resolve('autodll-webpack-plugin')))
.ncc({
externals: ['chokidar', 'webpack']
})
.target('dist/compiled/autodll-webpack-plugin/paths')
notify('Compiled autodll-webpack-plugin')
}
// eslint-disable-next-line camelcase
export async function ncc_webpack_dev_middleware (task, opts) {
await task
.source(opts.src || relative(__dirname, require.resolve('webpack-dev-middleware')))
.ncc({
externals: ['chokidar', 'webpack'],
packageName: 'webpack-dev-middleware'
})
.target('dist/compiled/webpack-dev-middleware')
notify('Compiled webpack-dev-middleware')
}
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
export async function ncc_arg (task, opts) { export async function ncc_arg (task, opts) {
await task await task
@ -169,7 +83,7 @@ export async function ncc_text_table (task, opts) {
} }
export async function precompile (task) { export async function precompile (task) {
await task.parallel(['ncc_webpack', 'ncc_webpack_NodeOutputFileSystem', 'ncc_webpack_graph_helpers', 'ncc_webpack_hot_middleware', 'ncc_autodll_webpack_plugin', 'ncc_autodll_webpack_plugin_paths', 'ncc_webpack_dev_middleware', 'ncc_unistore', 'ncc_resolve', 'ncc_arg', 'ncc_nanoid', 'ncc_text_table']) await task.parallel(['ncc_unistore', 'ncc_resolve', 'ncc_arg', 'ncc_nanoid', 'ncc_text_table'])
} }
export async function compile (task) { export async function compile (task) {

View file

@ -1,34 +0,0 @@
// Type definitions for loader-utils 1.1
// Project: https://github.com/webpack/loader-utils#readme
// Definitions by: Gyusun Yeom <https://github.com/Perlmint>
// Totooria Hyperion <https://github.com/TotooriaHyperion>
// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
// TypeScript Version: 2.3
/// <reference types="node" />
declare module "loader-utils" {
import { loader } from 'next/dist/compiled/webpack';
export interface InterpolateOption {
context?: string;
content?: string | Buffer;
regExp?: string | RegExp;
}
export interface OptionObject {
[key: string]: any;
}
export type HashType = "sha1" | "md5" | "sha256" | "sha512";
export type DigestType = "hex" | "base26" | "base32" | "base36" | "base49" | "base52" | "base58" | "base62" | "base64";
export function getOptions(loaderContext: loader.LoaderContext): OptionObject;
export function parseQuery(optionString: string): OptionObject;
export function stringifyRequest(loaderContext: loader.LoaderContext, resource: string): string;
export function getRemainingRequest(loaderContext: loader.LoaderContext): string;
export function getCurrentRequest(loaderContext: loader.LoaderContext): string;
export function isUrlRequest(url: string, root?: string): boolean;
export function parseString(str: string): string;
export function urlToRequest(url: string, root?: string): string;
export function interpolateName(loaderContext: loader.LoaderContext, name: string, options?: any): string;
export function getHashDigest(buffer: Buffer, hashType: HashType, digestType: DigestType, maxLength: number): string;
}

View file

@ -5,16 +5,6 @@ declare module 'webpack/lib/GraphHelpers';
declare module 'unfetch'; declare module 'unfetch';
declare module 'styled-jsx/server'; declare module 'styled-jsx/server';
declare module 'node-libs-browser' {
const nodeLibs: any
export = nodeLibs;
}
declare module 'next/dist/compiled/webpack/lib/GraphHelpers' {
export const connectChunkAndModule: any
}
declare module 'next/dist/compiled/nanoid/index.js' { declare module 'next/dist/compiled/nanoid/index.js' {
function nanoid(size?: number): string; function nanoid(size?: number): string;
@ -67,7 +57,7 @@ declare module 'next/dist/compiled/arg/index.js' {
} }
declare module 'autodll-webpack-plugin' { declare module 'autodll-webpack-plugin' {
import webpack from 'next/dist/compiled/webpack' import webpack from 'webpack'
class AutoDllPlugin implements webpack.Plugin { class AutoDllPlugin implements webpack.Plugin {
constructor(settings?: { constructor(settings?: {
inject?: boolean, inject?: boolean,

View file

@ -21,7 +21,7 @@
/// <reference types="node" /> /// <reference types="node" />
declare module 'next/dist/compiled/webpack' { declare module 'webpack' {
import { Tapable, HookMap, import { Tapable, HookMap,
SyncBailHook, SyncHook, SyncLoopHook, SyncWaterfallHook, SyncBailHook, SyncHook, SyncLoopHook, SyncWaterfallHook,
AsyncParallelBailHook, AsyncParallelHook, AsyncSeriesBailHook, AsyncSeriesHook, AsyncSeriesWaterfallHook } from 'tapable'; AsyncParallelBailHook, AsyncParallelHook, AsyncSeriesBailHook, AsyncSeriesHook, AsyncSeriesWaterfallHook } from 'tapable';

View file

@ -1,6 +1,5 @@
const withCSS = require('@zeit/next-css') const withCSS = require('@zeit/next-css')
const withSass = require('@zeit/next-sass') const withSass = require('@zeit/next-sass')
const webpack = require('next/dist/compiled/webpack')
const path = require('path') const path = require('path')
module.exports = withCSS(withSass({ module.exports = withCSS(withSass({
onDemandEntries: { onDemandEntries: {
@ -18,7 +17,7 @@ module.exports = withCSS(withSass({
env: { env: {
customVar: 'hello' customVar: 'hello'
}, },
webpack (config, { buildId }) { webpack (config, { buildId, webpack }) {
// When next-css is `npm link`ed we have to solve loaders from the project root // When next-css is `npm link`ed we have to solve loaders from the project root
const nextLocation = path.join(require.resolve('next/package.json'), '../') const nextLocation = path.join(require.resolve('next/package.json'), '../')
const nextCssNodeModulesLocation = path.join( const nextCssNodeModulesLocation = path.join(

282
yarn.lock
View file

@ -1773,163 +1773,166 @@
resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.10.tgz#17a8ec65cd8e88f51b418ceb271af18d3137df67" resolved "https://registry.yarnpkg.com/@types/yargs/-/yargs-12.0.10.tgz#17a8ec65cd8e88f51b418ceb271af18d3137df67"
integrity sha512-WsVzTPshvCSbHThUduGGxbmnwcpkgSctHGHTqzWyFg4lYAuV5qXlyFPOsP3OWqCINfmg/8VXP+zJaa4OxEsBQQ== integrity sha512-WsVzTPshvCSbHThUduGGxbmnwcpkgSctHGHTqzWyFg4lYAuV5qXlyFPOsP3OWqCINfmg/8VXP+zJaa4OxEsBQQ==
"@webassemblyjs/ast@1.7.11": "@webassemblyjs/ast@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace" resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA== integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
dependencies: dependencies:
"@webassemblyjs/helper-module-context" "1.7.11" "@webassemblyjs/helper-module-context" "1.8.5"
"@webassemblyjs/helper-wasm-bytecode" "1.7.11" "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
"@webassemblyjs/wast-parser" "1.7.11" "@webassemblyjs/wast-parser" "1.8.5"
"@webassemblyjs/floating-point-hex-parser@1.7.11": "@webassemblyjs/floating-point-hex-parser@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313" resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg== integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
"@webassemblyjs/helper-api-error@1.7.11": "@webassemblyjs/helper-api-error@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg== integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
"@webassemblyjs/helper-buffer@1.7.11": "@webassemblyjs/helper-buffer@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w== integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
"@webassemblyjs/helper-code-frame@1.7.11": "@webassemblyjs/helper-code-frame@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw== integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
dependencies: dependencies:
"@webassemblyjs/wast-printer" "1.7.11" "@webassemblyjs/wast-printer" "1.8.5"
"@webassemblyjs/helper-fsm@1.7.11": "@webassemblyjs/helper-fsm@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A== integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
"@webassemblyjs/helper-module-context@1.7.11": "@webassemblyjs/helper-module-context@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg== integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
"@webassemblyjs/helper-wasm-bytecode@1.7.11":
version "1.7.11"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
"@webassemblyjs/helper-wasm-section@1.7.11":
version "1.7.11"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
dependencies: dependencies:
"@webassemblyjs/ast" "1.7.11" "@webassemblyjs/ast" "1.8.5"
"@webassemblyjs/helper-buffer" "1.7.11" mamacro "^0.0.3"
"@webassemblyjs/helper-wasm-bytecode" "1.7.11"
"@webassemblyjs/wasm-gen" "1.7.11"
"@webassemblyjs/ieee754@1.7.11": "@webassemblyjs/helper-wasm-bytecode@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b" resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ== integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
"@webassemblyjs/helper-wasm-section@1.8.5":
version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
dependencies:
"@webassemblyjs/ast" "1.8.5"
"@webassemblyjs/helper-buffer" "1.8.5"
"@webassemblyjs/helper-wasm-bytecode" "1.8.5"
"@webassemblyjs/wasm-gen" "1.8.5"
"@webassemblyjs/ieee754@1.8.5":
version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
dependencies: dependencies:
"@xtuc/ieee754" "^1.2.0" "@xtuc/ieee754" "^1.2.0"
"@webassemblyjs/leb128@1.7.11": "@webassemblyjs/leb128@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63" resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw== integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
dependencies: dependencies:
"@xtuc/long" "4.2.1" "@xtuc/long" "4.2.2"
"@webassemblyjs/utf8@1.7.11": "@webassemblyjs/utf8@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82" resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA== integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
"@webassemblyjs/wasm-edit@1.7.11": "@webassemblyjs/wasm-edit@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg== integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
dependencies: dependencies:
"@webassemblyjs/ast" "1.7.11" "@webassemblyjs/ast" "1.8.5"
"@webassemblyjs/helper-buffer" "1.7.11" "@webassemblyjs/helper-buffer" "1.8.5"
"@webassemblyjs/helper-wasm-bytecode" "1.7.11" "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
"@webassemblyjs/helper-wasm-section" "1.7.11" "@webassemblyjs/helper-wasm-section" "1.8.5"
"@webassemblyjs/wasm-gen" "1.7.11" "@webassemblyjs/wasm-gen" "1.8.5"
"@webassemblyjs/wasm-opt" "1.7.11" "@webassemblyjs/wasm-opt" "1.8.5"
"@webassemblyjs/wasm-parser" "1.7.11" "@webassemblyjs/wasm-parser" "1.8.5"
"@webassemblyjs/wast-printer" "1.7.11" "@webassemblyjs/wast-printer" "1.8.5"
"@webassemblyjs/wasm-gen@1.7.11": "@webassemblyjs/wasm-gen@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA== integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
dependencies: dependencies:
"@webassemblyjs/ast" "1.7.11" "@webassemblyjs/ast" "1.8.5"
"@webassemblyjs/helper-wasm-bytecode" "1.7.11" "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
"@webassemblyjs/ieee754" "1.7.11" "@webassemblyjs/ieee754" "1.8.5"
"@webassemblyjs/leb128" "1.7.11" "@webassemblyjs/leb128" "1.8.5"
"@webassemblyjs/utf8" "1.7.11" "@webassemblyjs/utf8" "1.8.5"
"@webassemblyjs/wasm-opt@1.7.11": "@webassemblyjs/wasm-opt@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg== integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
dependencies: dependencies:
"@webassemblyjs/ast" "1.7.11" "@webassemblyjs/ast" "1.8.5"
"@webassemblyjs/helper-buffer" "1.7.11" "@webassemblyjs/helper-buffer" "1.8.5"
"@webassemblyjs/wasm-gen" "1.7.11" "@webassemblyjs/wasm-gen" "1.8.5"
"@webassemblyjs/wasm-parser" "1.7.11" "@webassemblyjs/wasm-parser" "1.8.5"
"@webassemblyjs/wasm-parser@1.7.11": "@webassemblyjs/wasm-parser@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a" resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg== integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
dependencies: dependencies:
"@webassemblyjs/ast" "1.7.11" "@webassemblyjs/ast" "1.8.5"
"@webassemblyjs/helper-api-error" "1.7.11" "@webassemblyjs/helper-api-error" "1.8.5"
"@webassemblyjs/helper-wasm-bytecode" "1.7.11" "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
"@webassemblyjs/ieee754" "1.7.11" "@webassemblyjs/ieee754" "1.8.5"
"@webassemblyjs/leb128" "1.7.11" "@webassemblyjs/leb128" "1.8.5"
"@webassemblyjs/utf8" "1.7.11" "@webassemblyjs/utf8" "1.8.5"
"@webassemblyjs/wast-parser@1.7.11": "@webassemblyjs/wast-parser@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ== integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
dependencies: dependencies:
"@webassemblyjs/ast" "1.7.11" "@webassemblyjs/ast" "1.8.5"
"@webassemblyjs/floating-point-hex-parser" "1.7.11" "@webassemblyjs/floating-point-hex-parser" "1.8.5"
"@webassemblyjs/helper-api-error" "1.7.11" "@webassemblyjs/helper-api-error" "1.8.5"
"@webassemblyjs/helper-code-frame" "1.7.11" "@webassemblyjs/helper-code-frame" "1.8.5"
"@webassemblyjs/helper-fsm" "1.7.11" "@webassemblyjs/helper-fsm" "1.8.5"
"@xtuc/long" "4.2.1" "@xtuc/long" "4.2.2"
"@webassemblyjs/wast-printer@1.7.11": "@webassemblyjs/wast-printer@1.8.5":
version "1.7.11" version "1.8.5"
resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813" resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg== integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
dependencies: dependencies:
"@webassemblyjs/ast" "1.7.11" "@webassemblyjs/ast" "1.8.5"
"@webassemblyjs/wast-parser" "1.7.11" "@webassemblyjs/wast-parser" "1.8.5"
"@xtuc/long" "4.2.1" "@xtuc/long" "4.2.2"
"@xtuc/ieee754@^1.2.0": "@xtuc/ieee754@^1.2.0":
version "1.2.0" version "1.2.0"
resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790" resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA== integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
"@xtuc/long@4.2.1": "@xtuc/long@4.2.2":
version "4.2.1" version "4.2.2"
resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8" resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g== integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
"@zeit/ncc@0.19.0-beta.1": "@zeit/ncc@0.15.2":
version "0.19.0-beta.1" version "0.15.2"
resolved "https://registry.yarnpkg.com/@zeit/ncc/-/ncc-0.19.0-beta.1.tgz#1c6276ac706c4df60d72b2f5e370f4aed41df38d" resolved "https://registry.yarnpkg.com/@zeit/ncc/-/ncc-0.15.2.tgz#14b232c2ecdb3a9c5923c34e83ef16e71c96387f"
integrity sha512-TyzK/ZYeOvArfqotrk3dg03zA4HDSTpKEnlSQ+flp7VP0DI1SGw/5wROOJWbj6J0mE7zD2tkhChxTumnHcYlAg== integrity sha512-O5olWTrJ/b/gI1pxHgolV8Gwx0aA5BUCYIaAGcIHzIe55CMU+J1CgpRCRGzOLyqal7bV/l0quFgl8vcT8G3DTg==
"@zeit/next-css@1.0.2-canary.2": "@zeit/next-css@1.0.2-canary.2":
version "1.0.2-canary.2" version "1.0.2-canary.2"
@ -8213,6 +8216,11 @@ makeerror@1.0.x:
dependencies: dependencies:
tmpl "1.0.x" tmpl "1.0.x"
mamacro@^0.0.3:
version "0.0.3"
resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
integrity sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==
map-age-cleaner@^0.1.1: map-age-cleaner@^0.1.1:
version "0.1.3" version "0.1.3"
resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a" resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@ -8753,7 +8761,7 @@ node-int64@^0.4.0:
resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b"
integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs= integrity sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=
node-libs-browser@2.2.0, node-libs-browser@^2.0.0: node-libs-browser@^2.0.0:
version "2.2.0" version "2.2.0"
resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77" resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.0.tgz#c72f60d9d46de08a940dedbb25f3ffa2f9bbaa77"
integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA== integrity sha512-5MQunG/oyOaBdttrL40dA7bUfPORLRWMUJLQtMg7nluxUvk5XwnLdL9twQHFAjRx/y7mIMkLKT9++qPbbk6BZA==
@ -11227,14 +11235,6 @@ scheduler@^0.13.6:
loose-envify "^1.1.0" loose-envify "^1.1.0"
object-assign "^4.1.1" object-assign "^4.1.1"
schema-utils@^0.4.4:
version "0.4.7"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-0.4.7.tgz#ba74f597d2be2ea880131746ee17d0a093c68187"
integrity sha512-v/iwU6wvwGK8HbU9yi3/nhGzP0yGSuhQMzL6ySiec1FSrZZDkhm4noOSWzrNFo/jEc+SJY6jRTwuwbSXJPDUnQ==
dependencies:
ajv "^6.1.0"
ajv-keywords "^3.1.0"
schema-utils@^1.0.0: schema-utils@^1.0.0:
version "1.0.0" version "1.0.0"
resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770" resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-1.0.0.tgz#0b79a93204d7b600d4b2850d1f66c2a34951c770"
@ -13014,15 +13014,15 @@ webpack-sources@1.3.0, webpack-sources@^1.0.1, webpack-sources@^1.1.0, webpack-s
source-list-map "^2.0.0" source-list-map "^2.0.0"
source-map "~0.6.1" source-map "~0.6.1"
webpack@4.29.0: webpack@4.30.0:
version "4.29.0" version "4.30.0"
resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz#f2cfef83f7ae404ba889ff5d43efd285ca26e750" resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.30.0.tgz#aca76ef75630a22c49fcc235b39b4c57591d33a9"
integrity sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w== integrity sha512-4hgvO2YbAFUhyTdlR4FNyt2+YaYBYHavyzjCMbZzgglo02rlKi/pcsEzwCuCpsn1ryzIl1cq/u8ArIKu8JBYMg==
dependencies: dependencies:
"@webassemblyjs/ast" "1.7.11" "@webassemblyjs/ast" "1.8.5"
"@webassemblyjs/helper-module-context" "1.7.11" "@webassemblyjs/helper-module-context" "1.8.5"
"@webassemblyjs/wasm-edit" "1.7.11" "@webassemblyjs/wasm-edit" "1.8.5"
"@webassemblyjs/wasm-parser" "1.7.11" "@webassemblyjs/wasm-parser" "1.8.5"
acorn "^6.0.5" acorn "^6.0.5"
acorn-dynamic-import "^4.0.0" acorn-dynamic-import "^4.0.0"
ajv "^6.1.0" ajv "^6.1.0"
@ -13038,7 +13038,7 @@ webpack@4.29.0:
mkdirp "~0.5.0" mkdirp "~0.5.0"
neo-async "^2.5.0" neo-async "^2.5.0"
node-libs-browser "^2.0.0" node-libs-browser "^2.0.0"
schema-utils "^0.4.4" schema-utils "^1.0.0"
tapable "^1.1.0" tapable "^1.1.0"
terser-webpack-plugin "^1.1.0" terser-webpack-plugin "^1.1.0"
watchpack "^1.5.0" watchpack "^1.5.0"