Merge branch 'main' into gl-js-v5.11.0

Author: HarelM

build/generate-style-spec.ts

@@ -389,12 +389,12 @@ export type SchemaSpecification = {
 // State
 export type StateSpecification = Record<string, SchemaSpecification>;
 
-export type FontFace = string | {
+export type MLFontFace = string | {
     url: string,
     "unicode-range"?: string[]
 };
 
-export type FontFacesSpecification = Record<string, FontFace>;
+export type FontFacesSpecification = Record<string, MLFontFace>;
 
 ${objectDeclaration('StyleSpecification', spec.$root)}
 

src/expression/expression.test.ts

@@ -138,7 +138,7 @@ describe('evaluate expression', () => {
         expect(value.kind).toBe('source');
 
         expect(value.evaluate({} as GlobalProperties, {properties: {x: 'invalid'}} as any as Feature)).toBeNull();
-        expect(console.warn).toHaveBeenCalledTimes(1);
+        expect(console.warn).toHaveBeenCalledTimes(2);
         expect(console.warn).toHaveBeenCalledWith('Could not parse variableAnchorOffsetCollection from value \'invalid\'');
 
         warnMock.mockClear();

tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
     "allowJs": true,
+    "outDir": "dist",
     "allowSyntheticDefaultImports": true,
     "checkJs": true,
     "isolatedModules": false,