@teambit/workspace.modules.node-modules-linker 0.0.6 → 0.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/node-modules-linker.js +9 -6
- package/dist/node-modules-linker.js.map +1 -1
- package/dist/{preview-1676208356500.js → preview-1676811569495.js} +0 -0
- package/node-modules-linker.ts +11 -5
- package/package-tar/teambit-workspace.modules.node-modules-linker-0.0.8.tgz +0 -0
- package/package.json +4 -3
- package/package-tar/teambit-workspace.modules.node-modules-linker-0.0.6.tgz +0 -0
|
@@ -41,6 +41,7 @@ const glob_1 = __importDefault(require("glob"));
|
|
|
41
41
|
const p_map_series_1 = __importDefault(require("p-map-series"));
|
|
42
42
|
const path = __importStar(require("path"));
|
|
43
43
|
const ramda_1 = __importDefault(require("ramda"));
|
|
44
|
+
const bit_roots_1 = require("@teambit/bit-roots");
|
|
44
45
|
const constants_1 = require("@teambit/legacy/dist/constants");
|
|
45
46
|
const package_json_file_1 = __importDefault(require("@teambit/legacy/dist/consumer/component/package-json-file"));
|
|
46
47
|
const data_to_persist_1 = __importDefault(require("@teambit/legacy/dist/consumer/component/sources/data-to-persist"));
|
|
@@ -50,6 +51,7 @@ const utils_1 = require("@teambit/legacy/dist/utils");
|
|
|
50
51
|
const component_node_modules_path_1 = __importDefault(require("@teambit/legacy/dist/utils/bit/component-node-modules-path"));
|
|
51
52
|
const codemod_components_1 = require("@teambit/legacy/dist/consumer/component-ops/codemod-components");
|
|
52
53
|
const symlink_1 = __importDefault(require("@teambit/legacy/dist/links/symlink"));
|
|
54
|
+
const component_id_to_package_name_1 = __importDefault(require("@teambit/legacy/dist/utils/bit/component-id-to-package-name"));
|
|
53
55
|
const component_package_version_1 = require("@teambit/component-package-version");
|
|
54
56
|
const package_json_transformer_1 = require("./package-json-transformer");
|
|
55
57
|
/**
|
|
@@ -67,12 +69,17 @@ class NodeModuleLinker {
|
|
|
67
69
|
link() {
|
|
68
70
|
var _a;
|
|
69
71
|
return __awaiter(this, void 0, void 0, function* () {
|
|
72
|
+
this.components = this.components.filter((component) => this.bitMap.getComponentIfExist(component.id._legacy));
|
|
70
73
|
const links = yield this.getLinks();
|
|
71
74
|
const linksResults = this.getLinksResults();
|
|
72
|
-
|
|
73
|
-
|
|
75
|
+
const workspacePath = this.consumer ? this.consumer.getPath() : undefined;
|
|
76
|
+
if (workspacePath)
|
|
77
|
+
links.addBasePath(workspacePath);
|
|
74
78
|
yield links.persistAllToFS();
|
|
75
79
|
yield ((_a = this.consumer) === null || _a === void 0 ? void 0 : _a.componentFsCache.deleteAllDependenciesDataCache());
|
|
80
|
+
if (workspacePath) {
|
|
81
|
+
yield (0, bit_roots_1.linkPkgsToBitRoots)(workspacePath, this.components.map((comp) => (0, component_id_to_package_name_1.default)(comp.state._consumer)));
|
|
82
|
+
}
|
|
76
83
|
return linksResults;
|
|
77
84
|
});
|
|
78
85
|
}
|
|
@@ -81,10 +88,6 @@ class NodeModuleLinker {
|
|
|
81
88
|
this.dataToPersist = new data_to_persist_1.default();
|
|
82
89
|
yield (0, p_map_series_1.default)(this.components, (component) => __awaiter(this, void 0, void 0, function* () {
|
|
83
90
|
const componentId = component.id.toString();
|
|
84
|
-
if (!this.bitMap.getComponentIfExist(component.id._legacy)) {
|
|
85
|
-
logger_1.default.debug(`skip linking component to node_modules: ${componentId}. it's not part of the workspace`);
|
|
86
|
-
return;
|
|
87
|
-
}
|
|
88
91
|
logger_1.default.debug(`linking component to node_modules: ${componentId}`);
|
|
89
92
|
yield this._populateComponentsLinks(component);
|
|
90
93
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-modules-linker.js","sourceRoot":"","sources":["../node-modules-linker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,gEAAsC;AACtC,2CAA6B;AAC7B,kDAAsB;
|
|
1
|
+
{"version":3,"file":"node-modules-linker.js","sourceRoot":"","sources":["../node-modules-linker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA0B;AAC1B,gDAAwB;AACxB,gEAAsC;AACtC,2CAA6B;AAC7B,kDAAsB;AACtB,kDAAwD;AAExD,8DAAoG;AAGpG,kHAAwF;AACxF,sHAA4F;AAC5F,8GAAqF;AAErF,gFAAwD;AACxD,sDAAmD;AACnD,6HAAuG;AAEvG,uGAAqH;AACrH,iFAAyD;AACzD,+HAAmG;AAEnG,kFAAkE;AAElE,yEAAoE;AAQpE;;;GAGG;AACH,MAAqB,gBAAgB;IAInC,YAAoB,UAAuB,EAAU,SAAoB;QAArD,eAAU,GAAV,UAAU,CAAa;QAAU,cAAS,GAAT,SAAS,CAAW;QACvE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC;QACxC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QACnC,IAAI,CAAC,aAAa,GAAG,IAAI,yBAAa,EAAE,CAAC;IAC3C,CAAC;IACK,IAAI;;;YACR,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;YAC/G,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,CAAC;YACpC,MAAM,YAAY,GAAG,IAAI,CAAC,eAAe,EAAE,CAAC;YAC5C,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;YAC1E,IAAI,aAAa;gBAAE,KAAK,CAAC,WAAW,CAAC,aAAa,CAAC,CAAC;YACpD,MAAM,KAAK,CAAC,cAAc,EAAE,CAAC;YAC7B,MAAM,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,gBAAgB,CAAC,8BAA8B,EAAE,CAAA,CAAC;YACvE,IAAI,aAAa,EAAE;gBACjB,MAAM,IAAA,8BAAkB,EACtB,aAAa,EACb,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAA,sCAAwB,EAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAC9E,CAAC;aACH;YACD,OAAO,YAAY,CAAC;;KACrB;IACK,QAAQ;;YACZ,IAAI,CAAC,aAAa,GAAG,IAAI,yBAAa,EAAE,CAAC;YACzC,MAAM,IAAA,sBAAU,EAAC,IAAI,CAAC,UAAU,EAAE,CAAO,SAAS,EAAE,EAAE;gBACpD,MAAM,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC,QAAQ,EAAE,CAAC;gBAC5C,gBAAM,CAAC,KAAK,CAAC,sCAAsC,WAAW,EAAE,CAAC,CAAC;gBAClE,MAAM,IAAI,CAAC,wBAAwB,CAAC,SAAS,CAAC,CAAC;YACjD,CAAC,CAAA,CAAC,CAAC;YAEH,OAAO,IAAI,CAAC,aAAa,CAAC;QAC5B,CAAC;KAAA;IACD,eAAe;QACb,MAAM,YAAY,GAA6B,EAAE,CAAC;QAClD,MAAM,qBAAqB,GAAG,CAAC,EAAS,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;QAC1G,MAAM,aAAa,GAAG,CAAC,EAA4B,EAAE,IAAY,EAAE,EAAU,EAAE,EAAE;YAC/E,IAAI,CAAC,EAAE;gBAAE,OAAO;YAChB,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,EAAE,CAAC,CAAC;YACrD,IAAI,kBAAkB,EAAE;gBACtB,kBAAkB,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;aAC7C;iBAAM;gBACL,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;aAClD;QACH,CAAC,CAAC;QACF,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,OAAgB,EAAE,EAAE;YACvD,aAAa,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;YACpC,MAAM,kBAAkB,GAAG,qBAAqB,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;YACvE,IAAI,CAAC,kBAAkB,EAAE;gBACvB,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,CAAC;aAC5D;QACH,CAAC,CAAC,CAAC;QACH,OAAO,YAAY,CAAC;IACtB,CAAC;IAED,gBAAgB,CAAC,SAA6B;QAC5C,IAAI,SAAS,EAAE;YACb,OAAO,SAAS,CAAC,YAAY,CAAC;SAC/B;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC;IAClE,CAAC;IAED;;;;;OAKG;IACG,wBAAwB,CAAC,SAAoB;;YACjD,MAAM,eAAe,GAAG,SAAS,CAAC,KAAK,CAAC,SAA8B,CAAC;YACvE,MAAM,WAAW,GAAG,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC;YACzC,MAAM,QAAQ,GAAwB,IAAA,qCAA6B,EAAC;gBAClE,aAAa,EAAE,eAAe,CAAC,aAAa;gBAC5C,EAAE,EAAE,WAAW;gBACf,aAAa,EAAE,IAAI;gBACnB,YAAY,EAAE,IAAI,CAAC,gBAAgB,CAAC,eAAe,CAAC;gBACpD,UAAU,EAAE,eAAe,CAAC,UAAU;aACvC,CAAC,CAAC;YAEH,IAAI,CAAC,mBAAmB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YAC9C,IAAI,CAAC,iCAAiC,CAAC,QAAQ,CAAC,CAAC;YACjD,MAAM,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC;QAC1C,CAAC;KAAA;IAED;;OAEG;IACK,mBAAmB,CAAC,SAAoB,EAAE,QAA6B;QAC7E,MAAM,YAAY,GAAG,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QAEpE,MAAM,WAAW,GAAG,YAAY,CAAC,gBAAgB,EAAE,CAAC;QACpD,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;YAC3B,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,OAAiB,EAAE,IAAI,CAAC,CAAC;YACxE,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,iBAAO,CAAC,YAAY,CAAC,eAAe,EAAE,IAAI,EAAE,SAAS,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QACzG,CAAC,CAAC,CAAC;QAEH,IAAI,sBAAU,EAAE;YACd,IAAI,CAAC,aAAa,CAAC,UAAU,CAC3B,iBAAO,CAAC,YAAY,CAClB,YAAY,CAAC,OAAiB,EAC9B,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,oCAAwB,CAAC,EAC7C,SAAS,CAAC,EAAE,CAAC,OAAO,CACrB,CACF,CAAC;SACH;IACH,CAAC;IAED;;;;;;OAMG;IACH,iCAAiC,CAAC,QAAgB;QAChD,IAAI;YACF,MAAM,IAAI,GAAG,kBAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;YACpC,IAAI,IAAI,CAAC,cAAc,EAAE,EAAE;gBACzB,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,qBAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;aACzD;YACD,OAAO,SAAS,CAAC;SAClB;QAAC,OAAO,GAAQ,EAAE;YACjB,OAAO,SAAS,CAAC,CAAC,+BAA+B;SAClD;IACH,CAAC;IAED;;;OAGG;IACH,mBAAmB,CAAC,IAAY,EAAE,EAAU,EAAE,SAA4B;QACxE,IAAI,CAAC,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,uDAAuD,CAAC,CAAC;QAC7F,MAAM,6BAA6B,GAAG,SAAS,CAAC,6BAA6B,CAAC;QAC9E,MAAM,eAAe,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QACxD,MAAM,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;QACpD,gBAAM,CAAC,KAAK,CACV,kEAAkE,eAAe,OAAO,aAAa,EAAE,CACxG,CAAC;QACF,MAAM,cAAc,GAAG,cAAI,CAAC,IAAI,CAAC,GAAG,EAAE,EAAE,GAAG,EAAE,eAAe,EAAE,CAAC,CAAC;QAChE,4GAA4G;QAC5G,mFAAmF;QACnF,MAAM,YAAY,GAAG,6BAA6B,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChG,MAAM,kBAAkB,GAAG,SAAS,CAAC,YAAY,CAAC,qBAAqB,EAAE,CAAC;QAC1E,IAAI,CAAC,eAAC,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE;YAClC,iEAAiE;YACjE,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAA,aAAK,EAAC,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;SAC9G;QACD,MAAM,IAAI,GAAG,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC;QAChH,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QAC5B,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;YACtB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;YAChD,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;YAC5C,OAAO,iBAAO,CAAC,YAAY,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;QAC9C,CAAC,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,CAChB,aAAkC,EAClC,KAAY,EACZ,OAA4B,EAC5B,aAAqB,EACrB,SAA4B;QAE5B,MAAM,gBAAgB,GAAG,IAAA,qCAA6B,kCACjD,SAAS,KACZ,EAAE,EAAE,KAAK,EACT,aAAa,EAAE,IAAI,EACnB,aAAa,EACb,YAAY,EAAE,IAAI,IAClB,CAAC;QACH,MAAM,oBAAoB,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,CAAC;QACxE,OAAO,iBAAO,CAAC,YAAY,CAAC,OAAO,EAAE,oBAAoB,EAAE,KAAK,CAAC,CAAC;IACpE,CAAC;IAED;;;;;;OAMG;IACW,iBAAiB,CAAC,SAAoB;;YAClD,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,SAA8B,CAAC;YAClE,MAAM,6BAA6B,GAAG,UAAU,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,wBAAY,CAAC,CAAC;YACtG,IAAI,6BAA6B;gBAAE,OAAO,CAAC,8DAA8D;YACzG,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CACpB,IAAA,qCAA6B,kCACxB,UAAU,KACb,EAAE,EAAE,UAAU,CAAC,EAAE,EACjB,aAAa,EAAE,IAAI,IACnB,CACH,CAAC;YACF,MAAM,WAAW,GAAG,2BAAe,CAAC,mBAAmB,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;YACtF,MAAM,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;YACtD,IAAI,sBAAU,EAAE;gBACd,mEAAmE;gBACnE,qEAAqE;gBACrE,sEAAsE;gBACtE,WAAW,CAAC,mBAAmB,CAAC,OAAO,EAAE,GAAG,oCAAwB,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC;aAChG;YACD,IAAI,WAAW,CAAC,iBAAiB,CAAC,OAAO,KAAK,QAAQ,EAAE;gBACtD,WAAW,CAAC,iBAAiB,CAAC,OAAO,GAAG,WAAW,CAAC;aACrD;iBAAM;gBACL,WAAW,CAAC,iBAAiB,CAAC,OAAO,GAAG,IAAA,wCAAY,EAAC,WAAW,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;aAC7F;YACD,mDAAmD;YACnD,mFAAmF;YAEnF,8GAA8G;YAC9G,wHAAwH;YAExH,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;QACxD,CAAC;KAAA;IAED;;OAEG;IACG,kBAAkB,CAAC,SAAoB,EAAE,WAA4B;;YACzE,OAAO,iDAAsB,CAAC,iBAAiB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;QAC1E,CAAC;KAAA;CACF;AAjOD,mCAiOC;AAED,SAAsB,4BAA4B,CAChD,SAAoB,EACpB,MAAe,EACf,2BAAoC;;QAEpC,IAAI,cAAc,CAAC;QACnB,IAAI,2BAA2B,EAAE;YAC/B,cAAc,GAAG,MAAM,IAAA,wDAAmC,EAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;SACxF;QACD,MAAM,YAAY,GAAG,MAAM,sBAAsB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACrE,OAAO,EAAE,YAAY,EAAE,cAAc,EAAE,CAAC;IAC1C,CAAC;CAAA;AAXD,oEAWC;AAED,SAAsB,sBAAsB,CAC1C,SAAoB,EACpB,MAAe,EACf,aAAa,GAAG,KAAK;;QAErB,MAAM,aAAa,GAAG,MAAM,SAAS,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;QAC1E,IAAI,CAAC,aAAa,CAAC,MAAM;YAAE,OAAO,EAAE,CAAC;QACrC,MAAM,aAAa,GAAG,GAAS,EAAE;YAC/B,IAAI,aAAa,EAAE;gBACjB,OAAO,SAAS,CAAC,KAAK,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;aAC/C;YACD,OAAO,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC1C,CAAC,CAAA,CAAC;QACF,MAAM,UAAU,GAAG,MAAM,aAAa,EAAE,CAAC;QACzC,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACrE,OAAO,gBAAgB,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;CAAA;AAhBD,wDAgBC;AAED,SAAsB,6BAA6B,CAAC,UAAuB,EAAE,SAAoB;;QAC/F,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,CAAC,UAAU,EAAE,SAAS,CAAC,CAAC;QACrE,OAAO,gBAAgB,CAAC,IAAI,EAAE,CAAC;IACjC,CAAC;CAAA;AAHD,sEAGC"}
|
|
File without changes
|
package/node-modules-linker.ts
CHANGED
|
@@ -3,6 +3,7 @@ import glob from 'glob';
|
|
|
3
3
|
import pMapSeries from 'p-map-series';
|
|
4
4
|
import * as path from 'path';
|
|
5
5
|
import R from 'ramda';
|
|
6
|
+
import { linkPkgsToBitRoots } from '@teambit/bit-roots';
|
|
6
7
|
import { BitId } from '@teambit/legacy-bit-id';
|
|
7
8
|
import { IS_WINDOWS, PACKAGE_JSON, SOURCE_DIR_SYMLINK_TO_NM } from '@teambit/legacy/dist/constants';
|
|
8
9
|
import BitMap from '@teambit/legacy/dist/consumer/bit-map/bit-map';
|
|
@@ -17,6 +18,7 @@ import getNodeModulesPathOfComponent from '@teambit/legacy/dist/utils/bit/compon
|
|
|
17
18
|
import { PathOsBasedRelative } from '@teambit/legacy/dist/utils/path';
|
|
18
19
|
import { changeCodeFromRelativeToModulePaths } from '@teambit/legacy/dist/consumer/component-ops/codemod-components';
|
|
19
20
|
import Symlink from '@teambit/legacy/dist/links/symlink';
|
|
21
|
+
import componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';
|
|
20
22
|
import { Workspace } from '@teambit/workspace';
|
|
21
23
|
import { snapToSemver } from '@teambit/component-package-version';
|
|
22
24
|
import { Component } from '@teambit/component';
|
|
@@ -42,21 +44,25 @@ export default class NodeModuleLinker {
|
|
|
42
44
|
this.dataToPersist = new DataToPersist();
|
|
43
45
|
}
|
|
44
46
|
async link(): Promise<NodeModulesLinksResult[]> {
|
|
47
|
+
this.components = this.components.filter((component) => this.bitMap.getComponentIfExist(component.id._legacy));
|
|
45
48
|
const links = await this.getLinks();
|
|
46
49
|
const linksResults = this.getLinksResults();
|
|
47
|
-
|
|
50
|
+
const workspacePath = this.consumer ? this.consumer.getPath() : undefined;
|
|
51
|
+
if (workspacePath) links.addBasePath(workspacePath);
|
|
48
52
|
await links.persistAllToFS();
|
|
49
53
|
await this.consumer?.componentFsCache.deleteAllDependenciesDataCache();
|
|
54
|
+
if (workspacePath) {
|
|
55
|
+
await linkPkgsToBitRoots(
|
|
56
|
+
workspacePath,
|
|
57
|
+
this.components.map((comp) => componentIdToPackageName(comp.state._consumer))
|
|
58
|
+
);
|
|
59
|
+
}
|
|
50
60
|
return linksResults;
|
|
51
61
|
}
|
|
52
62
|
async getLinks(): Promise<DataToPersist> {
|
|
53
63
|
this.dataToPersist = new DataToPersist();
|
|
54
64
|
await pMapSeries(this.components, async (component) => {
|
|
55
65
|
const componentId = component.id.toString();
|
|
56
|
-
if (!this.bitMap.getComponentIfExist(component.id._legacy)) {
|
|
57
|
-
logger.debug(`skip linking component to node_modules: ${componentId}. it's not part of the workspace`);
|
|
58
|
-
return;
|
|
59
|
-
}
|
|
60
66
|
logger.debug(`linking component to node_modules: ${componentId}`);
|
|
61
67
|
await this._populateComponentsLinks(component);
|
|
62
68
|
});
|
package/package.json
CHANGED
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/workspace.modules.node-modules-linker",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.8",
|
|
4
4
|
"homepage": "https://bit.dev/teambit/workspace/modules/node-modules-linker",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"componentId": {
|
|
7
7
|
"scope": "teambit.workspace",
|
|
8
8
|
"name": "modules/node-modules-linker",
|
|
9
|
-
"version": "0.0.
|
|
9
|
+
"version": "0.0.8"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"fs-extra": "10.0.0",
|
|
13
13
|
"glob": "7.1.6",
|
|
14
14
|
"p-map-series": "2.1.0",
|
|
15
15
|
"ramda": "0.27.1",
|
|
16
|
+
"@teambit/bit-roots": "0.0.1",
|
|
16
17
|
"@teambit/component-package-version": "0.0.422",
|
|
17
|
-
"@teambit/legacy-bit-id": "0.0.
|
|
18
|
+
"@teambit/legacy-bit-id": "0.0.423"
|
|
18
19
|
},
|
|
19
20
|
"devDependencies": {
|
|
20
21
|
"@types/fs-extra": "9.0.7",
|
|
Binary file
|