@xaypay/tui 0.0.78 → 0.0.79
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/index.es.js +16 -3
- package/dist/index.js +16 -3
- package/package.json +1 -1
- package/src/utils/index.js +16 -3
package/dist/index.es.js
CHANGED
|
@@ -192,10 +192,23 @@ File.defaultProps = {
|
|
|
192
192
|
const _ = require('lodash');
|
|
193
193
|
const compereConfigs = () => {
|
|
194
194
|
let projectConfig = {};
|
|
195
|
-
let packageConfig =
|
|
195
|
+
let packageConfig = {};
|
|
196
196
|
try {
|
|
197
|
-
|
|
198
|
-
} catch (e) {
|
|
197
|
+
packageConfig = require('../tui.config.js');
|
|
198
|
+
} catch (e) {
|
|
199
|
+
try {
|
|
200
|
+
packageConfig = require('../../tui.config.js');
|
|
201
|
+
} catch (err) {
|
|
202
|
+
packageConfig = {};
|
|
203
|
+
}
|
|
204
|
+
}
|
|
205
|
+
try {
|
|
206
|
+
projectConfig = require('../../../../tui.config.js');
|
|
207
|
+
} catch (error) {
|
|
208
|
+
projectConfig = {};
|
|
209
|
+
// console.log(error, 'Project: if you want to use custom styles, create tui.config.js file in your project root');
|
|
210
|
+
}
|
|
211
|
+
|
|
199
212
|
return _.merge(packageConfig, projectConfig);
|
|
200
213
|
};
|
|
201
214
|
|
package/dist/index.js
CHANGED
|
@@ -222,10 +222,23 @@ File.defaultProps = {
|
|
|
222
222
|
const _ = require('lodash');
|
|
223
223
|
const compereConfigs = () => {
|
|
224
224
|
let projectConfig = {};
|
|
225
|
-
let packageConfig =
|
|
225
|
+
let packageConfig = {};
|
|
226
226
|
try {
|
|
227
|
-
|
|
228
|
-
} catch (e) {
|
|
227
|
+
packageConfig = require('../tui.config.js');
|
|
228
|
+
} catch (e) {
|
|
229
|
+
try {
|
|
230
|
+
packageConfig = require('../../tui.config.js');
|
|
231
|
+
} catch (err) {
|
|
232
|
+
packageConfig = {};
|
|
233
|
+
}
|
|
234
|
+
}
|
|
235
|
+
try {
|
|
236
|
+
projectConfig = require('../../../../tui.config.js');
|
|
237
|
+
} catch (error) {
|
|
238
|
+
projectConfig = {};
|
|
239
|
+
// console.log(error, 'Project: if you want to use custom styles, create tui.config.js file in your project root');
|
|
240
|
+
}
|
|
241
|
+
|
|
229
242
|
return _.merge(packageConfig, projectConfig);
|
|
230
243
|
};
|
|
231
244
|
|
package/package.json
CHANGED
package/src/utils/index.js
CHANGED
|
@@ -2,11 +2,24 @@ const _ = require('lodash');
|
|
|
2
2
|
|
|
3
3
|
export const compereConfigs = () => {
|
|
4
4
|
let projectConfig = {};
|
|
5
|
-
let packageConfig =
|
|
5
|
+
let packageConfig = {};
|
|
6
6
|
|
|
7
7
|
try {
|
|
8
|
-
|
|
9
|
-
} catch(e)
|
|
8
|
+
packageConfig = require('../tui.config.js');
|
|
9
|
+
} catch (e){
|
|
10
|
+
try {
|
|
11
|
+
packageConfig = require('../../tui.config.js');
|
|
12
|
+
} catch (err) {
|
|
13
|
+
packageConfig = {};
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
try {
|
|
18
|
+
projectConfig = require('../../../../tui.config.js');
|
|
19
|
+
} catch (error) {
|
|
20
|
+
projectConfig = {};
|
|
21
|
+
// console.log(error, 'Project: if you want to use custom styles, create tui.config.js file in your project root');
|
|
22
|
+
}
|
|
10
23
|
|
|
11
24
|
return _.merge(packageConfig, projectConfig);
|
|
12
25
|
};
|