Re-enable more tests using uvu insted of jest

Author: Hexagon

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "proper-tags",
   "description": "A few common utility template tags for ES2015",
-  "version": "2.0.0-alpha.5",
+  "version": "2.0.0-alpha.6",
   "author": "Hexagon <https://github.com/hexagon>",
   "bugs": {
     "url": "http://github.com/declandewet/common-tags/issues"
@@ -16,6 +16,7 @@
   ],
   "devDependencies": {
     "eslint": "^8.37.0",
+    "micromatch": "^4.0.5",
     "rollup": "^1.32.1",
     "typescript": "^5.0.2",
     "uvu": "^0.5.6"
@@ -65,7 +66,7 @@
     "url": "https://github.com/hexagon/proper-tags"
   },
   "scripts": {
-    "test": "uvu src/commaLists/ && uvu src/commaListsAnd/ && uvu src/commaListsOr/",
+    "test": "uvu src/",
     "test:lint": "eslint ./**/*.js",
     "test:lint:fix": "eslint --fix  ./**/*.js",
     "build": "npm update && npm run build:precleanup && npm run test:lint && npm run build:dist && npm run build:typings",

package.json

@@ -62,7 +62,7 @@ import { html } from 'https://deno.land/x/proper_tags/dist/proper-tags.js';
 To include proper-tags via **jsdelivr**, add the following script tag to your HTML file:
 
 ```html
-<script src="https://cdn.jsdelivr.net/npm/proper-tags@2.0.0-alpha.5/dist/proper-tags.umd.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/proper-tags@2.0.0-alpha.6/dist/proper-tags.umd.js"></script>
 ```
 
 > **Note:** Make sure to replace `2.0.0-alpha.1` with the latest version

readme.md

@@ -1,4 +1,13 @@
-import TemplateTag from '../TemplateTag';
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+
+/* Recreate __dirname */
+import path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+import { TemplateTag } from './index.js';
 
 /* eslint-disable no-console */
 
@@ -55,3 +64,5 @@ test('performs a transformation & provides correct values to transform methods',
     ],
   });
 });
+
+test.run();

src/TemplateTag/TemplateTag.test.js renamed to src/TemplateTag/TemplateTag.test.js_disabled

@@ -1,5 +1,7 @@
 import { test } from 'uvu';
 import * as assert from 'uvu/assert';
+
+/* Recreate __dirname */
 import path from 'path';
 import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);

src/commaListsOr/commaListsOr.test.js

@@ -1,5 +1,7 @@
 import { test, suite } from 'uvu';
 import * as assert from 'uvu/assert';
+
+/* Recreate __dirname */
 import path from 'path';
 import { fileURLToPath } from 'url';
 const __filename = fileURLToPath(import.meta.url);

src/createTag/createTag.test.js renamed to src/createTag/createTag.test.js_disabled

@@ -1,5 +1,14 @@
-import html from './html';
-import { readFromFixture } from '../testUtils';
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+
+/* Recreate __dirname */
+import path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+import { html } from './html.js';
+import { readFromFixture } from '../testUtils/index.js';
 
 const val = 'amaze';
 const nil = null;
@@ -164,3 +173,5 @@ test('may not indent as expected when the array is not in a new line', () => {
 
   assert.equal(actual, expected);
 });
+
+test.run();

src/html/html.test.js

