Prettier: enable trailing comma (es5 option)

remarcmij · remarcmij · commit f402d20d92b9 · 2019-01-26T20:33:52.000+01:00
diff --git a/Week1/homework/app.js b/Week1/homework/app.js
@@ -3,7 +3,7 @@
 {
   const bookTitles = [
     // Replace with your own book titles
-    'harry_potter_chamber_secrets'
+    'harry_potter_chamber_secrets',
   ];
 
   // Replace with your own code
diff --git a/Week2/homework/maartjes-work.js b/Week2/homework/maartjes-work.js
@@ -3,43 +3,43 @@
 const monday = [
   {
     name: 'Write a summary HTML/CSS',
-    duration: 180
+    duration: 180,
   },
   {
     name: 'Some web development',
-    duration: 120
+    duration: 120,
   },
   {
     name: 'Fix homework for class10',
-    duration: 20
+    duration: 20,
   },
   {
     name: 'Talk to a lot of people',
-    duration: 200
-  }
+    duration: 200,
+  },
 ];
 
 const tuesday = [
   {
     name: 'Keep writing summary',
-    duration: 240
+    duration: 240,
   },
   {
     name: 'Some more web development',
-    duration: 180
+    duration: 180,
   },
   {
     name: 'Staring out the window',
-    duration: 10
+    duration: 10,
   },
   {
     name: 'Talk to a lot of people',
-    duration: 200
+    duration: 200,
   },
   {
     name: 'Look at application assignments new students',
-    duration: 40
-  }
+    duration: 40,
+  },
 ];
 
 const maartjesTasks = monday.concat(tuesday);
@@ -61,5 +61,5 @@ console.log(`Maartje has earned €${'replace this string with the earnings roun
 module.exports = {
   maartjesTasks,
   maartjesHourlyRate,
-  computeEarnings
+  computeEarnings,
 };
diff --git a/Week2/homework/map-filter.js b/Week2/homework/map-filter.js
@@ -11,5 +11,5 @@ console.log(doubleOddNumbers(myNumbers));
 // Do not change or remove anything below this line
 module.exports = {
   myNumbers,
-  doubleOddNumbers
+  doubleOddNumbers,
 };
diff --git a/Week3/homework/step2-3.js b/Week3/homework/step2-3.js
@@ -43,5 +43,5 @@ console.log('do-while', repeatStringNumTimesWithDoWhile('abc', 3));
 module.exports = {
   repeatStringNumTimesWithFor,
   repeatStringNumTimesWithWhile,
-  repeatStringNumTimesWithDoWhile
+  repeatStringNumTimesWithDoWhile,
 };
diff --git a/Week3/homework/step2-6.js b/Week3/homework/step2-6.js
@@ -19,5 +19,5 @@ console.log(flattenArray3d(arr3d)); // -> [1, 2, 3, 4, 5, 6, 7, 8]
 // Do not change or remove anything below this line
 module.exports = {
   flattenArray2d,
-  flattenArray3d
+  flattenArray3d,
 };
diff --git a/Week3/test/console-test.js b/Week3/test/console-test.js
@@ -2,10 +2,12 @@
 
 function consoleTest(filename, expectedOutput) {
   let outputData = '';
+  // eslint-disable-next-line no-return-assign
   const storeLog = (...inputs) => (outputData += inputs.join(' '));
 
   test(filename, () => {
-    console['log'] = jest.fn(storeLog);
+    console.log = jest.fn(storeLog);
+    // eslint-disable-next-line global-require
     require('../homework/' + filename);
     expect(outputData).toBe(expectedOutput);
   });
diff --git a/Week3/test/step2-3.test.js b/Week3/test/step2-3.test.js
@@ -1,7 +1,7 @@
 const {
   repeatStringNumTimesWithFor,
   repeatStringNumTimesWithWhile,
-  repeatStringNumTimesWithDoWhile
+  repeatStringNumTimesWithDoWhile,
 } = require('../homework/step2-3');
 
 describe('step2-3 with for-loop', () => {
diff --git a/prettier.config.js b/prettier.config.js
@@ -1,9 +1,9 @@
 module.exports = {
   printWidth: 100,
   singleQuote: true,
-  trailingComma: 'none',
+  trailingComma: 'es5',
   bracketSpacing: true,
   jsxBracketSameLine: false,
   tabWidth: 2,
-  semi: true
+  semi: true,
 };

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`{`
`4`	`4`	`const bookTitles = [`
`5`	`5`	`// Replace with your own book titles`
`6`		`- 'harry_potter_chamber_secrets'`
	`6`	`+ 'harry_potter_chamber_secrets',`
`7`	`7`	`];`
`8`	`8`
`9`	`9`	`// Replace with your own code`