sku 12.6.0 → 12.6.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # sku
 
+## 12.6.2
+
+### Patch Changes
+
+- Fix default compile package detection in PNPM repos ([#975](https://github.com/seek-oss/sku/pull/975))
+
+## 12.6.1
+
+### Patch Changes
+
+- When cleaning the build output directory, only delete files within the directory, rather than the entire directory ([#969](https://github.com/seek-oss/sku/pull/969))
+
 ## 12.6.0
 
 ### Minor Changes

package/context/defaultCompilePackages.js

@@ -2,7 +2,6 @@ const { posix: path } = require('node:path');
 const chalk = require('chalk');
 const { fdir: Fdir } = require('fdir');
 
-const { cwd } = require('../lib/cwd');
 const toPosixPath = require('../lib/toPosixPath');
 
 const { rootDir, isPnpm } = require('../lib/packageManager');
@@ -15,18 +14,17 @@ let detectedCompilePackages = [];
 // package manager. In either case, we can't correctly detect compile packages.
 if (rootDir) {
   try {
-    let crawler = new Fdir();
+    // Always use full paths so we don't need to worry about joining paths later
+    let crawler = new Fdir().withFullPaths();
 
     if (isPnpm) {
       // Follow symlinks inside node_modules into the pnpm virtual store
-      crawler = crawler.withSymlinks().withRelativePaths();
-    } else {
-      crawler = crawler.withBasePath();
+      crawler = crawler.withSymlinks();
     }
 
     const seekDependencyGlob = '**/@seek/*/package.json';
 
-    let results = crawler
+    const results = crawler
       .glob(seekDependencyGlob)
       .crawl('./node_modules/@seek')
       .sync();
@@ -43,23 +41,17 @@ if (rootDir) {
       );
 
       const pnpmVirtualStoreResults = new Fdir()
-        .withRelativePaths()
+        .withFullPaths()
         .glob(seekDependencyGlob)
         .crawl(pnpmVirtualStoreRelativePath)
         .sync();
 
       results.push(...pnpmVirtualStoreResults);
-
-      // All results will be relative to the virtual store directory, so we need
-      // to prepend the relative path from the current directory to the virtual store
-      results = results.map((file) =>
-        path.join(pnpmVirtualStoreRelativePath, file),
-      );
     }
 
     detectedCompilePackages = results
       .map((packagePath) => {
-        const packageJson = require(path.join(cwd(), packagePath));
+        const packageJson = require(packagePath);
 
         return {
           isCompilePackage: Boolean(packageJson.skuCompilePackage),

package/lib/buildFileUtils.js

@@ -8,7 +8,18 @@ const exists = require('./exists');
 const copyDirContents = require('./copyDirContents');
 
 const cleanTargetDirectory = async () => {
-  fs.rm(paths.target, { recursive: true, force: true });
+  const files = await new Fdir()
+    .withBasePath()
+    .withMaxDepth(1)
+    .withDirs()
+    // This glob pattern is used to exclude the target directory itself
+    .glob(`${paths.target}/*`)
+    .crawl(paths.target)
+    .withPromise();
+
+  for (const file of files) {
+    await fs.rm(file, { recursive: true, force: true });
+  }
 };
 
 const copyPublicFiles = async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sku",
-  "version": "12.6.0",
+  "version": "12.6.2",
   "description": "Front-end development toolkit, powered by Webpack, Babel, CSS Modules, Less and Jest",
   "main": "index.js",
   "bin": {