@teambit/workspace.modules.node-modules-linker 0.0.152 → 0.0.154

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.
@@ -58,6 +58,9 @@ export default class NodeModuleLinker {
58
58
  * these are changes made by aspects
59
59
  */
60
60
  _applyTransformers(component: Component, packageJson: PackageJsonFile): Promise<void>;
61
+ addTypesToExports(exports: Record<string, any>): Promise<{
62
+ default: any;
63
+ } & Record<string, any>>;
61
64
  }
62
65
  export declare function linkToNodeModulesWithCodemod(workspace: Workspace, bitIds: ComponentID[], changeRelativeToModulePaths: boolean): Promise<{
63
66
  linksResults: NodeModulesLinksResult[];
@@ -203,6 +203,23 @@ class NodeModuleLinker {
203
203
  // indicate that this component exists locally and it is symlinked into the workspace. not a normal package.
204
204
  packageJson.packageJsonObject._bit_local = true;
205
205
  packageJson.packageJsonObject.source = component.mainFile.relative;
206
+ // This is a hack because we have in the workspace package.json types:index.ts
207
+ // but also exports for core aspects
208
+ // TS can't find the types
209
+ // in order to solve it we copy the types to exports.types
210
+ // this will be applied only to aspects to minimize how it affects users
211
+ const envsData = component.state.aspects.get('teambit.envs/envs');
212
+ const isAspect = (envsData === null || envsData === void 0 ? void 0 : envsData.data.type) === 'aspect';
213
+ if (isAspect &&
214
+ packageJson.packageJsonObject.types &&
215
+ packageJson.packageJsonObject.exports &&
216
+ !packageJson.packageJsonObject.exports.types) {
217
+ const defaultModule = packageJson.packageJsonObject.exports.default;
218
+ if (defaultModule)
219
+ delete packageJson.packageJsonObject.exports.default;
220
+ packageJson.packageJsonObject.exports.types = `./${packageJson.packageJsonObject.types}`;
221
+ packageJson.packageJsonObject.exports.default = defaultModule;
222
+ }
206
223
  // packageJson.mergePropsFromExtensions(component);
207
224
  // TODO: we need to have an hook here to get the transformer from the pkg extension
208
225
  // don't delete the "version" prop, because in some scenarios, it's needed for the component to work properly.
@@ -223,6 +240,13 @@ class NodeModuleLinker {
223
240
  return package_json_transformer_1.PackageJsonTransformer.applyTransformers(component, packageJson);
224
241
  });
225
242
  }
243
+ addTypesToExports(exports) {
244
+ return __awaiter(this, void 0, void 0, function* () {
245
+ return Object.assign({}, {
246
+ default: exports.default,
247
+ }, exports);
248
+ });
249
+ }
226
250
  }
227
251
  exports.default = NodeModuleLinker;
