Merge pull request #207 from zspecza/update-packages

Author: fatfisz

package-lock.json

@@ -15,28 +15,28 @@
     "Rafał Ruciński (https://github.com/fatfisz)"
   ],
   "devDependencies": {
-    "@babel/cli": "7.2.3",
-    "@babel/core": "7.2.2",
-    "@babel/plugin-proposal-class-properties": "7.2.3",
-    "@babel/plugin-proposal-export-default-from": "7.2.0",
-    "@babel/preset-env": "7.2.3",
-    "babel-core": "7.0.0-bridge.0",
-    "babel-eslint": "10.0.1",
-    "babel-plugin-add-module-exports": "1.0.0",
-    "codecov": "3.1.0",
-    "cross-env": "5.2.0",
-    "doctoc": "1.4.0",
-    "eslint": "5.12.1",
-    "eslint-config-prettier": "3.6.0",
-    "eslint-plugin-prettier": "3.0.1",
-    "jest": "23.6.0",
-    "micromatch": "3.1.10",
-    "prettier": "1.16.0",
-    "rimraf": "2.6.3",
-    "rollup": "1.1.1",
-    "rollup-plugin-babel": "4.3.2",
-    "rollup-plugin-node-resolve": "4.0.0",
-    "rollup-plugin-uglify": "6.0.1"
+    "@babel/cli": "^7.10.1",
+    "@babel/core": "^7.10.2",
+    "@babel/plugin-proposal-class-properties": "^7.10.1",
+    "@babel/plugin-proposal-export-default-from": "^7.10.1",
+    "@babel/preset-env": "^7.10.2",
+    "@rollup/plugin-babel": "^5.0.2",
+    "@rollup/plugin-node-resolve": "^8.0.0",
+    "babel-core": "^6.26.3",
+    "babel-eslint": "^10.1.0",
+    "babel-plugin-add-module-exports": "^1.0.2",
+    "codecov": "^3.7.0",
+    "cross-env": "^7.0.2",
+    "doctoc": "^1.4.0",
+    "eslint": "^7.1.0",
+    "eslint-config-prettier": "^6.11.0",
+    "eslint-plugin-prettier": "^3.1.3",
+    "jest": "^26.0.1",
+    "micromatch": "^4.0.2",
+    "prettier": "^2.0.5",
+    "rimraf": "^3.0.2",
+    "rollup": "^2.12.0",
+    "rollup-plugin-uglify": "^6.0.4"
   },
   "directories": {
     "lib": "lib"
@@ -87,7 +87,7 @@
     "url": "https://github.com/declandewet/common-tags"
   },
   "scripts": {
-    "clear": "rimraf lib && rimraf es",
+    "clear": "rimraf lib && rimraf es && rimraf dist",
     "build": "npm run clear && npm run build:cjs && npm run build:es && npm run build:unpkg",
     "build:cjs": "babel src --out-dir lib --ignore **/*.test.js",
     "build:es": "cross-env BABEL_ENV=es babel src --out-dir es --ignore **/*.test.js",

package.json

@@ -1,5 +1,5 @@
-import babel from 'rollup-plugin-babel';
-import resolve from 'rollup-plugin-node-resolve';
+import babel from '@rollup/plugin-babel';
+import resolve from '@rollup/plugin-node-resolve';
 import { uglify } from 'rollup-plugin-uglify';
 
 export default {

rollup.config.js

@@ -33,7 +33,7 @@ function getInterimTag(originalTag, extraTag) {
 function getTagCallInfo(transformers) {
   return {
     transformers,
-    context: transformers.map(transformer =>
+    context: transformers.map((transformer) =>
       transformer.getInitialContext ? transformer.getInitialContext() : {},
     ),
   };
@@ -98,7 +98,7 @@ export default function createTag(...rawTransformers) {
 
     // if the first argument is an array, return a transformed end result of processing the template with our tag
     const processedTemplate = strings
-      .map(string => applyHook0(tagCallInfo, 'onString', string))
+      .map((string) => applyHook0(tagCallInfo, 'onString', string))
       .reduce((result, string, index) =>
         ''.concat(
           result,

src/createTag/createTag.js

@@ -19,10 +19,7 @@ test('transformer methods are optional', () => {
   });
   const noStringNorEnd = createTag({
     onSubstitution(sub) {
-      return sub
-        .split('')
-        .reverse()
-        .join('');
+      return sub.split('').reverse().join('');
     },
   });
   expect(noMethods`foo`).toBe('foo');

src/createTag/createTag.test.js

@@ -10,7 +10,7 @@ test('renders HTML, including arrays', () => {
   const actual = html`
     <h1>${val}${nil}</h1>
     <ul>
-      ${fruits.map(fruit => `<li>${fruit}</li>`)}
+      ${fruits.map((fruit) => `<li>${fruit}</li>`)}
     </ul>
   `;
 

src/html/html.test.js

@@ -17,15 +17,15 @@ function requireModule(module) {
 test('common-tags exports all the right modules directly', () => {
   const modules = context.modules;
   expect.assertions(modules.length);
-  modules.forEach(module => {
+  modules.forEach((module) => {
     expect(requireModule(module)).toBeDefined();
   });
 });
 
 test('common-tags exports all the right modules as props', () => {
   const modules = context.modules;
   expect.assertions(modules.length);
-  modules.forEach(module => {
+  modules.forEach((module) => {
     expect(require('./index')).toHaveProperty(module, requireModule(module));
   });
 });

src/index.test.js

@@ -1,4 +1,4 @@
-const isValidValue = x =>
+const isValidValue = (x) =>
   x != null && !Number.isNaN(x) && typeof x !== 'boolean';
 
 const removeNonPrintingValuesTransformer = () => ({

src/removeNonPrintingValuesTransformer/removeNonPrintingValuesTransformer.js

@@ -9,7 +9,7 @@ test('renders HTML, including arrays', () => {
   const actual = safeHtml`
     <h1>${val}</h1>
     <ul>
-      ${fruits.map(fruit => `${fruit}`)}
+      ${fruits.map((fruit) => `${fruit}`)}
     </ul>
   `;
   expect(actual).toBe(expected);
@@ -34,7 +34,7 @@ test('correctly escapes HTML tags on substitution', () => {
   const actual = safeHtml`
     <h1>${val}</h1>
     <ul>
-      ${fruits.map(fruit => `${fruit}`)}
+      ${fruits.map((fruit) => `${fruit}`)}
     </ul>
   `;
   expect(actual).toBe(expected);

src/safeHtml/safeHtml.test.js

@@ -1,4 +1,4 @@
-const splitStringTransformer = splitBy => {
+const splitStringTransformer = (splitBy) => {
   if (typeof splitBy !== 'string') {
     throw new Error('You need to specify a string character to split by.');
   }