@w5s/mrm-preset 1.0.0-alpha.2 → 1.0.0-alpha.21

package/gitignore/index.js

@@ -1,25 +1,8 @@
-const { gitIgnore } = require('../core/git');
+const { gitIgnoreTemplate } = require('../core/git.js');
 
-/**
- *
- * @param {string} templatePath
- * @param {Array<string>} flags
- */
-function createGitIgnore(templatePath, flags) {
-  function task() {
-    // eslint-disable-next-line global-require, import/no-dynamic-require
-    const templateMap = require(templatePath);
-
-    flags.forEach((flag) => {
-      if (templateMap[flag]) {
-        gitIgnore(flag, templateMap[flag]);
-      }
-    });
-  }
-
-  task.description = 'Adds Gitignore file';
-
-  return task;
+function task() {
+  gitIgnoreTemplate(['macOS', 'NodeJS', 'VisualStudioCode']);
 }
+task.description = 'Adds Gitignore file';
 
-module.exports = createGitIgnore(require.resolve('./template'), ['macOS', 'NodeJS', 'VisualStudioCode']);
+module.exports = task;

package/jest/index.js

@@ -1,19 +1,15 @@
-const { jest } = require('../core/jest');
-
-function createJest() {
-  /**
-   *
-   */
-  function task() {
-    jest({
-      state: 'present',
-    });
-  }
-
-  task.description = 'Setup Jest';
-  task.parameters = {};
-
-  return task;
+const { jest } = require('../core/jest.js');
+
+/**
+ *
+ */
+function task() {
+  jest({
+    state: 'present',
+  });
 }
 
-module.exports = createJest();
+task.description = 'Setup Jest';
+task.parameters = {};
+
+module.exports = task;

package/lang/.eslintrc.json

@@ -4,5 +4,8 @@
     "@typescript-eslint/no-unsafe-call": "off",
     "@typescript-eslint/no-unsafe-assignment": "off",
     "@typescript-eslint/no-unsafe-member-access": "off"
-  }
+  },
+  "ignorePatterns": [
+    "**/templates/*.ts"
+  ]
 }

package/lang/index.js

@@ -1,25 +1,24 @@
-const { join } = require('path');
+const path = require('node:path');
 const { json, file, template, packageJson } = require('mrm-core');
