@w5s/mrm-preset 1.0.0-alpha.41 → 1.0.0-alpha.43

package/CHANGELOG.md

@@ -3,6 +3,20 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 1.0.0-alpha.43 (2023-02-23)
+
+- ✨ Improve mrm bootstrap script ([0445277](https://github.com/w5s/project-config/commit/0445277))
+- ➖ Remove is-ci, lint-staged, commitlint dependency (used through npx) ([ae39f34](https://github.com/w5s/project-config/commit/ae39f34))
+- ➖ Remove mrm dependency ([7ee3d94](https://github.com/w5s/project-config/commit/7ee3d94))
+- 🐛 Fix unbound variable error ([d2aa040](https://github.com/w5s/project-config/commit/d2aa040))
+- 💚 Fix ci ([cded057](https://github.com/w5s/project-config/commit/cded057))
+
+## 1.0.0-alpha.42 (2023-02-10)
+
+- ✨ Configure @w5s/conventional-changelog ([b19e437](https://github.com/w5s/project-config/commit/b19e437))
+- ✨ Improve typescript support for monorepo packages ([0a13a68](https://github.com/w5s/project-config/commit/0a13a68))
+- 🗑️ Remove unneeded code ([ee9410e](https://github.com/w5s/project-config/commit/ee9410e))
+
 ## 1.0.0-alpha.41 (2023-02-06)
 
 - 📝 Update documentation ([8cd1934](https://github.com/w5s/project-config/commit/8cd1934))

package/bootstrap/index.js

@@ -29,11 +29,11 @@ function task({ mrmPreset, mrmTask, packageManager }) {
 
   npm.bootstrap(packageManager);
 
-  npm.dependency({
-    dev: true,
-    name: ['mrm', mrmPreset],
-    state: 'present',
-  });
+  // npm.dependency({
+  //   dev: true,
+  //   name: ['mrm', mrmPreset],
+  //   state: 'present',
+  // });
 
   pkg.withPackageJson((packageFile) => {
     const currentPackageManager = pkg.manager(packageFile);
@@ -47,7 +47,7 @@ function task({ mrmPreset, mrmTask, packageManager }) {
     pkg.script(packageFile, {
       name: 'mrm',
       state: 'present',
-      default: `mrm --preset ${mrmPreset}`,
+      default: `npm exec --package=mrm --package=${mrmPreset} -- mrm --preset ${mrmPreset}`,
     });
   });
 }

package/core/commitlint.js

@@ -23,13 +23,13 @@ function commitlint({ state, preset }) {
 
   gitHook({
     name: 'commit-msg',
-    content: 'npm exec --no -- commitlint --edit $1',
+    content: 'npm exec -- commitlint --edit $1',
     state,
   });
 
   npm.dependency({
     dev: true,
-    name: ['@commitlint/cli', preset],
+    name: [preset],
     state,
   });
 }

package/core/githooks.js

@@ -1,11 +1,13 @@
 const { execSync } = require('node:child_process');
 const path = require('node:path');
-const { file, packageJson, makeDirs } = require('mrm-core');
+const { file, makeDirs } = require('mrm-core');
 const project = require('./project.js');
 const npm = require('./npm.js');
 const pkg = require('./pkg.js');
 const block = require('./block.js');
 
+const hookDirectory = '.githooks';
+
 /**
  * @param {{
  *   state: 'present'|'absent',
@@ -17,21 +19,14 @@ function husky({ state }) {
   npm.dependency({
     dev: true,
     name: ['husky'],
-    state: hasHusky ? 'present' : 'absent',
+    state: 'absent',
   });
-  if (hasHusky) {
-    npm.dependency({
-      dev: true,
-      name: ['is-ci'],
-      state: 'present',
-    });
-  }
 
   pkg.withPackageJson((packageFile) => {
     pkg.script(packageFile, {
-      name: `${project.prepare}:husky`,
+      name: `${project.prepare}:githooks`,
       state: hasHusky ? 'present' : 'absent',
-      update: 'is-ci || husky install',
+      update: `[ -n "\${CI:-}" ] || npx husky install ${hookDirectory}`,
     });
   });
 }
@@ -44,10 +39,7 @@ function husky({ state }) {
  * }} options
  */
 function gitHook({ name, state, content }) {
-  const packageFileDefault = packageJson();
-  const hasHusky = pkg.hasDependency(packageFileDefault, 'husky', 'dev');
-  const hasGitHook = hasHusky && state === 'present';
-  const hookDirectory = '.husky';
+  const hasGitHook = state === 'present';
   const hookFileName = path.join(hookDirectory, name);
   if (hasGitHook) {
     makeDirs(hookDirectory);

package/githooks/index.js

@@ -31,7 +31,7 @@ function task() {
   });
   gitHook({
     name: 'pre-commit',
-    content: `npm exec --no -- lint-staged`,
+    content: `npm exec -- lint-staged`,
     state: gitSupported ? 'present' : 'absent',
   });
   gitHook({

package/lang/index.js

@@ -49,6 +49,44 @@ function createLang({ language: languageDefault = 'typescript', tsConfig: tsConf
 
       file('src/index.ts').delete();
       file('src/index.spec.ts').delete();
+
+      pkg.forEachWorkspace(({ projectDir, packageFile: projectPackageFile }) => {
+        const projectTsConfig = json(`${projectDir}/tsconfig.json`);
+        const projectTsConfigBuild = json(`${projectDir}/tsconfig.build.json`);
+        const hasTypecript = projectTsConfig.exists();
+        pkg.script(projectPackageFile, {
+          name: 'build:tsc',
+          state: hasTypecript ? 'present' : 'absent',
+          update: () => 'tsc -b tsconfig.build.json',
+        });
+        pkg.script(projectPackageFile, {
+          name: 'clean:tsc',
+          state: hasTypecript ? 'present' : 'absent',
+          update: () => 'rm -rf lib',
+        });
+        if (hasTypecript && projectPackageFile.get('name') !== '@w5s/ts-config') {
+          projectTsConfig
+            .merge({
+              $schema: 'https://json.schemastore.org/tsconfig.json',
+              extends: '../../tsconfig.settings.json',
+            })
+            .save();
+
+          projectTsConfigBuild
+            .merge({
+              $schema: 'https://json.schemastore.org/tsconfig.json',
+              extends: './tsconfig.json',
+              compilerOptions: {
+                noEmit: false,
+                outDir: 'lib',
+              },
+              include: ['src'],
+            })
+            .save();
+        } else {
+          projectTsConfigBuild.delete();
+        }
+      });
     } else {
       tsConfigSettings
         .merge({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "1.0.0-alpha.41",
+  "version": "1.0.0-alpha.43",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -43,7 +43,8 @@
   },
   "devDependencies": {
     "@types/debug": "4.1.7",
-    "mrm": "4.1.13"
+    "mrm": "4.1.13",
+    "mrm-preset-default": "4.1.11"
   },
   "engines": {
     "node": ">=16.0.0"
@@ -51,5 +52,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "cdb08978935c78ac2303b9a00f42f791e6361306"
+  "gitHead": "ace7dcdd3244c34b38de66da80347ca16e59838d"
 }

package/postconfigure/index.js

@@ -2,8 +2,16 @@ const { spawnSync } = require('node:child_process');
 const { packageJson } = require('mrm-core');
 const project = require('../core/project.js');
 const pkg = require('../core/pkg.js');
+const npm = require('../core/npm.js');
 
 function task() {
+  // Remove old deps
+  npm.dependency({
+    dev: true,
+    name: ['is-ci', '@commitlint/cli', 'lint-staged', 'mrm'],
+    state: 'absent',
+  });
+
   const packageFile = packageJson();
   const packageManager = pkg.manager(packageFile);
   const formatResult = spawnSync(packageManager, ['run', project.format]);

package/project/index.js

@@ -240,7 +240,7 @@ function task() {
       },
       npmClient: packageManager,
       useWorkspaces: rootUseWorkspace,
-      changelogPreset: 'gitmoji-config',
+      changelogPreset: '@w5s/conventional-changelog',
     });
     lernaConfig.save();
   } else {
@@ -310,6 +310,11 @@ function task() {
     name: ['lerna'],
     state: rootUseWorkspace ? 'present' : 'absent',
   });
+  npm.dependency({
+    dev: true,
+    name: ['@w5s/conventional-changelog'],
+    state: 'present',
+  });
 
   // VSCode
   vscodeTask({

package/release/index.js

@@ -10,7 +10,8 @@ function task() {
   pkg.withPackageJson((packageFile) => {
     pkg.script(packageFile, {
       name: project.release,
-      update: useWorkspace ? 'is-ci && lerna publish --yes || lerna publish' : semanticRelease.command(),
+      // eslint-disable-next-line no-template-curly-in-string
+      update: useWorkspace ? '[ -n "${CI:-}" ] && lerna publish --yes || lerna publish' : semanticRelease.command(),
       state: 'present',
     });
   });

package/renovate/index.js

@@ -27,7 +27,6 @@ function createRenovate({ renovatePresetApplication, renovatePresetLibrary }) {
       const renovateFile = json('renovate.json');
       renovateFile.merge({
         $schema: 'https://docs.renovatebot.com/renovate-schema.json',
-        ignorePaths: ['**/node_modules/**'],
       });
       renovateFile.set(
         'extends',

package/.turbo/turbo-build.log

@@ -1,6 +0,0 @@
-[1] : exited with code 0
-[tsc] 
-[tsc] > @w5s/mrm-preset@1.0.0-alpha.40 build:tsc
-[tsc] > tsc --noEmit --skipLibCheck
-[tsc] 
-[tsc] npm run build:tsc exited with code 0

package/.turbo/turbo-docs.log

@@ -1,63 +0,0 @@
-✔ README.md Updated
- Transforms run
-  ⁕ PKG_JSON:template=# W5s Mrm Preset _(${name})_ 
-  ⁕ PKG_JSON:template=> ${description}&unknownTxt=  
-  ⁕ PKG_JSON:template=[${license}][license-url] © ${author} 
-  ⁕ PKG_JSON:template=[package-version-svg]: https://img.shields.io/npm/v/${name}.svg?style=flat-square 
-  ⁕ PKG_JSON:template=[package-url]: https://www.npmjs.com/package/${name} 
-  ⁕ PKG_JSON:template=[license-image]: https://img.shields.io/badge/license-${license}-green.svg?style=flat-square 
-
-✔ _tester/node_modules/@w5s/mrm-preset/README.md Updated
- Transforms run
-  ⁕ PKG_JSON:template=# W5s Mrm Preset _(${name})_ 
-  ⁕ PKG_JSON:template=> ${description}&unknownTxt=  
-  ⁕ PKG_JSON:template=[${license}][license-url] © ${author} 
-  ⁕ PKG_JSON:template=[package-version-svg]: https://img.shields.io/npm/v/${name}.svg?style=flat-square 
-  ⁕ PKG_JSON:template=[package-url]: https://www.npmjs.com/package/${name} 
-  ⁕ PKG_JSON:template=[license-image]: https://img.shields.io/badge/license-${license}-green.svg?style=flat-square 
-
-✔ _tester/node_modules/@w5s/eslint-config/README.md Updated
- Transforms run
-  ⁕ PKG_JSON:template=# W5s ESLint configuration _(${name})_ 
-  ⁕ PKG_JSON:template=> ${description}&unknownTxt=  
-  ⁕ PKG_JSON:template=```console\nnpm install --save-dev ${name}\n``` 
-  ⁕ PKG_JSON:template=[${license}][license-url] © ${author} 
-  ⁕ PKG_JSON:template=[package-version-svg]: https://img.shields.io/npm/v/${name}.svg?style=flat-square 
-  ⁕ PKG_JSON:template=[package-url]: https://www.npmjs.com/package/${name} 
-  ⁕ PKG_JSON:template=[license-image]: https://img.shields.io/badge/license-${license}-green.svg?style=flat-square 
-
-✔ _tester/node_modules/@w5s/cspell-config/README.md Updated
- Transforms run
-  ⁕ PKG_JSON:template=# W5s CSpell configuration _(${name})_ 
-  ⁕ PKG_JSON:template=> ${description}&unknownTxt=  
-  ⁕ PKG_JSON:template=```console\nnpm install --save-dev ${name} cspell\n``` 
-  ⁕ PKG_JSON:template=```json\n{\n  "import": ["${name}"]\n}\n``` 
-  ⁕ PKG_JSON:template=[${license}][license-url] © ${author} 
-  ⁕ PKG_JSON:template=[package-version-svg]: https://img.shields.io/npm/v/${name}.svg?style=flat-square 
-  ⁕ PKG_JSON:template=[package-url]: https://www.npmjs.com/package/${name} 
-  ⁕ PKG_JSON:template=[license-image]: https://img.shields.io/badge/license-${license}-green.svg?style=flat-square 
-
-✔ _tester/node_modules/@w5s/ts-config/README.md Updated
- Transforms run
-  ⁕ PKG_JSON:template=# W5s Typescript configuration _(${name})_ 
-  ⁕ PKG_JSON:template=> ${description}&unknownTxt=  
-  ⁕ PKG_JSON:template=```console\nnpm install --save-dev ${name}\n``` 
-  ⁕ PKG_JSON:template=Typescript: ${peerDependencies.typescript}&unknownTxt=  
-  ⁕ PKG_JSON:template=[${license}][license-url] © ${author} 
-  ⁕ PKG_JSON:template=[package-version-svg]: https://img.shields.io/npm/v/${name}.svg?style=flat-square 
-  ⁕ PKG_JSON:template=[package-url]: https://www.npmjs.com/package/${name} 
-  ⁕ PKG_JSON:template=[license-image]: https://img.shields.io/badge/license-${license}-green.svg?style=flat-square 
-
-✔ _tester/node_modules/@w5s/prettier-config/README.md Updated
- Transforms run
-  ⁕ PKG_JSON:template=# W5s Prettier configuration _(${name})_ 
-  ⁕ PKG_JSON:template=> ${description}&unknownTxt=  
-  ⁕ PKG_JSON:template=```console\nnpm install --save-dev ${name}\n``` 
-  ⁕ PKG_JSON:template=```json\n"${name}"\n``` 
-  ⁕ PKG_JSON:template=```js\nmodule.exports = {\n  ...require('${name}'),\n  // Override rules\n};\n``` 
-  ⁕ PKG_JSON:template=Prettier: ${peerDependencies.prettier}&unknownTxt=  
-  ⁕ PKG_JSON:template=[${license}][license-url] © ${author} 
-  ⁕ PKG_JSON:template=[package-version-svg]: https://img.shields.io/npm/v/${name}.svg?style=flat-square 
-  ⁕ PKG_JSON:template=[package-url]: https://www.npmjs.com/package/${name} 
-  ⁕ PKG_JSON:template=[license-image]: https://img.shields.io/badge/license-${license}-green.svg?style=flat-square 
-

package/.turbo/turbo-format.log

@@ -1,6 +0,0 @@
-[1] : exited with code 0
-[src] 
-[src] > @w5s/mrm-preset@1.0.0-alpha.40 format:src
-[src] > eslint . --fix --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml
-[src] 
-[src] npm run format:src exited with code 0

package/.turbo/turbo-lint.log

@@ -1,6 +0,0 @@
-[1] : exited with code 0
-[src] 
-[src] > @w5s/mrm-preset@1.0.0-alpha.40 lint:src
-[src] > eslint . --ext=mjs,cjs,js,jsx,ts,tsx,json,jsonc,json5,yml,yaml
-[src] 
-[src] npm run lint:src exited with code 0

package/.turbo/turbo-spellcheck.log

@@ -1 +0,0 @@
-CSpell: Files checked: 51, Issues found: 0 in 0 files

package/.turbo/turbo-test.log

@@ -1,27 +0,0 @@
-[src] 
-[src] > @w5s/mrm-preset@1.0.0-alpha.40 test:src
-[src] > mkdir _tester; cd _tester; mrm bootstrap --dir ..; mrm configure --dir ..
-[src] 
-[src] mkdir: _tester: File exists
-[src] Running bootstrap...
-[src] Running alias configure...
-[src] Running gitignore...
-[src] Running project...
-[src] Update turbo.json
-[src] Running contributing...
-[src] Running licenses...
-[src] Running release...
-[src] Running ci...
-[src] Running lang...
-[src] Update tsconfig.json
-[src] Running commitlint...
-[src] Update .vscode/extensions.json
-[src] Running editorconfig...
-[src] Running eslint...
-[src] Running cspell...
-[src] Update .cspell.json
-[src] Running jest...
-[src] Running renovate...
-[src] Running githooks...
-[src] Running postconfigure...
-[src] npm run test:src exited with code 0