228
252
  function linkToNodeModulesWithCodemod(workspace, bitIds, changeRelativeToModulePaths) {
@@ -1 +1 @@
1
- {"version":3,"file":"node-modules-linker.js","sourceRoot":"","sources":["../node-modules-linker.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"node-modules-linker.js","sourceRoot":"","sources":["../node-modules-linker.ts"],"names":[],"mappings":"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"}
@@ -13,6 +13,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.PackageJsonTransformer = void 0;
16
+ const lodash_1 = require("lodash");
16
17
  const p_map_series_1 = __importDefault(require("p-map-series"));
17
18
  const parse_scope_1 = require("@teambit/legacy/dist/utils/bit/parse-scope");
18
19
  const component_placeholders_1 = require("@teambit/legacy/dist/utils/bit/component-placeholders");
@@ -39,9 +40,10 @@ class PackageJsonTransformer {
39
40
  scopeId,
40
41
  owner,
41
42
  };
43
+ // TODO: Consider calling the replacePlaceHoldersRecursive instead
42
44
  replacePlaceHolders(newPackageJsonObject, contextForReplace);
43
45
  if (newPackageJsonObject.exports && typeof newPackageJsonObject.exports === 'object') {
44
- replacePlaceHolders(newPackageJsonObject.exports, contextForReplace);
46
+ replacePlaceHoldersRecursive(newPackageJsonObject.exports, contextForReplace);
45
47
  }
46
48
  packageJson.mergePackageJsonObject(newPackageJsonObject);
47
49
  });
@@ -49,6 +51,18 @@ class PackageJsonTransformer {
49
51
  }
50
52
  exports.PackageJsonTransformer = PackageJsonTransformer;
51
53
  PackageJsonTransformer.packageJsonTransformersRegistry = [];
54
+ function replacePlaceHoldersRecursive(obj, contextForReplace) {
55
+ Object.keys(obj).forEach((key) => {
56
+ let value = obj[key];
57
+ if (typeof value === 'string') {
58
+ value = (0, component_placeholders_1.replacePlaceHolderForPackageValue)(contextForReplace, obj[key]);
59
+ obj[key] = value;
60
+ }
61
+ else if ((0, lodash_1.isObject)(value)) {
62
+ replacePlaceHoldersRecursive(value, contextForReplace);
63
+ }
64
+ }, {});
65
+ }
52
66
  function replacePlaceHolders(obj, contextForReplace) {
53
67
  Object.keys(obj).forEach((key) => {
54
68
  let value = obj[key];
@@ -1 +1 @@
1
- {"version":3,"file":"package-json-transformer.js","sourceRoot":"","sources":["../package-json-transformer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gEAAqC;AAErC,4EAAwE;AACxE,kGAA0G;AAK1G,MAAa,sBAAsB;IAEjC,MAAM,CAAC,8BAA8B,CACnC,IAAoG;QAEpG,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,MAAM,CAAO,iBAAiB,CAAC,SAAoB,EAAE,WAA4B;;YAC/E,IAAI,oBAAoB,GAAG,WAAW,CAAC,iBAAiB,CAAC;YAEzD,MAAM,IAAA,sBAAS,EAAC,sBAAsB,CAAC,+BAA+B,EAAE,CAAO,WAAW,EAAE,EAAE;gBAC5F,oBAAoB,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;YAC5E,CAAC,CAAA,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC;YACnC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAA,wBAAU,EAAC,OAAO,CAAC,CAAC;YAC7C,MAAM,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC;YAEnC,MAAM,iBAAiB,GAAG;gBACxB,QAAQ,EAAE,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ;gBAC5C,IAAI;gBACJ,KAAK;gBACL,OAAO;gBACP,KAAK;aACN,CAAC;YACF,mBAAmB,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;YAC7D,IAAI,oBAAoB,CAAC,OAAO,IAAI,OAAO,oBAAoB,CAAC,OAAO,KAAK,QAAQ,EAAE;gBACpF,mBAAmB,CAAC,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;aACtE;YACD,WAAW,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,CAAC;QAC3D,CAAC;KAAA;;AAlCH,wDAmCC;AAlCQ,sDAA+B,GAA4B,EAAE,CAAC;AAoCvE,SAAS,mBAAmB,CAAC,GAA2B,EAAE,iBAAiB;IACzE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC/B,IAAI,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QACrB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,KAAK,GAAG,IAAA,0DAAiC,EAAC,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SACxE;QACD,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACnB,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
1
+ {"version":3,"file":"package-json-transformer.js","sourceRoot":"","sources":["../package-json-transformer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAAkC;AAClC,gEAAqC;AAErC,4EAAwE;AACxE,kGAA0G;AAK1G,MAAa,sBAAsB;IAEjC,MAAM,CAAC,8BAA8B,CACnC,IAAoG;QAEpG,IAAI,CAAC,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClD,CAAC;IAED;;OAEG;IACH,MAAM,CAAO,iBAAiB,CAAC,SAAoB,EAAE,WAA4B;;YAC/E,IAAI,oBAAoB,GAAG,WAAW,CAAC,iBAAiB,CAAC;YAEzD,MAAM,IAAA,sBAAS,EAAC,sBAAsB,CAAC,+BAA+B,EAAE,CAAO,WAAW,EAAE,EAAE;gBAC5F,oBAAoB,GAAG,MAAM,WAAW,CAAC,SAAS,EAAE,oBAAoB,CAAC,CAAC;YAC5E,CAAC,CAAA,CAAC,CAAC;YAEH,MAAM,OAAO,GAAG,SAAS,CAAC,EAAE,CAAC,KAAK,CAAC;YACnC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,IAAA,wBAAU,EAAC,OAAO,CAAC,CAAC;YAC7C,MAAM,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC,QAAQ,CAAC;YAEnC,MAAM,iBAAiB,GAAG;gBACxB,QAAQ,EAAE,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,QAAQ;gBAC5C,IAAI;gBACJ,KAAK;gBACL,OAAO;gBACP,KAAK;aACN,CAAC;YACF,kEAAkE;YAClE,mBAAmB,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;YAC7D,IAAI,oBAAoB,CAAC,OAAO,IAAI,OAAO,oBAAoB,CAAC,OAAO,KAAK,QAAQ,EAAE;gBACpF,4BAA4B,CAAC,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;aAC/E;YACD,WAAW,CAAC,sBAAsB,CAAC,oBAAoB,CAAC,CAAC;QAC3D,CAAC;KAAA;;AAnCH,wDAoCC;AAnCQ,sDAA+B,GAA4B,EAAE,CAAC;AAqCvE,SAAS,4BAA4B,CAAC,GAA2B,EAAE,iBAAiB;IAClF,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC/B,IAAI,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QACrB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,KAAK,GAAG,IAAA,0DAAiC,EAAC,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YACvE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;SAClB;aAAM,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE;YAC1B,4BAA4B,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;SACxD;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC;AAED,SAAS,mBAAmB,CAAC,GAA2B,EAAE,iBAAiB;IACzE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;QAC/B,IAAI,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC;QACrB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;YAC7B,KAAK,GAAG,IAAA,0DAAiC,EAAC,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;SACxE;QACD,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACnB,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
@@ -192,6 +192,25 @@ export default class NodeModuleLinker {
192
192
  packageJson.packageJsonObject._bit_local = true;
193
193
  packageJson.packageJsonObject.source = component.mainFile.relative;
194
194
 
195
+ // This is a hack because we have in the workspace package.json types:index.ts
196
+ // but also exports for core aspects
197
+ // TS can't find the types
198
+ // in order to solve it we copy the types to exports.types
199
+ // this will be applied only to aspects to minimize how it affects users
200
+ const envsData = component.state.aspects.get('teambit.envs/envs');
201
+ const isAspect = envsData?.data.type === 'aspect';
202
+ if (
203
+ isAspect &&
204
+ packageJson.packageJsonObject.types &&
205
+ packageJson.packageJsonObject.exports &&
206
+ !packageJson.packageJsonObject.exports.types
207
+ ) {
208
+ const defaultModule = packageJson.packageJsonObject.exports.default;
209
+ if (defaultModule) delete packageJson.packageJsonObject.exports.default;
210
+ packageJson.packageJsonObject.exports.types = `./${packageJson.packageJsonObject.types}`;
211
+ packageJson.packageJsonObject.exports.default = defaultModule;
212
+ }
213
+
195
214
  // packageJson.mergePropsFromExtensions(component);
196
215
  // TODO: we need to have an hook here to get the transformer from the pkg extension
197
216
 
@@ -212,6 +231,13 @@ export default class NodeModuleLinker {
212
231
  async _applyTransformers(component: Component, packageJson: PackageJsonFile) {
213
232
  return PackageJsonTransformer.applyTransformers(component, packageJson);
214
233
  }
234
+
235
+ async addTypesToExports(exports: Record<string, any>) {
236
+ return Object.assign({}, {
237
+
238
+ default: exports.default,
239
+ }, exports);
240
+ }
215
241
  }
216
242
 
217
243
  export async function linkToNodeModulesWithCodemod(
@@ -1,3 +1,4 @@
1
+ import { isObject } from 'lodash';
1
2
  import mapSeries from 'p-map-series';
2
3
  import PackageJsonFile from '@teambit/legacy/dist/consumer/component/package-json-file';
3
4
  import { parseScope } from '@teambit/legacy/dist/utils/bit/parse-scope';
@@ -35,14 +36,27 @@ export class PackageJsonTransformer {
35
36
  scopeId,
36
37
  owner,
37
38
  };
39
+ // TODO: Consider calling the replacePlaceHoldersRecursive instead
38
40
  replacePlaceHolders(newPackageJsonObject, contextForReplace);
39
41
  if (newPackageJsonObject.exports && typeof newPackageJsonObject.exports === 'object') {
40
- replacePlaceHolders(newPackageJsonObject.exports, contextForReplace);
42
+ replacePlaceHoldersRecursive(newPackageJsonObject.exports, contextForReplace);
41
43
  }
42
44
  packageJson.mergePackageJsonObject(newPackageJsonObject);
43
45
  }
44
46
  }
45
47
 
48
+ function replacePlaceHoldersRecursive(obj: Record<string, string>, contextForReplace): void {
49
+ Object.keys(obj).forEach((key) => {
50
+ let value = obj[key];
51
+ if (typeof value === 'string') {
52
+ value = replacePlaceHolderForPackageValue(contextForReplace, obj[key]);
53
+ obj[key] = value;
54
+ } else if (isObject(value)) {
55
+ replacePlaceHoldersRecursive(value, contextForReplace);
56
+ }
57
+ }, {});
58
+ }
59
+
46
60
  function replacePlaceHolders(obj: Record<string, string>, contextForReplace): void {
47
61
  Object.keys(obj).forEach((key) => {
48
62
  let value = obj[key];
package/package.json CHANGED
@@ -1,22 +1,24 @@
1
1
  {
2
2
  "name": "@teambit/workspace.modules.node-modules-linker",
3
- "version": "0.0.152",
3
+ "version": "0.0.154",
4
4
  "homepage": "https://bit.cloud/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.152"
9
+ "version": "0.0.154"
10
10
  },
11
11
  "dependencies": {
12
12
  "fs-extra": "10.0.0",
13
13
  "p-map-series": "2.1.0",
14
+ "lodash": "4.17.21",
14
15
  "@teambit/bit-roots": "0.0.133",
15
16
  "@teambit/component-id": "1.2.0",
16
17
  "@teambit/component-package-version": "0.0.430"
17
18
  },
18
19
  "devDependencies": {
19
20
  "@types/fs-extra": "9.0.7",
21
+ "@types/lodash": "4.14.165",
20
22
  "@types/mocha": "9.1.0",
21
23
  "@types/jest": "26.0.20",
22
24
  "@types/node": "12.20.4",