@modern-js/app-tools 2.40.0 → 2.42.0

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.
Files changed (112) hide show
  1. package/dist/cjs/analyze/getHtmlTemplate.js +5 -5
  2. package/dist/cjs/analyze/templates.js +7 -6
  3. package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js +3 -1
  4. package/dist/cjs/builder/shared/bundlerPlugins/RouterPlugin.js +1 -1
  5. package/dist/cjs/config/default.js +2 -1
  6. package/dist/cjs/defineConfig.js +8 -6
  7. package/dist/esm/analyze/getHtmlTemplate.js +5 -5
  8. package/dist/esm/analyze/templates.js +6 -6
  9. package/dist/esm/builder/shared/builderPlugins/adapterSSR.js +6 -4
  10. package/dist/esm/builder/shared/bundlerPlugins/RouterPlugin.js +1 -1
  11. package/dist/esm/config/default.js +2 -1
  12. package/dist/esm/config/initialize/inits.js +19 -19
  13. package/dist/esm/defineConfig.js +1 -1
  14. package/dist/esm-node/analyze/getHtmlTemplate.js +5 -5
  15. package/dist/esm-node/analyze/templates.js +7 -6
  16. package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js +3 -1
  17. package/dist/esm-node/builder/shared/bundlerPlugins/RouterPlugin.js +1 -1
  18. package/dist/esm-node/config/default.js +2 -1
  19. package/dist/esm-node/defineConfig.js +8 -6
  20. package/dist/types/analyze/constants.d.ts +19 -19
  21. package/dist/types/analyze/generateCode.d.ts +9 -16
  22. package/dist/types/analyze/getBundleEntry.d.ts +1 -1
  23. package/dist/types/analyze/getClientRoutes/getRoutes.d.ts +7 -13
  24. package/dist/types/analyze/getClientRoutes/getRoutesLegacy.d.ts +7 -13
  25. package/dist/types/analyze/getClientRoutes/index.d.ts +1 -1
  26. package/dist/types/analyze/getClientRoutes/utils.d.ts +1 -1
  27. package/dist/types/analyze/getFileSystemEntry.d.ts +1 -1
  28. package/dist/types/analyze/getHtmlTemplate.d.ts +4 -7
  29. package/dist/types/analyze/getServerRoutes.d.ts +4 -7
  30. package/dist/types/analyze/index.d.ts +3 -5
  31. package/dist/types/analyze/isDefaultExportFunction.d.ts +1 -1
  32. package/dist/types/analyze/makeLegalIdentifier.d.ts +1 -1
  33. package/dist/types/analyze/nestedRoutes.d.ts +3 -3
  34. package/dist/types/analyze/templates.d.ts +22 -40
  35. package/dist/types/analyze/utils.d.ts +10 -19
  36. package/dist/types/builder/builder-rspack/adapterCopy.d.ts +1 -1
  37. package/dist/types/builder/builder-rspack/index.d.ts +1 -1
  38. package/dist/types/builder/builder-webpack/adapterModern.d.ts +1 -1
  39. package/dist/types/builder/builder-webpack/createCopyPattern.d.ts +20 -20
  40. package/dist/types/builder/builder-webpack/index.d.ts +1 -1
  41. package/dist/types/builder/generator/createBuilderOptions.d.ts +1 -1
  42. package/dist/types/builder/generator/createBuilderProviderConfig.d.ts +1 -1
  43. package/dist/types/builder/generator/getBuilderTargets.d.ts +1 -1
  44. package/dist/types/builder/generator/index.d.ts +2 -2
  45. package/dist/types/builder/index.d.ts +1 -1
  46. package/dist/types/builder/shared/builderPlugins/adapterBasic.d.ts +1 -1
  47. package/dist/types/builder/shared/builderPlugins/adapterHtml.d.ts +1 -1
  48. package/dist/types/builder/shared/builderPlugins/adapterSSR.d.ts +1 -1
  49. package/dist/types/builder/shared/builderPlugins/index.d.ts +1 -1
  50. package/dist/types/builder/shared/bundlerPlugins/HtmlAsyncChunkPlugin.d.ts +5 -5
  51. package/dist/types/builder/shared/bundlerPlugins/HtmlBottomTemplate.d.ts +7 -7
  52. package/dist/types/builder/shared/bundlerPlugins/RouterPlugin.d.ts +24 -31
  53. package/dist/types/builder/shared/bundlerPlugins/index.d.ts +1 -1
  54. package/dist/types/builder/shared/createCopyInfo.d.ts +4 -4
  55. package/dist/types/builder/shared/index.d.ts +1 -1
  56. package/dist/types/builder/shared/loaders/serverModuleLoader.d.ts +1 -1
  57. package/dist/types/builder/shared/types.d.ts +3 -3
  58. package/dist/types/commands/build.d.ts +1 -1
  59. package/dist/types/commands/deploy.d.ts +1 -1
  60. package/dist/types/commands/dev.d.ts +2 -2
  61. package/dist/types/commands/index.d.ts +1 -1
  62. package/dist/types/commands/inspect.d.ts +7 -7
  63. package/dist/types/commands/serve.d.ts +1 -1
  64. package/dist/types/config/default.d.ts +1 -1
  65. package/dist/types/config/index.d.ts +1 -1
  66. package/dist/types/config/initialize/index.d.ts +1 -1
  67. package/dist/types/config/initialize/inits.d.ts +1 -1
  68. package/dist/types/config/legacy/createHtmlConfig.d.ts +1 -1
  69. package/dist/types/config/legacy/createOutputConfig.d.ts +1 -1
  70. package/dist/types/config/legacy/createSourceConfig.d.ts +1 -1
  71. package/dist/types/config/legacy/createToolsConfig.d.ts +1 -1
  72. package/dist/types/config/legacy/index.d.ts +1 -1
  73. package/dist/types/defineConfig.d.ts +1 -1
  74. package/dist/types/exports/server.d.ts +1 -1
  75. package/dist/types/hooks.d.ts +1 -1
  76. package/dist/types/index.d.ts +6 -6
  77. package/dist/types/initialize/index.d.ts +3 -5
  78. package/dist/types/locale/en.d.ts +38 -38
  79. package/dist/types/locale/index.d.ts +75 -75
  80. package/dist/types/locale/zh.d.ts +38 -38
  81. package/dist/types/types/config/deploy.d.ts +21 -21
  82. package/dist/types/types/config/dev.d.ts +10 -10
  83. package/dist/types/types/config/experiments.d.ts +1 -1
  84. package/dist/types/types/config/html.d.ts +1 -1
  85. package/dist/types/types/config/index.d.ts +38 -38
  86. package/dist/types/types/config/output.d.ts +35 -28
  87. package/dist/types/types/config/performance.d.ts +1 -1
  88. package/dist/types/types/config/security.d.ts +1 -1
  89. package/dist/types/types/config/source.d.ts +52 -52
  90. package/dist/types/types/config/testing.d.ts +6 -6
  91. package/dist/types/types/config/tools.d.ts +26 -24
  92. package/dist/types/types/hooks.d.ts +75 -75
  93. package/dist/types/types/index.d.ts +17 -17
  94. package/dist/types/types/legacyConfig/deploy.d.ts +5 -5
  95. package/dist/types/types/legacyConfig/dev.d.ts +9 -9
  96. package/dist/types/types/legacyConfig/index.d.ts +16 -16
  97. package/dist/types/types/legacyConfig/output.d.ts +45 -45
  98. package/dist/types/types/legacyConfig/source.d.ts +22 -22
  99. package/dist/types/types/legacyConfig/testing.d.ts +6 -6
  100. package/dist/types/types/legacyConfig/tools.d.ts +10 -10
  101. package/dist/types/types/utils.d.ts +4 -4
  102. package/dist/types/utils/config.d.ts +7 -13
  103. package/dist/types/utils/createServer.d.ts +5 -5
  104. package/dist/types/utils/env.d.ts +1 -1
  105. package/dist/types/utils/generateWatchFiles.d.ts +1 -1
  106. package/dist/types/utils/getSelectedEntries.d.ts +1 -1
  107. package/dist/types/utils/getServerInternalPlugins.d.ts +1 -1
  108. package/dist/types/utils/printInstructions.d.ts +1 -1
  109. package/dist/types/utils/restart.d.ts +1 -1
  110. package/dist/types/utils/routes.d.ts +1 -1
  111. package/dist/types/utils/types.d.ts +13 -13
  112. package/package.json +26 -26
