@idio/frontend - npm Package Compare versions

Comparing version 1.3.0 to 1.4.0

build/index.js

@@ -1,8 +0,6 @@
-const { collect } = require('catchment');
-const { Replaceable } = require('restream');
 let read = require('@wrote/read'); if (read && read.__esModule) read = read.default;
-const { relative, join, dirname } = require('path');
 let transpileJSX = require('@a-la/jsx'); if (transpileJSX && transpileJSX.__esModule) transpileJSX = transpileJSX.default;
 let resolveDependency = require('resolve-dependency'); if (resolveDependency && resolveDependency.__esModule) resolveDependency = resolveDependency.default;
 let exists = require('@wrote/exists'); if (exists && exists.__esModule) exists = exists.default;
+const { patchSource } = require('./lib');
 
@@ -27,5 +25,8 @@ /**
     const p = ctx.path.replace('/', '')
-    if (p == directory || p.startsWith(`${directory}/`)) {
+    if ( p == directory
+      || p.startsWith(`${directory}/`)
+      || p.startsWith('node_modules/'))
+    {
       const { path, isDir } = await resolveDependency(p)
-      if (isDir) {
+      if (isDir && !p.endsWith('/')) {
         ctx.redirect(`/${path}`)
@@ -38,7 +39,2 @@ return
       ctx.body = body
-    } else if (p.startsWith('node_modules/')) {
-      let body = await read(p)
-      body = await patch(p, body, pragma)
-      ctx.body = body
-      ctx.type = 'application/javascript'
     } else {
@@ -80,54 +76,3 @@ await next()
 
-const patchSource = async (path, source) => {
-  const replacement = async (m, pre, from) => {
-    if (/^[/.]/.test(from)) {
-      const dir = dirname(path)
-      const p = join(dir, from)
-      const { path: rd } = await resolveDependency(p)
-      const rel = relative(dir, rd)
-      const r = rel.startsWith('.') ? rel : `./${rel}`
-      return `${pre}'${r}'`
-    }
-    let [scope, name, ...paths] = from.split('/')
-    if (!scope.startsWith('@') && name) {
-      paths = [name, ...paths]
-      name = scope
-    } else {
-      name = `${scope}/${name}`
-    }
-    if (paths.length) {
-      return getNodeModule(name, paths.join('/'), pre)
-    }
-    const { module: mod } = require(`${from}/package.json`)
-    if (!mod) {
-      console.warn('[↛] Package %s does not specify module in package.json, trying src', from)
-      const d = getNodeModule(from, 'src', pre)
-      return d
-    }
-    return getNodeModule(from, mod, pre)
-  }
-  const rs = new Replaceable([
-    {
-      re: /^( *import(?:\s+[^\s,]+\s*,?)?(?:\s*{(?:[^}]+)})?\s+from\s+)['"](.+)['"]/gm,
-      replacement,
-    },
-    {
-      re: /^( *import\s+)['"](.+)['"]/gm,
-      replacement,
-    },
-  ])
-  rs.end(source)
-  const body = await collect(rs)
-  return body
-}
 
-/**
- * Returns the import statement with the path to the dependency on the file system.
- */
-const getNodeModule = (from, path, pre) => {
-  const modPath = require.resolve(`${from}/${path}`)
-  const modRel = relative('', modPath)
-  return `${pre}'/${modRel}'`
-}
-
 /* documentary types/index.xml */
