From a3ec26d30aba5aa7a42adde49d2be2282b59855d Mon Sep 17 00:00:00 2001 From: Guy Bedford Date: Sun, 29 Mar 2020 19:37:41 -0600 Subject: [PATCH] ignore-loader --- packages/next/build/webpack/config/blocks/css/index.ts | 2 +- packages/next/package.json | 2 +- packages/next/taskfile.js | 9 +++++++++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/next/build/webpack/config/blocks/css/index.ts b/packages/next/build/webpack/config/blocks/css/index.ts index f2334614cc..a9e96d28bd 100644 --- a/packages/next/build/webpack/config/blocks/css/index.ts +++ b/packages/next/build/webpack/config/blocks/css/index.ts @@ -183,7 +183,7 @@ export const css = curry(async function css( regexCssGlobal, (scssEnabled && regexSassGlobal) as RegExp, ].filter(Boolean), - use: require.resolve('ignore-loader'), + use: require.resolve('next/dist/compiled/ignore-loader'), }, ], }) diff --git a/packages/next/package.json b/packages/next/package.json index cb27b60d52..bf2a4cbfe6 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -82,7 +82,6 @@ "css-loader": "3.3.0", "cssnano-simple": "1.0.0", "fork-ts-checker-webpack-plugin": "3.1.1", - "ignore-loader": "0.1.2", "jest-worker": "24.9.0", "loader-utils": "2.0.0", "mini-css-extract-plugin": "0.8.0", @@ -172,6 +171,7 @@ "fresh": "0.5.2", "gzip-size": "5.1.1", "http-proxy": "1.18.0", + "ignore-loader": "0.1.2", "is-docker": "2.0.0", "is-wsl": "2.1.1", "json5": "2.1.2", diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js index 0832586e25..3d47478b17 100644 --- a/packages/next/taskfile.js +++ b/packages/next/taskfile.js @@ -254,6 +254,14 @@ export async function ncc_http_proxy(task, opts) { .target('dist/compiled/http-proxy') } // eslint-disable-next-line camelcase +externals['ignore-loader'] = 'next/dist/compiled/ignore-loader' +export async function ncc_ignore_loader(task, opts) { + await task + .source(opts.src || relative(__dirname, require.resolve('ignore-loader'))) + .ncc({ packageName: 'ignore-loader', externals }) + .target('dist/compiled/ignore-loader') +} +// eslint-disable-next-line camelcase externals['is-docker'] = 'next/dist/compiled/is-docker' export async function ncc_is_docker(task, opts) { await task @@ -488,6 +496,7 @@ export async function precompile(task) { 'ncc_fresh', 'ncc_gzip_size', 'ncc_http_proxy', + 'ncc_ignore_loader', 'ncc_is_docker', 'ncc_is_wsl', 'ncc_json5', -- GitLab