@@ -2,14 +2,14 @@ import type { JestConfig, DevServerOptions } from '@modern-js/types';
2
2
  import type { BuilderConfig } from '@modern-js/builder-webpack-provider';
3
3
  type BuilderToolsConfig = Required<BuilderConfig>['tools'];
4
4
  export type ToolsLegacyUserConfig = BuilderToolsConfig & {
5
- esbuild?: Record<string, unknown>;
6
- devServer?: DevServerOptions;
7
- /**
8
- * The configuration of `tools.tailwindcss` is provided by `tailwindcss` plugin.
9
- * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
10
- * @requires `tailwindcss` plugin
11
- */
12
- tailwindcss?: Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
13
- jest?: JestConfig | ((jestConfig: JestConfig) => JestConfig);
5
+ esbuild?: Record<string, unknown>;
6
+ devServer?: DevServerOptions;
7
+ /**
8
+ * The configuration of `tools.tailwindcss` is provided by `tailwindcss` plugin.
9
+ * Please use `yarn new` or `pnpm new` to enable the corresponding capability.
10
+ * @requires `tailwindcss` plugin
11
+ */
12
+ tailwindcss?: Record<string, any> | ((options: Record<string, any>) => Record<string, any> | void);
13
+ jest?: JestConfig | ((jestConfig: JestConfig) => JestConfig);
14
14
  };
