@modern-js/new-action 2.0.0-beta.0 → 2.0.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,5 +1,53 @@
1
1
  # @modern-js/new-action
2
2
 
3
+ ## 2.0.0-beta.2
4
+
5
+ ### Major Changes
6
+
7
+ - dda38c9c3e: chore: v2
8
+
9
+ ### Patch Changes
10
+
11
+ - Updated dependencies [92f0ead]
12
+ - Updated dependencies [edd1cfb1af]
13
+ - Updated dependencies [cc971eabfc]
14
+ - Updated dependencies [5b9049f2e9]
15
+ - Updated dependencies [92004d1]
16
+ - Updated dependencies [b8bbe036c7]
17
+ - Updated dependencies [d5a31df781]
18
+ - Updated dependencies [dda38c9c3e]
19
+ - Updated dependencies [3bbea92b2a]
20
+ - Updated dependencies [abf3421a75]
21
+ - Updated dependencies [543be9558e]
22
+ - Updated dependencies [14b712da84]
23
+ - @modern-js/utils@2.0.0-beta.2
24
+ - @modern-js/generator-common@3.0.0-beta.2
25
+ - @modern-js/generator-utils@3.0.0-beta.2
26
+
27
+ ## 2.0.0-beta.1
28
+
29
+ ### Major Changes
30
+
31
+ - dda38c9: chore: v2
32
+
33
+ ### Patch Changes
34
+
35
+ - Updated dependencies [92f0ead]
36
+ - Updated dependencies [edd1cfb1af]
37
+ - Updated dependencies [cc971eabfc]
38
+ - Updated dependencies [5b9049f]
39
+ - Updated dependencies [92004d1]
40
+ - Updated dependencies [b8bbe036c7]
41
+ - Updated dependencies [d5a31df781]
42
+ - Updated dependencies [dda38c9]
43
+ - Updated dependencies [3bbea92b2a]
44
+ - Updated dependencies [abf3421]
45
+ - Updated dependencies [543be9558e]
46
+ - Updated dependencies [14b712d]
47
+ - @modern-js/utils@2.0.0-beta.1
48
+ - @modern-js/generator-common@3.0.0-beta.1
49
+ - @modern-js/generator-utils@3.0.0-beta.1
50
+
3
51
  ## 2.0.0-beta.0
4
52
 
5
53
  ### Major Changes
@@ -1,9 +1,6 @@
1
1
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
2
-
3
2
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
4
-
5
3
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
6
-
7
4
  import { merge } from '@modern-js/utils/lodash';
8
5
  import { CodeSmith } from '@modern-js/codesmith';
9
6
  import { FormilyAPI } from '@modern-js/codesmith-formily';
@@ -20,13 +17,11 @@ export const ModuleNewAction = async options => {
20
17
  cwd = process.cwd()
21
18
  } = options;
22
19
  let UserConfig = {};
23
-
24
20
  try {
25
21
  UserConfig = JSON.parse(config);
26
22
  } catch (e) {
27
23
  throw new Error('config is not a valid json');
28
24
  }
29
-
30
25
  i18n.changeLanguage({
31
26
  locale: UserConfig.locale || locale
32
27
  });
@@ -34,11 +29,9 @@ export const ModuleNewAction = async options => {
34
29
  debug,
35
30
  registryUrl: registry
36
31
  });
37
-
38
32
  if (!alreadyRepo(cwd)) {
39
33
  smith.logger.warn('not valid modern.js repo');
40
34
  }
