piral-cli 0.14.20 → 0.14.21-beta.4074

package/src/common/package.test.ts

@@ -29,6 +29,7 @@ describe('CLI package module', () => {
   it('getPiletsInfo returns pilets information about provided piralInfo', () => {
     const emptyPiletsInfo = {
       files: [],
+      template: 'default',
       externals: [],
       scripts: {},
       validators: {},
@@ -45,6 +46,7 @@ describe('CLI package module', () => {
     const piralInfo = {
       pilets: {
         files: ['foo.tgz', 'foo2.tgz'],
+        template: 'default',
         externals: [],
         scripts: {},
         validators: {},

package/src/common/package.ts

@@ -347,6 +347,7 @@ export function getPiletsInfo(piralInfo: any): PiletsInfo {
     files = [],
     externals = [],
     scripts = {},
+    template = 'default',
     validators = {},
     devDependencies = {},
     preScaffold = '',
@@ -360,6 +361,7 @@ export function getPiletsInfo(piralInfo: any): PiletsInfo {
     files,
     externals,
     scripts,
+    template,
     validators,
     devDependencies,
     preScaffold,

package/src/injectors/pilet.ts

@@ -10,6 +10,7 @@ import { axios, mime } from '../external';
 import { Bundler } from '../types';
 
 const { host } = config;
+const indexPath = '/index.html';
 
 interface Pilet {
   bundler: Bundler;
@@ -19,6 +20,7 @@ interface Pilet {
 
 export interface PiletInjectorConfig extends KrasInjectorConfig {
   pilets: Array<Pilet>;
+  publicUrl: string;
   meta: string;
   api: string;
   app: string;
@@ -210,26 +212,30 @@ export default class PiletInjector implements KrasInjector {
   }
 
   handle(req: KrasRequest): KrasResponse {
-    const { app, api } = this.config;
-    const path = req.url.substring(1).split('?')[0];
+    const { app, api, publicUrl } = this.config;
 
     if (!req.target) {
-      const target = join(app, path);
+      if (req.url.startsWith(publicUrl)) {
+        const path = req.url.substring(publicUrl.length).split('?')[0];
+        const target = join(app, path);
 
-      if (existsSync(target) && statSync(target).isFile()) {
-        if (req.url === '/index.html') {
-          return this.sendIndexFile(target, req.url);
+        if (existsSync(target) && statSync(target).isFile()) {
+          if (req.url === indexPath) {
+            return this.sendIndexFile(target, req.url);
+          } else {
+            return this.sendFile(target, req.url);
+          }
+        } else if (req.url !== indexPath) {
+          return this.handle({
+            ...req,
+            url: indexPath,
+          });
         }
-        return this.sendFile(target, req.url);
-      } else if (req.url !== '/index.html') {
-        return this.handle({
-          ...req,
-          url: '/index.html',
-        });
-      } else {
-        return undefined;
       }
+
+      return undefined;
     } else if (req.target === api) {
+      const path = req.url.substring(1).split('?')[0];
       return this.sendResponse(path, req.url);
     }
   }

package/src/types/common.ts

@@ -55,6 +55,7 @@ export interface TemplateFileLocation {
 
 export interface PiletsInfo {
   files: Array<string | TemplateFileLocation>;
+  template: string;
   externals: Array<string>;
   devDependencies: Record<string, string | true>;
   scripts: Record<string, string>;

package/src/types/public.ts

@@ -103,6 +103,8 @@ export interface DebugPiletParameters extends BaseBundleParameters {
   externals: Array<string>;
   importmap: Array<SharedDependency>;
   targetDir: string;
+  outFile: string;
+  outDir: string;
   entryModule: string;
   logLevel: LogLevels;
   version: PiletSchemaVersion;