@teambit/workspace.modules.node-modules-linker 0.0.161 → 0.0.163
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 +143 -0
- package/dist/codemod-components.d.ts +8 -0
- package/dist/codemod-components.js +138 -0
- package/dist/codemod-components.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/node-modules-linker.js +2 -2
- package/dist/node-modules-linker.js.map +1 -1
- package/index.ts +2 -0
- package/node-modules-linker.ts +2 -2
- package/package.json +4 -3
- /package/dist/{preview-1704192701443.js → preview-1706194779559.js} +0 -0
|
@@ -0,0 +1,143 @@
|
|
|
1
|
+
import path from 'path';
|
|
2
|
+
import { Workspace } from '@teambit/workspace';
|
|
3
|
+
import { IssuesClasses, RelativeComponentsAuthoredEntry } from '@teambit/component-issues';
|
|
4
|
+
import { Component } from '@teambit/component';
|
|
5
|
+
import { ComponentID, ComponentIdList } from '@teambit/component-id';
|
|
6
|
+
import { pathJoinLinux, pathNormalizeToLinux, pathRelativeLinux } from '@teambit/legacy/dist/utils';
|
|
7
|
+
import DataToPersist from '@teambit/legacy/dist/consumer/component/sources/data-to-persist';
|
|
8
|
+
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
|
+
import ConsumerComponent from '@teambit/legacy/dist/consumer/component';
|
|
12
|
+
|
|
13
|
+
export type CodemodResult = {
|
|
14
|
+
id: ComponentID;
|
|
15
|
+
changedFiles: string[];
|
|
16
|
+
warnings?: string[];
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
export async function changeCodeFromRelativeToModulePaths(
|
|
20
|
+
workspace: Workspace,
|
|
21
|
+
bitIds: ComponentID[]
|
|
22
|
+
): Promise<CodemodResult[]> {
|
|
23
|
+
const components = await loadComponents(workspace, bitIds);
|
|
24
|
+
const componentsWithRelativeIssues = components.filter(
|
|
25
|
+
(c) => c.state.issues && c.state.issues.getIssue(IssuesClasses.RelativeComponentsAuthored)
|
|
26
|
+
);
|
|
27
|
+
const dataToPersist = new DataToPersist();
|
|
28
|
+
const codemodResults = await Promise.all(
|
|
29
|
+
componentsWithRelativeIssues.map(async (component) => {
|
|
30
|
+
const { files, warnings } = await codemodComponent(workspace, component);
|
|
31
|
+
dataToPersist.addManyFiles(files);
|
|
32
|
+
return { id: component.id, changedFiles: files.map((f) => f.relative), warnings };
|
|
33
|
+
})
|
|
34
|
+
);
|
|
35
|
+
await dataToPersist.persistAllToFS();
|
|
36
|
+
const idsToReload = codemodResults.filter((c) => !c.warnings || c.warnings.length === 0).map((c) => c.id);
|
|
37
|
+
await reloadComponents(workspace, idsToReload);
|
|
38
|
+
|
|
39
|
+
return codemodResults.filter((c) => c.changedFiles.length || c.warnings);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
async function reloadComponents(workspace: Workspace, compIds: ComponentID[]) {
|
|
43
|
+
workspace.clearAllComponentsCache();
|
|
44
|
+
if (!compIds.length) return;
|
|
45
|
+
const components = await loadComponents(workspace, compIds);
|
|
46
|
+
const componentsWithRelativeIssues = components.filter(
|
|
47
|
+
(c) => c.state.issues && c.state.issues.getIssue(IssuesClasses.RelativeComponentsAuthored)
|
|
48
|
+
);
|
|
49
|
+
if (componentsWithRelativeIssues.length) {
|
|
50
|
+
const failedComps = componentsWithRelativeIssues.map((c) => c.id.toString()).join(', ');
|
|
51
|
+
throw new Error(`failed rewiring the following components: ${failedComps}`);
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
|
|
55
|
+
async function loadComponents(workspace: Workspace, bitIds: ComponentID[]): Promise<Component[]> {
|
|
56
|
+
const componentsIds = bitIds.length ? ComponentIdList.fromArray(bitIds) : await workspace.listIds();
|
|
57
|
+
const components = await workspace.getMany(componentsIds);
|
|
58
|
+
|
|
59
|
+
return components;
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
async function codemodComponent(
|
|
63
|
+
workspace: Workspace,
|
|
64
|
+
component: Component
|
|
65
|
+
): Promise<{ files: SourceFile[]; warnings?: string[] }> {
|
|
66
|
+
const issues = component.state.issues;
|
|
67
|
+
const files: SourceFile[] = [];
|
|
68
|
+
if (!issues || !issues.getIssue(IssuesClasses.RelativeComponentsAuthored)) return { files };
|
|
69
|
+
const warnings: string[] = [];
|
|
70
|
+
await Promise.all(
|
|
71
|
+
component.filesystem.files.map(async (file: SourceFile) => {
|
|
72
|
+
const relativeInstances = issues.getIssue(IssuesClasses.RelativeComponentsAuthored)?.data[
|
|
73
|
+
pathNormalizeToLinux(file.relative)
|
|
74
|
+
];
|
|
75
|
+
if (!relativeInstances) return;
|
|
76
|
+
// @ts-ignore
|
|
77
|
+
const fileBefore = file.contents.toString() as string;
|
|
78
|
+
let newFileString = fileBefore;
|
|
79
|
+
await Promise.all(
|
|
80
|
+
relativeInstances.map(async (relativeEntry: RelativeComponentsAuthoredEntry) => {
|
|
81
|
+
const id = relativeEntry.componentId;
|
|
82
|
+
const requiredComponent = await workspace.get(id);
|
|
83
|
+
const consumerComp = requiredComponent.state._consumer as ConsumerComponent;
|
|
84
|
+
const packageName = componentIdToPackageName({ ...consumerComp, id });
|
|
85
|
+
const cssFamily = ['.css', '.scss', '.less', '.sass'];
|
|
86
|
+
const isCss = cssFamily.includes(file.extname);
|
|
87
|
+
const packageNameSupportCss = isCss ? `~${packageName}` : packageName;
|
|
88
|
+
const stringToReplace = getNameWithoutInternalPath(workspace, relativeEntry);
|
|
89
|
+
// @todo: the "dist" should be replaced by the compiler dist-dir.
|
|
90
|
+
// newFileString = replacePackageName(newFileString, stringToReplace, packageNameSupportCss, 'dist');
|
|
91
|
+
newFileString = replacePackageName(newFileString, stringToReplace, packageNameSupportCss);
|
|
92
|
+
})
|
|
93
|
+
);
|
|
94
|
+
if (fileBefore !== newFileString) {
|
|
95
|
+
// @ts-ignore
|
|
96
|
+
file.contents = Buffer.from(newFileString);
|
|
97
|
+
files.push(file);
|
|
98
|
+
}
|
|
99
|
+
})
|
|
100
|
+
);
|
|
101
|
+
return { files, warnings };
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
/**
|
|
105
|
+
* e.g.
|
|
106
|
+
* importSource: '../workspace/workspace.ui'
|
|
107
|
+
* sourceRelativePath: 'extensions/workspace/workspace.ui.tsx'
|
|
108
|
+
* rootDir in .bitmap: 'extensions/workspace'.
|
|
109
|
+
*
|
|
110
|
+
* expected to return "../workspace", as this is the path to the package root without the internal path.
|
|
111
|
+
*
|
|
112
|
+
* eventually, only this string is replaced by the new package-name and the internal-path part
|
|
113
|
+
* remains intact. ('../workspace/workspace.ui' => '@bit/workspace/workspace.ui').
|
|
114
|
+
*/
|
|
115
|
+
function getNameWithoutInternalPath(workspace: Workspace, relativeEntry: RelativeComponentsAuthoredEntry): string {
|
|
116
|
+
const importSource = relativeEntry.importSource;
|
|
117
|
+
const componentMap = workspace.consumer.bitMap.getComponentIfExist(relativeEntry.componentId);
|
|
118
|
+
if (!componentMap) return importSource;
|
|
119
|
+
const rootDir = componentMap.rootDir;
|
|
120
|
+
if (!rootDir) return importSource;
|
|
121
|
+
const mainFile = componentMap.trackDir ? componentMap.mainFile : pathJoinLinux(rootDir, componentMap.mainFile);
|
|
122
|
+
const filePathRelativeToWorkspace = relativeEntry.relativePath.sourceRelativePath;
|
|
123
|
+
if (filePathRelativeToWorkspace === mainFile) {
|
|
124
|
+
return importSource;
|
|
125
|
+
}
|
|
126
|
+
// the importSource is not the main-file but an internal file, remove the internal part.
|
|
127
|
+
const internalPath = pathRelativeLinux(rootDir, filePathRelativeToWorkspace);
|
|
128
|
+
const removeLastOccurrence = (str, toRemove) => str.replace(new RegExp(`/${toRemove}$`), '');
|
|
129
|
+
if (importSource.endsWith(internalPath)) {
|
|
130
|
+
return removeLastOccurrence(importSource, internalPath);
|
|
131
|
+
}
|
|
132
|
+
const internalPathNoExt = internalPath.replace(path.extname(internalPath), '');
|
|
133
|
+
if (importSource.endsWith(internalPathNoExt)) {
|
|
134
|
+
return removeLastOccurrence(importSource, internalPathNoExt);
|
|
135
|
+
}
|
|
136
|
+
const internalPathNoIndex = removeLastOccurrence(internalPathNoExt, 'index');
|
|
137
|
+
if (importSource.endsWith(internalPathNoIndex)) {
|
|
138
|
+
return removeLastOccurrence(importSource, internalPathNoIndex);
|
|
139
|
+
}
|
|
140
|
+
|
|
141
|
+
// unable to find anything useful. just return the importSource.
|
|
142
|
+
return importSource;
|
|
143
|
+
}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Workspace } from '@teambit/workspace';
|
|
2
|
+
import { ComponentID } from '@teambit/component-id';
|
|
3
|
+
export declare type CodemodResult = {
|
|
4
|
+
id: ComponentID;
|
|
5
|
+
changedFiles: string[];
|
|
6
|
+
warnings?: string[];
|
|
7
|
+
};
|
|
8
|
+
export declare function changeCodeFromRelativeToModulePaths(workspace: Workspace, bitIds: ComponentID[]): Promise<CodemodResult[]>;
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
14
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
|
+
exports.changeCodeFromRelativeToModulePaths = void 0;
|
|
16
|
+
const path_1 = __importDefault(require("path"));
|
|
17
|
+
const component_issues_1 = require("@teambit/component-issues");
|
|
18
|
+
const component_id_1 = require("@teambit/component-id");
|
|
19
|
+
const utils_1 = require("@teambit/legacy/dist/utils");
|
|
20
|
+
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
|
+
function changeCodeFromRelativeToModulePaths(workspace, bitIds) {
|
|
24
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
25
|
+
const components = yield loadComponents(workspace, bitIds);
|
|
26
|
+
const componentsWithRelativeIssues = components.filter((c) => c.state.issues && c.state.issues.getIssue(component_issues_1.IssuesClasses.RelativeComponentsAuthored));
|
|
27
|
+
const dataToPersist = new data_to_persist_1.default();
|
|
28
|
+
const codemodResults = yield Promise.all(componentsWithRelativeIssues.map((component) => __awaiter(this, void 0, void 0, function* () {
|
|
29
|
+
const { files, warnings } = yield codemodComponent(workspace, component);
|
|
30
|
+
dataToPersist.addManyFiles(files);
|
|
31
|
+
return { id: component.id, changedFiles: files.map((f) => f.relative), warnings };
|
|
32
|
+
})));
|
|
33
|
+
yield dataToPersist.persistAllToFS();
|
|
34
|
+
const idsToReload = codemodResults.filter((c) => !c.warnings || c.warnings.length === 0).map((c) => c.id);
|
|
35
|
+
yield reloadComponents(workspace, idsToReload);
|
|
36
|
+
return codemodResults.filter((c) => c.changedFiles.length || c.warnings);
|
|
37
|
+
});
|
|
38
|
+
}
|
|
39
|
+
exports.changeCodeFromRelativeToModulePaths = changeCodeFromRelativeToModulePaths;
|
|
40
|
+
function reloadComponents(workspace, compIds) {
|
|
41
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
42
|
+
workspace.clearAllComponentsCache();
|
|
43
|
+
if (!compIds.length)
|
|
44
|
+
return;
|
|
45
|
+
const components = yield loadComponents(workspace, compIds);
|
|
46
|
+
const componentsWithRelativeIssues = components.filter((c) => c.state.issues && c.state.issues.getIssue(component_issues_1.IssuesClasses.RelativeComponentsAuthored));
|
|
47
|
+
if (componentsWithRelativeIssues.length) {
|
|
48
|
+
const failedComps = componentsWithRelativeIssues.map((c) => c.id.toString()).join(', ');
|
|
49
|
+
throw new Error(`failed rewiring the following components: ${failedComps}`);
|
|
50
|
+
}
|
|
51
|
+
});
|
|
52
|
+
}
|
|
53
|
+
function loadComponents(workspace, bitIds) {
|
|
54
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
55
|
+
const componentsIds = bitIds.length ? component_id_1.ComponentIdList.fromArray(bitIds) : yield workspace.listIds();
|
|
56
|
+
const components = yield workspace.getMany(componentsIds);
|
|
57
|
+
return components;
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
function codemodComponent(workspace, component) {
|
|
61
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
62
|
+
const issues = component.state.issues;
|
|
63
|
+
const files = [];
|
|
64
|
+
if (!issues || !issues.getIssue(component_issues_1.IssuesClasses.RelativeComponentsAuthored))
|
|
65
|
+
return { files };
|
|
66
|
+
const warnings = [];
|
|
67
|
+
yield Promise.all(component.filesystem.files.map((file) => __awaiter(this, void 0, void 0, function* () {
|
|
68
|
+
var _a;
|
|
69
|
+
const relativeInstances = (_a = issues.getIssue(component_issues_1.IssuesClasses.RelativeComponentsAuthored)) === null || _a === void 0 ? void 0 : _a.data[(0, utils_1.pathNormalizeToLinux)(file.relative)];
|
|
70
|
+
if (!relativeInstances)
|
|
71
|
+
return;
|
|
72
|
+
// @ts-ignore
|
|
73
|
+
const fileBefore = file.contents.toString();
|
|
74
|
+
let newFileString = fileBefore;
|
|
75
|
+
yield Promise.all(relativeInstances.map((relativeEntry) => __awaiter(this, void 0, void 0, function* () {
|
|
76
|
+
const id = relativeEntry.componentId;
|
|
77
|
+
const requiredComponent = yield workspace.get(id);
|
|
78
|
+
const consumerComp = requiredComponent.state._consumer;
|
|
79
|
+
const packageName = (0, component_id_to_package_name_1.default)(Object.assign(Object.assign({}, consumerComp), { id }));
|
|
80
|
+
const cssFamily = ['.css', '.scss', '.less', '.sass'];
|
|
81
|
+
const isCss = cssFamily.includes(file.extname);
|
|
82
|
+
const packageNameSupportCss = isCss ? `~${packageName}` : packageName;
|
|
83
|
+
const stringToReplace = getNameWithoutInternalPath(workspace, relativeEntry);
|
|
84
|
+
// @todo: the "dist" should be replaced by the compiler dist-dir.
|
|
85
|
+
// newFileString = replacePackageName(newFileString, stringToReplace, packageNameSupportCss, 'dist');
|
|
86
|
+
newFileString = (0, replace_package_name_1.default)(newFileString, stringToReplace, packageNameSupportCss);
|
|
87
|
+
})));
|
|
88
|
+
if (fileBefore !== newFileString) {
|
|
89
|
+
// @ts-ignore
|
|
90
|
+
file.contents = Buffer.from(newFileString);
|
|
91
|
+
files.push(file);
|
|
92
|
+
}
|
|
93
|
+
})));
|
|
94
|
+
return { files, warnings };
|
|
95
|
+
});
|
|
96
|
+
}
|
|
97
|
+
/**
|
|
98
|
+
* e.g.
|
|
99
|
+
* importSource: '../workspace/workspace.ui'
|
|
100
|
+
* sourceRelativePath: 'extensions/workspace/workspace.ui.tsx'
|
|
101
|
+
* rootDir in .bitmap: 'extensions/workspace'.
|
|
102
|
+
*
|
|
103
|
+
* expected to return "../workspace", as this is the path to the package root without the internal path.
|
|
104
|
+
*
|
|
105
|
+
* eventually, only this string is replaced by the new package-name and the internal-path part
|
|
106
|
+
* remains intact. ('../workspace/workspace.ui' => '@bit/workspace/workspace.ui').
|
|
107
|
+
*/
|
|
108
|
+
function getNameWithoutInternalPath(workspace, relativeEntry) {
|
|
109
|
+
const importSource = relativeEntry.importSource;
|
|
110
|
+
const componentMap = workspace.consumer.bitMap.getComponentIfExist(relativeEntry.componentId);
|
|
111
|
+
if (!componentMap)
|
|
112
|
+
return importSource;
|
|
113
|
+
const rootDir = componentMap.rootDir;
|
|
114
|
+
if (!rootDir)
|
|
115
|
+
return importSource;
|
|
116
|
+
const mainFile = componentMap.trackDir ? componentMap.mainFile : (0, utils_1.pathJoinLinux)(rootDir, componentMap.mainFile);
|
|
117
|
+
const filePathRelativeToWorkspace = relativeEntry.relativePath.sourceRelativePath;
|
|
118
|
+
if (filePathRelativeToWorkspace === mainFile) {
|
|
119
|
+
return importSource;
|
|
120
|
+
}
|
|
121
|
+
// the importSource is not the main-file but an internal file, remove the internal part.
|
|
122
|
+
const internalPath = (0, utils_1.pathRelativeLinux)(rootDir, filePathRelativeToWorkspace);
|
|
123
|
+
const removeLastOccurrence = (str, toRemove) => str.replace(new RegExp(`/${toRemove}$`), '');
|
|
124
|
+
if (importSource.endsWith(internalPath)) {
|
|
125
|
+
return removeLastOccurrence(importSource, internalPath);
|
|
126
|
+
}
|
|
127
|
+
const internalPathNoExt = internalPath.replace(path_1.default.extname(internalPath), '');
|
|
128
|
+
if (importSource.endsWith(internalPathNoExt)) {
|
|
129
|
+
return removeLastOccurrence(importSource, internalPathNoExt);
|
|
130
|
+
}
|
|
131
|
+
const internalPathNoIndex = removeLastOccurrence(internalPathNoExt, 'index');
|
|
132
|
+
if (importSource.endsWith(internalPathNoIndex)) {
|
|
133
|
+
return removeLastOccurrence(importSource, internalPathNoIndex);
|
|
134
|
+
}
|
|
135
|
+
// unable to find anything useful. just return the importSource.
|
|
136
|
+
return importSource;
|
|
137
|
+
}
|
|
138
|
+
//# sourceMappingURL=codemod-components.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"codemod-components.js","sourceRoot":"","sources":["../codemod-components.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,2 +1,3 @@
|
|
|
1
1
|
export { NodeModulesLinksResult, linkToNodeModulesByIds, linkToNodeModulesWithCodemod, linkToNodeModulesByComponents, removeLinksFromNodeModules, } from './node-modules-linker';
|
|
2
2
|
export { PackageJsonTransformer } from './package-json-transformer';
|
|
3
|
+
export type { CodemodResult } from './codemod-components';
|
|
@@ -46,11 +46,11 @@ const data_to_persist_1 = __importDefault(require("@teambit/legacy/dist/consumer
|
|
|
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
48
|
const component_node_modules_path_1 = __importDefault(require("@teambit/legacy/dist/utils/bit/component-node-modules-path"));
|
|
49
|
-
const codemod_components_1 = require("@teambit/legacy/dist/consumer/component-ops/codemod-components");
|
|
50
49
|
const symlink_1 = __importDefault(require("@teambit/legacy/dist/links/symlink"));
|
|
51
50
|
const component_id_to_package_name_1 = __importDefault(require("@teambit/legacy/dist/utils/bit/component-id-to-package-name"));
|
|
52
51
|
const component_package_version_1 = require("@teambit/component-package-version");
|
|
53
52
|
const package_json_transformer_1 = require("./package-json-transformer");
|
|
53
|
+
const codemod_components_1 = require("./codemod-components");
|
|
54
54
|
/**
|
|
55
55
|
* link given components to node_modules, so it's possible to use absolute link instead of relative
|
|
56
56
|
* for example, require('@bit/remote-scope.bar.foo)
|
|
@@ -242,7 +242,7 @@ function linkToNodeModulesWithCodemod(workspace, bitIds, changeRelativeToModuleP
|
|
|
242
242
|
return __awaiter(this, void 0, void 0, function* () {
|
|
243
243
|
let codemodResults;
|
|
244
244
|
if (changeRelativeToModulePaths) {
|
|
245
|
-
codemodResults = yield (0, codemod_components_1.changeCodeFromRelativeToModulePaths)(workspace
|
|
245
|
+
codemodResults = yield (0, codemod_components_1.changeCodeFromRelativeToModulePaths)(workspace, bitIds);
|
|
246
246
|
}
|
|
247
247
|
const linksResults = yield linkToNodeModulesByIds(workspace, bitIds);
|
|
248
248
|
return { linksResults, codemodResults };
|
|
@@ -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;AACxD,6HAAuG;AAEvG,
|
|
1
|
+
{"version":3,"file":"node-modules-linker.js","sourceRoot":"","sources":["../node-modules-linker.ts"],"names":[],"mappings":"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"}
|
package/index.ts
CHANGED
package/node-modules-linker.ts
CHANGED
|
@@ -13,13 +13,13 @@ import Consumer from '@teambit/legacy/dist/consumer/consumer';
|
|
|
13
13
|
import logger from '@teambit/legacy/dist/logger/logger';
|
|
14
14
|
import getNodeModulesPathOfComponent from '@teambit/legacy/dist/utils/bit/component-node-modules-path';
|
|
15
15
|
import { PathOsBasedAbsolute, PathOsBasedRelative } from '@teambit/legacy/dist/utils/path';
|
|
16
|
-
import { changeCodeFromRelativeToModulePaths } from '@teambit/legacy/dist/consumer/component-ops/codemod-components';
|
|
17
16
|
import Symlink from '@teambit/legacy/dist/links/symlink';
|
|
18
17
|
import componentIdToPackageName from '@teambit/legacy/dist/utils/bit/component-id-to-package-name';
|
|
19
18
|
import { Workspace } from '@teambit/workspace';
|
|
20
19
|
import { snapToSemver } from '@teambit/component-package-version';
|
|
21
20
|
import { Component } from '@teambit/component';
|
|
22
21
|
import { PackageJsonTransformer } from './package-json-transformer';
|
|
22
|
+
import { changeCodeFromRelativeToModulePaths } from './codemod-components';
|
|
23
23
|
|
|
24
24
|
type LinkDetail = { from: string; to: string };
|
|
25
25
|
export type NodeModulesLinksResult = {
|
|
@@ -234,7 +234,7 @@ export async function linkToNodeModulesWithCodemod(
|
|
|
234
234
|
) {
|
|
235
235
|
let codemodResults;
|
|
236
236
|
if (changeRelativeToModulePaths) {
|
|
237
|
-
codemodResults = await changeCodeFromRelativeToModulePaths(workspace
|
|
237
|
+
codemodResults = await changeCodeFromRelativeToModulePaths(workspace, bitIds);
|
|
238
238
|
}
|
|
239
239
|
const linksResults = await linkToNodeModulesByIds(workspace, bitIds);
|
|
240
240
|
return { linksResults, codemodResults };
|
package/package.json
CHANGED
|
@@ -1,19 +1,20 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@teambit/workspace.modules.node-modules-linker",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.163",
|
|
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.163"
|
|
10
10
|
},
|
|
11
11
|
"dependencies": {
|
|
12
12
|
"fs-extra": "10.0.0",
|
|
13
13
|
"p-map-series": "2.1.0",
|
|
14
14
|
"lodash": "4.17.21",
|
|
15
|
-
"@teambit/bit-roots": "0.0.133",
|
|
16
15
|
"@teambit/component-id": "1.2.0",
|
|
16
|
+
"@teambit/bit-roots": "0.0.133",
|
|
17
|
+
"@teambit/component-issues": "0.0.141",
|
|
17
18
|
"@teambit/component-package-version": "0.0.433"
|
|
18
19
|
},
|
|
19
20
|
"devDependencies": {
|
|
File without changes
|