41
-
42
35
  const formilyAPI = new FormilyAPI({
43
36
  materials: {},
44
37
  config: {},
@@ -50,43 +43,38 @@ export const ModuleNewAction = async options => {
50
43
  ModuleActionFunctions.forEach(func => {
51
44
  const enable = hasEnabledFunction(func, ModuleActionFunctionsDependencies, ModuleActionFunctionsDevDependencies, ModuleActionFunctionsPeerDependencies, cwd);
52
45
  funcMap[func] = enable;
53
-
54
46
  if (!enable) {
55
47
  hasOption = true;
56
48
  }
57
49
  });
58
-
59
50
  if (!hasOption) {
60
- smith.logger.warn('no option can be enabled'); // eslint-disable-next-line no-process-exit
61
-
51
+ smith.logger.warn('no option can be enabled');
52
+ // eslint-disable-next-line no-process-exit
62
53
  process.exit(1);
63
54
  }
64
-
65
55
  const ans = await formilyAPI.getInputBySchemaFunc(getModuleNewActionSchema, _objectSpread(_objectSpread({}, UserConfig), {}, {
66
56
  funcMap
67
57
  }));
68
58
  const actionType = ans.actionType;
69
59
  const action = ans[actionType];
70
60
  const generator = getGeneratorPath(ModuleNewActionGenerators[actionType][action], distTag);
71
-
72
61
  if (!generator) {
73
62
  throw new Error(`no valid option`);
74
63
  }
75
-
76
64
  const devDependency = ModuleActionFunctionsDevDependencies[action];
77
65
  const dependency = ModuleActionFunctionsDependencies[action];
78
66
  const peerDependency = ModuleActionFunctionsPeerDependencies[action];
79
-
80
67
  const getModulePluginVersion = packageName => {
81
68
  return getModernPluginVersion(Solution.Module, packageName, {
82
69
  registry,
83
- distTag
70
+ distTag,
71
+ cwd
84
72
  });
85
73
  };
86
-
87
74
  const finalConfig = merge(UserConfig, ans, {
88
75
  locale: UserConfig.locale || locale,
89
- packageManager: UserConfig.packageManager || (await getPackageManager(cwd))
76
+ packageManager: UserConfig.packageManager || (await getPackageManager(cwd)),
77
+ distTag
90
78
  }, {
91
79
  devDependencies: devDependency ? {
92
80
  [devDependency]: `${await getModulePluginVersion(devDependency)}`
@@ -16,13 +16,11 @@ export const MonorepoNewAction = async options => {
16
16
  cwd = process.cwd()
17
17
  } = options;
18
18
  let UserConfig = {};
19
-
20
19
  try {
21
20
  UserConfig = JSON.parse(config);
22
21
  } catch (e) {
23
22
  throw new Error('config is not a valid json');
24
23
  }
25
-
26
24
  i18n.changeLanguage({
27
25
  locale: UserConfig.locale || locale
28
26
  });
@@ -30,12 +28,11 @@ export const MonorepoNewAction = async options => {
30
28
  debug,
31
29
  registryUrl: registry
32
30
  });
33
-
34
31
  if (!alreadyRepo(cwd)) {
35
32
  smith.logger.warn('not valid modern.js repo');
36
- } // Determine if the plugin is a Monorepo dependency
37
-
33
+ }
38
34
 
35
+ // Determine if the plugin is a Monorepo dependency
39
36
  const plugins = plugin.map(plugin => {
40
37
  try {
41
38
  return path.join(require.resolve(plugin), '../../');
@@ -56,13 +53,11 @@ export const MonorepoNewAction = async options => {
56
53
  plugins
57
54
  });
58
55
  let generator = REPO_GENERATOR;
59
-
60
56
  if (process.env.CODESMITH_ENV === 'development') {
61
57
  generator = require.resolve(generator);
62
58
  } else if (distTag) {
63
59
  generator = `${generator}@${distTag}`;
64
60
  }
65
-
66
61
  const task = [{
67
62
  name: generator,
68
63
  config: finalConfig
@@ -1,9 +1,6 @@
1
1
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
2
-
3
2
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
4
-
5
3
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
6
-
7
4
  import { merge } from '@modern-js/utils/lodash';
8
5
  import { CodeSmith } from '@modern-js/codesmith';
9
6
  import { FormilyAPI } from '@modern-js/codesmith-formily';
@@ -20,13 +17,11 @@ export const MWANewAction = async options => {
20
17
  cwd = process.cwd()
21
18
  } = options;
22
19
  let UserConfig = {};
23
-
24
20
  try {
25
21
  UserConfig = JSON.parse(config);
26
22
  } catch (e) {
27
23
  throw new Error('config is not a valid json');
28
24
  }
29
-
30
25
  i18n.changeLanguage({
31
26
  locale: UserConfig.locale || locale
32
27
  });
@@ -34,11 +29,9 @@ export const MWANewAction = async options => {
34
29
  debug,
35
30
  registryUrl: registry
36
31
  });
37
-
38
32
  if (!alreadyRepo(cwd)) {
39
33
  smith.logger.warn('not valid modern.js repo');
40
34
  }
41
-
42
35
  const formilyAPI = new FormilyAPI({
43
36
  materials: {},
44
37
  config: {},
@@ -62,23 +55,22 @@ export const MWANewAction = async options => {
62
55
  const actionType = ans.actionType;
63
56
  const action = ans[actionType];
64
57
  const generator = getGeneratorPath(MWANewActionGenerators[actionType][action], distTag);
65
-
66
58
  if (!generator) {
67
59
  throw new Error(`no valid option`);
68
60
  }
69
-
70
61
  const getMwaPluginVersion = packageName => {
71
62
  return getModernPluginVersion(Solution.MWA, packageName, {
72
63
  registry,
73
- distTag
64
+ distTag,
65
+ cwd
74
66
  });
75
67
  };
76
-
77
68
  const devDependency = MWAActionFunctionsDevDependencies[action];
78
69
  const dependency = MWAActionFunctionsDependencies[action] || MWAActionRefactorDependencies[action];
79
70
  const finalConfig = merge(UserConfig, ans, {
80
71
  locale: UserConfig.locale || locale,
81
- packageManager: UserConfig.packageManager || (await getPackageManager(cwd))
72
+ packageManager: UserConfig.packageManager || (await getPackageManager(cwd)),
73
+ distTag
82
74
  }, {
83
75
  devDependencies: devDependency ? {
84
76
  [devDependency]: `${await getMwaPluginVersion(devDependency)}`
@@ -12,11 +12,9 @@ export const readJson = jsonPath => {
12
12
  if (!fs.existsSync(jsonPath)) {
13
13
  return {};
14
14
  }
15
-
16
15
  const jsonStr = fs.readFileSync(jsonPath, {
17
16
  encoding: 'utf8'
18
17
  });
19
-
20
18
  try {
21
19
  return json5.parse(jsonStr);
22
20
  } catch (error) {
@@ -26,29 +24,21 @@ export const readJson = jsonPath => {
26
24
  export function hasEnabledFunction(action, dependencies, devDependencies, peerDependencies, cwd) {
27
25
  const packageJsonPath = path.normalize(`${cwd}/package.json`);
28
26
  const packageJson = readJson(packageJsonPath);
29
-
30
27
  if (!dependencies[action] && !devDependencies[action]) {
31
28
  return false;
32
29
  }
33
-
34
30
  if (dependencies[action]) {
35
31
  var _packageJson$dependen;
36
-
37
32
  return (_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen[dependencies[action]];
38
33
  }
39
-
40
34
  if (peerDependencies[action]) {
41
35
  var _packageJson$peerDepe;
42
-
43
36
  return (_packageJson$peerDepe = packageJson.peerDependencies) === null || _packageJson$peerDepe === void 0 ? void 0 : _packageJson$peerDepe[peerDependencies[action]];
44
37
  }
45
-
46
38
  if (!peerDependencies[action] && devDependencies[action]) {
47
39
  var _packageJson$devDepen;
48
-
49
40
  return (_packageJson$devDepen = packageJson.devDependencies) === null || _packageJson$devDepen === void 0 ? void 0 : _packageJson$devDepen[devDependencies[action]];
50
41
  }
51
-
52
42
  return false;
53
43
  }
54
44
  export function getGeneratorPath(generator, distTag) {
@@ -57,6 +47,5 @@ export function getGeneratorPath(generator, distTag) {
57
47
  } else if (distTag) {
58
48
  return `${generator}@${distTag}`;
59
49
  }
60
-
61
50
  return generator;
62
51
  }
@@ -3,9 +3,7 @@
3
3
  Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
-
7
6
  var _utils = require("./utils");
8
-
9
7
  Object.keys(_utils).forEach(function (key) {
10
8
  if (key === "default" || key === "__esModule") return;
11
9
  if (key in exports && exports[key] === _utils[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_utils).forEach(function (key) {
16
14
  }
17
15
  });
18
16
  });
19
-
20
17
  var _mwa = require("./mwa");
21
-
22
18
  Object.keys(_mwa).forEach(function (key) {
23
19
  if (key === "default" || key === "__esModule") return;
24
20
  if (key in exports && exports[key] === _mwa[key]) return;
@@ -29,9 +25,7 @@ Object.keys(_mwa).forEach(function (key) {
29
25
  }
30
26
  });
31
27
  });
32
-
33
28
  var _module = require("./module");
34
-
35
29
  Object.keys(_module).forEach(function (key) {
36
30
  if (key === "default" || key === "__esModule") return;
37
31
  if (key in exports && exports[key] === _module[key]) return;
@@ -42,9 +36,7 @@ Object.keys(_module).forEach(function (key) {
42
36
  }
43
37
  });
44
38
  });
45
-
46
39
  var _monorepo = require("./monorepo");
47
-
48
40
  Object.keys(_monorepo).forEach(function (key) {
49
41
  if (key === "default" || key === "__esModule") return;
50
42
  if (key in exports && exports[key] === _monorepo[key]) return;
@@ -4,25 +4,15 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.ModuleNewAction = void 0;
7
-
8
7
  var _lodash = require("@modern-js/utils/lodash");
9
-
10
8
  var _codesmith = require("@modern-js/codesmith");
11
-
12
9
  var _codesmithFormily = require("@modern-js/codesmith-formily");
13
-
14
10
  var _generatorCommon = require("@modern-js/generator-common");
15
-
16
11
  var _generatorUtils = require("@modern-js/generator-utils");
17
-
18
12
  var _utils = require("./utils");
19
-
20
13
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
21
-
22
14
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
23
-
24
15
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
25
-
26
16
  const ModuleNewAction = async options => {
27
17
  const {
28
18
  locale = 'zh',
@@ -33,26 +23,21 @@ const ModuleNewAction = async options => {
33
23
  cwd = process.cwd()
34
24
  } = options;
35
25
  let UserConfig = {};
36
-
37
26
  try {
38
27
  UserConfig = JSON.parse(config);
39
28
  } catch (e) {
40
29
  throw new Error('config is not a valid json');
41
30
  }
42
-
43
31
  _generatorCommon.i18n.changeLanguage({
44
32
  locale: UserConfig.locale || locale
45
33
  });
46
-
47
34
  const smith = new _codesmith.CodeSmith({
48
35
  debug,
49
36
  registryUrl: registry
50
37
  });
51
-
52
38
  if (!(0, _utils.alreadyRepo)(cwd)) {
53
39
  smith.logger.warn('not valid modern.js repo');
54
40
  }
55
-
56
41
  const formilyAPI = new _codesmithFormily.FormilyAPI({
57
42
  materials: {},
58
43
  config: {},
@@ -61,47 +46,41 @@ const ModuleNewAction = async options => {
61
46
  });
62
47
  let hasOption = false;
63
48
  const funcMap = {};
64
-
65
49
  _generatorCommon.ModuleActionFunctions.forEach(func => {
66
50
  const enable = (0, _utils.hasEnabledFunction)(func, _generatorCommon.ModuleActionFunctionsDependencies, _generatorCommon.ModuleActionFunctionsDevDependencies, _generatorCommon.ModuleActionFunctionsPeerDependencies, cwd);
67
51
  funcMap[func] = enable;
68
-
69
52
  if (!enable) {
70
53
  hasOption = true;
71
54
  }
72
55
  });
73
-
74
56
  if (!hasOption) {
75
- smith.logger.warn('no option can be enabled'); // eslint-disable-next-line no-process-exit
76
-
57
+ smith.logger.warn('no option can be enabled');
58
+ // eslint-disable-next-line no-process-exit
77
59
  process.exit(1);
78
60
  }
79
-
80
61
  const ans = await formilyAPI.getInputBySchemaFunc(_generatorCommon.getModuleNewActionSchema, _objectSpread(_objectSpread({}, UserConfig), {}, {
81
62
  funcMap
82
63
  }));
83
64
  const actionType = ans.actionType;
84
65
  const action = ans[actionType];
85
66
  const generator = (0, _utils.getGeneratorPath)(_generatorCommon.ModuleNewActionGenerators[actionType][action], distTag);
86
-
87
67
  if (!generator) {
88
68
  throw new Error(`no valid option`);
89
69
  }
90
-
91
70
  const devDependency = _generatorCommon.ModuleActionFunctionsDevDependencies[action];
92
71
  const dependency = _generatorCommon.ModuleActionFunctionsDependencies[action];
93
72
  const peerDependency = _generatorCommon.ModuleActionFunctionsPeerDependencies[action];
94
-
95
73
  const getModulePluginVersion = packageName => {
96
74
  return (0, _generatorUtils.getModernPluginVersion)(_generatorCommon.Solution.Module, packageName, {
97
75
  registry,
98
- distTag
76
+ distTag,
77
+ cwd
99
78
  });
100
79
  };
101
-
102
80
  const finalConfig = (0, _lodash.merge)(UserConfig, ans, {
103
81
  locale: UserConfig.locale || locale,
104
- packageManager: UserConfig.packageManager || (await (0, _generatorUtils.getPackageManager)(cwd))
82
+ packageManager: UserConfig.packageManager || (await (0, _generatorUtils.getPackageManager)(cwd)),
83
+ distTag
105
84
  }, {
106
85
  devDependencies: devDependency ? {
107
86
  [devDependency]: `${await getModulePluginVersion(devDependency)}`
@@ -125,5 +104,4 @@ const ModuleNewAction = async options => {
125
104
  pwd: cwd
126
105
  });
127
106
  };
128
-
129
107
  exports.ModuleNewAction = ModuleNewAction;
@@ -4,23 +4,14 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.MonorepoNewAction = void 0;
7
-
8
7
  var _path = _interopRequireDefault(require("path"));
9
-
10
8
  var _lodash = require("@modern-js/utils/lodash");
11
-
12
9
  var _codesmith = require("@modern-js/codesmith");
13
-
14
10
  var _generatorCommon = require("@modern-js/generator-common");
15
-
16
11
  var _generatorUtils = require("@modern-js/generator-utils");
17
-
18
12
  var _utils = require("./utils");
19
-
20
13
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
21
-
22
14
  const REPO_GENERATOR = '@modern-js/repo-generator';
23
-
24
15
  const MonorepoNewAction = async options => {
25
16
  const {
26
17
  locale = 'zh',
@@ -32,27 +23,23 @@ const MonorepoNewAction = async options => {
32
23
  cwd = process.cwd()
33
24
  } = options;
34
25
  let UserConfig = {};
35
-
36
26
  try {
37
27
  UserConfig = JSON.parse(config);
38
28
  } catch (e) {
39
29
  throw new Error('config is not a valid json');
40
30
  }
41
-
42
31
  _generatorCommon.i18n.changeLanguage({
43
32
  locale: UserConfig.locale || locale
44
33
  });
45
-
46
34
  const smith = new _codesmith.CodeSmith({
47
35
  debug,
48
36
  registryUrl: registry
49
37
  });
50
-
51
38
  if (!(0, _utils.alreadyRepo)(cwd)) {
52
39
  smith.logger.warn('not valid modern.js repo');
53
- } // Determine if the plugin is a Monorepo dependency
54
-
40
+ }
55
41
 
42
+ // Determine if the plugin is a Monorepo dependency
56
43
  const plugins = plugin.map(plugin => {
57
44
  try {
58
45
  return _path.default.join(require.resolve(plugin), '../../');
@@ -73,13 +60,11 @@ const MonorepoNewAction = async options => {
73
60
  plugins
74
61
  });
75
62
  let generator = REPO_GENERATOR;
76
-
77
63
  if (process.env.CODESMITH_ENV === 'development') {
78
64
  generator = require.resolve(generator);
79
65
  } else if (distTag) {
80
66
  generator = `${generator}@${distTag}`;
81
67
  }
82
-
83
68
  const task = [{
84
69
  name: generator,
85
70
  config: finalConfig
@@ -92,5 +77,4 @@ const MonorepoNewAction = async options => {
92
77
  pwd: cwd
93
78
  });
94
79
  };
95
-
96
80
  exports.MonorepoNewAction = MonorepoNewAction;
@@ -4,25 +4,15 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.MWANewAction = void 0;
7
-
8
7
  var _lodash = require("@modern-js/utils/lodash");
9
-
10
8
  var _codesmith = require("@modern-js/codesmith");
11
-
12
9
  var _codesmithFormily = require("@modern-js/codesmith-formily");
13
-
14
10
  var _generatorCommon = require("@modern-js/generator-common");
15
-
16
11
  var _generatorUtils = require("@modern-js/generator-utils");
17
-
18
12
  var _utils = require("./utils");
19
-
20
13
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
21
-
22
14
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
23
-
24
15
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
25
-
26
16
  const MWANewAction = async options => {
27
17
  const {
28
18
  locale = 'zh',
@@ -33,26 +23,21 @@ const MWANewAction = async options => {
33
23
  cwd = process.cwd()
34
24
  } = options;
35
25
  let UserConfig = {};
36
-
37
26
  try {
38
27
  UserConfig = JSON.parse(config);
39
28
  } catch (e) {
40
29
  throw new Error('config is not a valid json');
41
30
  }
42
-
43
31
  _generatorCommon.i18n.changeLanguage({
44
32
  locale: UserConfig.locale || locale
45
33
  });
46
-
47
34
  const smith = new _codesmith.CodeSmith({
48
35
  debug,
49
36
  registryUrl: registry
50
37
  });
51
-
52
38
  if (!(0, _utils.alreadyRepo)(cwd)) {
53
39
  smith.logger.warn('not valid modern.js repo');
54
40
  }
55
-
56
41
  const formilyAPI = new _codesmithFormily.FormilyAPI({
57
42
  materials: {},
58
43
  config: {},
@@ -60,19 +45,15 @@ const MWANewAction = async options => {
60
45
  current: null
61
46
  });
62
47
  const funcMap = {};
63
-
64
48
  _generatorCommon.MWAActionFunctions.forEach(func => {
65
49
  const enable = (0, _utils.hasEnabledFunction)(func, _generatorCommon.MWAActionFunctionsDependencies, _generatorCommon.MWAActionFunctionsDevDependencies, {}, cwd);
66
50
  funcMap[func] = enable;
67
51
  });
68
-
69
52
  const refactorMap = {};
70
-
71
53
  _generatorCommon.MWAActionReactors.forEach(refactor => {
72
54
  const enable = (0, _utils.hasEnabledFunction)(refactor, _generatorCommon.MWAActionRefactorDependencies, {}, {}, cwd);
73
55
  refactorMap[refactor] = enable;
74
56
  });
75
-
76
57
  const ans = await formilyAPI.getInputBySchemaFunc(_generatorCommon.getMWANewActionSchema, _objectSpread(_objectSpread({}, UserConfig), {}, {
77
58
  funcMap,
78
59
  refactorMap
@@ -80,23 +61,22 @@ const MWANewAction = async options => {
80
61
  const actionType = ans.actionType;
81
62
  const action = ans[actionType];
82
63
  const generator = (0, _utils.getGeneratorPath)(_generatorCommon.MWANewActionGenerators[actionType][action], distTag);
83
-
84
64
  if (!generator) {
85
65
  throw new Error(`no valid option`);
86
66
  }
87
-
88
67
  const getMwaPluginVersion = packageName => {
89
68
  return (0, _generatorUtils.getModernPluginVersion)(_generatorCommon.Solution.MWA, packageName, {
90
69
  registry,
91
- distTag
70
+ distTag,
71
+ cwd
92
72
  });
93
73
  };
94
-
95
74
  const devDependency = _generatorCommon.MWAActionFunctionsDevDependencies[action];
96
75
  const dependency = _generatorCommon.MWAActionFunctionsDependencies[action] || _generatorCommon.MWAActionRefactorDependencies[action];
97
76
  const finalConfig = (0, _lodash.merge)(UserConfig, ans, {
98
77
  locale: UserConfig.locale || locale,
99
- packageManager: UserConfig.packageManager || (await (0, _generatorUtils.getPackageManager)(cwd))
78
+ packageManager: UserConfig.packageManager || (await (0, _generatorUtils.getPackageManager)(cwd)),
79
+ distTag
100
80
  }, {
101
81
  devDependencies: devDependency ? {
102
82
  [devDependency]: `${await getMwaPluginVersion(devDependency)}`
@@ -118,5 +98,4 @@ const MWANewAction = async options => {
118
98
  pwd: cwd
119
99
  });
120
100
  };
121
-
122
101
  exports.MWANewAction = MWANewAction;
@@ -7,15 +7,10 @@ exports.alreadyRepo = alreadyRepo;
7
7
  exports.getGeneratorPath = getGeneratorPath;
8
8
  exports.hasEnabledFunction = hasEnabledFunction;
9
9
  exports.readJson = void 0;
10
-
11
10
  var _path = _interopRequireDefault(require("path"));
12
-
13
11
  var _utils = require("@modern-js/utils");
14
-
15
12
  var _generatorUtils = require("@modern-js/generator-utils");
16
-
17
13
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
18
-
19
14
  function alreadyRepo(cwd = process.cwd()) {
20
15
  try {
21
16
  return _generatorUtils.fs.existsSync(_path.default.resolve(cwd, 'package.json'));
@@ -23,61 +18,45 @@ function alreadyRepo(cwd = process.cwd()) {
23
18
  return false;
24
19
  }
25
20
  }
26
-
27
21
  const readJson = jsonPath => {
28
22
  if (!_generatorUtils.fs.existsSync(jsonPath)) {
29
23
  return {};
30
24
  }
31
-
32
25
  const jsonStr = _generatorUtils.fs.readFileSync(jsonPath, {
33
26
  encoding: 'utf8'
34
27
  });
35
-
36
28
  try {
37
29
  return _utils.json5.parse(jsonStr);
38
30
  } catch (error) {
39
31
  throw Error(`${jsonPath} is not a valid json, please check and try again.`);
40
32
  }
41
33
  };
42
-
43
34
  exports.readJson = readJson;
44
-
45
35
  function hasEnabledFunction(action, dependencies, devDependencies, peerDependencies, cwd) {
46
36
  const packageJsonPath = _path.default.normalize(`${cwd}/package.json`);
47
-
48
37
  const packageJson = readJson(packageJsonPath);
49
-
50
38
  if (!dependencies[action] && !devDependencies[action]) {
51
39
  return false;
52
40
  }
53
-
54
41
  if (dependencies[action]) {
55
42
  var _packageJson$dependen;
56
-
57
43
  return (_packageJson$dependen = packageJson.dependencies) === null || _packageJson$dependen === void 0 ? void 0 : _packageJson$dependen[dependencies[action]];
58
44
  }
59
-
60
45
  if (peerDependencies[action]) {
61
46
  var _packageJson$peerDepe;
62
-
63
47
  return (_packageJson$peerDepe = packageJson.peerDependencies) === null || _packageJson$peerDepe === void 0 ? void 0 : _packageJson$peerDepe[peerDependencies[action]];
64
48
  }
65
-
66
49
  if (!peerDependencies[action] && devDependencies[action]) {
67
50
  var _packageJson$devDepen;
68
-
69
51
  return (_packageJson$devDepen = packageJson.devDependencies) === null || _packageJson$devDepen === void 0 ? void 0 : _packageJson$devDepen[devDependencies[action]];
70
52
  }
71
-
72
53
  return false;
73
54
  }
74
-
75
55
  function getGeneratorPath(generator, distTag) {
76
56
  if (process.env.CODESMITH_ENV === 'development') {
77
57
  return _path.default.dirname(require.resolve(generator));
78
58
  } else if (distTag) {
79
59
  return `${generator}@${distTag}`;
80
60
  }
81
-
82
61
  return generator;
83
62
  }
package/package.json CHANGED
@@ -11,7 +11,7 @@
11
11
  "modern",
12
12
  "modern.js"
13
13
  ],
14
- "version": "2.0.0-beta.0",
14
+ "version": "2.0.0-beta.2",
15
15
  "jsnext:source": "./src/index.ts",
16
16
  "types": "./dist/types/index.d.ts",
17
17
  "main": "./dist/js/node/index.js",
@@ -28,19 +28,19 @@
28
28
  },
29
29
  "dependencies": {
30
30
  "@babel/runtime": "^7.18.0",
31
- "@modern-js/codesmith": "2.0.0",
32
- "@modern-js/codesmith-formily": "2.0.0",
33
- "@modern-js/generator-common": "3.0.0-beta.0",
34
- "@modern-js/generator-utils": "3.0.0-beta.0",
35
- "@modern-js/utils": "2.0.0-beta.0"
31
+ "@modern-js/codesmith": "2.0.1",
32
+ "@modern-js/codesmith-formily": "2.0.1",
33
+ "@modern-js/generator-common": "3.0.0-beta.2",
34
+ "@modern-js/generator-utils": "3.0.0-beta.2",
35
+ "@modern-js/utils": "2.0.0-beta.2"
36
36
  },
37
37
  "devDependencies": {
38
- "@scripts/build": "2.0.0-beta.0",
39
- "@scripts/jest-config": "2.0.0-beta.0",
40
38
  "@types/jest": "^27",
41
39
  "@types/node": "^14",
42
40
  "jest": "^27",
43
- "typescript": "^4"
41
+ "typescript": "^4",
42
+ "@scripts/build": "2.0.0-beta.2",
43
+ "@scripts/jest-config": "2.0.0-beta.2"
44
44
  },
45
45
  "sideEffects": false,
46
46
  "modernConfig": {
@@ -53,8 +53,8 @@
53
53
  "access": "public"
54
54
  },
55
55
  "scripts": {
56
- "new": "modern new",
57
- "build": "modern build",
56
+ "new": "modern-lib new",
57
+ "build": "modern-lib build",
58
58
  "test": "jest --passWithNoTests"
59
59
  }
60
60
  }
@@ -1,4 +0,0 @@
1
- import { MWANewAction } from ".";
2
- MWANewAction({
3
- locale: 'zh'
4
- });
@@ -1,7 +0,0 @@
1
- "use strict";
2
-
3
- var _ = require(".");
4
-
5
- (0, _.MWANewAction)({
6
- locale: 'zh'
7
- });
@@ -1 +0,0 @@
1
- export {};