@modern-js/mwa-generator 1.3.3 → 1.3.6

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.3.3",
+  "version": "1.3.6",
   "jsnext:source": "./src/index.ts",
   "main": "./dist/js/node/main.js",
   "files": [
@@ -20,15 +20,15 @@
   ],
   "devDependencies": {
     "@babel/runtime": "^7",
-    "@modern-js/base-generator": "^1.3.1",
+    "@modern-js/base-generator": "^1.3.3",
     "@modern-js/codesmith": "^1.0.8",
-    "@modern-js/codesmith-api-app": "^1.0.7",
+    "@modern-js/codesmith-api-app": "^1.0.8",
     "@modern-js/codesmith-api-json": "^1.0.7",
     "@modern-js/codesmith-tools": "^1.0.9",
-    "@modern-js/entry-generator": "^1.3.1",
-    "@modern-js/electron-generator": "^1.2.1",
-    "@modern-js/dependence-generator": "^1.2.2",
-    "@modern-js/generator-common": "^1.4.0",
+    "@modern-js/entry-generator": "^1.3.2",
+    "@modern-js/electron-generator": "^1.2.2",
+    "@modern-js/dependence-generator": "^1.2.4",
+    "@modern-js/generator-common": "^1.4.4",
     "@modern-js/generator-utils": "^1.2.1",
     "@modern-js/plugin-i18n": "^1.2.1",
     "@types/jest": "^26",
@@ -46,7 +46,6 @@
     }
   },
   "publishConfig": {
-    "main": "./dist/js/node/main.js",
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },

package/templates/js-template/modern.config.js.handlebars

@@ -0,0 +1,2 @@
+// https://modernjs.dev/docs/apis/config/overview
+module.exports = {}

package/templates/ts-template/modern.config.ts.handlebars

@@ -0,0 +1,4 @@
+import { defineConfig } from '@modern-js/app-tools';
+
+// https://modernjs.dev/docs/apis/config/overview
+export default defineConfig({});

package/templates/ts-template/tsconfig.json

@@ -9,5 +9,5 @@
       "@shared/*": ["./shared/*"]
     }
   },
-  "include": ["src", "shared", "config"]
+  "include": ["src", "shared", "config", "modern.config.ts"]
 }

package/dist/js/node/index.js

