Skip to content

Commit d2cc279

Browse files
Hyperkid123Hyperkid123
authored
Merge pull request #1120 from rvsia/checkRootNodeModules
Check root and packages node_modules at the same time
2 parents 566be5b + e1a4d4f commit d2cc279

File tree

1 file changed

+15
-31
lines changed

1 file changed

+15
-31
lines changed

‎packages/common/babel.config.js‎

Lines changed: 15 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -50,14 +50,15 @@ const createSuirCJSTransform = (env = 'commonjs') => [
5050
'semantic-ui-react': {
5151
transform: (importName) => {
5252
let res;
53-
const files = glob.sync(path.resolve(__dirname, `../../node_modules/semantic-ui-react/dist/${env}/**/${importName}.js`));
53+
const files = glob.sync(path.resolve(__dirname, `../{..,suir-component-mapper}/node_modules/semantic-ui-react/dist/${env}/**/${importName}.js`));
54+
5455
if (files.length > 0) {
5556
res = files[0];
5657
} else {
5758
throw new Error(`File with importName ${importName} does not exist`);
5859
}
5960

60-
res = res.replace(path.resolve(__dirname, '../../node_modules/'), '');
61+
res = res.replace(/^.*node_modules\//, '');
6162
res = res.replace(/^\//, '');
6263
return res;
6364
},
@@ -92,15 +93,15 @@ const createPfReactTransform = (env) => [
9293
transform: (importName) => {
9394
let res;
9495
const files = glob.sync(
95-
path.resolve(__dirname, `../../node_modules/@patternfly/react-core/dist/${env}/**/${mapper[importName] || importName}.js`)
96+
path.resolve(__dirname, `../{..,pf4-component-mapper}//node_modules/@patternfly/react-core/dist/${env}/**/${mapper[importName] || importName}.js`)
9697
);
9798
if (files.length > 0) {
9899
res = files[0];
99100
} else {
100101
throw new Error(`File with importName ${importName} does not exist`);
101102
}
102103

103-
res = res.replace(path.resolve(__dirname, '../../node_modules/'), '');
104+
res = res.replace(/^.*node_modules\//, '');
104105
res = res.replace(/^\//, '');
105106
return res;
106107
},
@@ -115,23 +116,6 @@ const createPfReactTransform = (env) => [
115116
.toLowerCase()}`,
116117
preventFullImport: true
117118
},
118-
'patternfly-react': {
119-
transform: (importName) => {
120-
let res;
121-
const files = glob.sync(path.resolve(__dirname, `../../node_modules/patternfly-react/dist/${env}/**/${importName}.js`));
122-
if (files.length > 0) {
123-
res = files[0];
124-
} else {
125-
throw new Error(`File with importName ${importName} does not exist`);
126-
}
127-
128-
res = res.replace(path.resolve(__dirname, '../../node_modules/'), '');
129-
res = res.replace(/^\//, '');
130-
return res;
131-
},
132-
preventFullImport: false,
133-
skipDefaultConversion: false
134-
}
135119
},
136120
`pf-react-${env}`
137121
];
@@ -159,7 +143,7 @@ const createAntTransform = (env) => [
159143
const files = glob.sync(
160144
path.resolve(
161145
__dirname,
162-
`../../node_modules/antd/${env === 'cjs' ? 'lib' : 'es'}/${importName
146+
`../{..,ant-component-mapper}/node_modules/antd/${env === 'cjs' ? 'lib' : 'es'}/${importName
163147
.split(/(?=[A-Z])/)
164148
.join('-')
165149
.toLowerCase()}/index.js`
@@ -171,7 +155,7 @@ const createAntTransform = (env) => [
171155
throw new Error(`File with importName ${importName} does not exist`);
172156
}
173157

174-
res = res.replace(path.resolve(__dirname, '../../node_modules/'), '');
158+
res = res.replace(/^.*node_modules\//, '');
175159
res = res.replace(/^\//, '');
176160
return res;
177161
}
@@ -196,15 +180,15 @@ const createCarbonCJSTransform = (env) => [
196180
transform: (importName) => {
197181
let res;
198182
const files = glob.sync(
199-
path.resolve(__dirname, `../../node_modules/carbon-components-react/${env === 'cjs' ? 'lib' : 'es'}/**/${carbonMapper(importName)}.js`)
183+
path.resolve(__dirname, `../{..,carbon-component-mapper}/node_modules/carbon-components-react/${env === 'cjs' ? 'lib' : 'es'}/**/${carbonMapper(importName)}.js`)
200184
);
201185
if (files.length > 0) {
202186
res = files[0];
203187
} else {
204188
throw new Error(`File with importName ${importName} does not exist`);
205189
}
206190

207-
res = res.replace(path.resolve(__dirname, '../../node_modules/'), '');
191+
res = res.replace(/^.*node_modules\//, '');
208192
res = res.replace(/^\//, '');
209193
return res;
210194
},
@@ -215,15 +199,15 @@ const createCarbonCJSTransform = (env) => [
215199
transform: (importName) => {
216200
let res;
217201
const files = glob.sync(
218-
path.resolve(__dirname, `../../node_modules/carbon-components-react/${env === 'cjs' ? 'lib' : 'es'}/**/${carbonMapper(importName)}.js`)
202+
path.resolve(__dirname, `../{..,carbon-component-mapper}/node_modules/carbon-components-react/${env === 'cjs' ? 'lib' : 'es'}/**/${carbonMapper(importName)}.js`)
219203
);
220204
if (files.length > 0) {
221205
res = files[0];
222206
} else {
223207
throw new Error(`File with importName ${importName} does not exist`);
224208
}
225209

226-
res = res.replace(path.resolve(__dirname, '../../node_modules/'), '');
210+
res = res.replace(/^.*node_modules\//, '');
227211
res = res.replace(/^\//, '');
228212
return res;
229213
},
@@ -234,15 +218,15 @@ const createCarbonCJSTransform = (env) => [
234218
transform: (importName) => {
235219
let res;
236220
const files = glob.sync(
237-
path.resolve(__dirname, `../../node_modules/carbon-components-react/${env === 'cjs' ? 'lib' : 'es'}/**/${carbonMapper(importName)}.js`)
221+
path.resolve(__dirname, `../{..,carbon-component-mapper}/node_modules/carbon-components-react/${env === 'cjs' ? 'lib' : 'es'}/**/${carbonMapper(importName)}.js`)
238222
);
239223
if (files.length > 0) {
240224
res = files[0];
241225
} else {
242226
throw new Error(`File with importName ${importName} does not exist`);
243227
}
244228

245-
res = res.replace(path.resolve(__dirname, '../../node_modules/'), '');
229+
res = res.replace(/^.*node_modules\//, '');
246230
res = res.replace(/^\//, '');
247231
return res;
248232
},
@@ -256,15 +240,15 @@ const createCarbonCJSTransform = (env) => [
256240

257241
let res;
258242
const files = glob.sync(
259-
path.resolve(__dirname, `../../node_modules/@carbon/icons-react/${env === 'cjs' ? 'lib' : 'es'}/${iconName}/${size}.js`)
243+
path.resolve(__dirname, `../{..,carbon-component-mapper}/node_modules/@carbon/icons-react/${env === 'cjs' ? 'lib' : 'es'}/${iconName}/${size}.js`)
260244
);
261245
if (files.length > 0) {
262246
res = files[0];
263247
} else {
264248
throw new Error(`File with importName ${importName} does not exist`);
265249
}
266250

267-
res = res.replace(path.resolve(__dirname, '../../node_modules/'), '');
251+
res = res.replace(/^.*node_modules\//, '');
268252
res = res.replace(/^\//, '');
269253
return res;
270254
},

0 commit comments

Comments
 (0)