15
- export {};
15
+ export {};
@@ -1,7 +1,7 @@
1
1
  export type UnwrapBuilderConfig<Config, Key extends keyof Config> = Required<Config>[Key];
2
2
  export type Bundler = 'rspack' | 'webpack' | 'shared';
3
3
  export type FromConfig<B extends Bundler, Config extends {
4
- rspack: Rspack;
5
- webpack: Webpack;
6
- shared: Shared;
7
- }, Rspack = {}, Webpack = {}, Shared = {}> = B extends 'shared' ? Config['shared'] : B extends 'rspack' ? Config['rspack'] : Config['webpack'];
4
+ rspack: Rspack;
5
+ webpack: Webpack;
6
+ shared: Shared;
7
+ }, Rspack = {}, Webpack = {}, Shared = {}> = B extends 'shared' ? Config['shared'] : B extends 'rspack' ? Config['rspack'] : Config['webpack'];
@@ -2,22 +2,16 @@ import { bundle } from '@modern-js/node-bundle-require';
2
2
  import type { ServerConfig } from '@modern-js/server-core';
3
3
  import type { AppNormalizedConfig } from '../types';
4
4
  export declare const defineServerConfig: (config: ServerConfig) => ServerConfig;
5
- export declare const buildServerConfig: ({
6
- appDirectory,
7
- distDirectory,
8
- configFile,
9
- options,
10
- watch
11
- }: {
12
- appDirectory: string;
13
- distDirectory: string;
14
- configFile: string;
15
- options?: Parameters<typeof bundle>[1];
16
- watch?: boolean | undefined;
5
+ export declare const buildServerConfig: ({ appDirectory, distDirectory, configFile, options, watch, }: {
6
+ appDirectory: string;
7
+ distDirectory: string;
8
+ configFile: string;
9
+ options?: Parameters<typeof bundle>[1];
10
+ watch?: boolean | undefined;
17
11
  }) => Promise<void>;
18
12
  /**
19
13
  *
20
14
  * 处理循环引用的 replacer
21
15
  */
22
16
  export declare const safeReplacer: () => (key: string, value: unknown) => unknown;
23
- export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: AppNormalizedConfig<'shared'>) => Promise<void>;
17
+ export declare const emitResolvedConfig: (appDirectory: string, resolvedConfig: AppNormalizedConfig<'shared'>) => Promise<void>;
@@ -5,8 +5,8 @@ export declare const setServer: (newServer: Server) => void;
5
5
  export declare const closeServer: () => Promise<void>;
6
6
  export declare const createServer: (options: ModernDevServerOptions) => Promise<Server>;
7
7
  export declare const injectDataLoaderPlugin: (internalPlugins: InternalPlugins) => {
8
- '@modern-js/plugin-data-loader': {
9
- path: string;
10
- forced: boolean;
11
- };
12
- };
8
+ '@modern-js/plugin-data-loader': {
9
+ path: string;
10
+ forced: boolean;
11
+ };
12
+ };
@@ -1,2 +1,2 @@
1
1
  import type { IAppContext } from '../types';
