@zohodesk/react-cli 1.1.8 → 1.1.10
Sign up to get free protection for your applications and to get access to all the features.
- package/.vscode/settings.json +25 -0
- package/README.md +95 -28
- package/bin/cli.js +13 -52
- package/docs/CustomChunks.md +12 -9
- package/lib/common/runPreProcess.js +66 -0
- package/lib/common/splitChunks.js +65 -45
- package/lib/common/testPattern.js +9 -9
- package/lib/configs/webpack.dev.config.js +6 -3
- package/lib/configs/webpack.docs.config.js +4 -2
- package/lib/configs/webpack.impact.config.js +4 -2
- package/lib/configs/webpack.prod.config.js +6 -3
- package/lib/deprecationLogger.js +40 -0
- package/lib/loaderUtils/getCSSLoaders.js +24 -7
- package/lib/pluginUtils/getDevPlugins.js +3 -2
- package/lib/pluginUtils/getProdPlugins.js +1 -1
- package/lib/plugins/ReportGeneratePlugin.js +8 -6
- package/lib/plugins/ResourceHintsPlugin.js +13 -3
- package/lib/plugins/UnusedFilesFindPlugin.js +7 -5
- package/lib/plugins/utils/fileHandling.js +36 -39
- package/lib/schemas/index.js +19 -36
- package/lib/utils/deprecationSupport.js +134 -0
- package/lib/utils/getOptions.js +19 -79
- package/lib/utils/index.js +14 -12
- package/lib/utils/initPreCommitHook.js +5 -5
- package/lib/utils/log.js +11 -0
- package/lib/utils/pullOrigin.js +3 -3
- package/lib/utils/reinstallDependencies.js +3 -3
- package/lib/utils/switchBranch.js +4 -2
- package/npm-shrinkwrap.json +94 -2
- package/package.json +2 -2
- package/templates/docs/css/markdown.css +1 -1
@@ -0,0 +1,134 @@
|
|
1
|
+
"use strict";
|
2
|
+
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
4
|
+
value: true
|
5
|
+
});
|
6
|
+
exports.deprecationSupport = deprecationSupport;
|
7
|
+
|
8
|
+
var _path = _interopRequireDefault(require("path"));
|
9
|
+
|
10
|
+
var deprecationHandlers = _interopRequireWildcard(require("../deprecationLogger"));
|
11
|
+
|
12
|
+
var _windowsModification = require("../loaderUtils/windowsModification");
|
13
|
+
|
14
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
15
|
+
|
16
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
17
|
+
|
18
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
19
|
+
|
20
|
+
let {
|
21
|
+
deprecateMessage,
|
22
|
+
deprecateOption,
|
23
|
+
deprecationLoggerEnd
|
24
|
+
} = deprecationHandlers;
|
25
|
+
|
26
|
+
function modifyCssArr(arr) {
|
27
|
+
return arr.map(x => {
|
28
|
+
const includeCss = !x.startsWith('!');
|
29
|
+
const modifier = includeCss ? '/*.css' : '';
|
30
|
+
const filePath = x.replace(/^!/, ''); // Remove the "!" symbol if present
|
31
|
+
|
32
|
+
return (0, _windowsModification.windowsModificationFile)(_path.default.join(includeCss ? '**' : '!**', filePath, '**', modifier));
|
33
|
+
});
|
34
|
+
}
|
35
|
+
|
36
|
+
const defaultPostCssPluginOptions = {
|
37
|
+
valueReplacer: null,
|
38
|
+
hasRTL: false,
|
39
|
+
selectorReplace: null,
|
40
|
+
hoverActive: false,
|
41
|
+
combinerMediaQuery: false,
|
42
|
+
cssVariableReplacement: false,
|
43
|
+
selectorWeight: false,
|
44
|
+
minifier: false,
|
45
|
+
composeMinification: false
|
46
|
+
};
|
47
|
+
|
48
|
+
function deprecationSupport(options, disableDeprecationWarning) {
|
49
|
+
if (disableDeprecationWarning) {
|
50
|
+
/* eslint-disable no-empty-function */
|
51
|
+
deprecateMessage = () => {};
|
52
|
+
|
53
|
+
deprecateOption = () => {};
|
54
|
+
|
55
|
+
deprecationLoggerEnd = () => {};
|
56
|
+
/* eslint-enable no-empty-function */
|
57
|
+
|
58
|
+
}
|
59
|
+
|
60
|
+
options.app.plugins = options.app.plugins || defaultPostCssPluginOptions;
|
61
|
+
options.docs.plugins = options.docs.plugins || defaultPostCssPluginOptions;
|
62
|
+
options.css.plugins = options.css.plugins || defaultPostCssPluginOptions; // if (selectn(options, ".app.hasRTL") === true) {
|
63
|
+
|
64
|
+
if (options.app.hasRTL === true) {
|
65
|
+
deprecateOption('app.hasRTL', 'app.plugins.hasRTL');
|
66
|
+
options.app.plugins.hasRTL = true;
|
67
|
+
}
|
68
|
+
|
69
|
+
if (options.docs.hasRTL === true) {
|
70
|
+
deprecateOption('docs.hasRTL', 'docs.plugins.hasRTL');
|
71
|
+
options.docs.plugins.hasRTL = true;
|
72
|
+
}
|
73
|
+
|
74
|
+
if (options.app.selectorReplace !== null && options.app.plugins && (options.app.plugins.selectorReplace === null || options.app.plugins.selectorReplace === undefined)) {
|
75
|
+
deprecateMessage('when you use app.selectorReplace mention enable or disable app.plugins.selectorReplace by setting value to true or false');
|
76
|
+
options.app.plugins.selectorReplace = true;
|
77
|
+
}
|
78
|
+
|
79
|
+
if (options.docs.selectorReplace !== null && options.docs.plugins && (options.docs.plugins.selectorReplace === null || options.docs.plugins.selectorReplace === undefined)) {
|
80
|
+
deprecateMessage('when you use docs.selectorReplace mention enable or disable docs.plugins.selectorReplace by setting value to true or false');
|
81
|
+
options.docs.plugins.selectorReplace = true;
|
82
|
+
}
|
83
|
+
|
84
|
+
if (options.css.valueReplacer !== null && options.css.plugins && (options.app.plugins.valueReplacer === null || options.app.plugins.valueReplacer === undefined)) {
|
85
|
+
deprecateMessage('when you use app.valueReplacer mention enable or disable app.plugins.valueReplacer by setting value to true or false');
|
86
|
+
options.app.plugins.valueReplacer = true;
|
87
|
+
}
|
88
|
+
|
89
|
+
if (!options.app.patterns) {
|
90
|
+
options.app.patterns = {};
|
91
|
+
}
|
92
|
+
|
93
|
+
function handleRTL(rtlExclude, rtl, hasRTL, type) {
|
94
|
+
if (rtlExclude && rtlExclude.length > 0) {
|
95
|
+
options[type].patterns.hasRTL = modifyCssArr(rtlExclude);
|
96
|
+
deprecateOption(`${type}.rtlExclude`, `${type}.patterns.hasRTL`);
|
97
|
+
}
|
98
|
+
|
99
|
+
if (rtl && rtl.length > 0) {
|
100
|
+
options[type].patterns.hasRTL = modifyCssArr(rtl);
|
101
|
+
deprecateOption(`${type}.exclude.rtl`, `${type}.patterns.hasRTL`);
|
102
|
+
}
|
103
|
+
|
104
|
+
if (hasRTL && hasRTL.length > 0) {
|
105
|
+
options[type].patterns.hasRTL = modifyCssArr(hasRTL);
|
106
|
+
deprecateOption(`${type}.exclude.hasRTL`, `${type}.patterns.hasRTL`);
|
107
|
+
}
|
108
|
+
}
|
109
|
+
|
110
|
+
function addExcludesToPattern(patterns, exclude, type) {
|
111
|
+
Object.keys(defaultPostCssPluginOptions).forEach(key => {
|
112
|
+
if (!exclude[key] || exclude[key].length === 0) {
|
113
|
+
return;
|
114
|
+
}
|
115
|
+
|
116
|
+
if (patterns[key].length === 0) {
|
117
|
+
deprecateOption(`${type}.exclude.${key}`, `${type}.patterns.${key}`);
|
118
|
+
let tempArr = exclude[key];
|
119
|
+
tempArr = tempArr.map(x => _path.default.join('!**', x, '**')); // Since patterns[key] is empty we need to wildcard for allow all others.
|
120
|
+
|
121
|
+
tempArr.unshift('*');
|
122
|
+
patterns[key] = tempArr;
|
123
|
+
} else if (exclude[key].length > 0 && patterns[key].length > 0) {
|
124
|
+
deprecateOption(`${type}.exclude.${key}`, `${type}.patterns.${key}`, ` And Since you have used ${type}.patterns.${key} we won't use ${type}.exclude.${key}. So please make appropriate changes`);
|
125
|
+
}
|
126
|
+
});
|
127
|
+
}
|
128
|
+
|
129
|
+
handleRTL(options.app.rtlExclude, options.app.exclude.rtl, options.app.exclude.hasRTL, 'app');
|
130
|
+
handleRTL(options.docs.rtlExclude, options.docs.exclude.rtl, options.docs.exclude.hasRTL, 'docs');
|
131
|
+
addExcludesToPattern(options.app.patterns, options.app.exclude, 'app');
|
132
|
+
addExcludesToPattern(options.docs.patterns, options.docs.exclude, 'docs');
|
133
|
+
deprecationLoggerEnd();
|
134
|
+
}
|
package/lib/utils/getOptions.js
CHANGED
@@ -7,14 +7,20 @@ exports.default = void 0;
|
|
7
7
|
|
8
8
|
var _child_process = require("child_process");
|
9
9
|
|
10
|
-
var _fs =
|
10
|
+
var _fs = _interopRequireWildcard(require("fs"));
|
11
11
|
|
12
12
|
var _path = _interopRequireDefault(require("path"));
|
13
13
|
|
14
14
|
var _schemas = _interopRequireDefault(require("../schemas"));
|
15
15
|
|
16
|
+
var _deprecationSupport = require("./deprecationSupport");
|
17
|
+
|
16
18
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
17
19
|
|
20
|
+
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
21
|
+
|
22
|
+
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
23
|
+
|
18
24
|
// import { argv } from 'process';
|
19
25
|
const args = process.argv.slice(2); // console.log('argv', argv);
|
20
26
|
|
@@ -122,105 +128,39 @@ const defaulter = (target, source) => {
|
|
122
128
|
return defaultObject;
|
123
129
|
};
|
124
130
|
|
125
|
-
global.reactCLIOptions = null;
|
126
|
-
// let temp = obj;
|
127
|
-
// let keys = key.split('.');
|
128
|
-
// for (let i = 0; i < keys.length; i++) {
|
129
|
-
// const element = keys[i];
|
130
|
-
// temp = temp && temp[element];
|
131
|
-
// }
|
132
|
-
// return temp;
|
133
|
-
// }
|
134
|
-
|
135
|
-
function deprecationSupport(options) {
|
136
|
-
// if (selectn(options, ".app.hasRTL") === true) {
|
137
|
-
if (options.app.hasRTL === true) {
|
138
|
-
options.app.plugins.hasRTL = true;
|
139
|
-
}
|
140
|
-
|
141
|
-
if (options.docs.hasRTL === true) {
|
142
|
-
options.docs.plugins.hasRTL = true;
|
143
|
-
}
|
144
|
-
|
145
|
-
if (options.app.rtlExclude.length > 0) {
|
146
|
-
options.app.exclude.rtl = options.app.rtlExclude;
|
147
|
-
}
|
131
|
+
global.reactCLIOptions = null;
|
148
132
|
|
149
|
-
|
150
|
-
|
151
|
-
}
|
133
|
+
const getOptionsFromConfigFile = (appPath, configFileName) => {
|
134
|
+
const fileName = configFileName || 'build.config.js';
|
152
135
|
|
153
|
-
|
154
|
-
options.app.plugins.selectorReplace = true;
|
155
|
-
}
|
136
|
+
const packagePath = _path.default.join(appPath, fileName);
|
156
137
|
|
157
|
-
if (
|
158
|
-
|
138
|
+
if ((0, _fs.existsSync)(packagePath)) {
|
139
|
+
return require(packagePath).config;
|
159
140
|
}
|
160
141
|
|
161
|
-
|
162
|
-
|
163
|
-
}
|
164
|
-
|
165
|
-
options.app.exclude.hasRTL = options.app.exclude.rtl;
|
166
|
-
|
167
|
-
if (!options.app.patterns) {
|
168
|
-
options.app.patterns = {};
|
169
|
-
}
|
170
|
-
|
171
|
-
if (options.app.patterns.valueReplacer.length === 0) {
|
172
|
-
options.app.patterns.valueReplacer = ['*'];
|
173
|
-
}
|
174
|
-
|
175
|
-
if (options.app.patterns.selectorReplace.length === 0) {
|
176
|
-
options.app.patterns.selectorReplace = ['*'];
|
177
|
-
}
|
178
|
-
|
179
|
-
if (options.docs.patterns.selectorReplace.length === 0) {
|
180
|
-
options.docs.patterns.selectorReplace = ['*'];
|
181
|
-
}
|
182
|
-
|
183
|
-
Object.keys(options.app.patterns).forEach(key => {
|
184
|
-
if (options.app.exclude[key] && options.app.patterns[key].length === 0) {
|
185
|
-
let tempArr = options.app.exclude[key];
|
186
|
-
tempArr = tempArr.map(x => {
|
187
|
-
x = x.replace(/\//gi, _path.default.sep);
|
188
|
-
return `!**${x[0] === _path.default.sep || x[0] === '@' ? '' : _path.default.sep}${x}${x[x.length - 1] === _path.default.sep ? '' : _path.default.sep}**`;
|
189
|
-
});
|
190
|
-
options.app.patterns[key] = tempArr;
|
191
|
-
}
|
192
|
-
});
|
193
|
-
Object.keys(options.docs.patterns).forEach(key => {
|
194
|
-
if (options.docs.exclude[key] && options.docs.patterns[key].length === 0) {
|
195
|
-
let tempArr = options.docs.exclude[key];
|
196
|
-
tempArr = tempArr.map(x => {
|
197
|
-
x = x.replace(/\//gi, _path.default.sep);
|
198
|
-
return `!**${x[0] === _path.default.sep || x[0] === '@' ? '' : _path.default.sep}${x}${x[x.length - 1] === _path.default.sep ? '' : _path.default.sep}**`;
|
199
|
-
});
|
200
|
-
options.docs.patterns[key] = tempArr;
|
201
|
-
}
|
202
|
-
});
|
203
|
-
}
|
142
|
+
return null;
|
143
|
+
};
|
204
144
|
|
205
|
-
const getOptions =
|
145
|
+
const getOptions = fromRoot => {
|
206
146
|
if (global.reactCLIOptions) {
|
207
147
|
return global.reactCLIOptions;
|
208
148
|
}
|
209
149
|
|
210
150
|
const appPath = process.cwd();
|
211
|
-
let userSchemas;
|
151
|
+
let userSchemas = getOptionsFromConfigFile(appPath, processEnv.config_file);
|
212
152
|
|
213
153
|
const packagePath = _path.default.join(appPath, 'package.json');
|
214
154
|
|
215
155
|
if (_fs.default.existsSync(packagePath)) {
|
216
|
-
userSchemas = require(packagePath)['react-cli'] || {};
|
156
|
+
userSchemas = userSchemas || require(packagePath)['react-cli'] || {};
|
217
157
|
}
|
218
158
|
|
219
159
|
const options = defaulter(_schemas.default, userSchemas || {}); // for future may be for npm 8 edge cases
|
220
160
|
|
221
161
|
options.npmVersion = getNpmVersion();
|
222
162
|
options.cwd = getCWD();
|
223
|
-
deprecationSupport(options);
|
163
|
+
(0, _deprecationSupport.deprecationSupport)(options, options.disableDeprecationWarning || !fromRoot);
|
224
164
|
options.packageVersion = process.env.npm_package_version;
|
225
165
|
global.reactCLIOptions = options;
|
226
166
|
return options;
|
package/lib/utils/index.js
CHANGED
@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
5
5
|
});
|
6
6
|
var _exportNames = {
|
7
|
-
log: true,
|
8
7
|
writeFile: true,
|
9
8
|
makeDir: true,
|
10
9
|
getInfoFromPublicPaths: true,
|
11
10
|
getLibraryConflict: true,
|
11
|
+
log: true,
|
12
12
|
getOptions: true,
|
13
13
|
createEventStream: true,
|
14
14
|
getServerURL: true,
|
@@ -64,7 +64,13 @@ Object.defineProperty(exports, "jsonHelper", {
|
|
64
64
|
return _jsonHelper.default;
|
65
65
|
}
|
66
66
|
});
|
67
|
-
exports
|
67
|
+
Object.defineProperty(exports, "log", {
|
68
|
+
enumerable: true,
|
69
|
+
get: function () {
|
70
|
+
return _log.log;
|
71
|
+
}
|
72
|
+
});
|
73
|
+
exports.makeDir = void 0;
|
68
74
|
Object.defineProperty(exports, "pullOrigin", {
|
69
75
|
enumerable: true,
|
70
76
|
get: function () {
|
@@ -95,6 +101,8 @@ var _stream = require("stream");
|
|
95
101
|
|
96
102
|
var _fs = _interopRequireDefault(require("fs"));
|
97
103
|
|
104
|
+
var _log = require("./log");
|
105
|
+
|
98
106
|
var _getOptions = _interopRequireDefault(require("./getOptions"));
|
99
107
|
|
100
108
|
var _createEventStream = _interopRequireDefault(require("./createEventStream"));
|
@@ -161,13 +169,7 @@ var _ssTestHack = _interopRequireDefault(require("./ssTestHack"));
|
|
161
169
|
|
162
170
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
163
171
|
|
164
|
-
|
165
|
-
let print = console;
|
166
|
-
print.log(...info);
|
167
|
-
};
|
168
|
-
|
169
|
-
exports.log = log;
|
170
|
-
|
172
|
+
// eslint-disable-next-line no-duplicate-imports
|
171
173
|
let writeFile = (outputPath, src, isPath = false) => new Promise((resolve, reject) => {
|
172
174
|
let inStr;
|
173
175
|
|
@@ -314,9 +316,9 @@ let getLibraryConflict = (moduleObject, impactObj, changesOnly) => {
|
|
314
316
|
whichLibrary = "No component file changes!";
|
315
317
|
}
|
316
318
|
|
317
|
-
log('\n');
|
318
|
-
log('You can see the HTML out at coverageTest/impactLibrary.html!');
|
319
|
-
log('\x1b[33m%s\x1b[0m', '************************************************************ \n ');
|
319
|
+
(0, _log.log)('\n');
|
320
|
+
(0, _log.log)('You can see the HTML out at coverageTest/impactLibrary.html!');
|
321
|
+
(0, _log.log)('\x1b[33m%s\x1b[0m', '************************************************************ \n ');
|
320
322
|
return {
|
321
323
|
response: allImpactArray,
|
322
324
|
result: {
|
@@ -11,7 +11,7 @@ var _path = _interopRequireDefault(require("path"));
|
|
11
11
|
|
12
12
|
var _child_process = require("child_process");
|
13
13
|
|
14
|
-
var
|
14
|
+
var _log = require("./log");
|
15
15
|
|
16
16
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
17
17
|
|
@@ -38,7 +38,7 @@ let copyEslintConfig = rootDir => {
|
|
38
38
|
|
39
39
|
_fs.default.writeFileSync(targetPath, src);
|
40
40
|
|
41
|
-
(0,
|
41
|
+
(0, _log.log)('Eslint config added in project root path');
|
42
42
|
}
|
43
43
|
};
|
44
44
|
|
@@ -58,7 +58,7 @@ let initPreCommitHook = (forReactCLI = false) => {
|
|
58
58
|
|
59
59
|
_fs.default.writeFileSync(targetPath, precommit);
|
60
60
|
|
61
|
-
(0,
|
61
|
+
(0, _log.log)('pre-commit hook added');
|
62
62
|
}
|
63
63
|
|
64
64
|
let packagePath = _path.default.join(process.cwd(), 'package.json');
|
@@ -71,10 +71,10 @@ let initPreCommitHook = (forReactCLI = false) => {
|
|
71
71
|
|
72
72
|
_fs.default.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2));
|
73
73
|
|
74
|
-
(0,
|
74
|
+
(0, _log.log)('lint script added in your package.json');
|
75
75
|
}
|
76
76
|
} catch (e) {
|
77
|
-
(0,
|
77
|
+
(0, _log.log)('package.json not found');
|
78
78
|
}
|
79
79
|
}
|
80
80
|
};
|
package/lib/utils/log.js
ADDED
package/lib/utils/pullOrigin.js
CHANGED
@@ -7,20 +7,20 @@ exports.default = void 0;
|
|
7
7
|
|
8
8
|
var _child_process = require("child_process");
|
9
9
|
|
10
|
-
var
|
10
|
+
var _log = require("./log");
|
11
11
|
|
12
12
|
var _default = (type = 'git', branchName) => new Promise(resolve => {
|
13
13
|
if (type === 'git') {
|
14
14
|
(0, _child_process.spawnSync)('git', ['pull', 'origin', branchName], {
|
15
15
|
encoding: 'utf8'
|
16
16
|
});
|
17
|
-
(0,
|
17
|
+
(0, _log.log)(branchName, 'Branch Pulled!');
|
18
18
|
resolve();
|
19
19
|
} else if (type === 'hg') {
|
20
20
|
(0, _child_process.spawnSync)('hg', ['pull'], {
|
21
21
|
encoding: 'utf8'
|
22
22
|
});
|
23
|
-
(0,
|
23
|
+
(0, _log.log)(branchName, 'Branch Pulled!');
|
24
24
|
resolve();
|
25
25
|
}
|
26
26
|
});
|
@@ -13,7 +13,7 @@ var _child_process = require("child_process");
|
|
13
13
|
|
14
14
|
var _gitRootDir = _interopRequireDefault(require("git-root-dir"));
|
15
15
|
|
16
|
-
var
|
16
|
+
var _log = require("./log");
|
17
17
|
|
18
18
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
19
19
|
|
@@ -80,7 +80,7 @@ let reinstallDependencies1 = pathToSubProjects => {
|
|
80
80
|
let diffs = packageDiffChecker(prePackageJson, currentPackageJson);
|
81
81
|
|
82
82
|
if (Object.keys(diffs).length) {
|
83
|
-
(0,
|
83
|
+
(0, _log.log)(diffs, `package diffs between branches for ${project} project`);
|
84
84
|
(0, _child_process.spawnSync)('rm', ['-rf', 'package-lock.json'], {
|
85
85
|
cwd: projPath,
|
86
86
|
stdio: 'inherit'
|
@@ -93,7 +93,7 @@ let reinstallDependencies1 = pathToSubProjects => {
|
|
93
93
|
dummy.push(`${name}@${version}`);
|
94
94
|
}
|
95
95
|
|
96
|
-
(0,
|
96
|
+
(0, _log.log)(`npm ${['install'].concat(dummy).join(' ')}`);
|
97
97
|
(0, _child_process.spawnSync)('npm', ['install'].concat(dummy), {
|
98
98
|
cwd: projPath,
|
99
99
|
stdio: 'inherit'
|
@@ -9,13 +9,15 @@ var _child_process = require("child_process");
|
|
9
9
|
|
10
10
|
var _utils = require("../utils");
|
11
11
|
|
12
|
+
var _log = require("./log");
|
13
|
+
|
12
14
|
var _default = (type = 'git', branchName) => new Promise(resolve => {
|
13
15
|
if (type === 'git') {
|
14
|
-
(0,
|
16
|
+
(0, _log.log)((0, _utils.getCurrentBranch)(type, process.cwd()), 'Before the branch switch');
|
15
17
|
(0, _child_process.spawnSync)('git', ['checkout', branchName, '--force'], {
|
16
18
|
encoding: 'utf8'
|
17
19
|
});
|
18
|
-
(0,
|
20
|
+
(0, _log.log)((0, _utils.getCurrentBranch)(type, process.cwd()), 'After the branch switch');
|
19
21
|
(0, _utils.pullOrigin)(type, branchName).then(resolve);
|
20
22
|
} else if (type === 'hg') {
|
21
23
|
(0, _child_process.spawnSync)('hg', ['update', branchName], {
|
package/npm-shrinkwrap.json
CHANGED
@@ -1,12 +1,12 @@
|
|
1
1
|
{
|
2
2
|
"name": "@zohodesk/react-cli",
|
3
|
-
"version": "1.1.
|
3
|
+
"version": "1.1.10",
|
4
4
|
"lockfileVersion": 2,
|
5
5
|
"requires": true,
|
6
6
|
"packages": {
|
7
7
|
"": {
|
8
8
|
"name": "@zohodesk/react-cli",
|
9
|
-
"version": "1.1.
|
9
|
+
"version": "1.1.10",
|
10
10
|
"license": "ISC",
|
11
11
|
"dependencies": {
|
12
12
|
"@babel/cli": "7.10.5",
|
@@ -57,6 +57,7 @@
|
|
57
57
|
"jsdom": "16.4.0",
|
58
58
|
"loader-utils": "2.0.0",
|
59
59
|
"lodash-webpack-plugin": "0.11.5",
|
60
|
+
"markdown-it": "13.0.1",
|
60
61
|
"mini-css-extract-plugin": "0.10.0",
|
61
62
|
"nock": "13.2.9",
|
62
63
|
"nodemailer": "6.4.11",
|
@@ -12144,6 +12145,14 @@
|
|
12144
12145
|
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
|
12145
12146
|
"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
|
12146
12147
|
},
|
12148
|
+
"node_modules/linkify-it": {
|
12149
|
+
"version": "4.0.1",
|
12150
|
+
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
|
12151
|
+
"integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
|
12152
|
+
"dependencies": {
|
12153
|
+
"uc.micro": "^1.0.1"
|
12154
|
+
}
|
12155
|
+
},
|
12147
12156
|
"node_modules/load-json-file": {
|
12148
12157
|
"version": "1.1.0",
|
12149
12158
|
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
|
@@ -12342,6 +12351,37 @@
|
|
12342
12351
|
"node": ">=0.10.0"
|
12343
12352
|
}
|
12344
12353
|
},
|
12354
|
+
"node_modules/markdown-it": {
|
12355
|
+
"version": "13.0.1",
|
12356
|
+
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz",
|
12357
|
+
"integrity": "sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==",
|
12358
|
+
"dependencies": {
|
12359
|
+
"argparse": "^2.0.1",
|
12360
|
+
"entities": "~3.0.1",
|
12361
|
+
"linkify-it": "^4.0.1",
|
12362
|
+
"mdurl": "^1.0.1",
|
12363
|
+
"uc.micro": "^1.0.5"
|
12364
|
+
},
|
12365
|
+
"bin": {
|
12366
|
+
"markdown-it": "bin/markdown-it.js"
|
12367
|
+
}
|
12368
|
+
},
|
12369
|
+
"node_modules/markdown-it/node_modules/argparse": {
|
12370
|
+
"version": "2.0.1",
|
12371
|
+
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
|
12372
|
+
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
|
12373
|
+
},
|
12374
|
+
"node_modules/markdown-it/node_modules/entities": {
|
12375
|
+
"version": "3.0.1",
|
12376
|
+
"resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
|
12377
|
+
"integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q==",
|
12378
|
+
"engines": {
|
12379
|
+
"node": ">=0.12"
|
12380
|
+
},
|
12381
|
+
"funding": {
|
12382
|
+
"url": "https://github.com/fb55/entities?sponsor=1"
|
12383
|
+
}
|
12384
|
+
},
|
12345
12385
|
"node_modules/md5.js": {
|
12346
12386
|
"version": "1.3.5",
|
12347
12387
|
"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
|
@@ -12352,6 +12392,11 @@
|
|
12352
12392
|
"safe-buffer": "^5.1.2"
|
12353
12393
|
}
|
12354
12394
|
},
|
12395
|
+
"node_modules/mdurl": {
|
12396
|
+
"version": "1.0.1",
|
12397
|
+
"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
|
12398
|
+
"integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
|
12399
|
+
},
|
12355
12400
|
"node_modules/media-typer": {
|
12356
12401
|
"version": "0.3.0",
|
12357
12402
|
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
|
@@ -17169,6 +17214,11 @@
|
|
17169
17214
|
"is-typedarray": "^1.0.0"
|
17170
17215
|
}
|
17171
17216
|
},
|
17217
|
+
"node_modules/uc.micro": {
|
17218
|
+
"version": "1.0.6",
|
17219
|
+
"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
|
17220
|
+
"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
|
17221
|
+
},
|
17172
17222
|
"node_modules/uglify-js": {
|
17173
17223
|
"version": "3.17.3",
|
17174
17224
|
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz",
|
@@ -28076,6 +28126,14 @@
|
|
28076
28126
|
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
|
28077
28127
|
"integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
|
28078
28128
|
},
|
28129
|
+
"linkify-it": {
|
28130
|
+
"version": "4.0.1",
|
28131
|
+
"resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz",
|
28132
|
+
"integrity": "sha512-C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==",
|
28133
|
+
"requires": {
|
28134
|
+
"uc.micro": "^1.0.1"
|
28135
|
+
}
|
28136
|
+
},
|
28079
28137
|
"load-json-file": {
|
28080
28138
|
"version": "1.1.0",
|
28081
28139
|
"resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
|
@@ -28234,6 +28292,30 @@
|
|
28234
28292
|
"object-visit": "^1.0.0"
|
28235
28293
|
}
|
28236
28294
|
},
|
28295
|
+
"markdown-it": {
|
28296
|
+
"version": "13.0.1",
|
28297
|
+
"resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.1.tgz",
|
28298
|
+
"integrity": "sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==",
|
28299
|
+
"requires": {
|
28300
|
+
"argparse": "^2.0.1",
|
28301
|
+
"entities": "~3.0.1",
|
28302
|
+
"linkify-it": "^4.0.1",
|
28303
|
+
"mdurl": "^1.0.1",
|
28304
|
+
"uc.micro": "^1.0.5"
|
28305
|
+
},
|
28306
|
+
"dependencies": {
|
28307
|
+
"argparse": {
|
28308
|
+
"version": "2.0.1",
|
28309
|
+
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
|
28310
|
+
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
|
28311
|
+
},
|
28312
|
+
"entities": {
|
28313
|
+
"version": "3.0.1",
|
28314
|
+
"resolved": "https://registry.npmjs.org/entities/-/entities-3.0.1.tgz",
|
28315
|
+
"integrity": "sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="
|
28316
|
+
}
|
28317
|
+
}
|
28318
|
+
},
|
28237
28319
|
"md5.js": {
|
28238
28320
|
"version": "1.3.5",
|
28239
28321
|
"resolved": "https://registry.npmjs.org/md5.js/-/md5.js-1.3.5.tgz",
|
@@ -28244,6 +28326,11 @@
|
|
28244
28326
|
"safe-buffer": "^5.1.2"
|
28245
28327
|
}
|
28246
28328
|
},
|
28329
|
+
"mdurl": {
|
28330
|
+
"version": "1.0.1",
|
28331
|
+
"resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz",
|
28332
|
+
"integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g=="
|
28333
|
+
},
|
28247
28334
|
"media-typer": {
|
28248
28335
|
"version": "0.3.0",
|
28249
28336
|
"resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
|
@@ -32025,6 +32112,11 @@
|
|
32025
32112
|
"is-typedarray": "^1.0.0"
|
32026
32113
|
}
|
32027
32114
|
},
|
32115
|
+
"uc.micro": {
|
32116
|
+
"version": "1.0.6",
|
32117
|
+
"resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz",
|
32118
|
+
"integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA=="
|
32119
|
+
},
|
32028
32120
|
"uglify-js": {
|
32029
32121
|
"version": "3.17.3",
|
32030
32122
|
"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.17.3.tgz",
|
package/package.json
CHANGED
@@ -1,6 +1,6 @@
|
|
1
1
|
{
|
2
2
|
"name": "@zohodesk/react-cli",
|
3
|
-
"version": "1.1.
|
3
|
+
"version": "1.1.10",
|
4
4
|
"description": "A CLI tool for build modern web application and libraries",
|
5
5
|
"scripts": {
|
6
6
|
"init": "node ./lib/utils/init.js",
|
@@ -80,7 +80,7 @@
|
|
80
80
|
"jsdom": "16.4.0",
|
81
81
|
"loader-utils": "2.0.0",
|
82
82
|
"lodash-webpack-plugin": "0.11.5",
|
83
|
-
"markdown-it": "
|
83
|
+
"markdown-it": "13.0.1",
|
84
84
|
"mini-css-extract-plugin": "0.10.0",
|
85
85
|
"nock": "13.2.9",
|
86
86
|
"nodemailer": "6.4.11",
|