piral-cli 0.15.0-beta.4630 → 0.15.0-beta.4670

package/src/apps/publish-pilet.ts

@@ -138,12 +138,12 @@ async function getFiles(
         const { root, piletPackage, importmap, peerDependencies, peerModules, apps } = await retrievePiletData(
           targetDir,
         );
-        const piral = apps[0].appPackage.name;
+        const piralInstances = apps.map((m) => m.appPackage.name);
         const { main = 'dist/index.js', name = 'pilet' } = piletPackage;
         const dest = resolve(root, main);
         const outDir = dirname(dest);
         const outFile = basename(dest);
-        const externals = combinePiletExternals([piral], peerDependencies, peerModules, importmap);
+        const externals = combinePiletExternals(piralInstances, peerDependencies, peerModules, importmap);
         progress('Triggering pilet build ...');
 
         if (fresh) {
@@ -156,7 +156,7 @@ async function getFiles(
         await callPiletBuild(
           {
             root,
-            piral,
+            piralInstances,
             optimizeModules: false,
             sourceMaps: true,
             contentHash: true,

package/src/apps/upgrade-pilet.ts

@@ -1,7 +1,6 @@
 import { resolve } from 'path';
 import { LogLevels, NpmClientType } from '../types';
 import {
-  readJson,
   installNpmPackage,
   checkExistingDirectory,
   patchPiletPackage,
@@ -24,6 +23,7 @@ import {
   getPiralPath,
   isMonorepoPackageRef,
   getPiletScaffoldData,
+  retrievePiletData,
 } from '../common';
 
 export interface UpgradePiletOptions {
@@ -99,11 +99,11 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
   }
 
   const npmClient = await determineNpmClient(root, defaultNpmClient);
-  const pckg = await readJson(root, 'package.json');
-  const { devDependencies = {}, dependencies = {}, piral, source } = pckg;
+  const { apps, piletPackage } = await retrievePiletData(root);
+  const { devDependencies = {}, dependencies = {}, source } = piletPackage;
 
-  if (piral && typeof piral === 'object') {
-    const sourceName = piral.name;
+  for (const { appPackage } of apps) {
+    const sourceName = appPackage.name;
     const language = /\.jsx?$/.test(source) ? 'js' : 'ts';
 
     if (!sourceName || typeof sourceName !== 'string') {
@@ -170,9 +170,7 @@ export async function upgradePilet(baseDir = process.cwd(), options: UpgradePile
       log('generalDebug_0003', `Run: ${postUpgrade}`);
       await runScript(postUpgrade, root);
     }
-
-    logDone('Pilet upgraded successfully!');
-  } else {
-    fail('invalidPiletPackage_0041');
   }
+
+  logDone('Pilet upgraded successfully!');
 }

package/src/build/run-build-pilet.ts

@@ -5,7 +5,7 @@ let handler: PiletBuildHandler;
 
 function run(
   root: string,
-  piral: string,
+  piralInstances: Array<string>,
   sourceMaps: boolean,
   contentHash: boolean,
   minify: boolean,
@@ -21,13 +21,13 @@ function run(
 ) {
   setStandardEnvs({
     production: true,
-    piral,
+    piralInstances,
     root,
   });
 
   return handler.create({
     root,
-    piral,
+    piralInstances,
     entryModule,
     targetDir,
     outDir,
@@ -54,7 +54,7 @@ process.on('message', async (msg) => {
       case 'start':
         const bundler = await run(
           process.cwd(),
-          msg.piral,
+          msg.piralInstances,
           msg.sourceMaps,
           msg.contentHash,
           msg.minify,

package/src/build/run-build-piral.ts

@@ -5,7 +5,7 @@ let handler: PiralBuildHandler;
 
 function run(
   root: string,
-  piral: string,
+  piralInstances: Array<string>,
   emulator: boolean,
   standalone: boolean,
   sourceMaps: boolean,
@@ -25,7 +25,7 @@ function run(
     publicPath: publicUrl,
     debugPiral: emulator,
     debugPilet: emulator || standalone,
-    piral,
+    piralInstances,
     dependencies: externals,
   });
 
@@ -56,7 +56,7 @@ process.on('message', async (msg) => {
       case 'start':
         const bundler = await run(
           process.cwd(),
-          msg.piral,
+          msg.piralInstances,
           msg.emulator,
           msg.standalone,
           msg.sourceMaps,

package/src/build/run-debug-mono-piral.ts

@@ -8,7 +8,7 @@ function run(
   root: string,
   outFile: string,
   outDir: string,
-  piral: string,
+  piralInstances: Array<string>,
   hmr: boolean,
   externals: Array<string>,
   publicUrl: string,
@@ -19,7 +19,7 @@ function run(
   progress(`Preparing supplied Piral instance ...`);
 
   setStandardEnvs({
-    piral,
+    piralInstances,
     dependencies: externals,
     publicPath: publicUrl,
     production: false,
@@ -59,7 +59,7 @@ process.on('message', async (msg) => {
           root,
           msg.outFile,
           outDir,
-          msg.piral,
+          msg.piralInstances,
           true,
           msg.externals,
           msg.publicUrl,

package/src/build/run-debug-pilet.ts

@@ -15,7 +15,7 @@ function run(
   targetDir: string,
   outDir: string,
   outFile: string,
-  piral: string,
+  piralInstances: Array<string>,
   externals: Array<string>,
   importmap: Array<SharedDependency>,
   entryModule: string,
@@ -25,12 +25,13 @@ function run(
 ) {
   setStandardEnvs({
     production: false,
-    piral,
+    piralInstances,
     root,
   });
+
   return handler.create({
     root,
-    piral,
+    piralInstances,
     entryModule,
     targetDir,
     outDir,
@@ -68,7 +69,7 @@ process.on('message', async (msg) => {
           msg.targetDir,
           msg.outDir,
           msg.outFile,
-          msg.piral,
+          msg.piralInstances,
           msg.externals,
           msg.importmap,
           msg.entryModule,

package/src/build/run-debug-piral.ts

@@ -8,7 +8,7 @@ function run(
   root: string,
   outFile: string,
   outDir: string,
-  piral: string,
+  piralInstances: Array<string>,
   hmr: boolean,
   externals: Array<string>,
   publicUrl: string,
@@ -21,7 +21,7 @@ function run(
     debugPiral: true,
     dependencies: externals,
     publicPath: publicUrl,
-    piral,
+    piralInstances,
   });
 
   return handler.create({
@@ -61,7 +61,7 @@ process.on('message', async (msg) => {
           root,
           msg.outFile,
           msg.outDir,
-          msg.piral,
+          msg.piralInstances,
           msg.hmr,
           msg.externals,
           msg.publicUrl,

package/src/common/declaration.ts

@@ -124,6 +124,7 @@ export async function createPiletDeclaration(
     types: [...types, ...files],
     plugins: [createExcludePlugin([name])],
     apis: [],
+    noModuleDeclaration: true,
     imports: allowedImports,
     logLevel,
     logger: createLogger(),
@@ -149,6 +150,7 @@ export async function createPiralDeclaration(
     files,
     types: findDeclaredTypings(root),
     apis: findPiralBaseApi(root),
+    noModuleDeclaration: true,
     imports: externals,
     logLevel,
     logger: createLogger(),

package/src/common/envs.ts

@@ -47,12 +47,14 @@ export function setStandardEnvs(options: StandardEnvProps) {
     process.env.NODE_ENV = 'development';
   }
 
-  if (options.piral) {
-    process.env.PIRAL_INSTANCE = options.piral;
+  if (Array.isArray(options.piralInstances) && options.piralInstances.length) {
+    process.env.PIRAL_INSTANCE = options.piralInstances.join(',');
+  } else {
+    options.piralInstances = [];
   }
 
-  if (options.dependencies && options.dependencies.length) {
-    const excludedDependencies = [...frameworkLibs, options.piral];
+  if (Array.isArray(options.dependencies) && options.dependencies.length) {
+    const excludedDependencies = [...frameworkLibs, ...options.piralInstances];
     const dependencies = options.dependencies.filter((m) => !excludedDependencies.includes(m));
     process.env.SHARED_DEPENDENCIES = dependencies.join(',');
   } else {

package/src/common/index.ts

@@ -30,3 +30,5 @@ export * from './scripts';
 export * from './spec';
 export * from './template';
 export * from './url';
+export * from './version';
+export * from './watcher';

package/src/common/package.ts

@@ -574,7 +574,7 @@ export async function patchPiletPackage(
   log('generalDebug_0003', `Succesfully patched the pilet.json.`);
 }
 
-export async function getPiletPackage(
+async function getPiletPackage(
   root: string,
   name: string,
   version: string,
@@ -582,11 +582,13 @@ export async function getPiletPackage(
   fromEmulator: boolean,
   newInfo?: { language: SourceLanguage; bundler: string },
 ) {
+  const { piralCLI = { version: cliVersion } } = piralInfo;
   const { externals, packageOverrides, ...info } = getPiletsInfo(piralInfo);
   const piralDependencies = {
     ...piralInfo.devDependencies,
     ...piralInfo.dependencies,
   };
+  const toolVersion = piralCLI.version;
   const typeDependencies = newInfo ? getDevDependencies(newInfo.language) : {};
   const scripts = newInfo
     ? {
@@ -617,13 +619,11 @@ export async function getPiletPackage(
       return deps;
     }, {}),
     [name]: `${version || piralInfo.version}`,
+    ['piral-cli']: toolVersion,
   };
 
   if (newInfo) {
-    const bundler = newInfo.bundler;
-    const version = `^${cliVersion}`;
-    devDependencies['piral-cli'] = version;
-    await appendBundler(devDependencies, bundler, version);
+    await appendBundler(devDependencies, newInfo.bundler, toolVersion);
   }
 
   return deepMerge(packageOverrides, {

package/src/common/watcher.ts

@@ -0,0 +1,24 @@
+export interface WatcherContext {
+  onClean(dispose: () => void): void;
+  watch(file: string): void;
+}
+
+export function watcherTask(cb: (watcherContext: WatcherContext) => Promise<void>) {
+  return new Promise<void>((resolve, reject) => {
+    const disposers: Array<() => void> = [];
+    const context: WatcherContext = {
+      onClean(dispose) {
+        disposers.push(dispose);
+      },
+      watch(file) {},
+    };
+    cb(context).then(
+      () => {
+        resolve();
+      },
+      (err) => {
+        reject(err);
+      },
+    );
+  });
+}

package/src/types/public.ts

@@ -67,7 +67,7 @@ export interface BaseBundleParameters {
 }
 
 export interface DebugPiralParameters extends BaseBundleParameters {
-  piral: string;
+  piralInstances: Array<string>;
   hmr: boolean;
   externals: Array<string>;
   publicUrl: string;
@@ -78,7 +78,7 @@ export interface DebugPiralParameters extends BaseBundleParameters {
 }
 
 export interface WatchPiralParameters extends BaseBundleParameters {
-  piral: string;
+  piralInstances: Array<string>;
   externals: Array<string>;
   publicUrl: string;
   entryFiles: string;
@@ -86,7 +86,7 @@ export interface WatchPiralParameters extends BaseBundleParameters {
 }
 
 export interface BuildPiralParameters extends BaseBundleParameters {
-  piral: string;
+  piralInstances: Array<string>;
   emulator: boolean;
   standalone: boolean;
   sourceMaps: boolean;
@@ -101,7 +101,7 @@ export interface BuildPiralParameters extends BaseBundleParameters {
 }
 
 export interface DebugPiletParameters extends BaseBundleParameters {
-  piral: string;
+  piralInstances: Array<string>;
   hmr: boolean;
   externals: Array<string>;
   importmap: Array<SharedDependency>;
@@ -114,7 +114,7 @@ export interface DebugPiletParameters extends BaseBundleParameters {
 }
 
 export interface BuildPiletParameters extends BaseBundleParameters {
-  piral: string;
+  piralInstances: Array<string>;
   sourceMaps: boolean;
   contentHash: boolean;
   minify: boolean;
@@ -177,7 +177,7 @@ export interface PiralBuildHandler {
 export interface PiletBuildHandler {
   create(config: {
     root: string;
-    piral: string;
+    piralInstances: Array<string>;
     entryModule: string;
     targetDir: string;
     outDir: string;
@@ -241,6 +241,6 @@ export interface StandardEnvProps {
   debugPilet?: boolean;
   root: string;
   publicPath?: string;
-  piral?: string;
+  piralInstances?: Array<string>;
   dependencies?: Array<string>;
 }