Merge pull request #661 from smapiot/develop

Release 1.4.2
smapiot · Dec 16, 2023 · 2873b7d · 2873b7d
2 parents 3faaddc + 583b2ba
commit 2873b7d
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 41 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Piral Changelog
 
+## 1.4.2 (tbd)
+
+- Fixed misplaced *index.d.ts* in a scaffolded pilet (#658)
+- Fixed issue where `pilet publish` could remove the source folder (#657)
+- Updated toggle in debug utilities to always use life cycle (#659)
+
 ## 1.4.1 (December 14, 2023)
 
 - Fixed issue with pilet injector for certain apps in monorepos

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -48,20 +48,17 @@ stages:
     - task: Yarn@2
       displayName: Assemble Packages
       inputs:
-        Arguments: setup
+        Arguments: install --ignore-scripts
     - task: Yarn@2
       displayName: Build Core Demo
-      condition: ne(variables['Build.SourceBranchName'], variables['documentBranch'])
       inputs:
         Arguments: build:demo-core
     - task: Yarn@2
       displayName: Build CrossFx Demo
-      condition: ne(variables['Build.SourceBranchName'], variables['documentBranch'])
       inputs:
         Arguments: build:demo-cross
     - task: Yarn@2
       displayName: Build Full Demo
-      condition: ne(variables['Build.SourceBranchName'], variables['documentBranch'])
       inputs:
         Arguments: build:demo-full
     - task: Yarn@2
@@ -125,7 +122,7 @@ stages:
           - task: Yarn@2
             displayName: Assemble Packages
             inputs:
-              Arguments: setup
+              Arguments: install --ignore-scripts
           - task: npmAuthenticate@0
             inputs:
               workingFile: .npmrc
@@ -181,7 +178,7 @@ stages:
           - task: Yarn@2
             displayName: Assemble Packages
             inputs:
-              Arguments: setup
+              Arguments: install --ignore-scripts
           - task: npmAuthenticate@0
             inputs:
               workingFile: .npmrc
@@ -230,7 +227,7 @@ stages:
           - task: Yarn@2
             displayName: Assemble Packages
             inputs:
-              Arguments: setup
+              Arguments: install --ignore-scripts
           - task: npmAuthenticate@0
             inputs:
               workingFile: .npmrc
@@ -283,7 +280,7 @@ stages:
           - task: Yarn@2
             displayName: Assemble Packages
             inputs:
-              Arguments: setup
+              Arguments: install --ignore-scripts
           - task: npmAuthenticate@0
             inputs:
               workingFile: .npmrc
@@ -336,7 +333,7 @@ stages:
           - task: Yarn@2
             displayName: Assemble Packages
             inputs:
-              Arguments: setup
+              Arguments: install --ignore-scripts
           - task: npmAuthenticate@0
             inputs:
               workingFile: .npmrc
@@ -389,7 +386,7 @@ stages:
           - task: Yarn@2
             displayName: Assemble Packages
             inputs:
-              Arguments: setup
+              Arguments: install --ignore-scripts
           - task: npmAuthenticate@0
             inputs:
               workingFile: .npmrc
@@ -449,7 +446,7 @@ stages:
           - task: Yarn@2
             displayName: Assemble Packages
             inputs:
-              Arguments: setup
+              Arguments: install --ignore-scripts
           - task: npmAuthenticate@0
             inputs:
               workingFile: .npmrc
@@ -517,7 +514,7 @@ stages:
           - task: Yarn@2
             displayName: Assemble Packages
             inputs:
-              Arguments: setup
+              Arguments: install --ignore-scripts
           - task: npmAuthenticate@0
             inputs:
               workingFile: .npmrc
@@ -570,7 +567,7 @@ stages:
           - task: Yarn@2
             displayName: Assemble Packages
             inputs:
-              Arguments: setup
+              Arguments: install --ignore-scripts
           - task: npmAuthenticate@0
             inputs:
               workingFile: .npmrc
@@ -623,7 +620,7 @@ stages:
           - task: Yarn@2
             displayName: Assemble Packages
             inputs:
-              Arguments: setup
+              Arguments: install --ignore-scripts
           - task: npmAuthenticate@0
             inputs:
               workingFile: .npmrc
@@ -676,7 +673,7 @@ stages:
           - task: Yarn@2
             displayName: Assemble Packages
             inputs:
-              Arguments: setup
+              Arguments: install --ignore-scripts
           - task: npmAuthenticate@0
             inputs:
               workingFile: .npmrc
@@ -729,7 +726,7 @@ stages:
           - task: Yarn@2
             displayName: Assemble Packages
             inputs:
-              Arguments: setup
+              Arguments: install --ignore-scripts
           - task: npmAuthenticate@0
             inputs:
               workingFile: .npmrc
@@ -821,7 +818,7 @@ stages:
 - stage: DeployDemos
   displayName: Deploy Demos
   dependsOn: Build
-  condition: and(succeeded(), eq(variables['Build.SourceBranchName'], variables['releaseBranch']))
+  condition: and(succeeded(), eq(variables['Build.SourceBranchName'], variables['documentBranch']))
 
   jobs:
   - deployment: DeployCoreDemo

diff --git a/src/framework/piral-core/src/tools/debugger.ts b/src/framework/piral-core/src/tools/debugger.ts
@@ -13,15 +13,7 @@ export function integrateDebugger(
     removePilet: context.removePilet,
     updatePilet(pilet) {
       if (!pilet.disabled) {
-        const { createApi } = options;
-        const newApi = createApi(pilet);
-
-        try {
-          context.injectPilet(pilet);
-          pilet.setup(newApi);
-        } catch (error) {
-          console.error(error);
-        }
+        context.addPilet(pilet);
       } else {
         context.injectPilet(pilet);
       }

diff --git a/src/samples/sample-piral/src/index.tsx b/src/samples/sample-piral/src/index.tsx
@@ -25,12 +25,6 @@ const instance = createInstance({
     }),
   ],
   requestPilets() {
-    return Promise.resolve([{
-      spec: 'mf',
-      name: '@wmf/foo',
-      version: '1.0.0',
-      link: 'http://localhost:8080/index.js',
-    }]);
     return fetch('https://feed.piral.cloud/api/v1/pilet/sample')
       .then((res) => res.json())
       .then((res) => res.items);

diff --git a/src/tooling/piral-cli/src/apps/declaration-pilet.ts b/src/tooling/piral-cli/src/apps/declaration-pilet.ts
@@ -23,7 +23,7 @@ export interface DeclarationPiletOptions {
   target?: string;
 
   /**
-   * Specifies ff the target d.ts would be overwrwitten.
+   * Specifies ff the target d.ts would be overwritten.
    */
   forceOverwrite?: ForceOverwrite;
 
@@ -55,20 +55,18 @@ export async function declarationPilet(baseDir = process.cwd(), options: Declara
 
   for (const item of allEntries) {
     const targetDir = dirname(item);
-    const { peerDependencies, peerModules, root, apps, piletPackage, ignored, importmap, schema } =
-      await retrievePiletData(targetDir);
+    const { peerDependencies, peerModules, root, apps, piletPackage, importmap } = await retrievePiletData(targetDir);
     const piralInstances = apps.map((m) => m.appPackage.name);
     const externals = combinePiletExternals(piralInstances, peerDependencies, peerModules, importmap);
     const dest = resolve(root, target);
-    const outDir = dirname(dest);
 
     await createPiletDeclaration(
       piletPackage.name,
       piralInstances,
       root,
       item,
       externals,
-      outDir,
+      dest,
       forceOverwrite,
       logLevel,
     );

diff --git a/src/tooling/piral-cli/src/apps/publish-pilet.ts b/src/tooling/piral-cli/src/apps/publish-pilet.ts
@@ -148,11 +148,13 @@ async function getFiles(
         );
         const schemaVersion = originalSchemaVersion || schema || config.schemaVersion || defaultSchemaVersion;
         const piralInstances = apps.map((m) => m.appPackage.name);
-        const { main = 'dist/index.js', name = 'pilet' } = piletPackage;
+        const defaultOutput = 'dist/index.js';
+        const { main = defaultOutput, name = 'pilet' } = piletPackage;
         const propDest = resolve(root, main);
+        const propDestDir = dirname(propDest);
         log('generalDebug_0003', `Pilet "${name}" is supposed to generate artifact in "${propDest}".`);
-        const usePropDest = dirname(propDest) !== root && isSubDir(root, propDest);
-        const dest = usePropDest ? propDest : resolve(root, 'dist');
+        const usePropDest = propDestDir !== root && propDestDir !== targetDir && isSubDir(root, propDest);
+        const dest = usePropDest ? propDest : resolve(root, defaultOutput);
         log('generalDebug_0003', `Pilet "${name}" is generating artifact in "${dest}".`);
         const outDir = dirname(dest);
         const outFile = basename(dest);

diff --git a/tools/changelog-version.js b/tools/changelog-version.js
@@ -52,7 +52,7 @@ if (require.main === module) {
   if (args.includes('--update')) {
     updateChangelogDate();
   } else if (args.includes('--apply')) {
-    execSync(`lerna version ${version} --no-git-tag-version --yes`, {
+    execSync(`lerna version ${version} --no-git-tag-version --yes  --force-publish`, {
       cwd,
       stdio: 'inherit',
       shell: true,