Fix merge

postcss · May 17, 2021 · e4ab6c6 · e4ab6c6
1 parent 930637f
commit e4ab6c6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/lib/input.js b/lib/input.js
@@ -1,8 +1,8 @@
 'use strict'
 
+let { SourceMapConsumer, SourceMapGenerator } = require('source-map-js')
 let { fileURLToPath, pathToFileURL } = require('url')
 let { resolve, isAbsolute } = require('path')
-let { SourceMapConsumer, SourceMapGenerator } = require('source-map')
 let { nanoid } = require('nanoid/non-secure')
 
 let terminalHighlight = require('./terminal-highlight')

diff --git a/lib/map-generator.js b/lib/map-generator.js
@@ -1,15 +1,11 @@
 'use strict'
 
+let { SourceMapConsumer, SourceMapGenerator } = require('source-map-js')
 let { dirname, resolve, relative, sep } = require('path')
 let { pathToFileURL } = require('url')
-<<<<<<< HEAD
-let { SourceMapConsumer, SourceMapGenerator } = require('source-map')
 
 let sourceMapAvailable = Boolean(SourceMapConsumer && SourceMapGenerator)
 let pathAvailable = Boolean(dirname && resolve && relative && sep)
-=======
-let mozilla = require('source-map-js')
->>>>>>> a0eb4c0 (move from source-map to source-map-js)
 
 class MapGenerator {
   constructor(stringify, root, opts) {

diff --git a/package.json b/package.json
@@ -127,11 +127,11 @@
   },
   "browser": {
     "./lib/terminal-highlight": false,
+    "source-map-js": false,
     "colorette": false,
-    "fs": false,
     "path": false,
     "url": false,
-    "source-map": false
+    "fs": false
   },
   "size-limit": [
     {