@modern-js/new-action 1.0.1 → 1.1.2

package/CHANGELOG.md

@@ -1,5 +1,37 @@
 # @modern-js/new-action
 
+## 1.1.2
+
+### Patch Changes
+
+- 0fa83663: support more .env files
+- Updated dependencies [0fa83663]
+- Updated dependencies [429aab90]
+  - @modern-js/generator-common@1.1.2
+  - @modern-js/generator-utils@1.1.1
+
+## 1.1.1
+
+### Patch Changes
+
+- 3b6856b8: fix: typo
+- c7f4cafb: fix: module solution new error without peerDependencies
+- Updated dependencies [687c92c7]
+- Updated dependencies [c0fc0700]
+  - @modern-js/generator-common@1.1.1
+
+## 1.1.0
+
+### Minor Changes
+
+- 96119db2: Relese v1.1.0
+
+### Patch Changes
+
+- Updated dependencies [96119db2]
+  - @modern-js/generator-common@1.1.0
+  - @modern-js/generator-utils@1.1.0
+
 ## 1.0.1
 
 ### Patch Changes

package/README.md

@@ -17,10 +17,7 @@
 
 > The doc site ([modernjs.dev](https://modernjs.dev)) and articles are only available in Chinese for now, we are planning to add English versions soon.
 
-- 介绍 Modern.js (即将上线)
-- [迈入现代 Web 开发](https://zhuanlan.zhihu.com/p/386607009)
-- [现代 Web 开发者问卷调查报告](https://zhuanlan.zhihu.com/p/403206195)
-- [字节跳动是如何落地微前端的](https://mp.weixin.qq.com/s/L9wbfNG5fTXF5bx7dcgj4Q)
+- [Modern.js: Hello, World!](https://zhuanlan.zhihu.com/p/426707646)
 
 ## Getting Started
 

package/dist/js/modern/module.js

@@ -79,22 +79,22 @@ export const ModuleNewAction = async options => {
     generator = `${generator}@${distTag}`;
   }
 
-  const devDependencie = ModuleActionFunctionsDevDependencies[action];
-  const dependence = ModuleActionFunctionsDependencies[action];
-  const peerDependencie = ModuleActionFunctionsPeerDependencies[action];
+  const devDependency = ModuleActionFunctionsDevDependencies[action];
+  const dependency = ModuleActionFunctionsDependencies[action];
+  const peerDependency = ModuleActionFunctionsPeerDependencies[action];
 
   const finalConfig = _merge(UserConfig, ans, {
     locale: UserConfig.locale || locale,
     packageManager: getPackageManager(pwd)
   }, {
-    devDependencies: devDependencie ? {
-      [devDependencie]: `^${await getPackageVersion(devDependencie)}`
+    devDependencies: devDependency ? {
+      [devDependency]: `^${await getPackageVersion(devDependency)}`
     } : {},
-    dependencies: dependence ? {
-      [dependence]: `^${await getPackageVersion(dependence)}`
+    dependencies: dependency ? {
+      [dependency]: `^${await getPackageVersion(dependency)}`
     } : {},
-    peerDependencies: peerDependencie ? {
-      [peerDependencie]: `^${await getPackageVersion(peerDependencie)}`
+    peerDependencies: peerDependency ? {
+      [peerDependency]: `^${await getPackageVersion(peerDependency)}`
     } : {}
   });
 

package/dist/js/modern/mwa.js

@@ -67,18 +67,18 @@ export const MWANewAction = async options => {
     generator = `${generator}@${distTag}`;
   }
 
-  const devDependencie = MWAActionFunctionsDevDependencies[action];
-  const dependence = MWAActionFunctionsDependencies[action];
+  const devDependency = MWAActionFunctionsDevDependencies[action];
+  const dependency = MWAActionFunctionsDependencies[action];
 
   const finalConfig = _merge(UserConfig, ans, {
     locale: UserConfig.locale || locale,
     packageManager: getPackageManager(pwd)
   }, {
-    devDependencies: devDependencie ? {
-      [devDependencie]: `^${await getPackageVersion(devDependencie)}`
+    devDependencies: devDependency ? {
+      [devDependency]: `^${await getPackageVersion(devDependency)}`
     } : {},
-    dependencies: dependence ? {
-      [dependence]: `^${await getPackageVersion(dependence)}`
+    dependencies: dependency ? {
+      [dependency]: `^${await getPackageVersion(dependency)}`
     } : {}
   });
 

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

@@ -1,5 +1,6 @@
+import path from 'path';
 import json5 from 'json5';
-import { path, fs } from '@modern-js/generator-utils';
+import { fs } from '@modern-js/generator-utils';
 export function alreadyRepo() {
   try {
     return fs.existsSync(path.resolve(process.cwd(), 'package.json'));
@@ -32,15 +33,15 @@ export function hasEnabledFunction(action, dependencies, devDependencies, peerDe
   }
 
   if (dependencies[action]) {
-    return packageJson.dependencies[dependencies[action]];
+    return (packageJson.dependencies || {})[dependencies[action]];
   }
 
   if (peerDependencies[action]) {
-    return packageJson.peerDependencies[peerDependencies[action]];
+    return (packageJson.peerDependencies || {})[peerDependencies[action]];
   }
 
   if (!peerDependencies[action] && devDependencies[action]) {
-    return packageJson.devDependencies[devDependencies[action]];
+    return (packageJson.devDependencies || {})[devDependencies[action]];
   }
 
   return false;

package/dist/js/node/module.js

@@ -95,21 +95,21 @@ const ModuleNewAction = async options => {
     generator = `${generator}@${distTag}`;
   }
 
-  const devDependencie = _generatorCommon.ModuleActionFunctionsDevDependencies[action];
-  const dependence = _generatorCommon.ModuleActionFunctionsDependencies[action];
-  const peerDependencie = _generatorCommon.ModuleActionFunctionsPeerDependencies[action];
+  const devDependency = _generatorCommon.ModuleActionFunctionsDevDependencies[action];
+  const dependency = _generatorCommon.ModuleActionFunctionsDependencies[action];
+  const peerDependency = _generatorCommon.ModuleActionFunctionsPeerDependencies[action];
   const finalConfig = (0, _merge2.default)(UserConfig, ans, {
     locale: UserConfig.locale || locale,
     packageManager: (0, _generatorUtils.getPackageManager)(pwd)
   }, {
-    devDependencies: devDependencie ? {
-      [devDependencie]: `^${await (0, _generatorUtils.getPackageVersion)(devDependencie)}`
+    devDependencies: devDependency ? {
+      [devDependency]: `^${await (0, _generatorUtils.getPackageVersion)(devDependency)}`
     } : {},
-    dependencies: dependence ? {
-      [dependence]: `^${await (0, _generatorUtils.getPackageVersion)(dependence)}`
+    dependencies: dependency ? {
+      [dependency]: `^${await (0, _generatorUtils.getPackageVersion)(dependency)}`
     } : {},
-    peerDependencies: peerDependencie ? {
-      [peerDependencie]: `^${await (0, _generatorUtils.getPackageVersion)(peerDependencie)}`
+    peerDependencies: peerDependency ? {
+      [peerDependency]: `^${await (0, _generatorUtils.getPackageVersion)(peerDependency)}`
     } : {}
   });
   const task = [{

package/dist/js/node/mwa.js

@@ -83,17 +83,17 @@ const MWANewAction = async options => {
     generator = `${generator}@${distTag}`;
   }
 
-  const devDependencie = _generatorCommon.MWAActionFunctionsDevDependencies[action];
-  const dependence = _generatorCommon.MWAActionFunctionsDependencies[action];
+  const devDependency = _generatorCommon.MWAActionFunctionsDevDependencies[action];
+  const dependency = _generatorCommon.MWAActionFunctionsDependencies[action];
   const finalConfig = (0, _merge2.default)(UserConfig, ans, {
     locale: UserConfig.locale || locale,
     packageManager: (0, _generatorUtils.getPackageManager)(pwd)
   }, {
-    devDependencies: devDependencie ? {
-      [devDependencie]: `^${await (0, _generatorUtils.getPackageVersion)(devDependencie)}`
+    devDependencies: devDependency ? {
+      [devDependency]: `^${await (0, _generatorUtils.getPackageVersion)(devDependency)}`
     } : {},
-    dependencies: dependence ? {
-      [dependence]: `^${await (0, _generatorUtils.getPackageVersion)(dependence)}`
+    dependencies: dependency ? {
+      [dependency]: `^${await (0, _generatorUtils.getPackageVersion)(dependency)}`
     } : {}
   });
   const task = [{

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

@@ -7,6 +7,8 @@ exports.alreadyRepo = alreadyRepo;
 exports.hasEnabledFunction = hasEnabledFunction;
 exports.readJson = void 0;
 
+var _path = _interopRequireDefault(require("path"));
+
 var _json = _interopRequireDefault(require("json5"));
 
 var _generatorUtils = require("@modern-js/generator-utils");
@@ -15,7 +17,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 function alreadyRepo() {
   try {
-    return _generatorUtils.fs.existsSync(_generatorUtils.path.resolve(process.cwd(), 'package.json'));
+    return _generatorUtils.fs.existsSync(_path.default.resolve(process.cwd(), 'package.json'));
   } catch (e) {
     return false;
   }
@@ -41,7 +43,7 @@ const readJson = jsonPath => {
 exports.readJson = readJson;
 
 function hasEnabledFunction(action, dependencies, devDependencies, peerDependencies, cwd) {
-  const packageJsonPath = _generatorUtils.path.normalize(`${cwd}/package.json`);
+  const packageJsonPath = _path.default.normalize(`${cwd}/package.json`);
 
   const packageJson = readJson(packageJsonPath);
 
@@ -50,15 +52,15 @@ function hasEnabledFunction(action, dependencies, devDependencies, peerDependenc
   }
 
   if (dependencies[action]) {
-    return packageJson.dependencies[dependencies[action]];
+    return (packageJson.dependencies || {})[dependencies[action]];
   }
 
   if (peerDependencies[action]) {
-    return packageJson.peerDependencies[peerDependencies[action]];
+    return (packageJson.peerDependencies || {})[peerDependencies[action]];
   }
 
   if (!peerDependencies[action] && devDependencies[action]) {
-    return packageJson.devDependencies[devDependencies[action]];
+    return (packageJson.devDependencies || {})[devDependencies[action]];
   }
 
   return false;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.0.1",
+  "version": "1.1.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -30,8 +30,8 @@
     "@babel/runtime": "^7",
     "@modern-js/codesmith": "^1.0.0",
     "@modern-js/codesmith-api-app": "^1.0.0",
-    "@modern-js/generator-common": "^1.0.1",
-    "@modern-js/generator-utils": "^1.0.1",
+    "@modern-js/generator-common": "^1.1.2",
+    "@modern-js/generator-utils": "^1.1.1",
     "json5": "^2.2.0",
     "lodash": "^4.17.21"
   },
@@ -40,8 +40,8 @@
     "@types/lodash": "^4.14.168",
     "@types/node": "^14",
     "typescript": "^4",
-    "@modern-js/module-tools": "^1.0.1",
-    "@modern-js/plugin-testing": "^1.0.0"
+    "@modern-js/module-tools": "^1.1.0",
+    "@modern-js/plugin-testing": "^1.1.0"
   },
   "sideEffects": false,
   "modernConfig": {

package/src/module.ts

@@ -113,11 +113,11 @@ export const ModuleNewAction = async (options: IModuleNewActionOption) => {
     generator = `${generator}@${distTag}`;
   }
 
-  const devDependencie =
+  const devDependency =
     ModuleActionFunctionsDevDependencies[action as ActionFunction];
-  const dependence =
+  const dependency =
     ModuleActionFunctionsDependencies[action as ActionFunction];
-  const peerDependencie =
+  const peerDependency =
     ModuleActionFunctionsPeerDependencies[action as ActionFunction];
 
   const finalConfig = merge(
@@ -128,14 +128,16 @@ export const ModuleNewAction = async (options: IModuleNewActionOption) => {
       packageManager: getPackageManager(pwd),
     },
     {
-      devDependencies: devDependencie
-        ? { [devDependencie]: `^${await getPackageVersion(devDependencie)}` }
+      devDependencies: devDependency
+        ? { [devDependency]: `^${await getPackageVersion(devDependency)}` }
         : {},
-      dependencies: dependence
-        ? { [dependence]: `^${await getPackageVersion(dependence)}` }
+      dependencies: dependency
+        ? { [dependency]: `^${await getPackageVersion(dependency)}` }
         : {},
-      peerDependencies: peerDependencie
-        ? { [peerDependencie]: `^${await getPackageVersion(peerDependencie)}` }
+      peerDependencies: peerDependency
+        ? {
+            [peerDependency]: `^${await getPackageVersion(peerDependency)}`,
+          }
         : {},
     },
   );

package/src/mwa.ts

@@ -100,9 +100,9 @@ export const MWANewAction = async (options: IMWANewActionOption) => {
     generator = `${generator}@${distTag}`;
   }
 
-  const devDependencie =
+  const devDependency =
     MWAActionFunctionsDevDependencies[action as ActionFunction];
-  const dependence = MWAActionFunctionsDependencies[action as ActionFunction];
+  const dependency = MWAActionFunctionsDependencies[action as ActionFunction];
 
   const finalConfig = merge(
     UserConfig,
@@ -112,11 +112,11 @@ export const MWANewAction = async (options: IMWANewActionOption) => {
       packageManager: getPackageManager(pwd),
     },
     {
-      devDependencies: devDependencie
-        ? { [devDependencie]: `^${await getPackageVersion(devDependencie)}` }
+      devDependencies: devDependency
+        ? { [devDependency]: `^${await getPackageVersion(devDependency)}` }
         : {},
-      dependencies: dependence
-        ? { [dependence]: `^${await getPackageVersion(dependence)}` }
+      dependencies: dependency
+        ? { [dependency]: `^${await getPackageVersion(dependency)}` }
         : {},
     },
   );

package/src/utils/index.ts

@@ -1,6 +1,7 @@
+import path from 'path';
 import json5 from 'json5';
 import { ActionFunction } from '@modern-js/generator-common';
-import { path, fs } from '@modern-js/generator-utils';
+import { fs } from '@modern-js/generator-utils';
 
 export function alreadyRepo() {
   try {
@@ -36,13 +37,13 @@ export function hasEnabledFunction(
     return false;
   }
   if (dependencies[action]) {
-    return packageJson.dependencies[dependencies[action]];
+    return (packageJson.dependencies || {})[dependencies[action]];
   }
   if (peerDependencies[action]) {
-    return packageJson.peerDependencies[peerDependencies[action]];
+    return (packageJson.peerDependencies || {})[peerDependencies[action]];
   }
   if (!peerDependencies[action] && devDependencies[action]) {
-    return packageJson.devDependencies[devDependencies[action]];
+    return (packageJson.devDependencies || {})[devDependencies[action]];
   }
   return false;
 }