@@ -1,4 +1,7 @@
-import id from './id';
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+
+import { id } from './id.js';
 
 test('returns whatever comes at it', () => {
   assert.equal(id`foo${42}bar`, 'foo42bar');
@@ -7,3 +10,5 @@ test('returns whatever comes at it', () => {
 test('returns whatever comes at it (number version)', () => {
   assert.equal(id(42), 42);
 });
+
+test.run();

src/id/id.test.js

@@ -1,4 +1,7 @@
-import fs from "fs";
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+
+import * as fs from "fs";
 import path from "path";
 import mm from "micromatch";
 
@@ -29,3 +32,5 @@ test("common-tags exports all the right modules as props", () => {
 		assert.equal(require("./index")).toHaveProperty(module, requireModule(module));
 	});
 });
+
+test.run();

src/index.test.js renamed to src/index.test.js_disabled

@@ -1,5 +1,8 @@
-import inlineArrayTransformer from './inlineArrayTransformer';
-import createTag from '../createTag';
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+
+import { inlineArrayTransformer } from './inlineArrayTransformer.js';
+import { createTag } from '../createTag/index.js';
 
 test('only operates on arrays', () => {
   const tag = createTag(inlineArrayTransformer);
@@ -9,7 +12,7 @@ test('only operates on arrays', () => {
 test('includes an array as a comma-separated list', () => {
   const tag = createTag(inlineArrayTransformer({ separator: ',' }));
   assert.equal(tag`I like ${['apple', 'banana', 'kiwi']}`, 
-    'I like apple, banana, kiwi',
+    'I like apple, banana, kiwi'
   );
 });
 
@@ -28,7 +31,7 @@ test('replaces last separator with a conjunction', () => {
   );
   assert.equal(
     tag`I like ${['apple', 'banana', 'a fruit that has "," in the name']}`,
-  , 'I like apple, banana and a fruit that has "," in the name');
+    'I like apple, banana and a fruit that has "," in the name');
 });
 
 test('does not use a conjunction if there is only one item in an array', () => {
@@ -102,3 +105,5 @@ test('does not introduce excess newlines', () => {
     'My friends are always\n\n  dramatic\n  emotional\n  needy',
   );
 });
+
+test.run();

src/inlineArrayTransformer/inlineArrayTransformer.test.js

@@ -1,5 +1,14 @@
-import inlineLists from './inlineLists';
-import { readFromFixture } from '../testUtils';
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+
+/* Recreate __dirname */
+import path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+import { inlineLists } from './inlineLists.js';
+import { readFromFixture } from '../testUtils/index.js';
 
 const val = 'amaze';
 
@@ -12,3 +21,5 @@ test('includes arrays as space-separated list', () => {
   `;
   assert.equal(actual, expected);
 });
+
+test.run();

src/inlineLists/inlineLists.test.js

@@ -1,5 +1,14 @@
-import oneLine from './oneLine';
-import { readFromFixture } from '../testUtils';
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+
+/* Recreate __dirname */
+import path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+import { oneLine } from './oneLine.js';
+import { readFromFixture } from '../testUtils/index.js';
 
 const val = 'amaze';
 
@@ -34,3 +43,5 @@ test('preserves whitespace within input lines, replacing only newlines', () => {
   `;
   assert.equal(actual, expected);
 });
+
+test.run()

src/oneLine/oneLine.test.js

@@ -1,5 +1,14 @@
-import oneLineCommaLists from './oneLineCommaLists';
-import { readFromFixture } from '../testUtils';
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+
+/* Recreate __dirname */
+import path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+import { oneLineCommaLists } from './oneLineCommaLists.js';
+import { readFromFixture } from '../testUtils/index.js';
 
 const val = 'amaze';
 
@@ -12,3 +21,5 @@ test('includes arrays as comma-separated list on one line', () => {
   `;
   assert.equal(actual, expected);
 });
+
+test.run();

src/oneLineCommaLists/oneLineCommaLists.test.js

@@ -1,5 +1,14 @@
-import oneLineCommaListsAnd from './oneLineCommaListsAnd';
-import { readFromFixture } from '../testUtils';
+import { test } from 'uvu';
+import * as assert from 'uvu/assert';
+
+/* Recreate __dirname */
+import path from 'path';
+import { fileURLToPath } from 'url';
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+import { oneLineCommaListsAnd } from './oneLineCommaListsAnd.js';
+import { readFromFixture } from '../testUtils/index.js';
 
 const val = 'amaze';
 
@@ -25,3 +34,5 @@ test('only returns the first item of a single element array', () => {
   `;
   assert.equal(actual, expected);
 });
+
+test.run();