@modern-js/new-action 1.3.3 → 1.3.6

package/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  root: true,
+  extends: ['@modern-js'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: ['./tsconfig.json'],
+  },
+};

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @modern-js/new-action
 
+## 1.3.6
+
+### Patch Changes
+
+- 6cffe99d: chore:
+  remove react eslint rules for `modern-js` rule set.
+  add .eslintrc for each package to speed up linting
+- 04ae5262: chore: bump @modern-js/utils to v1.4.1 in dependencies
+- 60f7d8bf: feat: add tests dir to npmignore
+- Updated dependencies [b8599d09]
+- Updated dependencies [6cffe99d]
+- Updated dependencies [04ae5262]
+- Updated dependencies [60f7d8bf]
+- Updated dependencies [3bf4f8b0]
+  - @modern-js/utils@1.5.0
+  - @modern-js/generator-common@1.4.9
+  - @modern-js/generator-utils@1.2.2
+
+## 1.3.5
+
+### Patch Changes
+
+- 17d0cc46: feat: prebundle lodash to @modern-js/utils/lodash
+- Updated dependencies [77ff9754]
+- Updated dependencies [d2d1d6b2]
+- Updated dependencies [07a4887e]
+- Updated dependencies [ea2ae711]
+- Updated dependencies [17d0cc46]
+- Updated dependencies [d2d1d6b2]
+  - @modern-js/utils@1.4.0
+
 ## 1.3.3
 
 ### Patch Changes

package/dist/js/modern/module.js

@@ -1,10 +1,9 @@
-import _merge from "lodash/merge";
+import { merge } from '@modern-js/utils/lodash';
 import { CodeSmith, GeneratorCore, MaterialsManager } from '@modern-js/codesmith';
 import { AppAPI, forEach } from '@modern-js/codesmith-api-app';
-import { i18n, ModuleNewActionSchema, ModuleActionFunctions, ModuleActionFunctionsDependencies, ModuleActionFunctionsDevDependencies, ModuleActionFunctionsPeerDependencies, ModuleActionFunctionsAppendTypeContent, ModuleNewActionGenerators } from '@modern-js/generator-common';
+import { i18n, ModuleNewActionSchema, ModuleActionFunctions, ModuleActionFunctionsDependencies, ModuleActionFunctionsDevDependencies, ModuleActionFunctionsPeerDependencies, ModuleNewActionGenerators } from '@modern-js/generator-common';
 import { getPackageVersion, getPackageManager } from '@modern-js/generator-utils';
 import { alreadyRepo, hasEnabledFunction } from "./utils";
