forked from vercel/next.js
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move resolve-url-loader into Next.js (vercel#32932)
* Move resolve-url-loader into Next.js Fixes vercel#32157 Moves resolve-url-loader into Next.js and strips out all features that are not used like `rework` support. Will reduce install size as well as allow for optimizing the approach in the near future. * Update precompiled * Use loader-utils 2 * Update trace test * Revert "Update trace test" This reverts commit 7c09a07. * Add es5-ext as it's used in trace tests * Update join-function.js * Update bundle5.js
- Loading branch information
1 parent
4aa8c6f
commit 4ac46ec
Showing
26 changed files
with
804 additions
and
114 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
103 changes: 103 additions & 0 deletions
103
packages/next/build/webpack/loaders/resolve-url-loader/index.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,103 @@ | ||
| /* | ||
| The MIT License (MIT) | ||
| Copyright (c) 2016 Ben Holloway | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| SOFTWARE. | ||
| */ | ||
|
|
||
| import { SourceMapConsumer } from 'next/dist/compiled/source-map' | ||
| import valueProcessor from './lib/value-processor' | ||
| import { defaultJoin } from './lib/join-function' | ||
| import process from './lib/postcss' | ||
| /** | ||
| * A webpack loader that resolves absolute url() paths relative to their original source file. | ||
| * Requires source-maps to do any meaningful work. | ||
| * @param {string} content Css content | ||
| * @param {object} sourceMap The source-map | ||
| * @returns {string|String} | ||
| */ | ||
| export default async function resolveUrlLoader(content, sourceMap) { | ||
| const options = Object.assign( | ||
| { | ||
| sourceMap: this.sourceMap, | ||
| silent: false, | ||
| absolute: false, | ||
| keepQuery: false, | ||
| root: false, | ||
| debug: false, | ||
| join: defaultJoin, | ||
| }, | ||
| this.getOptions() | ||
| ) | ||
|
|
||
| let sourceMapConsumer | ||
| if (sourceMap) { | ||
| sourceMapConsumer = new SourceMapConsumer(sourceMap) | ||
| } | ||
|
|
||
| const callback = this.async() | ||
| const { postcss } = await options.postcss() | ||
| process(postcss, this.resourcePath, content, { | ||
| outputSourceMap: Boolean(options.sourceMap), | ||
| transformDeclaration: valueProcessor(this.resourcePath, options), | ||
| inputSourceMap: sourceMap, | ||
| sourceMapConsumer: sourceMapConsumer, | ||
| }) | ||
| .catch(onFailure) | ||
| .then(onSuccess) | ||
|
|
||
| function onFailure(error) { | ||
| callback(encodeError('CSS error', error)) | ||
| } | ||
|
|
||
| function onSuccess(reworked) { | ||
| if (reworked) { | ||
| // complete with source-map | ||
| // source-map sources are relative to the file being processed | ||
| if (options.sourceMap) { | ||
| callback(null, reworked.content, reworked.map) | ||
| } | ||
| // complete without source-map | ||
| else { | ||
| callback(null, reworked.content) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| function encodeError(label, exception) { | ||
| return new Error( | ||
| [ | ||
| 'resolve-url-loader', | ||
| ': ', | ||
| [label] | ||
| .concat( | ||
| (typeof exception === 'string' && exception) || | ||
| (exception instanceof Error && [ | ||
| exception.message, | ||
| exception.stack.split('\n')[1].trim(), | ||
| ]) || | ||
| [] | ||
| ) | ||
| .filter(Boolean) | ||
| .join('\n '), | ||
| ].join('') | ||
| ) | ||
| } | ||
| } |
65 changes: 65 additions & 0 deletions
65
packages/next/build/webpack/loaders/resolve-url-loader/lib/file-protocol.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,65 @@ | ||
| /* | ||
| The MIT License (MIT) | ||
| Copyright (c) 2016 Ben Holloway | ||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| of this software and associated documentation files (the "Software"), to deal | ||
| in the Software without restriction, including without limitation the rights | ||
| to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
| copies of the Software, and to permit persons to whom the Software is | ||
| furnished to do so, subject to the following conditions: | ||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
| SOFTWARE. | ||
| */ | ||
|
|
||
| /** | ||
| * Prepend file:// protocol to source path string or source-map sources. | ||
| */ | ||
| function prepend(candidate) { | ||
| if (typeof candidate === 'string') { | ||
| return 'file://' + candidate | ||
| } else if ( | ||
| candidate && | ||
| typeof candidate === 'object' && | ||
| Array.isArray(candidate.sources) | ||
| ) { | ||
| return Object.assign({}, candidate, { | ||
| sources: candidate.sources.map(prepend), | ||
| }) | ||
| } else { | ||
| throw new Error('expected string|object') | ||
| } | ||
| } | ||
|
|
||
| exports.prepend = prepend | ||
|
|
||
| /** | ||
| * Remove file:// protocol from source path string or source-map sources. | ||
| */ | ||
| function remove(candidate) { | ||
| if (typeof candidate === 'string') { | ||
| return candidate.replace(/^file:\/{2}/, '') | ||
| } else if ( | ||
| candidate && | ||
| typeof candidate === 'object' && | ||
| Array.isArray(candidate.sources) | ||
| ) { | ||
| return Object.assign({}, candidate, { | ||
| sources: candidate.sources.map(remove), | ||
| }) | ||
| } else { | ||
| throw new Error('expected string|object') | ||
| } | ||
| } | ||
|
|
||
| exports.remove = remove |
Oops, something went wrong.