diff --git a/packages/next/build/webpack/config/blocks/css/loaders/client.ts b/packages/next/build/webpack/config/blocks/css/loaders/client.ts index f09e66c1f1d25..40f76e6992394 100644 --- a/packages/next/build/webpack/config/blocks/css/loaders/client.ts +++ b/packages/next/build/webpack/config/blocks/css/loaders/client.ts @@ -10,7 +10,7 @@ export function getClientStyleLoader({ }): webpack.RuleSetUseItem { return isDevelopment ? { - loader: require.resolve('style-loader'), + loader: require.resolve('next/dist/compiled/style-loader'), options: { // By default, style-loader injects CSS into the bottom // of . This causes ordering problems between dev diff --git a/packages/next/package.json b/packages/next/package.json index 543c246ef48ae..b15d04ce6867c 100644 --- a/packages/next/package.json +++ b/packages/next/package.json @@ -97,7 +97,6 @@ "react-refresh": "0.8.3", "resolve-url-loader": "3.1.2", "stream-browserify": "3.0.0", - "style-loader": "1.2.1", "styled-jsx": "3.3.2", "use-subscription": "1.5.1", "vm-browserify": "1.1.2", @@ -223,6 +222,7 @@ "source-map": "0.6.1", "string-hash": "1.1.3", "strip-ansi": "6.0.0", + "style-loader": "1.2.1", "taskr": "1.1.0", "terser": "5.5.1", "text-table": "0.2.0", diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js index 8540345a4f77a..07cf59f61ef38 100644 --- a/packages/next/taskfile.js +++ b/packages/next/taskfile.js @@ -519,6 +519,20 @@ export async function ncc_strip_ansi(task, opts) { .target('compiled/strip-ansi') } // eslint-disable-next-line camelcase +externals['style-loader'] = 'next/dist/compiled/style-loader' +export async function ncc_style_loader(task, opts) { + await task + .source(opts.src || relative(__dirname, require.resolve('style-loader'))) + .ncc({ + packageName: 'style-loader', + externals: { + ...externals, + 'schema-utils': 'next/dist/compiled/schema-utils3', + }, + }) + .target('compiled/style-loader') +} +// eslint-disable-next-line camelcase externals['terser'] = 'next/dist/compiled/terser' export async function ncc_terser(task, opts) { await task @@ -695,6 +709,7 @@ export async function ncc(task) { 'ncc_source_map', 'ncc_string_hash', 'ncc_strip_ansi', + 'ncc_style_loader', 'ncc_terser', 'ncc_text_table', 'ncc_thread_loader',