@w5s/mrm-preset 1.0.0-alpha.5 → 1.0.0-alpha.6

package/CHANGELOG.md

@@ -3,6 +3,24 @@
 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.6](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.0.0-alpha.5...@w5s/mrm-preset@1.0.0-alpha.6) (2022-02-23)
+
+
+### Bug Fixes
+
+* correct gitignore task ([b4f0903](https://github.com/w5s/project-config/commit/b4f0903561c97500aef65488ef06ccd7eae0db80))
+* remove jest on lint-staged ([2fbc851](https://github.com/w5s/project-config/commit/2fbc85132ab380429d6966bff47b176bcfb51f6d))
+* shorten eslint extensions ([aecc870](https://github.com/w5s/project-config/commit/aecc870ce0b288436208757376bc05504bff3331))
+
+
+### Features
+
+* use es-jest as default jest preset ([61535d9](https://github.com/w5s/project-config/commit/61535d9c47c25150becc564a5dd273d7cc14b579))
+
+
+
+
+
 # [1.0.0-alpha.5](https://github.com/w5s/project-config/compare/@w5s/mrm-preset@1.0.0-alpha.4...@w5s/mrm-preset@1.0.0-alpha.5) (2022-02-18)
 
 

package/core/jest.js

@@ -1,6 +1,5 @@
 /* eslint-disable no-template-curly-in-string */
 const { packageJson } = require('mrm-core');
-const { vscodeSnippets } = require('./vscode');
 const pkg = require('./pkg');
 const npm = require('./npm');
 const project = require('./project');
@@ -13,34 +12,31 @@ const project = require('./project');
 function jest({ state }) {
   const packageFileDefault = packageJson();
   const hasJest = state === 'present';
-  const hasTypescript = pkg.hasDependency(packageFileDefault, 'typescript', 'dev');
   const hasWorkspaces = pkg.hasWorkspaces(packageFileDefault);
+  const hasTypescript = pkg.hasDependency(packageFileDefault, 'typescript', 'dev');
 
   pkg.withPackageJson((packageFile) => {
     if (hasJest) {
-      const ignorePatterns = ['/node_modules/', '/docs/', '/lib/', '/build/', '/.cache/', '/public/'];
-      packageFile.merge({
-        jest: {
-          coveragePathIgnorePatterns: ignorePatterns,
-          testPathIgnorePatterns: ignorePatterns,
-        },
-      });
-      if (hasTypescript) {
+      if (hasWorkspaces) {
+        pkg.value(packageFile, {
+          path: 'jest',
+          state: 'present',
+          update: () => ({
+            preset: 'es-jest',
+            projects: packageFile
+              .get('workspaces.packages', packageFile.get('workspaces', []))
+              .map((/** @type {string} */ workspace) => `<rootDir>/${workspace}`),
+          }),
+        });
+      } else {
+        const ignorePatterns = ['/node_modules/', '/docs/', '/lib/', '/build/', '/.cache/', '/public/'];
         packageFile.merge({
           jest: {
-            globals: {
-              'ts-jest': {
-                tsconfig: hasWorkspaces ? 'tsconfig.settings.json' : 'tsconfig.json',
-              },
-            },
-            roots: hasWorkspaces ? ['<rootDir>/packages'] : null,
-            transform: {
-              '^.+\\.tsx?$': 'ts-jest',
-            },
+            preset: 'es-jest',
+            coveragePathIgnorePatterns: ignorePatterns,
+            testPathIgnorePatterns: ignorePatterns,
           },
         });
-      } else {
-        packageFile.unset('jest.globals.ts-jest').unset('jest.transform.^.+\\.tsx?$');
       }
     } else {
       packageFile.unset('jest');
@@ -56,48 +52,43 @@ function jest({ state }) {
       script: hasWorkspaces ? pkg.emptyScript : 'jest',
       state: !hasJest || hasWorkspaces ? 'default' : 'present',
     });
-    pkg.script(packageFile, {
-      name: `${project.test}:watch`,
-      script: pkg.emptyScript,
-      state: 'absent',
-    });
   });
   // Dependencies
   npm.dependency({
     dev: true,
-    name: ['jest', 'babel-jest', '@babel/core'],
+    name: ['jest', 'es-jest'],
     state: hasJest ? 'present' : 'absent',
   });
   npm.dependency({
     dev: true,
-    name: ['ts-jest', '@types/jest'],
+    name: ['@types/jest'],
     state: hasJest && hasTypescript ? 'present' : 'absent',
   });
 
-  vscodeSnippets({
-    name: 'jest',
-    snippets: {
-      'Jest Describe Block': {
-        body: ["describe('${1:description}', () => {", '\t$0', '});'],
-        description: 'Jest describe block',
-        prefix: 'describe',
-        scope: 'javascript,typescript',
-      },
-      'Jest Expect': {
-        body: 'expect($0)',
-        description: 'Jest expect assertion',
-        prefix: 'expect',
-        scope: 'javascript,typescript',
-      },
-      'Jest Test Block': {
-        body: ["test('${1:description}', () => {", '\t$0', '});'],
-        description: 'Jest test block',
-        prefix: 'test',
-        scope: 'javascript,typescript',
-      },
-    },
-    state: hasJest ? 'present' : 'absent',
-  });
+  // vscodeSnippets({
+  //   name: 'jest',
+  //   snippets: {
+  //     'Jest Describe Block': {
+  //       body: ["describe('${1:description}', () => {", '\t$0', '});'],
+  //       description: 'Jest describe block',
+  //       prefix: 'describe',
+  //       scope: 'javascript,typescript',
+  //     },
+  //     'Jest Expect': {
+  //       body: 'expect($0)',
+  //       description: 'Jest expect assertion',
+  //       prefix: 'expect',
+  //       scope: 'javascript,typescript',
+  //     },
+  //     'Jest Test Block': {
+  //       body: ["test('${1:description}', () => {", '\t$0', '});'],
+  //       description: 'Jest test block',
+  //       prefix: 'test',
+  //       scope: 'javascript,typescript',
+  //     },
+  //   },
+  //   state: hasJest ? 'present' : 'absent',
+  // });
 }
 
 module.exports = {

package/eslint/index.js

@@ -70,7 +70,7 @@ function createESLint({ eslintPreset: eslintPresetDefault = 'eslint:recommended'
       json: hasJSON,
     };
     const extList = Object.keys(extsMap).filter((ext) => extsMap[ext]);
-    const extOption = ` --ext ${extList.map((ext) => `.${ext}`).join(',')}`;
+    const extOption = ` --ext=${extList.join(',')}`;
 
     pkg.withPackageJson((packageFile) => {
       pkg.script(packageFile, {

package/githooks/index.js

@@ -12,7 +12,6 @@ function createGitHooks() {
     const gitSupported = hasGit();
     const packageFile = packageJson();
     const hasESLint = pkg.hasDependency(packageFile, 'eslint', 'dev');
-    const hasJest = pkg.hasDependency(packageFile, 'jest', 'dev');
     const hasTsc = pkg.hasDependency(packageFile, 'typescript', 'dev');
 
     husky({
@@ -23,16 +22,8 @@ function createGitHooks() {
       update: (config) => ({
         ...config,
         '*.json': [...(hasESLint ? ['eslint'] : [])],
-        '*.js?(x)': [
-          ...(hasTsc ? ["bash -c 'tsc --noEmit'"] : []),
-          ...(hasESLint ? ['eslint'] : []),
-          ...(hasJest ? ['jest --ci --bail --findRelatedTests'] : []),
-        ],
-        '*.ts?(x)': [
-          ...(hasTsc ? ["bash -c 'tsc --noEmit'"] : []),
-          ...(hasESLint ? ['eslint'] : []),
-          ...(hasJest ? ['jest --ci --bail --findRelatedTests'] : []),
-        ],
+        '*.js?(x)': [...(hasTsc ? ["bash -c 'tsc --noEmit'"] : []), ...(hasESLint ? ['eslint'] : [])],
+        '*.ts?(x)': [...(hasTsc ? ["bash -c 'tsc --noEmit'"] : []), ...(hasESLint ? ['eslint'] : [])],
       }),
     });
     gitHook({

package/gitignore/index.js

@@ -4,3 +4,5 @@ function task() {
   gitIgnoreTemplate(['macOS', 'NodeJS', 'VisualStudioCode']);
 }
 task.description = 'Adds Gitignore file';
+
+module.exports = task;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@w5s/mrm-preset",
-  "version": "1.0.0-alpha.5",
+  "version": "1.0.0-alpha.6",
   "description": "Mrm configuration presets",
   "keywords": [
     "mrm",
@@ -45,5 +45,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "17d00b3e9ba103fd053aed2c06535d0b1526886a"
+  "gitHead": "0bf05f35388f1ddb53438a017186cf64d2ce99f2"
 }