Update dependencies

sass · Nov 1, 2021 · 4be7105 · 4be7105
1 parent 4ca178f
commit 4be7105
Show file tree

Hide file tree

Showing 12 changed files with 1,861 additions and 5,291 deletions.
diff --git a/jest.config.ts b/jest.config.ts
@@ -5,7 +5,7 @@ const config: Config.InitialOptions = {
   // Work around facebook/jest#2549
   testEnvironment: 'jest-environment-node-single-context',
   roots: ['test'],
-  setupFilesAfterEnv: ['jest-extended'],
+  setupFilesAfterEnv: ['jest-extended/all'],
 };
 
 export default config;
diff --git a/js-api-spec.ts b/js-api-spec.ts
@@ -34,7 +34,7 @@ const args = yargs(process.argv.slice(2))
     hidden: true,
   });
 
-const argv = args.argv;
+const argv = args.parseSync();
 
 if (argv.help) {
   args.showHelp();
@@ -49,7 +49,8 @@ const tmpObject = tmp.dirSync({
   unsafeCleanup: true,
 });
 const dir = tmpObject.name;
-del.sync(dir); // TODO(nweiz): Use fs.rmSync() when we drop support for Node 12
+// TODO(nweiz): Use fs.rmSync() when we drop support for Node 12
+del.sync(dir, {force: true});
 const sassPackagePath = p.join(dir, 'node_modules', 'sass');
 fs.mkdirSync(sassPackagePath, {recursive: true});
 

diff --git a/js-api-spec/value/color.test.ts b/js-api-spec/value/color.test.ts
@@ -10,7 +10,10 @@ skipForImpl('dart-sass', () => {
   describe('SassColor', () => {
     describe('construction', () => {
       describe('type', () => {
-        const color = SassColor.rgb(18, 52, 86);
+        let color: SassColor;
+        beforeEach(() => {
+          color = SassColor.rgb(18, 52, 86);
+        });
 
         it('is a value', () => {
           expect(color).toBeInstanceOf(Value);
@@ -83,7 +86,10 @@ skipForImpl('dart-sass', () => {
     });
 
     describe('an RGB color', () => {
-      const color = SassColor.rgb(18, 52, 86);
+      let color: SassColor;
+      beforeEach(() => {
+        color = SassColor.rgb(18, 52, 86);
+      });
 
       it('has RGB channels', () => {
         expect(color.red).toBe(18);
@@ -119,7 +125,10 @@ skipForImpl('dart-sass', () => {
     });
 
     describe('an HSL color', () => {
-      const color = SassColor.hsl(120, 42, 42);
+      let color: SassColor;
+      beforeEach(() => {
+        color = SassColor.hsl(120, 42, 42);
+      });
 
       it('has RGB channels', () => {
         expect(color.red).toBe(62);
@@ -153,7 +162,10 @@ skipForImpl('dart-sass', () => {
     });
 
     describe('an HWB color', () => {
-      const color = SassColor.hwb(120, 42, 42);
+      let color: SassColor;
+      beforeEach(() => {
+        color = SassColor.hwb(120, 42, 42);
+      });
 
       it('has RGB channels', () => {
         expect(color.red).toBe(107);
@@ -189,7 +201,10 @@ skipForImpl('dart-sass', () => {
     });
 
     describe('changing color values', () => {
-      const color = SassColor.rgb(18, 52, 86);
+      let color: SassColor;
+      beforeEach(() => {
+        color = SassColor.rgb(18, 52, 86);
+      });
 
       describe('changeRgb()', () => {
         it('changes RGB values', () => {

diff --git a/js-api-spec/value/number.test.ts b/js-api-spec/value/number.test.ts
@@ -13,7 +13,10 @@ skipForImpl('dart-sass', () => {
   describe('Sass number', () => {
     describe('unitless', () => {
       describe('integer', () => {
-        const number = new SassNumber(123);
+        let number: SassNumber;
+        beforeEach(() => {
+          number = new SassNumber(123);
+        });
 
         describe('construction', () => {
           it('is a value', () => {
@@ -214,7 +217,10 @@ skipForImpl('dart-sass', () => {
       });
 
       describe('fuzzy integer', () => {
-        const number = new SassNumber(123.000000000001);
+        let number: SassNumber;
+        beforeEach(() => {
+          number = new SassNumber(123.000000000001);
+        });
 
         it('has the correct value', () => {
           expect(number.value).toBe(123.000000000001);
@@ -252,7 +258,10 @@ skipForImpl('dart-sass', () => {
       });
 
       describe('double', () => {
-        const number = new SassNumber(123.456);
+        let number: SassNumber;
+        beforeEach(() => {
+          number = new SassNumber(123.456);
+        });
 
         it('has the correct value', () => {
           expect(number.value).toBe(123.456);
@@ -267,7 +276,10 @@ skipForImpl('dart-sass', () => {
     });
 
     describe('single numerator unit', () => {
-      const number = new SassNumber(123, 'px');
+      let number: SassNumber;
+      beforeEach(() => {
+        number = new SassNumber(123, 'px');
+      });
 
       describe('construction', () => {
         it('has that unit', () => {
@@ -481,9 +493,12 @@ skipForImpl('dart-sass', () => {
     });
 
     describe('numerator and denominator units', () => {
-      const number = SassNumber.withUnits(123, {
-        numeratorUnits: ['px'],
-        denominatorUnits: ['ms'],
+      let number: SassNumber;
+      beforeEach(() => {
+        number = SassNumber.withUnits(123, {
+          numeratorUnits: ['px'],
+          denominatorUnits: ['ms'],
+        });
       });
 
       describe('construction', () => {

diff --git a/js-api-spec/value/string.test.ts b/js-api-spec/value/string.test.ts
@@ -59,7 +59,10 @@ skipForImpl('dart-sass', () => {
     });
 
     describe('length and index handling', () => {
-      const string = new SassString('nb');
+      let string: SassString;
+      beforeEach(() => {
+        string = new SassString('nb');
+      });
 
       it('rejects a zero index', () => {
         expect(() =>
@@ -80,7 +83,10 @@ skipForImpl('dart-sass', () => {
       });
 
       describe('ASCII', () => {
-        const string = new SassString('nb');
+        let string: SassString;
+        beforeEach(() => {
+          string = new SassString('nb');
+        });
 
         // sass/embedded-host-node#72
         skipForImpl('sass-embedded', () => {
@@ -110,7 +116,10 @@ skipForImpl('dart-sass', () => {
       });
 
       describe('Unicode', () => {
-        const string = new SassString('a👭b👬c');
+        let string: SassString;
+        beforeEach(() => {
+          string = new SassString('a👭b👬c');
+        });
 
         // sass/embedded-host-node#72
         skipForImpl('sass-embedded', () => {

diff --git a/lib-js/cli-args.ts b/lib-js/cli-args.ts
@@ -97,7 +97,8 @@ export async function parseArgs(
         'When a test fails, enter into a dialog for how to handle it',
       type: 'boolean',
       default: false,
-    }).argv;
+    })
+    .parseSync();
 
   const root = path.resolve(process.cwd(), argv['root-path']);
 

diff --git a/lib-js/spec-directory/options.ts b/lib-js/spec-directory/options.ts
@@ -22,7 +22,7 @@ export default class SpecOptions {
   /** Create SpecOptions from yaml contents (as a string) */
   static fromYaml(content: string): SpecOptions {
     // TODO validate
-    return new SpecOptions((yaml.safeLoad(content) ?? {}) as OptionsData);
+    return new SpecOptions((yaml.load(content) ?? {}) as OptionsData);
   }
 
   /** Create new SpecOptions by merging this with other options */
@@ -72,6 +72,6 @@ export default class SpecOptions {
 
   /** Convert this options object to a Yaml string */
   toYaml(): string {
-    return yaml.safeDump(this.data).replace(/'(:[^']+)':/g, '$1:');
+    return yaml.dump(this.data).replace(/'(:[^']+)':/g, '$1:');
   }
 }
diff --git a/lib-js/test-case/test-case.ts b/lib-js/test-case/test-case.ts
@@ -50,7 +50,8 @@ export default class TestCase {
     const testCase = new TestCase(dir, impl, compiler, todoMode);
     try {
       testCase._result = await testCase.run();
-    } catch (error) {
+    } catch (caught) {
+      const error = caught instanceof Error ? caught : new Error(`${caught}`);
       testCase._actual = {isSuccess: false, error: error.toString()};
       testCase._result = {type: 'error', error};
     }