Unverified Commit bd8f3c62 authored by Guy Bedford's avatar Guy Bedford Committed by JJ Kasper

ncc Webpack build (#7301)

* add back ncc

* fixup ncc build
parent 1cf80482
import webpack, {Stats} from 'webpack' import webpack, {Stats} from 'next/dist/compiled/webpack'
export type CompilerResult = { export type CompilerResult = {
errors: Error[] errors: Error[]
......
...@@ -9,7 +9,7 @@ import { ...@@ -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 'webpack' import webpack from 'next/dist/compiled/webpack'
import { import {
DOT_NEXT_ALIAS, DOT_NEXT_ALIAS,
......
import {loader} from 'webpack' import {loader} from 'next/dist/compiled/webpack'
import loaderUtils from 'loader-utils' import loaderUtils from 'loader-utils'
export type ClientPagesLoaderOptions = { export type ClientPagesLoaderOptions = {
......
import {loader} from 'webpack' import {loader} from 'next/dist/compiled/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) {
......
import loaderUtils from 'loader-utils' import loaderUtils from 'loader-utils'
import { loader } from 'webpack' import { loader } from 'next/dist/compiled/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) {
......
import {loader} from 'webpack' import {loader} from 'next/dist/compiled/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 () { ...@@ -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) {
......
import { Compiler, Plugin } from 'webpack' import { Compiler, Plugin } from 'next/dist/compiled/webpack'
import { createHash } from 'crypto' import { createHash } from 'crypto'
import path from 'path' import path from 'path'
......
import { Compiler } from 'webpack' import { Compiler } from 'next/dist/compiled/webpack'
import { RawSource } from 'webpack-sources' import { RawSource } from 'webpack-sources'
import { import {
BUILD_MANIFEST, BUILD_MANIFEST,
......
...@@ -4,7 +4,7 @@ import { CLIENT_STATIC_FILES_RUNTIME_MAIN } from 'next-server/constants' ...@@ -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 'webpack' import { Compiler, Plugin } from 'next/dist/compiled/webpack'
type StringDictionary = { [pageName: string]: string[] } type StringDictionary = { [pageName: string]: string[] }
const manifest: { const manifest: {
......
import { Compiler } from 'webpack' import { Compiler } from 'next/dist/compiled/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
......
import { Compiler, Plugin } from 'webpack' import { Compiler, Plugin } from 'next/dist/compiled/webpack'
import { createHash } from 'crypto' import { createHash } from 'crypto'
export class HashedChunkIdsPlugin implements Plugin { export class HashedChunkIdsPlugin implements Plugin {
......
import { Compiler, Plugin } from 'webpack' import { Compiler, Plugin } from 'next/dist/compiled/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
......
import { Compiler, Plugin } from 'webpack' import { Compiler, Plugin } from 'next/dist/compiled/webpack'
import { realpathSync } from 'fs' import { realpathSync } from 'fs'
function deleteCache (path: string) { function deleteCache (path: string) {
......
import { join, resolve, relative, dirname } from 'path' import { join, resolve, relative, dirname } from 'path'
import { Compiler } from 'webpack' import { Compiler } from 'next/dist/compiled/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
......
import webpack from 'webpack' import webpack from 'next/dist/compiled/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'
......
import {Compiler, Plugin} from 'webpack' import {Compiler, Plugin} from 'next/dist/compiled/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'
......
...@@ -22,7 +22,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWAR ...@@ -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 'webpack' import { Compiler, compilation } from 'next/dist/compiled/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
......
import { Compiler } from 'webpack' import { Compiler } from 'next/dist/compiled/webpack'
import { connectChunkAndModule } from 'webpack/lib/GraphHelpers' import { connectChunkAndModule } from 'next/dist/compiled/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
......
import { Compiler, Plugin } from 'webpack' import { Compiler, Plugin } from 'next/dist/compiled/webpack'
export class SharedRuntimePlugin implements Plugin { export class SharedRuntimePlugin implements Plugin {
apply(compiler: Compiler) { apply(compiler: Compiler) {
......
...@@ -4,7 +4,7 @@ ...@@ -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 'webpack'; import { RequestShortener } from 'next/dist/compiled/webpack';
import TaskRunner from './TaskRunner' import TaskRunner from './TaskRunner'
const warningRegex = /\[.+:([0-9]+),([0-9]+)\]/ const warningRegex = /\[.+:([0-9]+),([0-9]+)\]/
......
...@@ -2,7 +2,7 @@ import { join } from 'path' ...@@ -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 'webpack' import {Compiler} from 'next/dist/compiled/webpack'
const unlink = promisify(fs.unlink) const unlink = promisify(fs.unlink)
......
...@@ -82,6 +82,7 @@ ...@@ -82,6 +82,7 @@
"loader-utils": "1.1.0", "loader-utils": "1.1.0",
"mkdirp": "0.5.1", "mkdirp": "0.5.1",
"next-server": "8.1.1-canary.29", "next-server": "8.1.1-canary.29",
"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,9 +97,6 @@ ...@@ -96,9 +97,6 @@
"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"
}, },
...@@ -130,15 +128,19 @@ ...@@ -130,15 +128,19 @@
"@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.15.2", "@zeit/ncc": "0.19.0-beta.1",
"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"
......
import { relative as relativePath, join, normalize, sep } from 'path' import { relative as relativePath, join, normalize, sep } from 'path'
import WebpackDevMiddleware from 'webpack-dev-middleware' import WebpackDevMiddleware from 'next/dist/compiled/webpack-dev-middleware'
import WebpackHotMiddleware from 'webpack-hot-middleware' import WebpackHotMiddleware from 'next/dist/compiled/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 'webpack' import webpack from 'next/dist/compiled/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'
......
import DynamicEntryPlugin from 'webpack/lib/DynamicEntryPlugin' import webpack from 'next/dist/compiled/webpack'
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,7 +17,8 @@ const BUILT = Symbol('built') ...@@ -17,7 +17,8 @@ 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 = DynamicEntryPlugin.createDependency(entry, name) const dep = webpack.SingleEntryPlugin.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()
...@@ -28,13 +29,10 @@ function addEntry (compilation, context, name, entry) { ...@@ -28,13 +29,10 @@ 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
...@@ -61,7 +59,7 @@ export default function onDemandEntryHandler (devMiddleware, multiCompiler, { ...@@ -61,7 +59,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)
......
...@@ -42,6 +42,68 @@ const babelServerOpts = { ...@@ -42,6 +42,68 @@ 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_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'],
packageName: 'autodll-webpack-plugin'
})
.target('dist/compiled/autodll-webpack-plugin')
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
...@@ -83,7 +145,7 @@ export async function ncc_text_table (task, opts) { ...@@ -83,7 +145,7 @@ export async function ncc_text_table (task, opts) {
} }
export async function precompile (task) { export async function precompile (task) {
await task.parallel(['ncc_unistore', 'ncc_resolve', 'ncc_arg', 'ncc_nanoid', 'ncc_text_table']) await task.parallel(['ncc_webpack', 'ncc_webpack_graph_helpers', 'ncc_webpack_hot_middleware', 'ncc_autodll_webpack_plugin', 'ncc_webpack_dev_middleware', 'ncc_unistore', 'ncc_resolve', 'ncc_arg', 'ncc_nanoid', 'ncc_text_table'])
} }
export async function compile (task) { export async function compile (task) {
......
// 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;
}
...@@ -5,6 +5,16 @@ declare module 'webpack/lib/GraphHelpers'; ...@@ -5,6 +5,16 @@ 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;
...@@ -57,7 +67,7 @@ declare module 'next/dist/compiled/arg/index.js' { ...@@ -57,7 +67,7 @@ declare module 'next/dist/compiled/arg/index.js' {
} }
declare module 'autodll-webpack-plugin' { declare module 'autodll-webpack-plugin' {
import webpack from 'webpack' import webpack from 'next/dist/compiled/webpack'
class AutoDllPlugin implements webpack.Plugin { class AutoDllPlugin implements webpack.Plugin {
constructor(settings?: { constructor(settings?: {
inject?: boolean, inject?: boolean,
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
/// <reference types="node" /> /// <reference types="node" />
declare module 'webpack' { declare module 'next/dist/compiled/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';
......
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: {
...@@ -17,7 +18,7 @@ module.exports = withCSS(withSass({ ...@@ -17,7 +18,7 @@ module.exports = withCSS(withSass({
env: { env: {
customVar: 'hello' customVar: 'hello'
}, },
webpack (config, { buildId, webpack }) { webpack (config, { buildId }) {
// 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(
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment