wirejs-scripts 1.0.3 → 2.0.1

package/bin.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 const process = require('process');
 const child_process = require('child_process');
@@ -6,7 +6,6 @@ const rimraf = require('rimraf');
 const fs = require('fs');
 const path = require('path');
 
-const exgratia = require('ex-gratia');
 const webpack = require('webpack');
 const webpackConfigure = require('./configs/webpack.config');
 const WebpackDevServer = require('webpack-dev-server');
@@ -45,7 +44,6 @@ async function compile(watch = false) {
 					directory: path.join(CWD, 'dist')
 				},
 				open: true,
-				port: 9999,
 			}, compiler);
 
 			console.log('Starting server...');

package/configs/webpack.config.js

@@ -5,7 +5,6 @@ const { exec } = require('child_process');
 const process = require('process');
 const CopyWebpackPlugin = require('copy-webpack-plugin');
 const marked = require('marked');
-const { JSDOM } = require('jsdom');
 
 const CWD = process.cwd();
 
@@ -55,43 +54,6 @@ const CollectLayouts = {
 	}
 };
 
-async function mermaid(text) {
-	const tempbase = path.join(
-		__dirname,
-		`__mermaid_temp_${new Date().getTime()}`
-	);
-	const tempInput = `${tempbase}.txt`;
-	const tempOutput = `${tempbase}.svg`;
-	const pConfigPath = path.join(
-		__dirname,
-		'puppeteer-config.json'
-	);
-
-	console.log(`writing ${tempInput} ...`);
-	fs.writeFileSync(tempInput, text);
-
-	await new Promise((resolve, reject) => {
-		const cmd = `npm exec mmdc -- -i "${tempInput}" -o "${tempOutput}" -b transparent -p "${pConfigPath}"`;
-		console.log(`executing ${cmd} ...`);
-		exec(cmd, {cwd: __dirname}, (err, stdout, stderr) => {
-			if (err || stderr) {
-				console.log('failed', {err, stdout, stderr});
-				reject(err);
-			} else {
-				console.log('succeeded', stdout);
-				resolve();
-			}
-		});
-	});
-	console.log(`mermaid CLI done generating ${tempOutput}`);
-
-	const svg = fs.readFileSync(tempOutput);
-	fs.unlinkSync(tempInput)
-	fs.unlinkSync(tempOutput);
-
-	return svg;
-};
-
 const SSG = {
 	transformer: async (content, _path) => {
 		let _meta = {};
@@ -120,23 +82,7 @@ const SSG = {
 					.replace(/(``+)/g, m => Array(m.length).fill('\\`').join(''))
 				;
 				const bodyMarkdown = eval('`' + escapedMarkdown + '`');
-				const prebody = marked(bodyMarkdown);
-				const { window } = new JSDOM(prebody, { querySelectorAll: true });
-
-				if (window && window.document && window.document.body) {
-					await Promise.all(
-						[...window.document.body
-							.querySelectorAll('.language-mermaid')
-						].map(async mdNode => {
-							const svg = await mermaid(mdNode.textContent);
-							mdNode.parentNode.innerHTML = svg;
-						})
-					);
-					body = window.document.body.innerHTML;
-				} else {
-					body = prebody;
-				}
-
+				body = marked(bodyMarkdown);
 			} else {
 				body = eval('`' + content + '`');
 			}
@@ -338,6 +284,11 @@ module.exports = (env, argv) => {
 						fullySpecified: false
 					}
 				},
+				{
+					test: /\.md$/,
+					use: "raw-loader",
+					// use: path.resolve(__dirname, '../node_modules/raw-loader')
+				},
 				{
 					test: /\.tpl$/,
 					use: "raw-loader",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wirejs-scripts",
-  "version": "1.0.3",
+  "version": "2.0.1",
   "description": "Basic build and start commands for wirejs apps",
   "bin": {
     "wirejs-scripts": "./bin.js"
@@ -16,12 +16,10 @@
   },
   "homepage": "https://github.com/svidgen/wirejs-scripts#readme",
   "dependencies": {
-    "@mermaid-js/mermaid-cli": "^9.0.0",
     "copy-webpack-plugin": "^10.2.4",
     "css-loader": "^5.2.0",
     "file-loader": "^6.2.0",
     "glob": "^7.2.0",
-    "jsdom": "^16.5.2",
     "marked": "^2.0.1",
     "raw-loader": "^4.0.2",
     "rimraf": "^3.0.2",
@@ -29,7 +27,6 @@
     "webpack": "^5.28.0",
     "webpack-cli": "^4.6.0",
     "webpack-dev-server": "^4.8.1",
-    "ex-gratia": "^1.0.3",
     "highlight.js": "^11.1.0",
     "wirejs-dom": "^1.0.4"
   }

package/configs/puppeteer-config.json

@@ -1,3 +0,0 @@
-{
-	"args": ["--no-sandbox"]
-}