@w5s/mrm-preset 1.0.0-alpha.3 → 1.0.0-alpha.4

package/CHANGELOG.md

@@ -3,6 +3,25 @@
 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.4](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.0.0-alpha.3...@w5s/mrm-preset@1.0.0-alpha.4) (2022-02-16)
+
+
+### Bug Fixes
+
+* correct eslint vscode settings ([a32e0fb](https://github.com/w5s/project-config/commit/a32e0fb739cbe349565b26ea412cdf37e3d56bdb))
+* correct mrm preset url ([ad6f030](https://github.com/w5s/project-config/commit/ad6f03091e0a294c043974b564e24c79023e659b))
+* correct typo ([2218859](https://github.com/w5s/project-config/commit/221885997fec37149f7e349b00a58fbcb3bfb8db))
+* rollback to eslint.validate vscode setting ([769a2e1](https://github.com/w5s/project-config/commit/769a2e100083aca4f5e9037fa539fcf1f6002d65))
+
+
+### Features
+
+* improve typescript eslint configuration ([efc6f1c](https://github.com/w5s/project-config/commit/efc6f1cef876e8fc5d4d1d1b94ca90a6805fbbbf))
+
+
+
+
+
 # [1.0.0-alpha.3](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.0.0-alpha.2...@w5s/mrm-preset@1.0.0-alpha.3) (2022-02-15)
 
 

package/contributing/templates/CODE_OF_CONDUCT.md

@@ -6,7 +6,7 @@
 We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
+identity and expression, level of experience, education, socioeconomic status,
 nationality, personal appearance, race, caste, color, religion, or sexual identity
 and orientation.
 
@@ -119,11 +119,11 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage],
 version 2.0, available at
 [https://www.contributor-covenant.org/version/2/0/code_of_conduct.html][v2.0].
 
-Community Impact Guidelines were inspired by 
+Community Impact Guidelines were inspired by
 [Mozilla's code of conduct enforcement ladder][Mozilla CoC].
 
 For answers to common questions about this code of conduct, see the FAQ at
-[https://www.contributor-covenant.org/faq][FAQ]. Translations are available 
+[https://www.contributor-covenant.org/faq][FAQ]. Translations are available
 at [https://www.contributor-covenant.org/translations][translations].
 
 [homepage]: https://www.contributor-covenant.org
@@ -131,4 +131,3 @@ at [https://www.contributor-covenant.org/translations][translations].
 [Mozilla CoC]: https://github.com/mozilla/diversity
 [FAQ]: https://www.contributor-covenant.org/faq
 [translations]: https://www.contributor-covenant.org/translations
-

package/core/githooks.js

@@ -44,7 +44,8 @@ function husky({ state }) {
  * }} options
  */
 function gitHook({ name, state, content }) {
-  const hasHusky = Boolean(packageJson().get('devDependencies.husky'));
+  const packageFileDefault = packageJson();
+  const hasHusky = pkg.hasDependency(packageFileDefault, 'husky', 'dev');
   const hasGitHook = hasHusky && state === 'present';
   const hookDirectory = '.husky';
   const hookFileName = path.join(hookDirectory, name);

package/core/jest.js

@@ -13,8 +13,8 @@ const project = require('./project');
 function jest({ state }) {
   const packageFileDefault = packageJson();
   const hasJest = state === 'present';
-  const hasTypescript = Boolean(packageFileDefault.get('devDependencies.typescript'));
-  const hasWorkspaces = Boolean(packageFileDefault.get('workspaces'));
+  const hasTypescript = pkg.hasDependency(packageFileDefault, 'typescript', 'dev');
+  const hasWorkspaces = pkg.hasWorkspaces(packageFileDefault);
 
   pkg.withPackageJson((packageFile) => {
     if (hasJest) {

package/core/pkg.js

@@ -58,6 +58,34 @@ function manager(packageFile) {
   return defaultManager;
 }
 
+/**
+ *
+ * @param {import('mrm-core').PackageJson} packageFile
+ */
+function hasWorkspaces(packageFile) {
+  return Boolean(packageFile.get('workspaces'));
+}
+
+/**
+ *
+ * @param {import('mrm-core').PackageJson} packageFile
+ * @param {string} packageName
+ * @param {'normal'|'dev'|'peer'=} dependencyType
+ */
+function hasDependency(packageFile, packageName, dependencyType) {
+  return Boolean(
+    packageFile.get(
+      `${
+        dependencyType == null || dependencyType === 'normal'
+          ? 'dependencies'
+          : dependencyType === 'dev'
+          ? 'devDependencies'
+          : 'peerDependencies'
+      }.${packageName}`
+    )
+  );
+}
+
 /**
  *
  * @param {import('mrm-core').PackageJson} packageFile
@@ -94,5 +122,7 @@ module.exports = {
   script,
   manager,
   engineMinVersion,
+  hasDependency,
+  hasWorkspaces,
   withPackageJson,
 };

package/core/semanticRelease.js

@@ -34,7 +34,7 @@ function semanticRelease({ state, update, preset }) {
     });
   });
 }
-semanticRelease.command = function () {
+semanticRelease.command = function command() {
   return 'semantic-release';
 };
 

package/core/typedoc.js

@@ -23,7 +23,7 @@ const jsonFile = require('./jsonFile');
  */
 function typedoc({ state, update }) {
   const packageFileDefault = packageJson();
-  const hasWorkspaces = Boolean(packageFileDefault.get('workspaces'));
+  const hasWorkspaces = pkg.hasWorkspaces(packageFileDefault);
   const hasTypedoc = state === 'present';
 
   pkg.withPackageJson((packageFile) => {

package/eslint/index.js

@@ -15,7 +15,8 @@ function createESLint({ eslintPreset: eslintPresetDefault = 'eslint:recommended'
    * }} config
    */
   function task({ eslintPreset, eslintRules }) {
-    const hasTypescript = packageJson().get('devDependencies.typescript');
+    const packageFileDefault = packageJson();
+    const hasTypescript = pkg.hasDependency(packageFileDefault, 'typescript', 'dev');
     const hasJSX = true;
     const hasJSON = true;
 

package/githooks/index.js

@@ -1,6 +1,7 @@
 const path = require('path');
 const { packageJson, template } = require('mrm-core');
 const project = require('../core/project');
+const pkg = require('../core/pkg');
 const { hasGit } = require('../core/git');
 const { gitHook, husky } = require('../core/githooks');
 const { lintStaged } = require('../core/lintStaged');
@@ -10,9 +11,9 @@ function createGitHooks() {
   function task() {
     const gitSupported = hasGit();
     const packageFile = packageJson();
-    const hasESLint = Boolean(packageFile.get('devDependencies.eslint'));
-    const hasJest = Boolean(packageFile.get('devDependencies.jest'));
-    const hasTsc = Boolean(packageFile.get('devDependencies.typescript'));
+    const hasESLint = pkg.hasDependency(packageFile, 'eslint', 'dev');
+    const hasJest = pkg.hasDependency(packageFile, 'jest', 'dev');
+    const hasTsc = pkg.hasDependency(packageFile, 'typescript', 'dev');
 
     husky({
       state: gitSupported ? 'present' : 'absent',

package/lang/index.js

@@ -4,7 +4,6 @@ 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');
 
@@ -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 = packageFile.get('mrmConfig.packageArchetype') === 'application';
+    const hasWorkspaces = pkg.hasWorkspaces(packageFile);
     const tsConfigSettingsName = 'tsconfig.settings.json';
     const tsConfigSettings = json(tsConfigSettingsName);
     const tsConfig = json('tsconfig.json');
@@ -77,9 +77,9 @@ function createLang({ language: languageDefault = 'typescript', tsConfig: tsConf
       }
     }
     // 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",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.4",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "9935d3a478d08c3c6c02f467f65c623a16749753"
+  "gitHead": "cd7eb2b021bb3c9dbc91375cece5349173a7c81a"
 }

package/renovate/index.js

@@ -54,6 +54,6 @@ function createRenovate({ renovatePresetApplication, renovatePresetLibrary }) {
 }
 
 module.exports = createRenovate({
-  renovatePresetApplication: '@w5s/renovate-config:application',
-  renovatePresetLibrary: '@w5s/renovate-config:library',
+  renovatePresetApplication: 'github>w5s/renovate-config:application',
+  renovatePresetLibrary: 'github>w5s/renovate-config:library',
 });

package/core/workspace.js

@@ -1,6 +0,0 @@
-const { packageJson } = require('mrm-core');
-
-function useWorkspaces() {
-  return packageJson().get('mrmConfig.packageArchetype') === 'workspace';
-}
-exports.useWorkspaces = useWorkspaces;