@ossy/cli 0.0.3-alpha → 0.0.4

package/README.md

@@ -1,6 +1,21 @@
 # @ossy/cli
 
-Command line tool that makes it easier to interact with our APIs
+Command line tool that makes it easier to interact with our services
+
+## App
+
+### build
+
+Builds a production version of the app
+```
+npx @ossy/cli app build
+```
+
+### serve
+Serves the app
+```
+npx @ossy/cli app serve
+```
 
 ## Cms
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/cli",
-  "version": "0.0.3-alpha",
+  "version": "0.0.4",
   "description": "Command line tool that makes it easier to interact with our APIs",
   "source": "./src/index.js",
   "main": "./src/index.js",

package/src/app/build.js

@@ -0,0 +1,95 @@
+import path from 'path';
+import fs from 'fs';
+import { rollup } from 'rollup';
+import babel from '@rollup/plugin-babel';
+import { nodeResolve as resolveDependencies } from '@rollup/plugin-node-resolve'
+import resolveCommonJsDependencies from '@rollup/plugin-commonjs'
+import removeOwnPeerDependencies from 'rollup-plugin-peer-deps-external'
+import minifyJS from '@rollup/plugin-terser'
+// import typescript from '@rollup/plugin-typescript'
+import preserveDirectives from "rollup-plugin-preserve-directives"
+import json from "@rollup/plugin-json"
+import copy from 'rollup-plugin-copy';
+import replace from '@rollup/plugin-replace';
+import remove from 'rollup-plugin-delete';
+
+// export const build = async ({
+//     source = 'src/index.jsx',
+//     destination = 'build',
+// }) => {
+//     console.log('[@ossy/app][Build] Starting build...')
+    
+//     const sourcePath = path.resolve(source);
+//     const destinationDir = path.resolve(destination);
+
+//     if (!fs.existsSync(sourcePath)) {
+//         throw new Error(`[@ossy/app][Build] Source path does not exist: ${sourcePath}`);
+//     }
+
+//     const sourceData = fs.readFileSync(sourcePath, 'utf8');
+
+//     fs.mkdirSync(destinationDir, { recursive: true });
+//     fs.writeFileSync(path.join(destinationDir, 'index.js'), sourceData, { encoding: 'utf8', flag: 'w' });
+
+//     console.log('[@ossy/app][Build] Build finished')
+// }
+
+
+
+// Build folder structure
+// build/server.js (provided by script)
+// build/pages.js (manifest of pages and their entry points)
+// build/<page-id>.page.js (for each page)
+// build/static/index.js
+// build/static/*.js
+
+
+export const build = async ({
+    source = 'src/App.jsx',
+    destination = 'build',
+} = {}) => {
+    console.log('[@ossy/cli][app][build] Starting...')
+    
+    const sourcePath = path.resolve(source);
+    const buildPath = path.resolve(destination);
+
+    if (!fs.existsSync(sourcePath)) {
+        throw new Error(`[@ossy/cli][app][build] Source path does not exist: ${sourcePath}`);
+    }
+
+    const inputOptions = {
+        input: sourcePath,
+        plugins: [
+            remove({ targets: buildPath }),
+            replace({ 'process.env.NODE_ENV': JSON.stringify('production') }),
+            json(),
+            removeOwnPeerDependencies(),
+            resolveCommonJsDependencies(),
+            resolveDependencies({ preferBuiltins: true }),
+            babel({
+              babelHelpers: 'bundled',
+              exclude: ['**/node_modules/**/*'],
+              presets: ['@babel/preset-env', '@babel/preset-react']
+            }),
+            preserveDirectives(),
+            minifyJS(),
+        ],
+    };
+
+    const outputOptions = [
+        {
+            dir: 'build',
+            entryFileNames: ({ name }) => name === 'server'  ? '[name].js' : 'static/[name].js',
+            chunkFileNames: 'static/[name]-[hash].js',
+            format: 'esm',
+        }
+    ];
+
+    const bundle = await rollup(inputOptions);
+
+    for (const options of outputOptions) {
+        await bundle.write(options);
+    }
+
+    console.log('[@ossy/cli][app][build] Finished');
+};

package/src/app/cli.js

@@ -0,0 +1,22 @@
+#!/usr/bin/env node
+
+const [_, __, handlerName, ...restArgs] = process.argv
+import { build } from './cli/build.js'
+
+export const handler = ([command, ...options]) => {
+
+    if (!command) {
+        logError({ message: '[@ossy/cli][app] No command provided' })
+    }
+
+    const commandHandler = {
+        'build': build,
+    }[command]
+
+    if (!commandHandler) {
+        logError({ message: `[@ossy/cli][app] Unknown command: ${command}` })
+    }
+
+    commandHandler(options)
+
+}

package/src/cms/cli.js

@@ -3,16 +3,11 @@ import { resolve } from 'path'
 import { readFileSync } from 'fs'
 import arg from 'arg'
 import fetch from 'node-fetch'
-import { logInfo, logErrorAndReject, logDebug } from '../log.js'
-
-const config = {
-  apiUrl: 'https://api.ossy.se/api/v0',
-  // apiUrl: 'http://localhost:3001/api/v0'
-}
+import { logInfo, logError, logErrorAndReject, logDebug } from '../log.js'
 
 const Api = {
-  uploadResourceTemplates: (token, workspaceId, resourceTemplates) => {
-    const endpoint = `${config.apiUrl}/workspaces/${workspaceId}/resource-templates`
+  uploadResourceTemplates: (apiUrl, token, workspaceId, resourceTemplates) => {
+    const endpoint = `${apiUrl}/workspaces/${workspaceId}/resource-templates`
 
     const fetchOptions = {
       method: 'POST',
@@ -34,19 +29,20 @@ const importResourceTemplates = options => {
     '--authentication': String,
     '--a': '--authentication',
 
-    '--ossy-file': String,
-    '-o': '--ossy-file',
+    '--config': String,
+    '-c': '--config',
   }, { argv: options })
 
   logInfo({ message: '[CMS] reading files' })
-  const token = parsedArgs['--authentication']
-  const filePath = resolve(parsedArgs['--ossy-file'])
+  const token = parsedArgs['--authentication'];
+  const filePath = resolve(parsedArgs['--config'])
 
   if (!token) return logErrorAndReject({ message: '[CMS] No token provided with --authentication'})
 
   return resolveConfigImport(filePath)
     .then(module => {
       const config = module?.default
+      const apiUrl = config?.apiUrl || 'https://api.ossy.se/api/v0'
       const workspaceId = config?.workspaceId
       const resourceTemplates = config?.resourceTemplates
 
@@ -54,9 +50,12 @@ const importResourceTemplates = options => {
       if (!resourceTemplates) return logErrorAndReject({ message: '[CMS] No resource templates provided in ossy.json'})
 
       logInfo({ message: '[CMS] uploading resource templates' })
-      return Api.uploadResourceTemplates(token, workspaceId, resourceTemplates)
-          .then(() => logInfo({ message: '[CMS] Done' }))
-          .catch(error => logErrorAndReject({ message: '[CMS] Error', error }))
+
+      Api.uploadResourceTemplates(apiUrl, token, workspaceId, resourceTemplates)
+          .then(response => {
+            logInfo({ message: '[CMS] Done' })
+          })
+          .catch(error => logError({ message: '[CMS] Error', error }))
     })
 
 }

package/src/index.js

@@ -4,6 +4,7 @@
 const [_, __, handlerName, ...restArgs] = process.argv
 
 const loadHandler = {
+  app: () => import('./app/cli.js'),
   cms: () => import('./cms/cli.js')
 }[handlerName]