@sasjs/cli 3.11.0 → 3.12.0

package/build/commands/create/spec/angularAppFiles.js

@@ -126,6 +126,11 @@ exports.angularAppFiles = {
                     subFolders: []
                 }
             ]
+        },
+        {
+            folderName: 'docs',
+            files: [{ fileName: 'index.html' }],
+            subFolders: []
         }
     ]
 };

package/build/commands/create/spec/create.spec.js

@@ -140,6 +140,9 @@ describe('sasjs create', function () {
                     _a.sent();
                     return [4 /*yield*/, verifyCreateWeb('.', 'react')];
                 case 4:
+                    _a.sent();
+                    return [4 /*yield*/, (0, test_1.verifyGitNotPresent)(process.projectDir)];
+                case 5:
                     _a.sent();
                     return [2 /*return*/];
             }
@@ -164,6 +167,9 @@ describe('sasjs create', function () {
                     _a.sent();
                     return [4 /*yield*/, verifyCreateWeb('test-react-app', 'react')];
                 case 4:
+                    _a.sent();
+                    return [4 /*yield*/, (0, test_1.verifyGitNotPresent)(process.projectDir)];
+                case 5:
                     _a.sent();
                     return [2 /*return*/];
             }
@@ -212,6 +218,9 @@ describe('sasjs create', function () {
                     _a.sent();
                     return [4 /*yield*/, verifyCreateWeb('test-angular-app', 'angular')];
                 case 4:
+                    _a.sent();
+                    return [4 /*yield*/, (0, test_1.verifyGitNotPresent)(process.projectDir)];
+                case 5:
                     _a.sent();
                     return [2 /*return*/];
             }

package/build/commands/create/spec/reactAppFiles.js

@@ -77,6 +77,17 @@ exports.reactAppFiles = {
                     subFolders: []
                 }
             ]
+        },
+        {
+            folderName: 'public',
+            files: [],
+            subFolders: [
+                {
+                    folderName: 'docs',
+                    files: [{ fileName: 'index.html' }],
+                    subFolders: []
+                }
+            ]
         }
     ]
 };

package/build/utils/test.d.ts

@@ -21,3 +21,4 @@ export declare const verifyDotFiles: (docsFolder: string) => Promise<void>;
 export declare const verifyDotFilesNotGenerated: (docsFolder: string) => Promise<void>;
 export declare const verifyCompiledService: (compiledContent: string, macrosToTest: string[], checkInit?: boolean, checkTerm?: boolean) => Promise<void>;
 export declare const verifyCompiledJob: (compiledContent: string, macrosToTest: string[], checkInit?: boolean, checkTerm?: boolean) => Promise<void>;
+export declare const verifyGitNotPresent: (folder: string) => Promise<void>;

package/build/utils/test.js

@@ -50,7 +50,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyCompiledJob = exports.verifyCompiledService = exports.verifyDotFilesNotGenerated = exports.verifyDotFiles = exports.verifyDocs = exports.updateConfig = exports.updateTarget = exports.removeAllTargetsFromConfigs = exports.verifyPackageJsonContent = exports.verifyFolder = exports.mockProcessExit = exports.verifyStep = exports.createTestGlobalTarget = exports.generateTestTarget = exports.removeTestServerFolder = exports.removeTestApp = exports.createTestMinimalApp = exports.createTestJobsApp = exports.createTestApp = void 0;
+exports.verifyGitNotPresent = exports.verifyCompiledJob = exports.verifyCompiledService = exports.verifyDotFilesNotGenerated = exports.verifyDotFiles = exports.verifyDocs = exports.updateConfig = exports.updateTarget = exports.removeAllTargetsFromConfigs = exports.verifyPackageJsonContent = exports.verifyFolder = exports.mockProcessExit = exports.verifyStep = exports.createTestGlobalTarget = exports.generateTestTarget = exports.removeTestServerFolder = exports.removeTestApp = exports.createTestMinimalApp = exports.createTestJobsApp = exports.createTestApp = void 0;
 var path_1 = __importDefault(require("path"));
 var dotenv_1 = __importDefault(require("dotenv"));
 var utils_1 = require("@sasjs/utils");
@@ -629,3 +629,20 @@ var verifyCompile = function (compiledContent, macrosToTest, checkInit, checkTer
         return [2 /*return*/];
     });
 }); };
