@ossy/app 1.0.7 → 1.0.9

package/cli/build.js

@@ -12,11 +12,10 @@ import copy from 'rollup-plugin-copy';
 import replace from '@rollup/plugin-replace';
 import arg from 'arg'
 import { ensureBuildStubs } from '../scripts/ensure-build-stubs.mjs'
-import { createRequire } from 'node:module'
 
-const PAGE_FILE_PATTERN = /\.page\.(jsx?|tsx?)$/
-const API_FILE_PATTERN = /\.api\.(mjs|cjs|js)$/
-const TASK_FILE_PATTERN = /\.task\.(mjs|cjs|js)$/
+export const PAGE_FILE_PATTERN = /\.page\.(jsx?|tsx?)$/
+export const API_FILE_PATTERN = /\.api\.(mjs|cjs|js)$/
+export const TASK_FILE_PATTERN = /\.task\.(mjs|cjs|js)$/
 const RESOURCE_TEMPLATE_FILE_PATTERN = /\.resource\.js$/
 
 /** Written next to `*.resource.js` under `src/resource-templates/` when that dir exists. */
@@ -153,7 +152,6 @@ export function createOssyRollupPlugins ({
   middlewareSourcePath,
   configSourcePath,
   nodeEnv,
-  nodeExternals: useNodeExternals = false,
   preferBuiltins = true,
   copyPublicFrom,
   buildPath,
@@ -185,16 +183,16 @@ export function createOssyRollupPlugins ({
     }),
     json(),
   ]
-  if (useNodeExternals) {
-    plugins.push(
-      nodeExternals({
-        deps: true,
-        devDeps: false,
-        peerDeps: true,
-        packagePath: path.join(process.cwd(), 'package.json'),
-      })
-    )
-  }
+
+  plugins.push(
+    nodeExternals({
+      deps: true,
+      devDeps: false,
+      peerDeps: true,
+      packagePath: path.join(process.cwd(), 'package.json'),
+    })
+  )
+
   plugins.push(
     resolveCommonJsDependencies(),
     resolveDependencies({ preferBuiltins }),
@@ -214,25 +212,10 @@ export function createOssyRollupPlugins ({
   return plugins
 }
 
-export function discoverApiFiles(srcDir) {
-  const dir = path.resolve(srcDir)
-  if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) {
-    return []
-  }
-  const files = []
-  const walk = (d) => {
-    const entries = fs.readdirSync(d, { withFileTypes: true })
-    for (const e of entries) {
-      const full = path.join(d, e.name)
-      if (e.isDirectory()) walk(full)
-      else if (API_FILE_PATTERN.test(e.name)) files.push(full)
-    }
-  }
-  walk(dir)
-  return files.sort()
-}
-
-export function discoverTaskFiles(srcDir) {
+/**
+ * Recursively lists files under `srcDir` whose basename matches `filePattern` (e.g. `/\.api\.js$/`).
+ */
+export function discoverFilesByPattern (srcDir, filePattern) {
   const dir = path.resolve(srcDir)
   if (!fs.existsSync(dir) || !fs.statSync(dir).isDirectory()) {
     return []
@@ -243,7 +226,7 @@ export function discoverTaskFiles(srcDir) {
     for (const e of entries) {
       const full = path.join(d, e.name)
       if (e.isDirectory()) walk(full)
-      else if (TASK_FILE_PATTERN.test(e.name)) files.push(full)
+      else if (filePattern.test(e.name)) files.push(full)
     }
   }
   walk(dir)
@@ -295,7 +278,7 @@ export function generateApiModule ({ generatedPath, apiFiles }) {
 export function resolveApiSource ({ srcDir, buildPath }) {
   ensureOssyGeneratedDir(buildPath)
   const generatedPath = path.join(ossyGeneratedDir(buildPath), OSSY_GEN_API_BASENAME)
-  const apiFiles = discoverApiFiles(srcDir)
+  const apiFiles = discoverFilesByPattern(srcDir, API_FILE_PATTERN)
   fs.writeFileSync(
     generatedPath,
     generateApiModule({ generatedPath, apiFiles })
@@ -344,7 +327,7 @@ export function resolveTaskSource ({ srcDir, scriptDir, buildPath }) {
   ensureOssyGeneratedDir(buildPath)
   const generatedPath = path.join(ossyGeneratedDir(buildPath), OSSY_GEN_TASKS_BASENAME)
 
-  const taskFiles = discoverTaskFiles(srcDir)
+  const taskFiles = discoverFilesByPattern(srcDir, TASK_FILE_PATTERN)
   if (taskFiles.length > 0) {
     fs.writeFileSync(
       generatedPath,
@@ -359,23 +342,6 @@ export function resolveTaskSource ({ srcDir, scriptDir, buildPath }) {
   return { taskSourcePath: defaultStub, taskOverviewFiles: [], usedGenerated: false }
 }
 
-export function discoverPageFiles(srcDir) {
-  if (!fs.existsSync(srcDir) || !fs.statSync(srcDir).isDirectory()) {
-    return []
-  }
-  const files = []
-  const walk = (d) => {
-    const entries = fs.readdirSync(d, { withFileTypes: true })
-    for (const e of entries) {
-      const full = path.join(d, e.name)
-      if (e.isDirectory()) walk(full)
-      else if (PAGE_FILE_PATTERN.test(e.name)) files.push(full)
-    }
-  }
-  walk(srcDir)
-  return files.sort()
-}
-
 export function filePathToRoute(filePath, srcDir) {
   const rel = path.relative(srcDir, filePath).replace(/\\/g, '/')
   let pathPart = rel.replace(PAGE_FILE_PATTERN, '').replace(/\/index$/, '').replace(/\/home$/, '') || 'home'
@@ -511,65 +477,6 @@ export function generatePagesModule (pageFiles, srcDir, generatedPath) {
   return lines.join('\n')
 }
 
-export async function discoverModulePageFiles({ configPath }) {
-  if (!configPath || !fs.existsSync(configPath)) return []
-  try {
-    // Try a cheap static parse first so we don't depend on the config file being
-    // importable (configs often import theme/template modules that may not be
-    // resolvable in the build-time node context).
-    const cfgSource = fs.readFileSync(configPath, 'utf8')
-    const modules = []
-
-    // pagesModules: ['a', "b"]
-    const arrMatch = cfgSource.match(/pagesModules\s*:\s*\[([^\]]*)\]/m)
-    if (arrMatch?.[1]) {
-      const body = arrMatch[1]
-      const re = /['"]([^'"]+)['"]/g
-      let m
-      while ((m = re.exec(body)) !== null) modules.push(m[1])
-    }
-
-    // pagesModule: 'a'
-    if (modules.length === 0) {
-      const singleMatch = cfgSource.match(/pagesModule\s*:\s*['"]([^'"]+)['"]/m)
-      if (singleMatch?.[1]) modules.push(singleMatch[1])
-    }
-
-    if (modules.length) {
-      const req = createRequire(path.resolve(process.cwd(), 'package.json'))
-      const files = []
-      for (const name of modules) {
-        const pkgJsonPath = req.resolve(`${name}/package.json`)
-        const pkgDir = path.dirname(pkgJsonPath)
-        const modulePagesDir = path.join(pkgDir, 'src', 'pages')
-        files.push(...discoverPageFiles(modulePagesDir))
-      }
-      return files
-    }
-
-    const mod = await import(url.pathToFileURL(configPath))
-    const cfg = mod?.default ?? mod ?? {}
-    const modules2 = Array.isArray(cfg.pagesModules)
-      ? cfg.pagesModules
-      : (typeof cfg.pagesModule === 'string' ? [cfg.pagesModule] : [])
-
-    if (!modules2.length) return []
-
-    const req = createRequire(path.resolve(process.cwd(), 'package.json'))
-    const files = []
-    for (const name of modules2) {
-      const pkgJsonPath = req.resolve(`${name}/package.json`)
-      const pkgDir = path.dirname(pkgJsonPath)
-      const modulePagesDir = path.join(pkgDir, 'src', 'pages')
-      files.push(...discoverPageFiles(modulePagesDir))
-    }
-    return files
-  } catch (e) {
-    console.warn('[@ossy/app][build] pagesModules config could not be loaded; continuing without modules')
-    return []
-  }
-}
-
 export function parsePagesFromSource(filePath) {
   try {
     const content = fs.readFileSync(filePath, 'utf8')
@@ -666,8 +573,7 @@ export const build = async (cliArgs) => {
     const buildPath = path.resolve('build')
     const srcDir = path.resolve('src')
     const configPath = path.resolve(options['--config'] || 'src/config.js');
-    const pageFiles = discoverPageFiles(srcDir)
-    const modulePageFiles = await discoverModulePageFiles({ configPath })
+    const pageFiles = discoverFilesByPattern(srcDir, PAGE_FILE_PATTERN)
 
     resetOssyBuildDir(buildPath)
 
@@ -675,14 +581,13 @@ export const build = async (cliArgs) => {
 
     const pagesGeneratedPath = path.join(ossyGeneratedDir(buildPath), OSSY_GEN_PAGES_BASENAME)
 
-    const allPageFiles = [...pageFiles, ...modulePageFiles]
     fs.writeFileSync(
       pagesGeneratedPath,
-      generatePagesModule(allPageFiles, srcDir, pagesGeneratedPath)
+      generatePagesModule(pageFiles, srcDir, pagesGeneratedPath)
     )
     const ossyDir = ossyGeneratedDir(buildPath)
-    writePageHydrateStubs(allPageFiles, srcDir, ossyDir)
-    const clientHydrateInput = buildClientHydrateInput(allPageFiles, srcDir, ossyDir)
+    writePageHydrateStubs(pageFiles, srcDir, ossyDir)
+    const clientHydrateInput = buildClientHydrateInput(pageFiles, srcDir, ossyDir)
 
     const {
       apiSourcePath: resolvedApi,
@@ -724,7 +629,6 @@ export const build = async (cliArgs) => {
 
     const serverPlugins = createOssyRollupPlugins({
       ...sharedPluginOpts,
-      nodeExternals: true,
       preferBuiltins: true,
       copyPublicFrom: publicDir,
     })
@@ -747,7 +651,6 @@ export const build = async (cliArgs) => {
 
     const clientPlugins = createOssyRollupPlugins({
       ...sharedPluginOpts,
-      nodeExternals: false,
       preferBuiltins: false,
     })
 

package/cli/dev.js

@@ -3,9 +3,9 @@ import url from 'url';
 import fs from 'fs';
 import {
   printBuildOverview,
-  discoverPageFiles,
+  discoverFilesByPattern,
+  PAGE_FILE_PATTERN,
   generatePagesModule,
-  discoverModulePageFiles,
   resolveApiSource,
   resetOssyBuildDir,
   createOssyRollupPlugins,
@@ -37,23 +37,21 @@ export const dev = async (cliArgs) => {
     const buildPath = path.resolve('build')
     const srcDir = path.resolve('src')
     const configPath = path.resolve(options['--config'] || 'src/config.js');
-    const pageFiles = discoverPageFiles(srcDir)
-    const modulePageFiles = await discoverModulePageFiles({ configPath })
+    const pageFiles = discoverFilesByPattern(srcDir, PAGE_FILE_PATTERN)
 
     resetOssyBuildDir(buildPath)
 
     writeResourceTemplatesBarrelIfPresent({ cwd: process.cwd(), log: true })
 
-    const allPageFiles = [...pageFiles, ...modulePageFiles]
     const pagesGeneratedPath = path.join(ossyGeneratedDir(buildPath), OSSY_GEN_PAGES_BASENAME)
     fs.writeFileSync(
       pagesGeneratedPath,
-      generatePagesModule(allPageFiles, srcDir, pagesGeneratedPath)
+      generatePagesModule(pageFiles, srcDir, pagesGeneratedPath)
     )
     const effectivePagesSource = pagesGeneratedPath
     const ossyDir = ossyGeneratedDir(buildPath)
-    writePageHydrateStubs(allPageFiles, srcDir, ossyDir)
-    const clientHydrateInput = buildClientHydrateInput(allPageFiles, srcDir, ossyDir)
+    writePageHydrateStubs(pageFiles, srcDir, ossyDir)
+    const clientHydrateInput = buildClientHydrateInput(pageFiles, srcDir, ossyDir)
 
     const {
       apiSourcePath: resolvedApi,
@@ -95,14 +93,12 @@ export const dev = async (cliArgs) => {
 
     const serverPlugins = createOssyRollupPlugins({
       ...sharedPluginOpts,
-      nodeExternals: true,
       preferBuiltins: true,
       copyPublicFrom: publicDir,
     })
 
     const clientPlugins = createOssyRollupPlugins({
       ...sharedPluginOpts,
-      nodeExternals: false,
       preferBuiltins: false,
     })
 
@@ -219,13 +215,13 @@ export const dev = async (cliArgs) => {
     fs.watch(srcDir, { recursive: true }, (eventType, filename) => {
       if (!filename) return
       if (/\.page\.(jsx?|tsx?)$/.test(filename)) {
-        const combined = [...discoverPageFiles(srcDir), ...modulePageFiles]
+        const refreshedPageFiles = discoverFilesByPattern(srcDir, PAGE_FILE_PATTERN)
         const regenPath = path.join(ossyGeneratedDir(buildPath), OSSY_GEN_PAGES_BASENAME)
-        fs.writeFileSync(regenPath, generatePagesModule(combined, srcDir, regenPath))
-        writePageHydrateStubs(combined, srcDir, ossyDir)
+        fs.writeFileSync(regenPath, generatePagesModule(refreshedPageFiles, srcDir, regenPath))
+        writePageHydrateStubs(refreshedPageFiles, srcDir, ossyDir)
         if (typeof watcher?.invalidate === 'function') {
           watcher.invalidate(regenPath)
-          for (const f of combined) {
+          for (const f of refreshedPageFiles) {
             const hid = clientHydrateIdForPage(f, srcDir)
             watcher.invalidate(path.join(ossyDir, `hydrate-${hid}.jsx`))
           }

package/cli/index.js

@@ -0,0 +1,30 @@
+#!/usr/bin/env node
+import { build } from './build.js'
+import { dev } from './dev.js'
+
+const [,, command, ...restArgs] = process.argv
+
+if (!command) {
+  console.error(
+    '[@ossy/app] No command provided. Usage: app dev | build'
+  )
+  process.exit(1)
+}
+
+const run = async () => {
+  if (command === 'dev') {
+    await dev(restArgs)
+    return
+  }
+  if (command === 'build') {
+    await build(restArgs)
+    return
+  }
+  console.error(`[@ossy/app] Unknown command: ${command}`)
+  process.exit(1)
+}
+
+run().catch((err) => {
+  console.error(err)
+  process.exit(1)
+})

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@ossy/app",
-  "version": "1.0.7",
+  "version": "1.0.9",
   "description": "",
   "source": "./src/index.js",
   "main": "./src/index.js",
   "type": "module",
+  "bin": {
+    "app": "./cli/index.js"
+  },
   "scripts": {
     "build": "echo Building not required",
     "test": "node --experimental-vm-modules ../node_modules/jest/bin/jest.js --verbose",
@@ -24,14 +27,14 @@
     "@babel/eslint-parser": "^7.15.8",
     "@babel/preset-react": "^7.26.3",
     "@babel/register": "^7.25.9",
-    "@ossy/connected-components": "^1.0.7",
-    "@ossy/design-system": "^1.0.7",
-    "@ossy/pages": "^1.0.7",
-    "@ossy/router": "^1.0.7",
-    "@ossy/router-react": "^1.0.7",
-    "@ossy/sdk": "^1.0.7",
-    "@ossy/sdk-react": "^1.0.7",
-    "@ossy/themes": "^1.0.7",
+    "@ossy/connected-components": "^1.0.9",
+    "@ossy/design-system": "^1.0.9",
+    "@ossy/pages": "^1.0.9",
+    "@ossy/router": "^1.0.9",
+    "@ossy/router-react": "^1.0.9",
+    "@ossy/sdk": "^1.0.9",
+    "@ossy/sdk-react": "^1.0.9",
+    "@ossy/themes": "^1.0.9",
     "@rollup/plugin-alias": "^6.0.0",
     "@rollup/plugin-babel": "6.1.0",
     "@rollup/plugin-commonjs": "^29.0.0",
@@ -64,5 +67,5 @@
     "README.md",
     "tsconfig.json"
   ],
-  "gitHead": "70b3f02434c86812a9ddd58f6b062667650949c2"
+  "gitHead": "c9da4864730c693fe18339f0920a0802ce9c8ebf"
 }