2
- export declare function getAutoInjectEnv(appContext: IAppContext): Record<string, string>;
2
+ export declare function getAutoInjectEnv(appContext: IAppContext): Record<string, string>;
@@ -1,3 +1,3 @@
1
1
  import { IAppContext } from '../types';
2
2
  export declare const addServerConfigToDeps: (dependencies: string[], appDirectory: string, serverConfigFile: string) => Promise<void>;
3
- export declare function generateWatchFiles(appContext: IAppContext, configDir?: string): Promise<string[]>;
3
+ export declare function generateWatchFiles(appContext: IAppContext, configDir?: string): Promise<string[]>;
@@ -2,4 +2,4 @@ import { Entrypoint } from '@modern-js/types';
2
2
  /**
3
3
  * Allow user to select entrypoints to build.
4
4
  */
5
- export declare const getSelectedEntries: (entry: string[] | boolean, entrypoints: Entrypoint[]) => Promise<string[]>;
5
+ export declare const getSelectedEntries: (entry: string[] | boolean, entrypoints: Entrypoint[]) => Promise<string[]>;
@@ -1,2 +1,2 @@
1
1
  import { AppTools, PluginAPI } from '../types';
2
- export declare function getServerInternalPlugins(api: PluginAPI<AppTools<'shared'>>): Promise<Record<string, string>>;
2
+ export declare function getServerInternalPlugins(api: PluginAPI<AppTools<'shared'>>): Promise<Record<string, string>>;
@@ -1,3 +1,3 @@
1
1
  import type { IAppContext, CliHooksRunner } from '@modern-js/core';
2
2
  import type { AppNormalizedConfig, AppTools } from '../types';
3
- export declare const printInstructions: (hookRunners: CliHooksRunner<AppTools<'shared'>>, appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Promise<void>;
3
+ export declare const printInstructions: (hookRunners: CliHooksRunner<AppTools<'shared'>>, appContext: IAppContext, config: AppNormalizedConfig<'shared'>) => Promise<void>;
@@ -1,3 +1,3 @@
1
1
  import { ToRunners } from '@modern-js/core';
2
2
  import { AppToolsHooks } from '../types/hooks';
3
- export declare function restart(hooksRunner: ToRunners<AppToolsHooks>, filename: string): Promise<void>;
3
+ export declare function restart(hooksRunner: ToRunners<AppToolsHooks>, filename: string): Promise<void>;
@@ -1,3 +1,3 @@
1
1
  import type { IAppContext } from '@modern-js/core';
2
2
  declare const generateRoutes: (appContext: IAppContext) => Promise<void>;
3
- export { generateRoutes };
3
+ export { generateRoutes };
@@ -1,22 +1,22 @@
1
1
  export type DevOptions = {
2
- entry?: string[] | boolean;
3
- config?: string;
4
- apiOnly?: boolean;
5
- analyze?: boolean;
2
+ entry?: string[] | boolean;
3
+ config?: string;
4
+ apiOnly?: boolean;
5
+ analyze?: boolean;
6
6
  };
7
7
  export type BuildOptions = {
8
- config?: string;
9
- analyze?: boolean;
8
+ config?: string;
9
+ analyze?: boolean;
10
10
  };
11
11
  export type DeployOptions = {
12
- config?: string;
13
- skipBuild?: boolean;
12
+ config?: string;
13
+ skipBuild?: boolean;
14
14
  };
15
15
  export type StartOptions = {
16
- apiOnly?: boolean;
16
+ apiOnly?: boolean;
17
17
  };
18
18
  export type InspectOptions = {
19
- env: string;
20
- output: string;
21
- verbose?: boolean;
22
- };
19
+ env: string;
20
+ output: string;
21
+ verbose?: boolean;
22
+ };
package/package.json CHANGED
@@ -15,7 +15,7 @@
15
15
  "modern",