+var verifyGitNotPresent = function (folder) { return __awaiter(void 0, void 0, void 0, function () {
+    var gitFolderOrModules;
+    return __generator(this, function (_a) {
+        switch (_a.label) {
+            case 0: return [4 /*yield*/, (0, utils_1.listFilesAndSubFoldersInFolder)(folder, true)];
+            case 1:
+                gitFolderOrModules = (_a.sent()).filter(function (sub) {
+                    return /\.git$/.test(sub) ||
+                        new RegExp(".git".concat(utils_1.pathSepEscaped)).test(sub) ||
+                        /\.gitmodules/.test(sub);
+                });
+                expect(gitFolderOrModules.length).toEqual(0);
+                return [2 /*return*/];
+        }
+    });
+}); };
+exports.verifyGitNotPresent = verifyGitNotPresent;

package/build/utils/utils.js

@@ -191,8 +191,19 @@ function createApp(folderPath, repoUrl, installDependencies) {
     var spinner = (0, ora_1.default)("Creating SASjs project in ".concat(folderPath, "."));
     spinner.start();
     var gitBranch = repoUrl.includes('template_sasonly') ? 'master' : 'main';
-    shelljs_1.default.exec("cd \"".concat(folderPath, "\" && git clone --depth 1 -b ").concat(gitBranch, " ").concat(repoUrl, " ."), { silent: true });
-    shelljs_1.default.rm('-rf', path_1.default.join(folderPath, '.git'));
+    var gitVersion = (shelljs_1.default
+        .exec("git version", { silent: true })
+        .stdout.match(/(?<!git version)\d+\.\d+\.\d+/) || '')[0].replace(/\./g, '');
+    // NOTE: git version 2.13 and greater are using '--recurse-submodules' instead of '--recurse' attribute to clone submodules
+    shelljs_1.default.exec("cd \"".concat(folderPath, "\" && git clone --recurse").concat(parseInt(gitVersion) > 2130 ? '-submodules' : '', " --depth 1 -b ").concat(gitBranch, " ").concat(repoUrl, " ."), { silent: true });
+    deleteGitFolder(folderPath);
+    shelljs_1.default.rm('-f', [path_1.default.join(folderPath, '.gitmodules')]);
+    if (repoUrl.includes('react-seed-app')) {
+        deleteGitFolder(path_1.default.join(folderPath, 'public', 'docs'));
+    }
+    else if (repoUrl.includes('angular-seed-app')) {
+        deleteGitFolder(path_1.default.join(folderPath, 'docs'));
+    }
     spinner.stop();
     if (installDependencies) {
         spinner.text = 'Installing dependencies...';
@@ -203,6 +214,9 @@ function createApp(folderPath, repoUrl, installDependencies) {
         spinner.stop();
     }
 }
+var deleteGitFolder = function (folderPath) {
+    return shelljs_1.default.rm('-rf', path_1.default.join(folderPath, '.git'));
+};
 function setupNpmProject(folderName) {
     return __awaiter(this, void 0, void 0, function () {
         var folderPath;
@@ -241,7 +255,7 @@ exports.setupNpmProject = setupNpmProject;
 function setupGitIgnore(folderName) {
     var _a, _b;
     return __awaiter(this, void 0, void 0, function () {
-        var gitIgnoreFilePath, gitIgnoreExists, gitIgnoreContent, newgitIgnoreContent, regExpSasjsBuild, regExpSasjsResults, regExpNodeModules, folderPath, gitDirectoryExists;
+        var gitIgnoreFilePath, gitIgnoreExists, gitIgnoreContent, newgitIgnoreContent, regExpSasjsBuild, regExpSasjsResults, regExpNodeModules;
         return __generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
@@ -278,17 +292,7 @@ function setupGitIgnore(folderName) {
                     _c.sent();
                     (_b = process.logger) === null || _b === void 0 ? void 0 : _b.success('.gitignore file has been created.');
                     _c.label = 7;
-                case 7:
-                    folderPath = path_1.default.join(process.projectDir, folderName);
-                    return [4 /*yield*/, (0, utils_1.folderExists)(path_1.default.join(folderPath, '.git'))];
-                case 8:
-                    gitDirectoryExists = _c.sent();
-                    if (!gitDirectoryExists) {
-                        shelljs_1.default.exec("cd ".concat(folderName, " && git init"), {
-                            silent: true
-                        });
-                    }
-                    return [2 /*return*/];
+                case 7: return [2 /*return*/];
             }
         });
     });

package/package.json

@@ -94,5 +94,5 @@
     "typescript": "4.5.4",
     "util": "0.12.4"
   },
-  "version": "3.11.0"
+  "version": "3.12.0"
 }