Merge pull request #50 from chenasraf/develop

v1.1.4

.github/workflows/develop.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: "12.x"
+          node-version: "18.x"
       - run: yarn install --frozen-lockfile
       - run: yarn test
       - run: yarn build

.github/workflows/docs.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: "12.x"
+          node-version: "18.x"
       - run: cd doc-theme && yarn install && yarn build && rm -rf node_modules && cd ..
       - run: yarn install --frozen-lockfile
       - run: yarn typedoc

.github/workflows/pull_requests.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: "12.x"
+          node-version: "18.x"
       - run: yarn install --frozen-lockfile
       - run: yarn build
       - run: yarn test

.github/workflows/release.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v1
         with:
-          node-version: "12.x"
+          node-version: "18.x"
       - run: yarn install --frozen-lockfile
       - run: yarn test
       - run: yarn build

babel.config.js

@@ -1,3 +0,0 @@
-module.exports = {
-  plugins: ["@babel/plugin-proposal-nullish-coalescing-operator"],
-}

doc-theme/tsconfig.json

@@ -61,7 +61,7 @@
     // "declarationDir": "./",                           /* Specify the output directory for generated declaration files. */
     // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
     /* Interop Constraints */
-    // "isolatedModules": true,                          /* Ensure that each file can be safely transpiled without relying on other imports. */
+    "isolatedModules": true, //                          /* Ensure that each file can be safely transpiled without relying on other imports. */
     // "allowSyntheticDefaultImports": true,             /* Allow 'import x from y' when a module doesn't have a default export. */
     "esModuleInterop": true, /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */
     // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
@@ -90,4 +90,4 @@
     // "skipDefaultLibCheck": true,                      /* Skip type checking .d.ts files that are included with TypeScript. */
     "skipLibCheck": true //                              /* Skip type checking all .d.ts files. */
   }
-}
+}

jest.config.ts

