js-draw 0.17.4 → 0.18.0

package/.github/workflows/firebase-hosting-merge.yml

@@ -18,6 +18,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install dependencies
         run: yarn install
+      - name: Test imports
+        run: yarn dist-test
       - name: Run tests
         run: yarn test
       - name: Lint

package/.github/workflows/firebase-hosting-pull-request.yml

@@ -19,6 +19,8 @@ jobs:
       - uses: actions/checkout@v3
       - name: Install dependencies
         run: yarn install
+      - name: Test imports
+        run: yarn dist-test
       - name: Run tests
         run: yarn test
       - name: Lint

package/.github/workflows/github-pages.yml

@@ -34,6 +34,8 @@ jobs:
         uses: actions/checkout@v3
       - name: Install dependencies
         run: yarn install
+      - name: Test imports
+        run: yarn dist-test
       - name: Run tests
         run: yarn test
       - name: Lint

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.18.0
+ * Publish both CommonJS and ES Modules
+ * Fix ES module imports.
+
 # 0.17.4
  * Fix `CanvasRenderer` and `SVGRenderer` not exported.
  * Fix pasting images copied from js-draw into some external apps.

package/build_tools/postDist.ts

@@ -0,0 +1,71 @@
+
+import { readdir, stat, rename, readFile, writeFile, unlink } from 'fs/promises';
+import path from 'path';
+
+// Script to be run after building JavaScript files from TypeScript.
+// TODO: This is very hacky.
+// TODO: [Use the TypeScript Compiler API instead.](https://github.com/microsoft/TypeScript/wiki/Using-the-Compiler-API)
+
+// Iterates over every JavaScript file in [directory].
+const forEachFile = async (directory: string, processFile: (filePath: string)=>Promise<void>) => {
+	const files = await readdir(directory);
+
+	await Promise.all(files.map(async (file) => {
+		const filePath = path.join(directory, file);
+		const stats = await stat(filePath);
+
+		if (stats.isDirectory()) {
+			await forEachFile(filePath, processFile);
+		} else if (stats.isFile()) {
+			await processFile(filePath);
+		} else {
+			throw new Error('Unknown file type!');
+		}
+	}));
+};
+
+const removeFiles = async (directory: string, filePattern: RegExp) => {
+	await forEachFile(directory, async (filePath: string) => {
+		if (!filePath.match(filePattern)) {
+			return;
+		}
+
+		await unlink(filePath);
+	});
+};
+
+const main = async () => {
+	const rootDir = path.dirname(__dirname);
+	const cjsPath = `${rootDir}/dist/cjs`;
+	const mjsPath = `${rootDir}/dist/mjs`;
+
+	const testPattern = /\.test\.js$/;
+	await removeFiles(cjsPath, testPattern);
+	await removeFiles(mjsPath, testPattern);
+
+	// We need to replace imports in ESM files.
+	await forEachFile(mjsPath, async (filePath: string) => {
+		if (!filePath.endsWith('.js')) {
+			return;
+		}
+
+		// Rename
+		const newPath = filePath.replace(/\.js$/, '.mjs');
+		await rename(filePath, newPath);
+
+		// Change imports from
+		//   import foo from './bar'
+		// to
+		//   import foo from './bar.mjs'
+		// and exports similarly.
+		let contents = await readFile(newPath, { encoding: 'utf-8' });
+
+		// TODO: Switch to using the TypeScript compiler API. This has the danger of changing imports
+		// in multi-line strings.
+		contents = contents.replace(/([\n]|^)(import|export)(.*)from\s+(['"])(\.*\/[^\n]+)(['"])/g, '$1$2 $3 from $4$5.mjs$6');
+
+		await writeFile(newPath, contents);
+	});
+};
+
+main();