@modern-js/app-tools 1.6.10-alpha.0 → 1.8.0

package/dist/js/node/analyze/utils.js

@@ -0,0 +1,107 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.walkDirectory = exports.isRouteComponentFile = exports.getDefaultImports = void 0;
+
+var _fs = _interopRequireDefault(require("fs"));
+
+var _path = _interopRequireDefault(require("path"));
+
+var _utils = require("@modern-js/utils");
+
+var _constants = require("./constants");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+const walkDirectory = dir => _fs.default.readdirSync(dir).reduce((previous, filename) => {
+  const filePath = _path.default.join(dir, filename);
+
+  if (_fs.default.statSync(filePath).isDirectory()) {
+    return [...previous, ...walkDirectory(filePath)];
+  } else {
+    return [...previous, filePath];
+  }
+}, []);
+
+exports.walkDirectory = walkDirectory;
+
+const getDefaultImports = ({
+  entrypoint,
+  srcDirectory,
+  internalSrcAlias,
+  internalDirAlias
+}) => {
+  const {
+    entryName,
+    fileSystemRoutes,
+    customBootstrap,
+    entry
+  } = entrypoint;
+  const imports = [{
+    specifiers: [{
+      local: 'React'
+    }],
+    value: 'react'
+  }, {
+    specifiers: [{
+      imported: 'createApp'
+    }, {
+      imported: 'bootstrap'
+    }],
+    value: '@modern-js/runtime'
+  }, customBootstrap && {
+    specifiers: [{
+      local: 'customBootstrap'
+    }],
+    value: (0, _utils.normalizeToPosixPath)(customBootstrap.replace(srcDirectory, internalSrcAlias))
+  }].filter(Boolean);
+
+  if (fileSystemRoutes) {
+    const route = {
+      specifiers: [{
+        imported: 'routes'
+      }],
+      value: (0, _utils.normalizeToPosixPath)(`${internalDirAlias}/${entryName}/${_constants.FILE_SYSTEM_ROUTES_FILE_NAME}`)
+    };
+
+    if (fileSystemRoutes.globalApp) {
+      imports.push({
+        specifiers: [{
+          local: 'App'
+        }],
+        value: (0, _utils.normalizeToPosixPath)(fileSystemRoutes.globalApp.replace(srcDirectory, internalSrcAlias))
+      });
+    } else {
+      route.initialize = 'const App = false;';
+    }
+
+    imports.push(route);
+  } else {
+    imports.push({
+      specifiers: [{
+        local: 'App'
+      }],
+      value: (0, _utils.normalizeToPosixPath)(entry.replace(srcDirectory, internalSrcAlias))
+    });
+  }
+
+  return imports;
+};
+
+exports.getDefaultImports = getDefaultImports;
+
+const isRouteComponentFile = filePath => {
+  if (/\.(d|test|spec|e2e)\.(js|jsx|ts|tsx)$/.test(filePath)) {
+    return false;
+  }
+
+  if (['.js', '.jsx', '.ts', '.tsx'].includes(_path.default.extname(filePath))) {
+    return true;
+  }
+
+  return false;
+};
+
+exports.isRouteComponentFile = isRouteComponentFile;

package/dist/js/node/index.js

@@ -15,12 +15,12 @@ var _path = _interopRequireDefault(require("path"));
 
 var _core = require("@modern-js/core");
 
-var _pluginAnalyze = _interopRequireDefault(require("@modern-js/plugin-analyze"));
-
 var _pluginJarvis = _interopRequireDefault(require("@modern-js/plugin-jarvis"));
 
 var _utils = require("@modern-js/utils");
 
+var _analyze = _interopRequireDefault(require("./analyze"));
+
 var _hooks = require("./hooks");
 
 var _locale = require("./locale");