@@ -13,7 +13,7 @@ export default {
   // The directory where Jest should store its cached dependency information
   // cacheDirectory: "/private/var/folders/q9/0mns8fgd00b4t5j5lq2wh2yh0000gn/T/jest_dx",
 
-  // Automatically clear mock calls and instances between every test
+  // Automatically clear mock calls, instances, contexts and results before every test
   clearMocks: true,
 
   // Indicates whether the coverage information should be collected while executing the test
@@ -50,6 +50,11 @@ export default {
   // Make calling deprecated APIs throw helpful error messages
   // errorOnDeprecated: false,
 
+  // The default configuration for fake timers
+  // fakeTimers: {
+  //   "enableGlobally": false
+  // },
+
   // Force coverage collection from ignored files using an array of glob patterns
   // forceCoverageMatch: [],
 
@@ -73,6 +78,8 @@ export default {
   // An array of file extensions your modules use
   // moduleFileExtensions: [
   //   "js",
+  //   "mjs",
+  //   "cjs",
   //   "jsx",
   //   "ts",
   //   "tsx",
@@ -82,6 +89,11 @@ export default {
 
   // A map from regular expressions to module names or to arrays of module names that allow to stub out resources with a single module
   // moduleNameMapper: {},
+  // moduleNameMapper: {
+  //   chalk: "<rootDir>/node_modules/chalk/source/index.js",
+  //   "#ansi-styles": "<rootDir>/node_modules/chalk/source/vendor/ansi-styles/index.js",
+  //   "#supports-color": "<rootDir>/node_modules/chalk/source/vendor/supports-color/index.js",
+  // },
 
   // An array of regexp pattern strings, matched against all module paths before considered 'visible' to the module loader
   modulePathIgnorePatterns: ["<rootDir>/dist"],
@@ -101,7 +113,7 @@ export default {
   // Use this configuration option to add custom reporters to Jest
   // reporters: undefined,
 
-  // Automatically reset mock state between every test
+  // Automatically reset mock state before every test
   // resetMocks: false,
 
   // Reset the module registry before running each individual test
@@ -110,7 +122,7 @@ export default {
   // A path to a custom resolver
   // resolver: undefined,
 
-  // Automatically restore mock state between every test
+  // Automatically restore mock state and implementation before every test
   // restoreMocks: false,
 
   // The root directory that Jest should scan for tests and modules within
@@ -137,7 +149,7 @@ export default {
   // snapshotSerializers: [],
 
   // The test environment that will be used for testing
-  testEnvironment: "node",
+  // testEnvironment: "jest-environment-node",
 
   // Options that will be passed to the testEnvironment
   // testEnvironmentOptions: {},
@@ -165,14 +177,8 @@ export default {
   // This option allows use of a custom test runner
   // testRunner: "jest-circus/runner",
 
-  // This option sets the URL for the jsdom environment. It is reflected in properties such as location.href
-  // testURL: "http://localhost",
-
-  // Setting this value to "fake" allows the use of fake timers for functions such as "setTimeout"
-  // timers: "real",
-
   // A map from regular expressions to paths to transformers
-  // transform: {},
+  // transform: undefined,
 
   // An array of regexp pattern strings that are matched against all source file paths, matched files will skip transformation
   // transformIgnorePatterns: [
@@ -180,6 +186,11 @@ export default {
   //   "\\.pnp\\.[^\\/]+$"
   // ],
 
+  // transform: {
+  //   "^.+\\.ts?$": "ts-jest",
+  // },
+  // transformIgnorePatterns: ["<rootDir>/node_modules/"],
+
   // An array of regexp pattern strings that are matched against all modules before the module loader will automatically return a mock for them
   // unmockedModulePathPatterns: undefined,
 
@@ -191,6 +202,4 @@ export default {
 
   // Whether to use watchman for file crawling
   // watchman: true,
-
-  // extensionsToTreatAsEsm: [".ts"],
 }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "simple-scaffold",
-  "version": "1.1.3",
+  "version": "1.1.4",
   "description": "A simple command to generate any file structure, from single components to entire app boilerplates.",
   "homepage": "https://casraf.blog/simple-scaffold",
   "repository": "https://github.com/chenasraf/simple-scaffold.git",
@@ -24,7 +24,7 @@
     "build": "yarn clean && tsc && chmod -R +x ./dist && cp ./package.json ./README.md ./dist/",
     "dev": "tsc --watch",
     "start": "node dist/scaffold.js",
-    "test": "jest --verbose",
+    "test": "jest",
     "cmd": "node --trace-warnings dist/cmd.js",
     "build-test": "yarn build && yarn test",
     "build-cmd": "yarn build && yarn cmd",
@@ -35,26 +35,26 @@
   },
   "dependencies": {
     "chalk": "^4.1.2",
-    "date-fns": "^2.28.0",
-    "glob": "^7.1.3",
+    "date-fns": "^2.29.3",
+    "glob": "^9.2.1",
     "handlebars": "^4.7.7",
     "lodash": "^4.17.21",
-    "massarg": "^1.0.5",
+    "massarg": "^1.0.7-pre.1",
     "util.promisify": "^1.1.1"
   },
   "devDependencies": {
-    "@types/glob": "^7.1.1",
-    "@types/jest": "^26.0.24",
+    "@types/glob": "^8.1.0",
+    "@types/jest": "^29.4.0",
     "@types/lodash": "^4.14.171",
     "@types/mock-fs": "^4.13.1",
-    "@types/node": "^14.14.22",
+    "@types/node": "^18.15.1",
     "doc-theme": "file:./doc-theme",
-    "jest": "^27.0.6",
-    "mock-fs": "^5.0.0",
-    "rimraf": "^3.0.2",
-    "ts-jest": "^27.0.3",
-    "ts-node": "^10.1.0",
-    "typedoc": "^0.22.15",
-    "typescript": "^4.3.5"
+    "jest": "^29.5.0",
+    "mock-fs": "^5.2.0",
+    "rimraf": "^4.4.0",
+    "ts-jest": "^29.0.5",
+    "ts-node": "^10.9.1",
+    "typedoc": "^0.23.26",
+    "typescript": "^4.9.5"
   }
 }

src/utils.ts

@@ -12,6 +12,7 @@ const { stat, access, mkdir } = fsPromises
 import dtAdd from "date-fns/add"
 import dtFormat from "date-fns/format"
 import dtParseISO from "date-fns/parseISO"
+import { glob, hasMagic } from "glob"
 
 const dateFns = {
   add: dtAdd,
@@ -19,8 +20,6 @@ const dateFns = {
   parseISO: dtParseISO,
 }
 
-import { glob } from "glob"
-import { promisify } from "util"
 const { readFile, writeFile } = fsPromises
 
 export const defaultHelpers: Record<DefaultHelpers, Helper> = {
@@ -214,10 +213,10 @@ export function getBasePath(relPath: string): string {
 
 export async function getFileList(config: ScaffoldConfig, template: string): Promise<string[]> {
   return (
-    await promisify(glob)(template, {
+    await glob(template, {
       dot: true,
-      debug: config.verbose === LogLevel.Debug,
       nodir: true,
+      // debug: config.verbose === LogLevel.Debug,
     })
   ).map((f) => f.replace(/\//g, path.sep))
 }
@@ -231,7 +230,7 @@ export interface GlobInfo {
 }
 
 export async function getTemplateGlobInfo(config: ScaffoldConfig, template: string): Promise<GlobInfo> {
-  const isGlob = glob.hasMagic(template)
+  const isGlob = hasMagic(template)
   log(config, LogLevel.Debug, "before isDir", "isGlob:", isGlob, template)
   let _template = template
   let nonGlobTemplate = isGlob ? removeGlob(template) : template