16
16
  "modern.js"
17
17
  ],
18
- "version": "2.40.0",
18
+ "version": "2.42.0",
19
19
  "jsnext:source": "./src/index.ts",
20
20
  "types": "./dist/types/index.d.ts",
21
21
  "main": "./dist/cjs/index.js",
@@ -71,40 +71,40 @@
71
71
  "@babel/types": "^7.22.15",
72
72
  "es-module-lexer": "^1.1.0",
73
73
  "esbuild": "0.17.19",
74
- "@swc/helpers": "0.5.1",
75
- "@modern-js/builder": "2.40.0",
76
- "@modern-js/builder-plugin-node-polyfill": "2.40.0",
77
- "@modern-js/builder-plugin-esbuild": "2.40.0",
78
- "@modern-js/builder-shared": "2.40.0",
79
- "@modern-js/core": "2.40.0",
80
- "@modern-js/builder-webpack-provider": "2.40.0",
81
- "@modern-js/new-action": "2.40.0",
82
- "@modern-js/node-bundle-require": "2.40.0",
83
- "@modern-js/plugin": "2.40.0",
84
- "@modern-js/plugin-i18n": "2.40.0",
85
- "@modern-js/plugin-data-loader": "2.40.0",
86
- "@modern-js/prod-server": "2.40.0",
87
- "@modern-js/plugin-lint": "2.40.0",
88
- "@modern-js/server": "2.40.0",
89
- "@modern-js/types": "2.40.0",
90
- "@modern-js/utils": "2.40.0",
91
- "@modern-js/upgrade": "2.40.0",
92
- "@modern-js/server-core": "2.40.0"
74
+ "@swc/helpers": "0.5.3",
75
+ "@modern-js/builder-plugin-node-polyfill": "2.42.0",
76
+ "@modern-js/builder-plugin-esbuild": "2.42.0",
77
+ "@modern-js/builder-webpack-provider": "2.42.0",
78
+ "@modern-js/builder-shared": "2.42.0",
79
+ "@modern-js/builder": "2.42.0",
80
+ "@modern-js/core": "2.42.0",
81
+ "@modern-js/plugin": "2.42.0",
82
+ "@modern-js/new-action": "2.42.0",
83
+ "@modern-js/node-bundle-require": "2.42.0",
84
+ "@modern-js/plugin-data-loader": "2.42.0",
85
+ "@modern-js/plugin-lint": "2.42.0",
86
+ "@modern-js/plugin-i18n": "2.42.0",
87
+ "@modern-js/prod-server": "2.42.0",
88
+ "@modern-js/server": "2.42.0",
89
+ "@modern-js/upgrade": "2.42.0",
90
+ "@modern-js/types": "2.42.0",
91
+ "@modern-js/server-core": "2.42.0",
92
+ "@modern-js/utils": "2.42.0"
93
93
  },
94
94
  "devDependencies": {
95
- "@types/babel__traverse": "^7.14.2",
95
+ "@types/babel__traverse": "7.18.5",
96
96
  "@types/jest": "^29",
97
97
  "@types/node": "^14",
98
98
  "jest": "^29",
99
99
  "typescript": "^5",
100
100
  "webpack": "^5.88.1",
101
- "@modern-js/builder-plugin-swc": "2.40.0",
102
- "@modern-js/builder-rspack-provider": "2.40.0",
103
- "@scripts/build": "2.40.0",
104
- "@scripts/jest-config": "2.40.0"
101
+ "@modern-js/builder-plugin-swc": "2.42.0",
102
+ "@modern-js/builder-rspack-provider": "2.42.0",
103
+ "@scripts/build": "2.42.0",
104
+ "@scripts/jest-config": "2.42.0"
105
105
  },
106
106
  "peerDependencies": {
107
- "@modern-js/builder-rspack-provider": "^2.40.0"
107
+ "@modern-js/builder-rspack-provider": "^2.42.0"
108
108
  },
109
109
  "peerDependenciesMeta": {
110
110
  "@modern-js/builder-rspack-provider": {