jizy-packer 2.1.36 → 2.1.38
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/cli/init.js +18 -4
- package/package.json +1 -1
package/cli/init.js
CHANGED
|
@@ -2,6 +2,7 @@ import fs from "fs";
|
|
|
2
2
|
import path from "path";
|
|
3
3
|
import readline from "readline";
|
|
4
4
|
import { fileURLToPath } from "url";
|
|
5
|
+
import { execSync } from "child_process";
|
|
5
6
|
|
|
6
7
|
function loadYourConfig(baseDir, defaults) {
|
|
7
8
|
const configPath = path.join(baseDir, "me.json");
|
|
@@ -94,6 +95,10 @@ function loadActualPackageJsonFile(baseDir, defaults) {
|
|
|
94
95
|
defaults.AUTHOR_WEBSITE = pkg.author.url;
|
|
95
96
|
}
|
|
96
97
|
}
|
|
98
|
+
|
|
99
|
+
if (pkg.license) {
|
|
100
|
+
defaults.LICENSE = pkg.license;
|
|
101
|
+
}
|
|
97
102
|
}
|
|
98
103
|
|
|
99
104
|
return { pkg, defaults };
|
|
@@ -124,7 +129,7 @@ function loadActualComposerJsonFile(baseDir, defaults) {
|
|
|
124
129
|
defaults.DESCRIPTION = composer.description;
|
|
125
130
|
}
|
|
126
131
|
|
|
127
|
-
if (defaults.KEYWORDS && composer.keywords) {
|
|
132
|
+
if (!defaults.KEYWORDS && composer.keywords) {
|
|
128
133
|
defaults.KEYWORDS = composer.keywords;
|
|
129
134
|
}
|
|
130
135
|
|
|
@@ -240,7 +245,7 @@ defaults = composerJson.defaults;
|
|
|
240
245
|
const composer = composerJson.composer;
|
|
241
246
|
|
|
242
247
|
if (pkg.dependencies && pkg.dependencies.less) {
|
|
243
|
-
answers.LESS =
|
|
248
|
+
answers.LESS = true;
|
|
244
249
|
}
|
|
245
250
|
|
|
246
251
|
if (!defaults.YEAR) {
|
|
@@ -392,6 +397,9 @@ pkg.scripts = Object.assign({}, pkg.scripts, {
|
|
|
392
397
|
"jpack:dist-debug": "node ./cli/jpack.js --debug"
|
|
393
398
|
});
|
|
394
399
|
|
|
400
|
+
// force less dependency for now
|
|
401
|
+
// @todo update builder to manage LESS not installed case
|
|
402
|
+
answers.LESS = true;
|
|
395
403
|
if (answers.LESS) {
|
|
396
404
|
pkg.dependencies = Object.assign({}, pkg.dependencies, {
|
|
397
405
|
"less": "^4.1.3"
|
|
@@ -475,7 +483,7 @@ fs.writeFileSync(path.join(baseDir, "composer.json"), JSON.stringify(composer, n
|
|
|
475
483
|
//
|
|
476
484
|
|
|
477
485
|
if (answers.LESS) {
|
|
478
|
-
console.log('
|
|
486
|
+
console.log('Check LESS install...');
|
|
479
487
|
|
|
480
488
|
try {
|
|
481
489
|
execSync('npm install less', { stdio: 'inherit', cwd: baseDir });
|
|
@@ -489,9 +497,15 @@ if (answers.LESS) {
|
|
|
489
497
|
// console.log(srcDir);
|
|
490
498
|
// console.log(baseDir);
|
|
491
499
|
copyDefaultFiles(srcDir, baseDir, answers);
|
|
500
|
+
console.log('✓ copied default files');
|
|
492
501
|
|
|
493
502
|
// add an empty js file to start with
|
|
494
|
-
const
|
|
503
|
+
const mainJsDir = path.join(baseDir, 'lib', 'js');
|
|
504
|
+
if (!fs.existsSync(mainJsDir)) {
|
|
505
|
+
fs.mkdirSync(mainJsDir, { recursive: true });
|
|
506
|
+
}
|
|
507
|
+
const mainJs = path.join(mainJsDir, answers.MODULE_NAME + '.js');
|
|
495
508
|
if (!fs.existsSync(mainJs)) {
|
|
496
509
|
fs.writeFileSync(mainJs, '', 'utf8');
|
|
497
510
|
}
|
|
511
|
+
console.log('✓ created main js file');
|