@@ -134,0 +79,0 @@ /**

CHANGELOG.md

 ## 8 February 2019
 
+### 1.4.0
+
+- [feature] Resolve `node_modules` entries.
+- [feature] Resolve using FindPackageJson instead of `require.resolve` to serve linked packages.
+- [fix] Don't override local dependencies' paths.
+
+## 8 February 2019
+
 ### 1.3.0
@@ -4,0 +12,0 @@

package.json

 {
   "name": "@idio/frontend",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "The Middleware To Serve Front-End JavaScript.",
@@ -35,3 +35,7 @@ "main": "build/index.js",
     "jsx",
-    "node_modules"
+    "node_modules",
+    "browser",
+    "development",
+    "dev",
+    "middleware"
   ],
@@ -62,2 +66,3 @@ "author": "Anton <[e-mail]>",
     "catchment": "3.2.2",
+    "fpj": "1.0.0",
     "resolve-dependency": "1.0.0",
@@ -64,0 +69,0 @@ "restream": "3.5.0"

README.md

@@ -53,3 +53,3 @@ # @idio/frontend
     logger: { use: true },
-    frontend: {
+    _frontend: {
       use: true,
@@ -91,4 +91,9 @@ middlewareConstructor(_, config) {
 import Component from './Component'
+// linked node_modules are also resolved
+import { Form, Input } from '@depack/form'
 
 render(<Component test="Welcome"/>, document.body)
+render(<Form>
+  <Input placeholder="hello world"/>
+</Form>, document.body)
 ```
@@ -116,3 +121,3 @@
 
-![Chrome Example](docs/Example.gif)
+![Chrome Example](docs/Example1.gif)
 
@@ -119,0 +124,0 @@ <p align="center"><a href="#table-of-contents"><img src=".documentary/section-breaks/2.svg?sanitize=true"></a></p>

src/index.js

@@ -1,8 +0,6 @@
-import { collect } from 'catchment'
-import { Replaceable } from 'restream'
 import read from '@wrote/read'
-import { relative, join, dirname } from 'path'
 import transpileJSX from '@a-la/jsx'
 import resolveDependency from 'resolve-dependency'
 import exists from '@wrote/exists'
+import { patchSource } from './lib'
 
@@ -27,5 +25,8 @@ /**
     const p = ctx.path.replace('/', '')
-    if (p == directory || p.startsWith(`${directory}/`)) {
+    if ( p == directory
+      || p.startsWith(`${directory}/`)
+      || p.startsWith('node_modules/'))
+    {
       const { path, isDir } = await resolveDependency(p)
-      if (isDir) {
+      if (isDir && !p.endsWith('/')) {
         ctx.redirect(`/${path}`)
@@ -38,7 +39,2 @@ return
       ctx.body = body
-    } else if (p.startsWith('node_modules/')) {
-      let body = await read(p)
-      body = await patch(p, body, pragma)
-      ctx.body = body
-      ctx.type = 'application/javascript'
     } else {
@@ -80,54 +76,3 @@ await next()
 
-const patchSource = async (path, source) => {
-  const replacement = async (m, pre, from) => {
-    if (/^[/.]/.test(from)) {
-      const dir = dirname(path)
-      const p = join(dir, from)
-      const { path: rd } = await resolveDependency(p)
-      const rel = relative(dir, rd)
-      const r = rel.startsWith('.') ? rel : `./${rel}`
-      return `${pre}'${r}'`
-    }
-    let [scope, name, ...paths] = from.split('/')
-    if (!scope.startsWith('@') && name) {
-      paths = [name, ...paths]
-      name = scope
-    } else {
-      name = `${scope}/${name}`
-    }
-    if (paths.length) {
-      return getNodeModule(name, paths.join('/'), pre)
-    }
-    const { module: mod } = require(`${from}/package.json`)
-    if (!mod) {
-      console.warn('[↛] Package %s does not specify module in package.json, trying src', from)
-      const d = getNodeModule(from, 'src', pre)
-      return d
-    }
-    return getNodeModule(from, mod, pre)
-  }
-  const rs = new Replaceable([
-    {
-      re: /^( *import(?:\s+[^\s,]+\s*,?)?(?:\s*{(?:[^}]+)})?\s+from\s+)['"](.+)['"]/gm,
-      replacement,
-    },
-    {
-      re: /^( *import\s+)['"](.+)['"]/gm,
-      replacement,
-    },
-  ])
-  rs.end(source)
-  const body = await collect(rs)
-  return body
-}
 
-/**
- * Returns the import statement with the path to the dependency on the file system.
- */
-const getNodeModule = (from, path, pre) => {
-  const modPath = require.resolve(`${from}/${path}`)
-  const modRel = relative('', modPath)
-  return `${pre}'/${modRel}'`
-}
-
 /* documentary types/index.xml */
@@ -134,0 +79,0 @@ /**

New alerts

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Fixed alerts

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

19385

increased by8.07%

Number of package files

8

increased by33.33%

Lines of code

292

increased by11.45%

Number of lines in readme file

151

increased by3.42%

Number of low supply chain risk alerts

2

decreased by-50%

Worsened metrics

Dependency count

7

increased by16.67%

Number of medium supply chain risk alerts

1

increased byInfinity%

Dependency changes

• + Addedfpj@1.0.0

• + Addedfpj@1.0.0(transitive)