-const npm = require('../core/npm');
-const { gitIgnore } = require('../core/git');
-const project = require('../core/project');
-const { eslintIgnore } = require('../core/eslint');
-const { useWorkspaces } = require('../core/workspace');
-const { typedoc } = require('../core/typedoc');
-const pkg = require('../core/pkg');
+const npm = require('../core/npm.js');
+const { gitIgnore } = require('../core/git.js');
+const project = require('../core/project.js');
+const { eslintIgnore } = require('../core/eslint.js');
+const { typedoc } = require('../core/typedoc.js');
+const pkg = require('../core/pkg.js');
 
 /**
  *
  * @param {{
  *  language: 'typescript',
- *  tsConfig: string,
+ *  tsConfig: string
  * }} config
  */
 function createLang({ language: languageDefault = 'typescript', tsConfig: tsConfigDefault }) {
   /**
    *
    * @param {{
-   *   language: 'typescript',
+   *   language: 'typescript'
    * }} config
    */
   function task({ language }) {
@@ -27,8 +26,9 @@ function createLang({ language: languageDefault = 'typescript', tsConfig: tsConf
   }
   task.typescript = () => {
     const tsConfigPreset = tsConfigDefault;
-    const isApplication = packageJson().get('mrmConfig.packageArchetype') === 'application';
-    const hasWorkspaces = useWorkspaces();
+    const packageFile = packageJson();
+    const isApplication = pkg.archetype(packageFile) === 'application';
+    const hasWorkspaces = pkg.hasWorkspaces(packageFile);
     const tsConfigSettingsName = 'tsconfig.settings.json';
     const tsConfigSettings = json(tsConfigSettingsName);
     const tsConfig = json('tsconfig.json');
@@ -37,12 +37,14 @@ function createLang({ language: languageDefault = 'typescript', tsConfig: tsConf
     gitIgnore('Typescript', ['lib/', '*.tsbuildinfo', 'typings/']);
     eslintIgnore(['lib/']);
 
+    // const excludeList = ['**/*.test.*', '**/*.spec.*', '**/__tests__/**'];
     if (hasWorkspaces) {
       tsConfig
         .unset('compilerOptions.rootDir')
         .unset('compilerOptions.outDir')
         .unset('include')
         .merge({
+          $schema: 'https://json.schemastore.org/tsconfig.json',
           extends: `./${tsConfigSettingsName}`,
         })
         .save();
@@ -52,6 +54,7 @@ function createLang({ language: languageDefault = 'typescript', tsConfig: tsConf
     } else {
       tsConfigSettings
         .merge({
+          $schema: 'https://json.schemastore.org/tsconfig.json',
           compilerOptions: {},
           extends: tsConfigPreset,
         })
@@ -63,23 +66,23 @@ function createLang({ language: languageDefault = 'typescript', tsConfig: tsConf
             rootDir: './src',
           },
           extends: `./${tsConfigSettingsName}`,
-          include: ['./src'],
+          include: ['src'],
         })
         .save();
 
       // Create default index
-      const templateDir = join(__dirname, 'templates');
+      const templateDir = path.join(__dirname, 'templates');
       if (!file('src/index.ts').exists()) {
-        template('src/index.ts', join(templateDir, 'index.ts')).apply().save();
+        template('src/index.ts', path.join(templateDir, 'index.ts')).apply().save();
       }
       if (!file('src/index.spec.ts').exists()) {
-        template('src/index.spec.ts', join(templateDir, 'index.spec.ts')).apply().save();
+        template('src/index.spec.ts', path.join(templateDir, 'index.spec.ts')).apply().save();
       }
     }
     // Application setup
-    pkg.withPackageJson((packageFile) => {
+    pkg.withPackageJson((_packageFile) => {
       if (isApplication) {
-        pkg.script(packageFile, {
+        pkg.script(_packageFile, {
           name: project.develop,
           script:
             "NODE_ENV=development ts-node-dev --require='tsconfig-paths/register' -r dotenv/config -- ./src/index.ts dotenv_config_path=.env",
@@ -101,7 +104,7 @@ function createLang({ language: languageDefault = 'typescript', tsConfig: tsConf
     });
 
     typedoc({
-      state: 'present',
+      state: isApplication ? 'absent' : 'present',
       update: (config) => ({
         // Default values
         tsconfig: 'tsconfig.json',

package/licenses/index.js

@@ -0,0 +1,26 @@
+const { packageJson } = require('mrm-core');
+const pkg = require('../core/pkg.js');
+const jsonFile = require('../core/jsonFile.js');
+
+function task() {
+  pkg.withPackageJson((packageFile) => {
+    jsonFile.value(packageFile, {
+      path: 'license',
+      state: 'present',
+      default: 'UNLICENSED',
+    });
+  });
+  const license = packageJson().get('license');
+
+  pkg.forEachWorkspace(({ packageFile }) => {
+    jsonFile.value(packageFile, {
+      path: 'license',
+      state: 'present',
+      default: license,
+    });
+  });
+}
+
+task.description = 'Setup License';
+task.parameters = {};
+module.exports = task;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "1.0.0-alpha.2",
+  "version": "1.0.0-alpha.21",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -13,37 +13,42 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/w5s/project-config.git",
+    "url": "git@github.com:w5s/project-config.git",
     "directory": "packages/mrm-preset"
   },
   "license": "MIT",
   "author": "Julien Polo <julien.polo@gmail.com>",
   "main": "config.json",
   "scripts": {
-    "build": "npm-run-all -p 'build:*'",
+    "build": "concurrently \"npm:build:*\" ",
     "build:empty": ":",
     "build:tsc": "tsc --noEmit --skipLibCheck",
+    "clean": "concurrently \"npm:clean:*\" \":\"",
     "docs": "md-magic --path '**/*.md' --ignore='node_modules'",
-    "format": "eslint . --fix",
-    "lint": "eslint .",
-    "test": "mkdir _tester; cd _tester; ../node_modules/.bin/mrm bootstrap --dir ..; ../node_modules/.bin/mrm configure --dir .."
+    "format": "concurrently \"npm:format:*\" \":\"",
+    "format:src": "eslint . --fix --ext=mjs,cjs,js,jsx,ts,tsx,json",
+    "lint": "concurrently \"npm:lint:*\" \":\"",
+    "lint:src": "eslint . --ext=mjs,cjs,js,jsx,ts,tsx,json",
+    "prepare": "concurrently \"npm:prepare:*\" \":\"",
+    "spellcheck": "cspell --no-progress '**'",
+    "test": "mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir .."
   },
   "dependencies": {
     "debug": "^4.3.3",
-    "mrm-core": "^6.0.0",
+    "glob": "^8.0.3",
+    "mrm-core": "^7.0.0",
     "semver-intersect": "^1.4.0",
-    "sync-directory": "^4.0.0"
+    "sync-directory": "^5.0.0"
   },
   "devDependencies": {
     "@types/debug": "^4.1.7",
-    "mrm": "3.0.10"
+    "mrm": "4.0.0"
   },
   "engines": {
-    "node": ">=12.x",
-    "yarn": ">=1.x"
+    "node": ">=16.0.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1fd5f03e6f071785cc5be4f9a57430485cf9d6fc"
+  "gitHead": "524f252acd9eba4c34b5ae0850bd6670b31db429"
 }

package/postconfigure/index.js

@@ -1,7 +1,7 @@
-const { spawnSync } = require('child_process');
+const { spawnSync } = require('node:child_process');
 const { packageJson } = require('mrm-core');
-const project = require('../core/project');
-const pkg = require('../core/pkg');
+const project = require('../core/project.js');
+const pkg = require('../core/pkg.js');
 
 function task() {
   const packageFile = packageJson();