Merge pull request #2867 from patrick-rodgers/version-4

Version 4

buildsystem-config.ts

@@ -1,14 +1,31 @@
 import { resolve } from "path";
-import { BuildSchema } from "@pnp/buildsystem";
+import { 
+    BuildSchema,
+    BuildTimeline,
+    Build,
+    ReplaceVersion,
+ } from "@pnp/buildsystem";
 // import { ConfigCollection, BuildSchema, Tasks, PackageSchema, PublishSchema } from "@pnp/buildsystem";
 
+export function PnPBuild(): (b: BuildTimeline) => BuildTimeline {
+
+    return (instance: BuildTimeline) => {
+
+        Build()(instance);
+        ReplaceVersion(["sp/behaviors/telemetry.js", "graph/behaviors/telemetry.js"])(instance);
+
+        return instance;
+    }
+}
+
 
 export default [<BuildSchema>{
     name: "build",
     distFolder: "./dist/packages",
     targets: [
         resolve("./packages/tsconfig.json"),
-    ]
+    ],
+    behaviors: [PnPBuild()]
 }];
 
 // export default <ConfigCollection>[

tools/buildsystem/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@pnp/buildsystem",
-    "version": "4.0.0-beta2",
+    "version": "4.0.0-beta3",
     "bin": {
         "pnpbuild": "bin/buildsystem.js"
     },

tools/buildsystem/src/behaviors/build.ts

@@ -35,5 +35,7 @@ export function Build(flags?: string[]): TimelinePipe {
                 });
             });
         });
+
+        return instance;
     }
 }

tools/buildsystem/src/behaviors/copy-asset-files.ts

@@ -45,7 +45,7 @@ export function CopyAssetFiles(path: string, pattern: string[]): TimelinePipe {
 
             this.log(`Completed CopyAssetFiles.`);
         });
-    }
-
 
+        return instance;
+    }
 }

tools/buildsystem/src/behaviors/copy-package-files.ts

@@ -45,5 +45,7 @@ export function CopyPackageFiles(source: "src" | "built", pattern: string[]): Ti
 
             this.log(`Completing CopyPackageFiles with pattern ${stringPattern} on target '${this.context.target.tsconfigPath}'`);
         });
+
+        return instance;
     }
 }

tools/buildsystem/src/behaviors/publish-nightly.ts

@@ -3,7 +3,7 @@ import { BuildTimeline } from "src/build-timeline";
 import { Publish } from "./publish.js";
 import { resolve } from "path";
 import importJSON from "../lib/import-json.js";
-import buildWriteFile from "src/lib/write-file.js";
+import buildWriteFile from "../lib/write-file.js";
 
 /**
  * Does a nightly publish after setting the nightly version and updating deps
@@ -49,5 +49,7 @@ export function PublishNightly(flags: string[], nightlyName: "v3nightly" | "v4ni
 
         // we want to publish
         Publish(flags)(instance);
+
+        return instance;
     }
 }

tools/buildsystem/src/behaviors/publish.ts

@@ -38,5 +38,7 @@ export function Publish(flags?: string[]): TimelinePipe {
 
             await Promise.all(promises);
         });
+
+        return instance;
     }
 }

tools/buildsystem/src/behaviors/replace-version.ts

@@ -21,5 +21,7 @@ export function ReplaceVersion(paths: string[], versionMask = /\$\$Version\$\$/i
 
             return (<any>replace)(options);
         });
+
+        return instance;
     }
 }

tools/buildsystem/src/behaviors/webpack.ts

@@ -27,5 +27,7 @@ export function Webpack(config: wp.Configuration): TimelinePipe {
                 });
             });
         });
+
+        return instance;
     }
 }

tools/buildsystem/src/behaviors/write-packagejson.ts

@@ -42,5 +42,7 @@ export function WritePackageJSON(transform?: (p: any) => typeof p): TimelinePipe
 
             await Promise.all(promises);
         });
+
+        return instance;
     }
 }