fix: Handle legacy type definition for sourcemap's RawSourceMap.

Author: chriseppstein

packages/@css-blocks/core/src/BlockParser/BlockFactory.ts

@@ -1,6 +1,6 @@
 import { ObjectDictionary, isString } from "@opticss/util";
 import * as debugGenerator from "debug";
-import { postcss } from "opticss";
+import { LegacyRawSourceMap, adaptFromLegacySourceMap, postcss } from "opticss";
 import * as path from "path";
 import { RawSourceMap } from "source-map";
 
@@ -262,9 +262,13 @@ export class BlockFactory {
 }
 
 function sourceMapFromProcessedFile(result: ProcessedFile): RawSourceMap | string | undefined {
-  let sourceMap: RawSourceMap | string | undefined = result.sourceMap;
+  let sourceMap: LegacyRawSourceMap | RawSourceMap | string | undefined = result.sourceMap;
   if (!sourceMap && !isString(result.content) && result.content.map) {
     sourceMap = result.content.map.toJSON();
   }
-  return sourceMap;
+  if (typeof sourceMap === "object") {
+    return adaptFromLegacySourceMap(sourceMap);
+  } else {
+    return sourceMap;
+  }
 }

packages/@css-blocks/webpack/src/CssAssets.ts

@@ -3,7 +3,7 @@ import * as  async from "async";
 import * as convertSourceMap from "convert-source-map";
 import * as debugGenerator from "debug";
 import * as fs from "fs";
-import { postcss } from "opticss";
+import { adaptFromLegacySourceMap, adaptToLegacySourceMap, postcss } from "opticss";
 import * as path from "path";
 import { RawSourceMap } from "source-map";
 import { Compiler as WebpackCompiler } from "webpack";
@@ -259,7 +259,7 @@ function assetAsSource(contents: string, filename: string): Source {
         let sm: RawSourceMap = sourcemap.toObject();
         contents = convertSourceMap.removeComments(contents);
         contents = convertSourceMap.removeMapFileComments(contents);
-        return new SourceMapSource(contents, filename, sm);
+        return new SourceMapSource(contents, filename, adaptToLegacySourceMap(sm));
     } else {
         return new RawSource(contents);
     }
@@ -315,7 +315,8 @@ function assetFileAsSource(sourcePath: string, callback: (err: Error | undefined
 function sourceAndMap(asset: Source): SourceAndMap {
     // sourceAndMap is supposedly more efficient when implemented.
     if (asset.sourceAndMap) {
-        return asset.sourceAndMap();
+        let {source, map} = asset.sourceAndMap();
+        return {source, map: adaptFromLegacySourceMap(map)};
     } else {
         let source = asset.source();
         let map: RawSourceMap | undefined = undefined;
@@ -349,7 +350,7 @@ function makePostcssProcessor (
             });
 
             return result.then((result) => {
-                return new SourceMapSource(result.css, assetPath, result.map.toJSON(), source, map);
+                return new SourceMapSource(result.css, assetPath, result.map.toJSON(), source, map && adaptToLegacySourceMap(map));
             });
         });
     };

packages/@css-blocks/webpack/src/Plugin.ts

@@ -1,7 +1,7 @@
 import { TemplateTypes } from "@opticss/template-api";
 import { ObjectDictionary, flatten, objectValues } from "@opticss/util";
 import * as debugGenerator from "debug";
-import { postcss } from "opticss";
+import { LegacyRawSourceMap, adaptToLegacySourceMap, postcss } from "opticss";
 import * as path from "path";
 import { RawSourceMap } from "source-map";
 import * as Tapable from "tapable";
@@ -138,7 +138,7 @@ export class CssBlocksPlugin
         let source: Source;
         if (result.optimizationResult.output.sourceMap) {
           let resultMap = result.optimizationResult.output.sourceMap;
-          let rawSourceMap: RawSourceMap;
+          let rawSourceMap: LegacyRawSourceMap | RawSourceMap;
           if (typeof resultMap === "string") {
             rawSourceMap = JSON.parse(resultMap);
           } else {
@@ -147,7 +147,7 @@ export class CssBlocksPlugin
           source = new SourceMapSource(
             result.optimizationResult.output.content.toString(),
             "optimized css",
-            rawSourceMap);
+            adaptToLegacySourceMap(rawSourceMap));
         } else {
           source = new RawSource(result.optimizationResult.output.content.toString());
         }