@webiny/build-tools 0.0.0-unstable.6da6f521e4 → 0.0.0-unstable.7be00a75a9

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@webiny/build-tools",
-	"version": "0.0.0-unstable.6da6f521e4",
+	"version": "0.0.0-unstable.7be00a75a9",
 	"type": "module",
 	"exports": {
 		".": "./index.js",
@@ -73,8 +73,7 @@
 		}
 	},
 	"publishConfig": {
-		"access": "public",
-		"directory": "."
+		"access": "public"
 	},
 	"gitHead": "b8aec8a1be3f25c3b428b357fe1e352c7cbff9ae"
 }

package/workspaces/linkWorkspaces.js

@@ -1,7 +1,6 @@
 /**
  * This tool will re-link monorepo packages to one of the following directories (by priority):
- * - {package}/package.json -> publishConfig.directory
- * - lerna.json -> command.publish.contents
+ * - {package}/package.json -> webiny.publishFrom
  * - package root directory
  */
 
@@ -11,7 +10,6 @@ import path from "path";
 import get from "lodash/get.js";
 import fs from "fs-extra";
 import * as rimraf from "rimraf";
-import { loadJsonFileSync } from "load-json-file";
 
 async function symlink(src, dest) {
     if (process.platform !== "win32") {
@@ -71,9 +69,6 @@ export const linkWorkspaces = async ({ whitelist, blacklist } = defaults) => {
             return whitelist.some(w => pkg.startsWith(w));
         });
 
-    const lernaJson = path.resolve("lerna.json");
-    const lerna = fs.existsSync(lernaJson) ? loadJsonFileSync(lernaJson) : null;
-
     for (let i = 0; i < packages.length; i++) {
         const packageJson = path.resolve(packages[i], "package.json");
         if (!fs.existsSync(packageJson)) {
@@ -83,11 +78,7 @@ export const linkWorkspaces = async ({ whitelist, blacklist } = defaults) => {
         const pkgJson = await PackageJson.fromFile(packageJson);
         const pkg = pkgJson.getJson();
 
-        let targetDirectory = get(pkg, "publishConfig.directory");
-        if (!targetDirectory && lerna) {
-            targetDirectory = get(lerna, "command.publish.contents");
-        }
-
+        const targetDirectory = get(pkg, "webiny.publishFrom");
         const link = path.resolve("node_modules", pkg.name);
         const target = path.resolve(packages[i], targetDirectory || ".");