Add fonts and fix resolveLoader configuration in Webpack (#58)

* v0.1.5

* Format code

* Fixes modules resolving configuration in Webpack

* Fixes resolveLoader configuration in Webpack

* v0.1.7

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posttext/build",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "description": "The next generation markup language for everyone!",
   "keywords": [
     "text",
@@ -31,7 +31,7 @@
     "coverage": "cross-env NODE_OPTIONS=--experimental-vm-modules jest --coverage",
     "add-license": "node scripts/add-license -f templates/Exhibit-A.ts packages/*/src/**/*.{ts,js} packages/*/*.{ts,js} *.{ts,js}",
     "publish-all": "pnpm build && pnpm test && pnpm m --filter ./packages publish --access public --tag beta",
-    "bump-version": "node scripts/bump-version.js && pnpm format"
+    "bump-version": "node scripts/bump-version.js"
   },
   "devDependencies": {
     "@types/jest": "^26.0.23",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posttext/cli",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "description": "The Posttext CLI",
   "type": "module",
   "main": "index.js",
@@ -43,7 +43,7 @@
     "boxen": "^5.0.1",
     "chalk": "^4.1.1",
     "chokidar": "^3.5.2",
-    "find-up": "^5.0.0",
+    "find-up": "^6.2.0",
     "fs-extra": "^10.0.0",
     "koa": "^2.13.1",
     "koa-static": "^5.0.0",

packages/cli/src/compile.ts

@@ -5,7 +5,7 @@
 import fs from 'fs-extra'
 import url from 'url'
 import path from 'path'
-import findUp from 'find-up'
+import { findUpMultiple } from 'find-up'
 import { Compiler } from '@posttext/compiler'
 import { importMeta, StdModule } from '@posttext/modules'
 import { getInterpreters } from '@posttext/interpreters/web'
@@ -30,10 +30,13 @@ export class CompileCommand implements Command {
 
     const compiler = Compiler.create()
 
-    const pathToNodeModules = await findUp('node_modules', {
-      cwd: url.fileURLToPath(importMeta.url),
-      type: 'directory',
-    })
+    const pathsToNodeModules = await findUpMultiple(
+      'node_modules',
+      {
+        cwd: url.fileURLToPath(importMeta.url),
+        type: 'directory',
+      }
+    )
 
     compiler
       .getPrinter()
@@ -58,7 +61,7 @@ export class CompileCommand implements Command {
               path.dirname(url.fileURLToPath(import.meta.url)),
               '../node_modules'
             ),
-            ...(pathToNodeModules ? [pathToNodeModules] : []),
+            ...(pathsToNodeModules ? pathsToNodeModules : []),
           ],
         },
       })

packages/cli/src/serve.ts

@@ -10,7 +10,7 @@ import path from 'path'
 import serve from 'koa-static'
 import boxen from 'boxen'
 import chalk from 'chalk'
-import findUp from 'find-up'
+import { findUpMultiple } from 'find-up'
 import Router from '@koa/router'
 import chokidar from 'chokidar'
 import url from 'url'
@@ -119,10 +119,13 @@ export class ServeCommand implements Command {
   ): Promise<void> {
     await fs.ensureDir(outputPath)
 
-    const pathToNodeModules = await findUp('node_modules', {
-      cwd: url.fileURLToPath(importMeta.url),
-      type: 'directory',
-    })
+    const pathsToNodeModules = await findUpMultiple(
+      'node_modules',
+      {
+        cwd: url.fileURLToPath(importMeta.url),
+        type: 'directory',
+      }
+    )
 
     const interpreters = getInterpreters({
       output: outputPath,
@@ -144,7 +147,7 @@ export class ServeCommand implements Command {
       ],
       mode: 'development',
       resolve: {
-        modules: pathToNodeModules ? [pathToNodeModules] : [],
+        modules: pathsToNodeModules ? pathsToNodeModules : [],
       },
     })
 

packages/compiler/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posttext/compiler",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "description": "The compiler for Posttext",
   "type": "module",
   "main": "index.js",

packages/interpreters/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posttext/interpreters",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "description": "The backend interpreters for Posttext",
   "main": "index.js",
   "type": "module",
@@ -39,7 +39,7 @@
     "@posttext/parser": "workspace:*",
     "@posttext/registry": "workspace:*",
     "css-loader": "^5.2.6",
-    "find-up": "^5.0.0",
+    "find-up": "^6.2.0",
     "fs-extra": "^10.0.0",
     "handlebars": "^4.7.7",
     "memoizee": "^0.4.15",

packages/interpreters/src/web/interpreters.ts

@@ -5,7 +5,7 @@
 import fs from 'fs-extra'
 import url from 'url'
 import path from 'path'
-import findUp from 'find-up'
+import { findUpMultiple } from 'find-up'
 import webpack from 'webpack'
 import prettier from 'prettier'
 import MiniCssExtractPlugin from 'mini-css-extract-plugin'
@@ -198,10 +198,13 @@ export const getInterpreters = ({
           .map((dep) => dep.src)
           .concat(externalCssDeps) as string[]
 
-        const pathToNodeModules = await findUp('node_modules', {
-          cwd: url.fileURLToPath(import.meta.url),
-          type: 'directory',
-        })
+        const pathsToNodeModules = await findUpMultiple(
+          'node_modules',
+          {
+            cwd: url.fileURLToPath(import.meta.url),
+            type: 'directory',
+          }
+        )
 
         if (jsDeps.length + cssDeps.length > 0) {
           const compiler = webpack({
@@ -238,17 +241,17 @@ export const getInterpreters = ({
             },
             resolve: {
               modules: [
-                ...(pathToNodeModules
-                  ? [pathToNodeModules]
+                ...(pathsToNodeModules
+                  ? pathsToNodeModules
                   : []),
                 ...new Set(resolve?.modules),
               ],
               extensions: ['.ts', '.tsx', '.js', '.css'],
             },
             resolveLoader: {
               modules: [
-                ...(pathToNodeModules
-                  ? [pathToNodeModules]
+                ...(pathsToNodeModules
+                  ? pathsToNodeModules
                   : []),
               ],
             },

packages/modules/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posttext/modules",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "description": "The official modules for Posttext",
   "type": "module",
   "main": "index.js",

packages/parser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posttext/parser",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "description": "The parser for Posttext",
   "type": "module",
   "main": "index.js",

packages/printer/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posttext/printer",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "description": "The printer for Posttext",
   "type": "module",
   "main": "./lib/index.js",

packages/ptlib/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posttext/ptlib",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "description": "Utility library for Posttext modules",
   "type": "module",
   "main": "index.js",

packages/registry/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@posttext/registry",
-  "version": "0.1.4",
+  "version": "0.1.7",
   "description": "The library for registering modules in Posttext",
   "type": "module",
   "main": "index.js",