-// eslint-disable-next-line max-statements
 export const ModuleNewAction = async options => {
   const {
     locale = 'zh',
@@ -82,8 +81,7 @@ export const ModuleNewAction = async options => {
   const devDependency = ModuleActionFunctionsDevDependencies[action];
   const dependency = ModuleActionFunctionsDependencies[action];
   const peerDependency = ModuleActionFunctionsPeerDependencies[action];
-
-  const finalConfig = _merge(UserConfig, ans, {
+  const finalConfig = merge(UserConfig, ans, {
     locale: UserConfig.locale || locale,
     packageManager: UserConfig.packageManager || (await getPackageManager(cwd))
   }, {
@@ -95,10 +93,8 @@ export const ModuleNewAction = async options => {
     } : {},
     peerDependencies: peerDependency ? {
       [peerDependency]: `^${await getPackageVersion(peerDependency)}`
-    } : {},
-    appendTypeContent: ModuleActionFunctionsAppendTypeContent[action]
+    } : {}
   });
-
   const task = [{
     name: generator,
     config: finalConfig

package/dist/js/modern/monorepo.js

@@ -1,4 +1,4 @@
-import _merge from "lodash/merge";
+import { merge } from '@modern-js/utils/lodash';
 import { CodeSmith } from '@modern-js/codesmith';
 import { i18n } from '@modern-js/generator-common';
 import { getPackageManager } from '@modern-js/generator-utils';
@@ -34,14 +34,13 @@ export const MonorepoNewAction = async options => {
     smith.logger.warn('not valid modern.js repo');
   }
 
-  const finalConfig = _merge(UserConfig, {
+  const finalConfig = merge(UserConfig, {
     locale: UserConfig.locale || locale,
     packageManager: UserConfig.packageManager || (await getPackageManager(cwd)),
     isMonorepo: true,
     distTag,
     plugins
   });
-
   let generator = REPO_GENERAROE;
 
   if (process.env.CODESMITH_ENV === 'development') {

package/dist/js/modern/mwa.js

@@ -1,10 +1,9 @@
-import _merge from "lodash/merge";
+import { merge } from '@modern-js/utils/lodash';
 import { CodeSmith, GeneratorCore, MaterialsManager } from '@modern-js/codesmith';
 import { AppAPI, forEach } from '@modern-js/codesmith-api-app';
 import { MWANewActionSchema, MWAActionFunctions, MWAActionFunctionsDependencies, MWAActionFunctionsAppendTypeContent, MWAActionFunctionsDevDependencies, MWANewActionGenerators, i18n } from '@modern-js/generator-common';
 import { getPackageManager, getPackageVersion } from '@modern-js/generator-utils';
 import { alreadyRepo, hasEnabledFunction } from "./utils";
-// eslint-disable-next-line max-statements
 export const MWANewAction = async options => {
   const {
     locale = 'zh',
@@ -69,8 +68,7 @@ export const MWANewAction = async options => {
 
   const devDependency = MWAActionFunctionsDevDependencies[action];
   const dependency = MWAActionFunctionsDependencies[action];
-
-  const finalConfig = _merge(UserConfig, ans, {
+  const finalConfig = merge(UserConfig, ans, {
     locale: UserConfig.locale || locale,
     packageManager: UserConfig.packageManager || (await getPackageManager(cwd))
   }, {
@@ -82,7 +80,6 @@ export const MWANewAction = async options => {
     } : {},
     appendTypeContent: MWAActionFunctionsAppendTypeContent[action]
   });
-
   const task = [{
     name: generator,
     config: finalConfig

package/dist/js/modern/utils/index.js

@@ -22,8 +22,7 @@ export const readJson = jsonPath => {
   } catch (error) {
     throw Error(`${jsonPath} is not a valid json, please check and try again.`);
   }
-}; // eslint-disable-next-line max-params
-
+};
 export function hasEnabledFunction(action, dependencies, devDependencies, peerDependencies, cwd) {
   const packageJsonPath = path.normalize(`${cwd}/package.json`);
   const packageJson = readJson(packageJsonPath);
@@ -33,15 +32,21 @@ export function hasEnabledFunction(action, dependencies, devDependencies, peerDe
   }
 
   if (dependencies[action]) {
-    return (packageJson.dependencies || {})[dependencies[action]];
+    var _packageJson$dependen;
+
+    return (_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen[dependencies[action]];
   }
 
   if (peerDependencies[action]) {
-    return (packageJson.peerDependencies || {})[peerDependencies[action]];
+    var _packageJson$peerDepe;
+
+    return (_packageJson$peerDepe = packageJson.peerDependencies) === null || _packageJson$peerDepe === void 0 ? void 0 : _packageJson$peerDepe[peerDependencies[action]];
   }
 
   if (!peerDependencies[action] && devDependencies[action]) {
-    return (packageJson.devDependencies || {})[devDependencies[action]];
+    var _packageJson$devDepen;
+
+    return (_packageJson$devDepen = packageJson.devDependencies) === null || _packageJson$devDepen === void 0 ? void 0 : _packageJson$devDepen[devDependencies[action]];
   }
 
   return false;

package/dist/js/node/module.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ModuleNewAction = void 0;
 
-var _merge2 = _interopRequireDefault(require("lodash/merge"));
+var _lodash = require("@modern-js/utils/lodash");
 
 var _codesmith = require("@modern-js/codesmith");
 
@@ -17,9 +17,6 @@ var _generatorUtils = require("@modern-js/generator-utils");
 
 var _utils = require("./utils");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// eslint-disable-next-line max-statements
 const ModuleNewAction = async options => {
   const {
     locale = 'zh',
@@ -98,7 +95,7 @@ const ModuleNewAction = async options => {
   const devDependency = _generatorCommon.ModuleActionFunctionsDevDependencies[action];
   const dependency = _generatorCommon.ModuleActionFunctionsDependencies[action];
   const peerDependency = _generatorCommon.ModuleActionFunctionsPeerDependencies[action];
-  const finalConfig = (0, _merge2.default)(UserConfig, ans, {
+  const finalConfig = (0, _lodash.merge)(UserConfig, ans, {
     locale: UserConfig.locale || locale,
     packageManager: UserConfig.packageManager || (await (0, _generatorUtils.getPackageManager)(cwd))
   }, {
@@ -110,8 +107,7 @@ const ModuleNewAction = async options => {
     } : {},
     peerDependencies: peerDependency ? {
       [peerDependency]: `^${await (0, _generatorUtils.getPackageVersion)(peerDependency)}`
-    } : {},
-    appendTypeContent: _generatorCommon.ModuleActionFunctionsAppendTypeContent[action]
+    } : {}
   });
   const task = [{
     name: generator,

package/dist/js/node/monorepo.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.MonorepoNewAction = void 0;
 
-var _merge2 = _interopRequireDefault(require("lodash/merge"));
+var _lodash = require("@modern-js/utils/lodash");
 
 var _codesmith = require("@modern-js/codesmith");
 
@@ -15,8 +15,6 @@ var _generatorUtils = require("@modern-js/generator-utils");
 
 var _utils = require("./utils");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const REPO_GENERAROE = '@modern-js/repo-generator';
 
 const MonorepoNewAction = async options => {
@@ -50,7 +48,7 @@ const MonorepoNewAction = async options => {
     smith.logger.warn('not valid modern.js repo');
   }
 
-  const finalConfig = (0, _merge2.default)(UserConfig, {
+  const finalConfig = (0, _lodash.merge)(UserConfig, {
     locale: UserConfig.locale || locale,
     packageManager: UserConfig.packageManager || (await (0, _generatorUtils.getPackageManager)(cwd)),
     isMonorepo: true,

package/dist/js/node/mwa.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.MWANewAction = void 0;
 
-var _merge2 = _interopRequireDefault(require("lodash/merge"));
+var _lodash = require("@modern-js/utils/lodash");
 
 var _codesmith = require("@modern-js/codesmith");
 
@@ -17,9 +17,6 @@ var _generatorUtils = require("@modern-js/generator-utils");
 
 var _utils = require("./utils");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-// eslint-disable-next-line max-statements
 const MWANewAction = async options => {
   const {
     locale = 'zh',
@@ -85,7 +82,7 @@ const MWANewAction = async options => {
 
   const devDependency = _generatorCommon.MWAActionFunctionsDevDependencies[action];
   const dependency = _generatorCommon.MWAActionFunctionsDependencies[action];
-  const finalConfig = (0, _merge2.default)(UserConfig, ans, {
+  const finalConfig = (0, _lodash.merge)(UserConfig, ans, {
     locale: UserConfig.locale || locale,
     packageManager: UserConfig.packageManager || (await (0, _generatorUtils.getPackageManager)(cwd))
   }, {

package/dist/js/node/utils/index.js

@@ -37,8 +37,7 @@ const readJson = jsonPath => {
   } catch (error) {
     throw Error(`${jsonPath} is not a valid json, please check and try again.`);
   }
-}; // eslint-disable-next-line max-params
-
+};
 
 exports.readJson = readJson;
 
@@ -52,15 +51,21 @@ function hasEnabledFunction(action, dependencies, devDependencies, peerDependenc
   }
 
   if (dependencies[action]) {
-    return (packageJson.dependencies || {})[dependencies[action]];
+    var _packageJson$dependen;
+
+    return (_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen[dependencies[action]];
   }
 
   if (peerDependencies[action]) {
-    return (packageJson.peerDependencies || {})[peerDependencies[action]];
+    var _packageJson$peerDepe;
+
+    return (_packageJson$peerDepe = packageJson.peerDependencies) === null || _packageJson$peerDepe === void 0 ? void 0 : _packageJson$peerDepe[peerDependencies[action]];
   }
 
   if (!peerDependencies[action] && devDependencies[action]) {
-    return (packageJson.devDependencies || {})[devDependencies[action]];
+    var _packageJson$devDepen;
+
+    return (_packageJson$devDepen = packageJson.devDependencies) === null || _packageJson$devDepen === void 0 ? void 0 : _packageJson$devDepen[devDependencies[action]];
   }
 
   return false;

package/jest.config.js

@@ -2,7 +2,6 @@ const sharedConfig = require('@scripts/jest-config');
 
 /** @type {import('@jest/types').Config.InitialOptions} */
 module.exports = {
-  // eslint-disable-next-line node/no-unsupported-features/es-syntax
   ...sharedConfig,
   rootDir: __dirname,
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.3",
+  "version": "1.3.6",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -31,14 +31,13 @@
     "@babel/runtime": "^7",
     "@modern-js/codesmith": "^1.0.8",
     "@modern-js/codesmith-api-app": "^1.0.8",
-    "@modern-js/generator-common": "^1.4.4",
-    "@modern-js/generator-utils": "^1.2.1",
-    "json5": "^2.2.0",
-    "lodash": "^4.17.21"
+    "@modern-js/generator-common": "^1.4.9",
+    "@modern-js/generator-utils": "^1.2.2",
+    "@modern-js/utils": "^1.5.0",
+    "json5": "^2.2.0"
   },
   "devDependencies": {
     "@types/jest": "^26",
-    "@types/lodash": "^4.14.168",
     "@types/node": "^14",
     "typescript": "^4",
     "@scripts/build": "0.0.0",

package/tests/index.test.ts

@@ -1,7 +0,0 @@
-import { MWANewAction } from '../src';
-
-describe('generator-new-action', () => {
-  it('default', () => {
-    expect(MWANewAction).toBeDefined();
-  });
-});

package/tests/tsconfig.json

@@ -1,13 +0,0 @@
-{
-  "extends": "@modern-js/tsconfig/base",
-  "compilerOptions": {
-    "declaration": true,
-    "jsx": "preserve",
-    "baseUrl": "./",
-    "outDir": "./out",
-    "emitDeclarationOnly": true,
-    "isolatedModules": true,
-    "paths": {},
-    "types": ["node", "jest"]
-  }
-}