chore: Updates to handle upgraded dependencies.

Author: chriseppstein

package.json

@@ -7,6 +7,7 @@
     "toc": "markdown-toc -i --maxdepth 2 README.md",
     "compile": "tsc -b packages",
     "compile:watch": "tsc -b packages --watch",
+    "test": "lerna run test",
     "test:all": "lerna run test:runner",
     "compile:clean": "rm -rf packages/@css-blocks/*/dist && yarn run compile",
     "install:clean": "rm -rf node_modules packages/@css-blocks/*/node_modules && yarn"

packages/@css-blocks/broccoli/tsconfig.json

@@ -1,7 +1,8 @@
 {
   "extends": "../../../tsconfig.json",
   "compilerOptions": {
-    "composite": true,
+    // Composite is false due to https://github.com/Microsoft/TypeScript/issues/31181
+    "composite": false,
     "outDir": "dist",
     "baseUrl": "dist"
   },

packages/@css-blocks/core/src/Analyzer/validations/property-conflict-validator.ts

@@ -131,8 +131,8 @@ function formatRulesetConflicts(prop: string, rules: Ruleset<Style>[]) {
     let decl = rule.declarations.get(prop);
     let nodes: postcss.Rule[] | postcss.Declaration[] =  decl ? decl.map((d) => d.node) : [rule.node];
     for (let node of nodes) {
-      let line = node.source.start && `:${node.source.start.line}` || "";
-      let column = node.source.start && `:${node.source.start.column}` || "";
+      let line = node.source && node.source.start && `:${node.source.start.line}` || "";
+      let column = node.source && node.source.start && `:${node.source.start.column}` || "";
       out.add(`    ${rule.style.asSource(true)} (${rule.file}${line}${column})`);
     }
   }

packages/@css-blocks/webpack/package.json

@@ -44,9 +44,10 @@
     "@types/convert-source-map": "^1.3.33",
     "@types/extract-text-webpack-plugin": "^2.1.0",
     "@types/glob": "^7.1.1",
+    "@types/tapable": "^0.2.4",
     "@types/webpack": "^4.0.0",
     "@types/webpack-merge": "4.1.5",
-    "@types/webpack-sources": "^0.1.2",
+    "@types/webpack-sources": "^0.1.5",
     "css-loader": "^0.28.4",
     "extract-text-webpack-plugin": "^2.1.2",
     "glob": "^7.1.2",
@@ -69,4 +70,4 @@
     "tapable": "^0.2.5",
     "webpack-sources": "^1.0.1"
   }
-}
+}

packages/@css-blocks/webpack/test/configs/basicConfig.ts

@@ -36,5 +36,8 @@ export function config(entry: EntryTypes, options?: LoaderOptions): WebpackConfi
         }),
     ],
   };
-  return merge(defaultOutputConfig(), baseConfig);
+
+  // The webpack types used by webpack-merge don't agree with ours.
+  // tslint:disable-next-line:prefer-unknown-to-any
+  return merge(defaultOutputConfig() as any, baseConfig as any) as any;
 }

packages/@css-blocks/webpack/test/configs/extractTextConfig.ts

@@ -14,7 +14,8 @@ export function config(entry: string, options?: LoaderOptions): WebpackConfigura
       filename: "[name].[contenthash].css",
   });
 
-  return merge(defaultOutputConfig(), {
+  let outputConfig = defaultOutputConfig();
+  let config = {
     entry: entry,
     output: {
       filename: "bundle.extractText.js",
@@ -36,5 +37,9 @@ export function config(entry: string, options?: LoaderOptions): WebpackConfigura
     plugins: [
       extractText,
     ],
-  });
+  };
+
+  // The webpack types used by webpack-merge don't agree with ours.
+  // tslint:disable-next-line:prefer-unknown-to-any
+  return merge(outputConfig as any, config as any) as any;
 }

packages/@css-blocks/webpack/test/configs/templateConfig.ts

@@ -73,7 +73,7 @@ export function config(): Promise<WebpackConfiguration> {
       analyzer,
     });
 
-    return merge(defaultOutputConfig(), {
+    let config = {
       entry: "./test/fixtures/javascripts/foo.js",
       output: {
         filename: "bundle.template.js",
@@ -94,6 +94,10 @@ export function config(): Promise<WebpackConfiguration> {
           inlineSourceMaps: false,
         }),
       ],
-    });
+    };
+
+    // The webpack types used by webpack-merge don't agree with ours.
+    // tslint:disable-next-line:prefer-unknown-to-any
+    return merge(defaultOutputConfig() as any, config as any) as any;
   });
 }