@teambit/workspace.modules.node-modules-linker 0.0.174 → 0.0.176
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/codemod-components.ts +2 -3
- package/dist/codemod-components.js +7 -8
- package/dist/codemod-components.js.map +1 -1
- package/dist/node-modules-linker.d.ts +2 -2
- package/dist/node-modules-linker.js +5 -5
- package/dist/node-modules-linker.js.map +1 -1
- package/dist/package-json-transformer.js +4 -5
- package/dist/package-json-transformer.js.map +1 -1
- package/node-modules-linker.ts +4 -4
- package/package-json-transformer.ts +1 -2
- package/package.json +8 -4
- package/dist/tsconfig.json +0 -37
- package/tsconfig.json +0 -37
- /package/dist/{preview-1717644115890.js → preview-1720667996237.js} +0 -0
package/codemod-components.ts
CHANGED
|
@@ -3,11 +3,10 @@ import { Workspace } from '@teambit/workspace';
|
|
|
3
3
|
import { IssuesClasses, RelativeComponentsAuthoredEntry } from '@teambit/component-issues';
|
|
4
4
|
import { Component } from '@teambit/component';
|
|
5
5
|
import { ComponentID, ComponentIdList } from '@teambit/component-id';
|
|
6
|
-
import { pathJoinLinux, pathNormalizeToLinux, pathRelativeLinux } from '@teambit/legacy
|
|
6
|
+
import { pathJoinLinux, pathNormalizeToLinux, pathRelativeLinux, replacePackageName } from '@teambit/legacy.utils';
|
|
7
|
+
import { componentIdToPackageName } from '@teambit/pkg.modules.component-package-name';
|
|
7
8
|
import DataToPersist from '@teambit/legacy/dist/consumer/component/sources/data-to-persist';
|
|
8
9
|
import { SourceFile } from '@teambit/legacy/dist/consumer/component/sources';
|
|
9
|
-
import componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';
|
|
10
|
-
import replacePackageName from '@teambit/legacy/dist/utils/string/replace-package-name';
|
|
11
10
|
import ConsumerComponent from '@teambit/legacy/dist/consumer/component';
|
|
12
11
|
|
|
13
12
|
export type CodemodResult = {
|
|
@@ -16,10 +16,9 @@ exports.changeCodeFromRelativeToModulePaths = void 0;
|
|
|
16
16
|
const path_1 = __importDefault(require("path"));
|
|
17
17
|
const component_issues_1 = require("@teambit/component-issues");
|
|
18
18
|
const component_id_1 = require("@teambit/component-id");
|
|
19
|
-
const
|
|
19
|
+
const legacy_utils_1 = require("@teambit/legacy.utils");
|
|
20
|
+
const pkg_modules_component_package_name_1 = require("@teambit/pkg.modules.component-package-name");
|
|
20
21
|
const data_to_persist_1 = __importDefault(require("@teambit/legacy/dist/consumer/component/sources/data-to-persist"));
|
|
21
|
-
const component_id_to_package_name_1 = __importDefault(require("@teambit/legacy/dist/utils/bit/component-id-to-package-name"));
|
|
22
|
-
const replace_package_name_1 = __importDefault(require("@teambit/legacy/dist/utils/string/replace-package-name"));
|
|
23
22
|
function changeCodeFromRelativeToModulePaths(workspace, bitIds) {
|
|
24
23
|
return __awaiter(this, void 0, void 0, function* () {
|
|
25
24
|
const components = yield loadComponents(workspace, bitIds);
|
|
@@ -66,7 +65,7 @@ function codemodComponent(workspace, component) {
|
|
|
66
65
|
const warnings = [];
|
|
67
66
|
yield Promise.all(component.filesystem.files.map((file) => __awaiter(this, void 0, void 0, function* () {
|
|
68
67
|
var _a;
|
|
69
|
-
const relativeInstances = (_a = issues.getIssue(component_issues_1.IssuesClasses.RelativeComponentsAuthored)) === null || _a === void 0 ? void 0 : _a.data[(0,
|
|
68
|
+
const relativeInstances = (_a = issues.getIssue(component_issues_1.IssuesClasses.RelativeComponentsAuthored)) === null || _a === void 0 ? void 0 : _a.data[(0, legacy_utils_1.pathNormalizeToLinux)(file.relative)];
|
|
70
69
|
if (!relativeInstances)
|
|
71
70
|
return;
|
|
72
71
|
// @ts-ignore
|
|
@@ -76,14 +75,14 @@ function codemodComponent(workspace, component) {
|
|
|
76
75
|
const id = relativeEntry.componentId;
|
|
77
76
|
const requiredComponent = yield workspace.get(id);
|
|
78
77
|
const consumerComp = requiredComponent.state._consumer;
|
|
79
|
-
const packageName = (0,
|
|
78
|
+
const packageName = (0, pkg_modules_component_package_name_1.componentIdToPackageName)(Object.assign(Object.assign({}, consumerComp), { id }));
|
|
80
79
|
const cssFamily = ['.css', '.scss', '.less', '.sass'];
|
|
81
80
|
const isCss = cssFamily.includes(file.extname);
|
|
82
81
|
const packageNameSupportCss = isCss ? `~${packageName}` : packageName;
|
|
83
82
|
const stringToReplace = getNameWithoutInternalPath(workspace, relativeEntry);
|
|
84
83
|
// @todo: the "dist" should be replaced by the compiler dist-dir.
|
|
85
84
|
// newFileString = replacePackageName(newFileString, stringToReplace, packageNameSupportCss, 'dist');
|
|
86
|
-
newFileString = (0,
|
|
85
|
+
newFileString = (0, legacy_utils_1.replacePackageName)(newFileString, stringToReplace, packageNameSupportCss);
|
|
87
86
|
})));
|
|
88
87
|
if (fileBefore !== newFileString) {
|
|
89
88
|
// @ts-ignore
|
|
@@ -113,13 +112,13 @@ function getNameWithoutInternalPath(workspace, relativeEntry) {
|
|
|
113
112
|
const rootDir = componentMap.rootDir;
|
|
114
113
|
if (!rootDir)
|
|
115
114
|
return importSource;
|
|
116
|
-
const mainFile = componentMap.trackDir ? componentMap.mainFile : (0,
|
|
115
|
+
const mainFile = componentMap.trackDir ? componentMap.mainFile : (0, legacy_utils_1.pathJoinLinux)(rootDir, componentMap.mainFile);
|
|
117
116
|
const filePathRelativeToWorkspace = relativeEntry.relativePath.sourceRelativePath;
|
|
118
117
|
if (filePathRelativeToWorkspace === mainFile) {
|
|
119
118
|
return importSource;
|
|
120
119
|
}
|
|
121
120
|
// the importSource is not the main-file but an internal file, remove the internal part.
|
|
122
|
-
const internalPath = (0,
|
|
121
|
+
const internalPath = (0, legacy_utils_1.pathRelativeLinux)(rootDir, filePathRelativeToWorkspace);
|
|
123
122
|
const removeLastOccurrence = (str, toRemove) => str.replace(new RegExp(`/${toRemove}$`), '');
|
|
124
123
|
if (importSource.endsWith(internalPath)) {
|
|
125
124
|
return removeLastOccurrence(importSource, internalPath);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codemod-components.js","sourceRoot":"","sources":["../codemod-components.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,gDAAwB;AAExB,gEAA2F;AAE3F,wDAAqE;AACrE,
|
|
1
|
+
{"version":3,"file":"codemod-components.js","sourceRoot":"","sources":["../codemod-components.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
1
|
import { ComponentID } from '@teambit/component-id';
|
|
2
|
-
import BitMap from '@teambit/legacy
|
|
2
|
+
import { BitMap } from '@teambit/legacy.bit-map';
|
|
3
3
|
import ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';
|
|
4
4
|
import PackageJsonFile from '@teambit/legacy/dist/consumer/component/package-json-file';
|
|
5
5
|
import DataToPersist from '@teambit/legacy/dist/consumer/component/sources/data-to-persist';
|
|
6
6
|
import Consumer from '@teambit/legacy/dist/consumer/consumer';
|
|
7
|
-
import { PathOsBasedAbsolute } from '@teambit/
|
|
7
|
+
import { PathOsBasedAbsolute } from '@teambit/toolbox.path.path';
|
|
8
8
|
import { Workspace } from '@teambit/workspace';
|
|
9
9
|
import { Component } from '@teambit/component';
|
|
10
10
|
type LinkDetail = {
|
|
@@ -45,9 +45,8 @@ const package_json_file_1 = __importDefault(require("@teambit/legacy/dist/consum
|
|
|
45
45
|
const data_to_persist_1 = __importDefault(require("@teambit/legacy/dist/consumer/component/sources/data-to-persist"));
|
|
46
46
|
const remove_path_1 = __importDefault(require("@teambit/legacy/dist/consumer/component/sources/remove-path"));
|
|
47
47
|
const logger_1 = __importDefault(require("@teambit/legacy/dist/logger/logger"));
|
|
48
|
-
const
|
|
48
|
+
const pkg_modules_component_package_name_1 = require("@teambit/pkg.modules.component-package-name");
|
|
49
49
|
const symlink_1 = __importDefault(require("@teambit/legacy/dist/links/symlink"));
|
|
50
|
-
const component_id_to_package_name_1 = __importDefault(require("@teambit/legacy/dist/utils/bit/component-id-to-package-name"));
|
|
51
50
|
const component_package_version_1 = require("@teambit/component-package-version");
|
|
52
51
|
const package_json_transformer_1 = require("./package-json-transformer");
|
|
53
52
|
const codemod_components_1 = require("./codemod-components");
|
|
@@ -60,6 +59,7 @@ class NodeModuleLinker {
|
|
|
60
59
|
this.components = components;
|
|
61
60
|
this.workspace = workspace;
|
|
62
61
|
this.consumer = this.workspace.consumer;
|
|
62
|
+
// @ts-ignore todo: remove after deleting teambit.legacy
|
|
63
63
|
this.bitMap = this.consumer.bitMap;
|
|
64
64
|
this.dataToPersist = new data_to_persist_1.default();
|
|
65
65
|
this.existingLinks = [];
|
|
@@ -86,7 +86,7 @@ class NodeModuleLinker {
|
|
|
86
86
|
// component-issues like "MissingLinksFromNodeModulesToSrc" incorrectly.
|
|
87
87
|
this.workspace.clearAllComponentsCache();
|
|
88
88
|
}
|
|
89
|
-
yield (0, bit_roots_1.linkPkgsToBitRoots)(workspacePath, this.components.map((comp) => (0,
|
|
89
|
+
yield (0, bit_roots_1.linkPkgsToBitRoots)(workspacePath, this.components.map((comp) => (0, pkg_modules_component_package_name_1.componentIdToPackageName)(comp.state._consumer)));
|
|
90
90
|
return linksResults;
|
|
91
91
|
});
|
|
92
92
|
}
|
|
@@ -146,7 +146,7 @@ class NodeModuleLinker {
|
|
|
146
146
|
_populateComponentsLinks(component) {
|
|
147
147
|
return __awaiter(this, void 0, void 0, function* () {
|
|
148
148
|
const legacyComponent = component.state._consumer;
|
|
149
|
-
const linkPath = (0,
|
|
149
|
+
const linkPath = (0, pkg_modules_component_package_name_1.getNodeModulesPathOfComponent)(legacyComponent);
|
|
150
150
|
yield this.symlinkComponentDir(component, linkPath);
|
|
151
151
|
this._deleteExistingLinksRootIfSymlink(linkPath);
|
|
152
152
|
yield this.createPackageJson(component);
|
|
@@ -211,7 +211,7 @@ class NodeModuleLinker {
|
|
|
211
211
|
const hasPackageJsonAsComponentFile = legacyComp.files.some((file) => file.relative === constants_1.PACKAGE_JSON);
|
|
212
212
|
if (hasPackageJsonAsComponentFile)
|
|
213
213
|
return; // don't generate package.json on top of the user package.json
|
|
214
|
-
const dest = path.join((0,
|
|
214
|
+
const dest = path.join((0, pkg_modules_component_package_name_1.getNodeModulesPathOfComponent)(Object.assign(Object.assign({}, legacyComp), { id: legacyComp.id })));
|
|
215
215
|
const packageJsonExist = yield fs_extra_1.default.pathExists(path.join(dest, 'package.json'));
|
|
216
216
|
if (!packageJsonExist) {
|
|
217
217
|
this.packageJsonCreated = true;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"node-modules-linker.js","sourceRoot":"","sources":["../node-modules-linker.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wDAA0B;AAC1B,gEAAsC;AACtC,2CAA6B;AAC7B,kDAAwD;AAExD,8DAAoG;AAGpG,kHAAwF;AACxF,sHAA4F;AAC5F,8GAAqF;AAErF,gFAAwD;
|
|
1
|
+
{"version":3,"file":"node-modules-linker.js","sourceRoot":"","sources":["../node-modules-linker.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
15
15
|
exports.PackageJsonTransformer = void 0;
|
|
16
16
|
const lodash_1 = require("lodash");
|
|
17
17
|
const p_map_series_1 = __importDefault(require("p-map-series"));
|
|
18
|
-
const
|
|
19
|
-
const component_placeholders_1 = require("@teambit/legacy/dist/utils/bit/component-placeholders");
|
|
18
|
+
const legacy_utils_1 = require("@teambit/legacy.utils");
|
|
20
19
|
class PackageJsonTransformer {
|
|
21
20
|
static registerPackageJsonTransformer(func) {
|
|
22
21
|
this.packageJsonTransformersRegistry.push(func);
|
|
@@ -31,7 +30,7 @@ class PackageJsonTransformer {
|
|
|
31
30
|
newPackageJsonObject = yield transformer(component, newPackageJsonObject);
|
|
32
31
|
}));
|
|
33
32
|
const scopeId = component.id.scope;
|
|
34
|
-
const { scope, owner } = (0,
|
|
33
|
+
const { scope, owner } = (0, legacy_utils_1.parseScope)(scopeId);
|
|
35
34
|
const name = component.id.fullName;
|
|
36
35
|
const contextForReplace = {
|
|
37
36
|
mainFile: component.state._consumer.mainFile,
|
|
@@ -55,7 +54,7 @@ function replacePlaceHoldersRecursive(obj, contextForReplace) {
|
|
|
55
54
|
Object.keys(obj).forEach((key) => {
|
|
56
55
|
let value = obj[key];
|
|
57
56
|
if (typeof value === 'string') {
|
|
58
|
-
value = (0,
|
|
57
|
+
value = (0, legacy_utils_1.replacePlaceHolderForPackageValue)(contextForReplace, obj[key]);
|
|
59
58
|
obj[key] = value;
|
|
60
59
|
}
|
|
61
60
|
else if ((0, lodash_1.isObject)(value)) {
|
|
@@ -67,7 +66,7 @@ function replacePlaceHolders(obj, contextForReplace) {
|
|
|
67
66
|
Object.keys(obj).forEach((key) => {
|
|
68
67
|
let value = obj[key];
|
|
69
68
|
if (typeof value === 'string') {
|
|
70
|
-
value = (0,
|
|
69
|
+
value = (0, legacy_utils_1.replacePlaceHolderForPackageValue)(contextForReplace, obj[key]);
|
|
71
70
|
}
|
|
72
71
|
obj[key] = value;
|
|
73
72
|
}, {});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"package-json-transformer.js","sourceRoot":"","sources":["../package-json-transformer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAAkC;AAClC,gEAAqC;AAErC,
|
|
1
|
+
{"version":3,"file":"package-json-transformer.js","sourceRoot":"","sources":["../package-json-transformer.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,mCAAkC;AAClC,gEAAqC;AAErC,wDAAsF;AAKtF,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,yBAAU,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,CAAC;gBACrF,4BAA4B,CAAC,oBAAoB,CAAC,OAAO,EAAE,iBAAiB,CAAC,CAAC;YAChF,CAAC;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,CAAC;YAC9B,KAAK,GAAG,IAAA,gDAAiC,EAAC,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;YACvE,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACnB,CAAC;aAAM,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,EAAE,CAAC;YAC3B,4BAA4B,CAAC,KAAK,EAAE,iBAAiB,CAAC,CAAC;QACzD,CAAC;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,CAAC;YAC9B,KAAK,GAAG,IAAA,gDAAiC,EAAC,iBAAiB,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC;QACzE,CAAC;QACD,GAAG,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACnB,CAAC,EAAE,EAAE,CAAC,CAAC;AACT,CAAC"}
|
package/node-modules-linker.ts
CHANGED
|
@@ -4,17 +4,16 @@ import * as path from 'path';
|
|
|
4
4
|
import { linkPkgsToBitRoots } from '@teambit/bit-roots';
|
|
5
5
|
import { ComponentID } from '@teambit/component-id';
|
|
6
6
|
import { IS_WINDOWS, PACKAGE_JSON, SOURCE_DIR_SYMLINK_TO_NM } from '@teambit/legacy/dist/constants';
|
|
7
|
-
import BitMap from '@teambit/legacy
|
|
7
|
+
import { BitMap } from '@teambit/legacy.bit-map';
|
|
8
8
|
import ConsumerComponent from '@teambit/legacy/dist/consumer/component/consumer-component';
|
|
9
9
|
import PackageJsonFile from '@teambit/legacy/dist/consumer/component/package-json-file';
|
|
10
10
|
import DataToPersist from '@teambit/legacy/dist/consumer/component/sources/data-to-persist';
|
|
11
11
|
import RemovePath from '@teambit/legacy/dist/consumer/component/sources/remove-path';
|
|
12
12
|
import Consumer from '@teambit/legacy/dist/consumer/consumer';
|
|
13
13
|
import logger from '@teambit/legacy/dist/logger/logger';
|
|
14
|
-
import
|
|
15
|
-
import {
|
|
14
|
+
import { PathOsBasedAbsolute, PathOsBasedRelative } from '@teambit/toolbox.path.path';
|
|
15
|
+
import { componentIdToPackageName, getNodeModulesPathOfComponent } from '@teambit/pkg.modules.component-package-name';
|
|
16
16
|
import Symlink from '@teambit/legacy/dist/links/symlink';
|
|
17
|
-
import componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';
|
|
18
17
|
import { Workspace } from '@teambit/workspace';
|
|
19
18
|
import { snapToSemver } from '@teambit/component-package-version';
|
|
20
19
|
import { Component } from '@teambit/component';
|
|
@@ -40,6 +39,7 @@ export default class NodeModuleLinker {
|
|
|
40
39
|
|
|
41
40
|
constructor(private components: Component[], private workspace: Workspace) {
|
|
42
41
|
this.consumer = this.workspace.consumer;
|
|
42
|
+
// @ts-ignore todo: remove after deleting teambit.legacy
|
|
43
43
|
this.bitMap = this.consumer.bitMap;
|
|
44
44
|
this.dataToPersist = new DataToPersist();
|
|
45
45
|
this.existingLinks = [];
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { isObject } from 'lodash';
|
|
2
2
|
import mapSeries from 'p-map-series';
|
|
3
3
|
import PackageJsonFile from '@teambit/legacy/dist/consumer/component/package-json-file';
|
|
4
|
-
import { parseScope } from '@teambit/legacy
|
|
5
|
-
import { replacePlaceHolderForPackageValue } from '@teambit/legacy/dist/utils/bit/component-placeholders';
|
|
4
|
+
import { parseScope, replacePlaceHolderForPackageValue } from '@teambit/legacy.utils';
|
|
6
5
|
import { Component } from '@teambit/component';
|
|
7
6
|
|
|
8
7
|
type PackageJsonTransformers = Function[];
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/workspace.modules.node-modules-linker",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.176",
|
|
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.
|
|
9
|
+
"version": "0.0.176"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"fs-extra": "10.0.0",
|
|
@@ -14,8 +14,12 @@
|
|
|
14
14
|
"lodash": "4.17.21",
|
|
15
15
|
"@teambit/component-id": "1.2.0",
|
|
16
16
|
"@teambit/bit-roots": "0.0.133",
|
|
17
|
-
"@teambit/component-issues": "0.0.
|
|
18
|
-
"@teambit/
|
|
17
|
+
"@teambit/component-issues": "0.0.150",
|
|
18
|
+
"@teambit/legacy.utils": "0.0.3",
|
|
19
|
+
"@teambit/pkg.modules.component-package-name": "0.0.2",
|
|
20
|
+
"@teambit/component-package-version": "0.0.433",
|
|
21
|
+
"@teambit/legacy.bit-map": "0.0.5",
|
|
22
|
+
"@teambit/toolbox.path.path": "0.0.2"
|
|
19
23
|
},
|
|
20
24
|
"devDependencies": {
|
|
21
25
|
"@types/fs-extra": "9.0.7",
|
package/dist/tsconfig.json
DELETED
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"compilerOptions": {
|
|
3
|
-
"lib": [
|
|
4
|
-
"es2019",
|
|
5
|
-
"DOM",
|
|
6
|
-
"ES6",
|
|
7
|
-
"DOM.Iterable"
|
|
8
|
-
],
|
|
9
|
-
"target": "es2015",
|
|
10
|
-
"module": "CommonJS",
|
|
11
|
-
"jsx": "react",
|
|
12
|
-
"allowJs": true,
|
|
13
|
-
"composite": true,
|
|
14
|
-
"declaration": true,
|
|
15
|
-
"sourceMap": true,
|
|
16
|
-
"skipLibCheck": true,
|
|
17
|
-
"experimentalDecorators": true,
|
|
18
|
-
"outDir": "dist",
|
|
19
|
-
"moduleResolution": "node",
|
|
20
|
-
"esModuleInterop": true,
|
|
21
|
-
"rootDir": ".",
|
|
22
|
-
"resolveJsonModule": true
|
|
23
|
-
},
|
|
24
|
-
"exclude": [
|
|
25
|
-
"artifacts",
|
|
26
|
-
"public",
|
|
27
|
-
"dist",
|
|
28
|
-
"node_modules",
|
|
29
|
-
"package.json",
|
|
30
|
-
"**/*.cjs"
|
|
31
|
-
],
|
|
32
|
-
"include": [
|
|
33
|
-
"**/*",
|
|
34
|
-
"**/*.json"
|
|
35
|
-
],
|
|
36
|
-
"references": []
|
|
37
|
-
}
|
package/tsconfig.json
DELETED
|
@@ -1,37 +0,0 @@
|
|
|
1
|
-
{
|
|
2
|
-
"compilerOptions": {
|
|
3
|
-
"lib": [
|
|
4
|
-
"es2019",
|
|
5
|
-
"DOM",
|
|
6
|
-
"ES6",
|
|
7
|
-
"DOM.Iterable"
|
|
8
|
-
],
|
|
9
|
-
"target": "es2015",
|
|
10
|
-
"module": "CommonJS",
|
|
11
|
-
"jsx": "react",
|
|
12
|
-
"allowJs": true,
|
|
13
|
-
"composite": true,
|
|
14
|
-
"declaration": true,
|
|
15
|
-
"sourceMap": true,
|
|
16
|
-
"skipLibCheck": true,
|
|
17
|
-
"experimentalDecorators": true,
|
|
18
|
-
"outDir": "dist",
|
|
19
|
-
"moduleResolution": "node",
|
|
20
|
-
"esModuleInterop": true,
|
|
21
|
-
"rootDir": ".",
|
|
22
|
-
"resolveJsonModule": true
|
|
23
|
-
},
|
|
24
|
-
"exclude": [
|
|
25
|
-
"artifacts",
|
|
26
|
-
"public",
|
|
27
|
-
"dist",
|
|
28
|
-
"node_modules",
|
|
29
|
-
"package.json",
|
|
30
|
-
"**/*.cjs"
|
|
31
|
-
],
|
|
32
|
-
"include": [
|
|
33
|
-
"**/*",
|
|
34
|
-
"**/*.json"
|
|
35
|
-
],
|
|
36
|
-
"references": []
|
|
37
|
-
}
|
|
File without changes
|