chore: compile resolve-url-loader (#21351)

Closes #21166
vercel · Jan 19, 2021 · ab158c0 · ab158c0
1 parent 56b149f
commit ab158c0
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 2 deletions.
diff --git a/packages/next/build/webpack/config/blocks/css/index.ts b/packages/next/build/webpack/config/blocks/css/index.ts
@@ -53,7 +53,7 @@ export const css = curry(async function css(
     // To fix this, we use `resolve-url-loader` to rewrite the CSS
     // imports to real file paths.
     {
-      loader: require.resolve('resolve-url-loader'),
+      loader: require.resolve('next/dist/compiled/resolve-url-loader'),
       options: {
         // Source maps are not required here, but we may as well emit
         // them.

diff --git a/packages/next/compiled/resolve-url-loader/engine/fail.js b/packages/next/compiled/resolve-url-loader/engine/fail.js
diff --git a/packages/next/compiled/resolve-url-loader/engine/postcss.js b/packages/next/compiled/resolve-url-loader/engine/postcss.js
diff --git a/packages/next/compiled/resolve-url-loader/engine/rework.js b/packages/next/compiled/resolve-url-loader/engine/rework.js
diff --git a/packages/next/compiled/resolve-url-loader/index.js b/packages/next/compiled/resolve-url-loader/index.js
diff --git a/packages/next/compiled/resolve-url-loader/package.json b/packages/next/compiled/resolve-url-loader/package.json
@@ -0,0 +1 @@
+{"name":"resolve-url-loader","main":"index.js","author":"bholloway","license":"MIT"}
diff --git a/packages/next/package.json b/packages/next/package.json
@@ -93,7 +93,6 @@
     "raw-body": "2.4.1",
     "react-is": "16.13.1",
     "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",
@@ -216,6 +215,7 @@
     "postcss-preset-env": "6.7.0",
     "postcss-scss": "3.0.4",
     "recast": "0.18.5",
+    "resolve-url-loader": "3.1.2",
     "sass-loader": "10.0.5",
     "schema-utils": "2.7.1",
     "semver": "7.3.2",

diff --git a/packages/next/taskfile.js b/packages/next/taskfile.js
@@ -433,6 +433,16 @@ export async function ncc_recast(task, opts) {
     .target('compiled/recast')
 }
 // eslint-disable-next-line camelcase
+externals['resolve-url-loader'] = 'next/dist/compiled/resolve-url-loader'
+export async function ncc_resolve_url_loader(task, opts) {
+  await task
+    .source(
+      opts.src || relative(__dirname, require.resolve('resolve-url-loader'))
+    )
+    .ncc({ packageName: 'resolve-url-loader', externals })
+    .target('compiled/resolve-url-loader')
+}
+// eslint-disable-next-line camelcase
 externals['sass-loader'] = 'next/dist/compiled/sass-loader'
 export async function ncc_sass_loader(task, opts) {
   await task
@@ -686,6 +696,7 @@ export async function ncc(task) {
       'ncc_postcss_preset_env',
       'ncc_postcss_scss',
       'ncc_recast',
+      'ncc_resolve_url_loader',
       'ncc_sass_loader',
       'ncc_schema_utils',
       'ncc_schema_utils3',