@@ -43,7 +43,7 @@ var _default = () => ({
   name: '@modern-js/app-tools',
   post: ['@modern-js/plugin-analyze', '@modern-js/plugin-ssr', '@modern-js/plugin-state', '@modern-js/plugin-router', '@modern-js/plugin-polyfill'],
   registerHook: _hooks.hooks,
-  usePlugins: [(0, _pluginAnalyze.default)(), (0, _pluginJarvis.default)()],
+  usePlugins: [(0, _analyze.default)(), (0, _pluginJarvis.default)()],
   setup: api => {
     const locale = (0, _language.getLocaleLanguage)();
 
@@ -128,7 +128,7 @@ var _default = () => ({
       },
 
       async beforeRestart() {
-        (0, _utils.cleanRequireCache)([require.resolve('@modern-js/plugin-analyze/cli')]);
+        (0, _utils.cleanRequireCache)([require.resolve("./analyze/cli")]);
       }
 
     };

package/dist/js/node/utils/language.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getLocaleLanguage = getLocaleLanguage;
 
-var _i18nCliLanguageDetector = require("@modern-js/i18n-cli-language-detector");
+var _languageDetector = require("@modern-js/plugin-i18n/language-detector");
 
 function getLocaleLanguage() {
-  const detector = new _i18nCliLanguageDetector.I18CLILanguageDetector();
+  const detector = new _languageDetector.I18CLILanguageDetector();
   return detector.detect();
 }

package/dist/types/analyze/constants.d.ts

@@ -0,0 +1,14 @@
+export declare const JS_EXTENSIONS: string[];
+export declare const INDEX_FILE_NAME = "index";
+export declare const APP_FILE_NAME = "App";
+export declare const PAGES_DIR_NAME = "pages";
+export declare const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
+export declare const ENTRY_POINT_FILE_NAME = "index.js";
+export declare const FILE_SYSTEM_ROUTES_DYNAMIC_REGEXP: RegExp;
+export declare const FILE_SYSTEM_ROUTES_LAYOUT = "_layout";
+export declare const FILE_SYSTEM_ROUTES_GLOBAL_LAYOUT = "_app";
+export declare const FILE_SYSTEM_ROUTES_INDEX = "index";
+export declare const FILE_SYSTEM_ROUTES_IGNORED_REGEX: RegExp;
+export declare const HTML_PARTIALS_FOLDER = "html";
+export declare const HTML_PARTIALS_EXTENSIONS: string[];
+export declare const FILE_SYSTEM_ROUTES_COMPONENTS_DIR = "internal_components";

package/dist/types/analyze/generateCode.d.ts

@@ -0,0 +1,4 @@
+import type { IAppContext, NormalizedConfig, PluginAPI, ImportStatement } from '@modern-js/core';
+import type { Entrypoint } from '@modern-js/types';
+export declare const createImportStatements: (statements: ImportStatement[]) => string;
+export declare const generateCode: (appContext: IAppContext, config: NormalizedConfig, entrypoints: Entrypoint[], api: PluginAPI) => Promise<void>;

package/dist/types/analyze/getBundleEntry.d.ts

@@ -0,0 +1,3 @@
+import type { IAppContext, NormalizedConfig } from '@modern-js/core';
+import type { Entrypoint } from '@modern-js/types';
+export declare const getBundleEntry: (appContext: IAppContext, config: NormalizedConfig) => Entrypoint[];

package/dist/types/analyze/getClientRoutes.d.ts

@@ -0,0 +1,19 @@
+import type { Entrypoint, Route } from '@modern-js/types';
+export type { Route };
+export interface Identifier {
+  name: string;
+  path: string;
+}
+export declare const getClientRoutes: ({
+  entrypoint,
+  srcDirectory,
+  srcAlias,
+  internalDirectory,
+  internalDirAlias
+}: {
+  entrypoint: Entrypoint;
+  srcDirectory: string;
+  srcAlias: string;
+  internalDirectory: string;
+  internalDirAlias: string;
+}) => Route[];

package/dist/types/analyze/getFileSystemEntry.d.ts

@@ -0,0 +1,4 @@
+import type { NormalizedConfig, IAppContext } from '@modern-js/core';
+import type { Entrypoint } from '@modern-js/types';
+export type { Entrypoint };
+export declare const getFileSystemEntry: (appContext: IAppContext, config: NormalizedConfig) => Entrypoint[];

package/dist/types/analyze/getHtmlTemplate.d.ts

@@ -0,0 +1,9 @@
+import type { IAppContext, NormalizedConfig, PluginAPI } from '@modern-js/core';
+import type { Entrypoint, HtmlTemplates } from '@modern-js/types';
+export declare const getHtmlTemplate: (entrypoints: Entrypoint[], api: PluginAPI, {
+  appContext,
+  config
+}: {
+  appContext: IAppContext;
+  config: NormalizedConfig;
+}) => Promise<HtmlTemplates>;

package/dist/types/analyze/getServerRoutes.d.ts

@@ -0,0 +1,9 @@
+import type { NormalizedConfig, IAppContext } from '@modern-js/core';
+import type { Entrypoint, ServerRoute } from '@modern-js/types';
+export declare const getServerRoutes: (entrypoints: Entrypoint[], {
+  appContext,
+  config
+}: {
+  appContext: IAppContext;
+  config: NormalizedConfig;
+}) => ServerRoute[];

package/dist/types/analyze/index.d.ts

@@ -0,0 +1,39 @@
+import type { CliPlugin, RuntimePlugin, ImportStatement } from '@modern-js/core';
+import type { Route, Entrypoint, ServerRoute, HtmlPartials } from '@modern-js/types';
+export declare const modifyEntryImports: import("@modern-js/plugin").AsyncWaterfall<{
+  imports: ImportStatement[];
+  entrypoint: Entrypoint;
+}>;
+export declare const modifyEntryExport: import("@modern-js/plugin").AsyncWaterfall<{
+  entrypoint: Entrypoint;
+  exportStatement: string;
+}>;
+export declare const addRuntimeExports: import("@modern-js/plugin").AsyncWaterfall<void>;
+export declare const modifyEntryRuntimePlugins: import("@modern-js/plugin").AsyncWaterfall<{
+  entrypoint: Entrypoint;
+  plugins: RuntimePlugin[];
+}>;
+export declare const modifyEntryRenderFunction: import("@modern-js/plugin").AsyncWaterfall<{
+  entrypoint: Entrypoint;
+  code: string;
+}>;
+export declare const modifyFileSystemRoutes: import("@modern-js/plugin").AsyncWaterfall<{
+  entrypoint: Entrypoint;
+  routes: Route[];
+}>;
+export declare const modifyServerRoutes: import("@modern-js/plugin").AsyncWaterfall<{
+  routes: ServerRoute[];
+}>;
+export declare const htmlPartials: import("@modern-js/plugin").AsyncWaterfall<{
+  entrypoint: Entrypoint;
+  partials: HtmlPartials;
+}>;
+export declare const beforeGenerateRoutes: import("@modern-js/plugin").AsyncWaterfall<{
+  entrypoint: Entrypoint;
+  code: string;
+}>;
+export declare const addDefineTypes: import("@modern-js/plugin").AsyncWaterfall<void>;
+
+declare const _default: () => CliPlugin;
+
+export default _default;

package/dist/types/analyze/isDefaultExportFunction.d.ts

@@ -0,0 +1 @@
+export declare const isDefaultExportFunction: (file: string | false) => boolean;

package/dist/types/analyze/makeLegalIdentifier.d.ts

@@ -0,0 +1 @@
+export declare function makeLegalIdentifier(str: string): string;

package/dist/types/analyze/templates.d.ts

@@ -0,0 +1,32 @@
+import type { RuntimePlugin } from '@modern-js/core';
+import type { Entrypoint, Route } from '@modern-js/types';
+export declare const index: ({
+  mountId,
+  imports,
+  renderFunction,
+  exportStatement
+}: {
+  mountId: string;
+  imports: string;
+  exportStatement: string;
+  renderFunction: string;
+}) => string;
+export declare const renderFunction: ({
+  plugins,
+  customBootstrap,
+  fileSystemRoutes
+}: {
+  plugins: RuntimePlugin[];
+  customBootstrap?: string | false | undefined;
+  fileSystemRoutes: Entrypoint['fileSystemRoutes'];
+}) => string;
+export declare const html: (partials: {
+  top: string[];
+  head: string[];
+  body: string[];
+}) => string;
+export declare const fileSystemRoutes: ({
+  routes
+}: {
+  routes: Route[];
+}) => string;

package/dist/types/analyze/utils.d.ts

@@ -0,0 +1,15 @@
+import type { Entrypoint } from '@modern-js/types';
+import type { ImportStatement } from '@modern-js/core';
+export declare const walkDirectory: (dir: string) => string[];
+export declare const getDefaultImports: ({
+  entrypoint,
+  srcDirectory,
+  internalSrcAlias,
+  internalDirAlias
+}: {
+  entrypoint: Entrypoint;
+  srcDirectory: string;
+  internalSrcAlias: string;
+  internalDirAlias: string;
+}) => ImportStatement[];
+export declare const isRouteComponentFile: (filePath: string) => boolean;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.6.10-alpha.0",
+  "version": "1.8.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -57,22 +57,24 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.18.0",
-    "@modern-js/core": "^1.12.2-alpha.0",
-    "@modern-js/i18n-cli-language-detector": "^1.2.4",
-    "@modern-js/new-action": "^1.3.11-alpha.0",
-    "@modern-js/node-bundle-require": "^1.3.7-alpha.0",
-    "@modern-js/plugin": "^1.4.0-alpha.0",
-    "@modern-js/plugin-analyze": "^1.4.7-alpha.0",
-    "@modern-js/plugin-i18n": "^1.2.8-alpha.0",
-    "@modern-js/plugin-jarvis": "^1.2.14-alpha.0",
-    "@modern-js/prod-server": "^1.1.9-alpha.0",
-    "@modern-js/server": "^1.5.0-alpha.0",
-    "@modern-js/types": "^1.5.5-alpha.0",
-    "@modern-js/utils": "^1.7.9-alpha.0",
-    "@modern-js/webpack": "^1.11.3-alpha.0"
+    "@modern-js/core": "^1.13.1",
+    "@modern-js/new-action": "^1.4.0",
+    "@modern-js/node-bundle-require": "^1.3.7",
+    "@modern-js/plugin": "^1.4.1",
+    "@modern-js/plugin-i18n": "^1.3.0",
+    "@modern-js/plugin-jarvis": "^1.2.14",
+    "@modern-js/prod-server": "^1.2.1",
+    "@modern-js/server": "^1.6.0",
+    "@modern-js/types": "^1.6.0",
+    "@modern-js/utils": "^1.8.0",
+    "@modern-js/webpack": "^1.12.2",
+    "@babel/parser": "^7.18.0",
+    "@babel/traverse": "^7.18.0",
+    "@babel/types": "^7.18.0"
   },
   "devDependencies": {
-    "@modern-js/server-core": "1.4.0-alpha.0",
+    "@modern-js/server-core": "1.4.1",
+    "@types/babel__traverse": "^7.14.2",
     "@scripts/build": "0.0.0",
     "@scripts/jest-config": "0.0.0",
     "@types/jest": "^27",