@@ -1,265 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.handleTemplateFile = exports.default = void 0;
-
-var _path = _interopRequireDefault(require("path"));
-
-var _codesmithApiApp = require("@modern-js/codesmith-api-app");
-
-var _codesmithApiJson = require("@modern-js/codesmith-api-json");
-
-var _generatorCommon = require("@modern-js/generator-common");
-
-var _generatorUtils = require("@modern-js/generator-utils");
-
-var _locale = require("./locale");
-
-const _excluded = ["hasPlugin", "generatorPlugin"];
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
-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; }
-
-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; }
-
-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; }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-const getGeneratorPath = (generator, distTag) => {
-  if (process.env.CODESMITH_ENV === 'development') {
-    return _path.default.dirname(require.resolve(generator));
-  } else if (distTag) {
-    return `${generator}@${distTag}`;
-  }
-
-  return generator;
-}; // eslint-disable-next-line max-statements
-
-
-const handleTemplateFile = async (context, generator, appApi) => {
-  const jsonAPI = new _codesmithApiJson.JsonAPI(generator);
-  const {
-    isMonorepoSubProject,
-    isTest,
-    projectDir = ''
-  } = context.config;
-  const {
-    outputPath
-  } = generator;
-  let packages = [];
-
-  if (isMonorepoSubProject) {
-    try {
-      packages = (0, _generatorUtils.getAllPackages)(outputPath);
-    } catch (e) {
-      generator.logger.debug('get all packages error', e);
-      generator.logger.warn(_locale.i18n.t(_locale.localeKeys.get_packages_error));
-    }
-  }
-
-  const _context$config = context.config,
-        {
-    hasPlugin,
-    generatorPlugin
-  } = _context$config,
-        extra = _objectWithoutProperties(_context$config, _excluded);
-
-  let schema = _generatorCommon.MWASchema;
-  let inputValue = {};
-
-  if (hasPlugin) {
-    await generatorPlugin.installPlugins(_generatorCommon.Solution.MWA, extra);
-    schema = generatorPlugin.getInputSchema(_generatorCommon.Solution.MWA);
-    inputValue = generatorPlugin.getInputValue(); // eslint-disable-next-line require-atomic-updates
-
-    context.config.gitCommitMessage = generatorPlugin.getGitMessage() || context.config.gitCommitMessage;
-  }
-
-  const ans = await appApi.getInputBySchema(schema, _objectSpread(_objectSpread(_objectSpread({}, context.config), inputValue), {}, {
-    isMwa: true,
-    isEmptySrc: true
-  }), {
-    packageName: input => (0, _generatorUtils.validatePackageName)(input, packages, {
-      isMonorepoSubProject
-    }),
-    packagePath: input => (0, _generatorUtils.validatePackagePath)(input, _path.default.join(process.cwd(), projectDir), {
-      isTest,
-      isMwa: true
-    })
-  });
-  generator.logger.debug(`inputData=${JSON.stringify(ans)}`, ans);
-  const {
-    packageName,
-    packagePath,
-    language,
-    runWay,
-    packageManager,
-    needModifyMWAConfig,
-    disableStateManagement,
-    clientRoute,
-    enableLess,
-    enableSass
-  } = ans;
-  const projectPath = (0, _generatorUtils.getMWAProjectPath)(packagePath, isMonorepoSubProject, isTest);
-
-  const dirname = _path.default.basename(generator.outputPath);
-
-  await appApi.runSubGenerator(getGeneratorPath(_generatorCommon.BaseGenerator, context.config.distTag), undefined, _objectSpread(_objectSpread({}, context.config), {}, {
-    hasPlugin: false
-  }));
-  await appApi.forgeTemplate('templates/base-template/**/*', undefined, resourceKey => resourceKey.replace('templates/base-template/', projectPath).replace('.handlebars', ''), {
-    name: packageName || dirname,
-    packageManager: (0, _generatorUtils.getPackageManagerText)(packageManager),
-    isMonorepoSubProject
-  });
-
-  if (language === _generatorCommon.Language.TS) {
-    await jsonAPI.update(context.materials.default.get(_path.default.join(projectPath, 'package.json')), {
-      query: {},
-      update: {
-        $set: {
-          'devDependencies.typescript': '^4',
-          'devDependencies.@types/react': '^17',
-          'devDependencies.@types/react-dom': '^17',
-          'devDependencies.@types/node': '^14'
-        }
-      }
-    });
-    await appApi.forgeTemplate('templates/ts-template/**/*', undefined, resourceKey => resourceKey.replace('templates/ts-template/', projectPath).replace('.handlebars', ''));
-  }
-
-  if (!isMonorepoSubProject && packageManager === _generatorCommon.PackageManager.Pnpm) {
-    await appApi.forgeTemplate('templates/pnpm-template/**/*', undefined, resourceKey => resourceKey.replace('templates/pnpm-template/', projectPath).replace('.handlebars', ''));
-  }
-
-  await appApi.runSubGenerator(getGeneratorPath(_generatorCommon.EntryGenerator, context.config.distTag), `./${projectPath}`, _objectSpread(_objectSpread({}, context.config), {}, {
-    disableStateManagement: needModifyMWAConfig === _generatorCommon.BooleanConfig.NO ? _generatorCommon.BooleanConfig.NO : disableStateManagement,
-    clientRoute: needModifyMWAConfig === _generatorCommon.BooleanConfig.NO ? _generatorCommon.ClientRoute.SelfControlRoute : clientRoute,
-    isSubGenerator: true
-  }));
-
-  if (runWay === _generatorCommon.RunWay.Electron) {
-    await appApi.runSubGenerator(getGeneratorPath(_generatorCommon.ElectronGenerator, context.config.distTag), undefined, _objectSpread(_objectSpread({}, context.config), {}, {
-      projectPath,
-      isSubGenerator: true
-    }));
-  }
-
-  if (enableLess === _generatorCommon.BooleanConfig.YES) {
-    const lessDependence = _generatorCommon.MWAActionFunctionsDependencies[_generatorCommon.ActionFunction.Less];
-    await appApi.runSubGenerator(getGeneratorPath(_generatorCommon.DependenceGenerator, context.config.distTag), undefined, {
-      dependencies: {
-        [lessDependence]: `^${await (0, _generatorUtils.getPackageVersion)(lessDependence)}`
-      },
-      projectPath,
-      isSubGenerator: true
-    });
-  }
-
-  if (enableSass === _generatorCommon.BooleanConfig.YES) {
-    const sassDependence = _generatorCommon.MWAActionFunctionsDependencies[_generatorCommon.ActionFunction.Sass];
-    [_generatorCommon.ActionFunction.Sass];
-    await appApi.runSubGenerator(getGeneratorPath(_generatorCommon.DependenceGenerator, context.config.distTag), undefined, {
-      dependencies: {
-        [sassDependence]: `${await (0, _generatorUtils.getPackageVersion)(sassDependence)}`
-      },
-      projectPath,
-      isSubGenerator: true
-    });
-  }
-
-  if (isMonorepoSubProject) {
-    await appApi.updateWorkspace({
-      name: packagePath,
-      path: projectPath
-    });
-  }
-
-  return {
-    projectPath,
-    isElectron: runWay === _generatorCommon.RunWay.Electron
-  };
-}; // eslint-disable-next-line max-statements
-
-
-exports.handleTemplateFile = handleTemplateFile;
-
-var _default = async (context, generator) => {
-  const appApi = new _codesmithApiApp.AppAPI(context, generator);
-  const {
-    locale
-  } = context.config;
-
-  _generatorCommon.i18n.changeLanguage({
-    locale
-  });
-
-  _generatorUtils.i18n.changeLanguage({
-    locale
-  });
-
-  appApi.i18n.changeLanguage({
-    locale
-  });
-
-  _locale.i18n.changeLanguage({
-    locale
-  });
-
-  if (!(await appApi.checkEnvironment())) {
-    // eslint-disable-next-line no-process-exit
-    process.exit(1);
-  }
-
-  generator.logger.debug(`start run @modern-js/mwa-generator`);
-  generator.logger.debug(`context=${JSON.stringify(context)}`);
-  generator.logger.debug(`context.data=${JSON.stringify(context.data)}`);
-  let projectPath = '';
-  let isElectron = false;
-
-  try {
-    ({
-      projectPath,
-      isElectron
-    } = await handleTemplateFile(context, generator, appApi));
-  } catch (e) {
-    generator.logger.error(e); // eslint-disable-next-line no-process-exit
-
-    process.exit(1);
-  }
-
-  if (context.handleForged) {
-    await context.handleForged(_generatorCommon.Solution.MWA, context, context.config.hasPlugin, projectPath);
-  }
-
-  try {
-    await appApi.runGitAndInstall(context.config.gitCommitMessage);
-  } catch (e) {
-    generator.logger.error(e); // eslint-disable-next-line no-process-exit
-
-    process.exit(1);
-  }
-
-  if (isElectron) {
-    appApi.showSuccessInfo(`${_locale.i18n.t(_locale.localeKeys.success, {
-      packageManager: (0, _generatorUtils.getPackageManagerText)(context.config.packageManager)
-    })}
-      ${_locale.i18n.t(_locale.localeKeys.electron.success, {
-      packageManager: (0, _generatorUtils.getPackageManagerText)(context.config.packageManager)
-    })}`);
-  } else {
-    appApi.showSuccessInfo(_locale.i18n.t(_locale.localeKeys.success, {
-      packageManager: (0, _generatorUtils.getPackageManagerText)(context.config.packageManager)
-    }));
-  }
-
-  generator.logger.debug(`forge @modern-js/mwa-generator succeed `);
-};
-
-exports.default = _default;