@modern-js/app-tools 1.4.2 → 1.4.3

package/CHANGELOG.md

@@ -1,5 +1,36 @@
 # @modern-js/app-tools
 
+## 1.4.3
+
+### Patch Changes
+
+- 4b5d4bf4: feat: add img resource's inline and url type declaration
+- bdcf0865: fix: empty distDirectory for api service
+- 02fb4146: support product server
+- edc3bd3d: fix: @modern-js/core package not found
+- Updated dependencies [969f172f]
+- Updated dependencies [0ad75faa]
+- Updated dependencies [4c792f68]
+- Updated dependencies [83059b93]
+- Updated dependencies [4b5d4bf4]
+- Updated dependencies [0ad75faa]
+- Updated dependencies [62f5b8c8]
+- Updated dependencies [55e18278]
+- Updated dependencies [4499a674]
+- Updated dependencies [0ad75faa]
+- Updated dependencies [02fb4146]
+- Updated dependencies [403f5169]
+- Updated dependencies [e37ea5b2]
+- Updated dependencies [a7f42f48]
+- Updated dependencies [83059b93]
+  - @modern-js/core@1.4.4
+  - @modern-js/webpack@1.4.1
+  - @modern-js/utils@1.3.3
+  - @modern-js/new-action@1.3.3
+  - @modern-js/server@1.4.4
+  - @modern-js/types@1.3.4
+  - @modern-js/prod-server@1.0.1
+
 ## 1.4.2
 
 ### Patch Changes

package/dist/js/modern/commands/build.js

@@ -7,7 +7,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { webpack } from 'webpack';
 import { WebpackConfigTarget, getWebpackConfig } from '@modern-js/webpack';
 import { useAppContext, useResolvedConfigContext, mountHook, ResolvedConfigContext, manager } from '@modern-js/core';
-import { fs, formatWebpackMessages, measureFileSizesBeforeBuild, printFileSizesAfterBuild, printBuildError, logger, isUseSSRBundle } from '@modern-js/utils';
+import { formatWebpackMessages, measureFileSizesBeforeBuild, printFileSizesAfterBuild, printBuildError, logger, isUseSSRBundle, emptyDir } from '@modern-js/utils';
 import { generateRoutes } from "../utils/routes"; // These sizes are pretty large. We'll warn for bundles exceeding them.
 
 const WARN_AFTER_BUNDLE_GZIP_SIZE = 512 * 1024;
@@ -23,6 +23,10 @@ export const build = async options => {
   /* eslint-enable react-hooks/rules-of-hooks */
 
   if (!existSrc) {
+    const {
+      distDirectory
+    } = appContext;
+    await emptyDir(distDirectory);
     await mountHook().beforeBuild({
       webpackConfigs: []
     });
@@ -53,7 +57,7 @@ export const build = async options => {
 
           if (messages.errors.length === 0) {
             logger.info(`File sizes after ${label} build:\n`);
-            printFileSizesAfterBuild(stats, previousFileSizes, outputPath, WARN_AFTER_BUNDLE_GZIP_SIZE, WARN_AFTER_CHUNK_GZIP_SIZE);
+            printFileSizesAfterBuild(stats, previousFileSizes, distDirectory, WARN_AFTER_BUNDLE_GZIP_SIZE, WARN_AFTER_CHUNK_GZIP_SIZE);
             logger.log();
           }
         } // When using run or watch, call close and wait for it to finish before calling run or watch again.
@@ -87,9 +91,11 @@ export const build = async options => {
       cliOptions: options
     }));
   });
-  const outputPath = appContext.distDirectory;
-  const previousFileSizes = await measureFileSizesBeforeBuild(outputPath);
-  fs.emptyDirSync(outputPath);
+  const {
+    distDirectory
+  } = appContext;
+  const previousFileSizes = await measureFileSizesBeforeBuild(distDirectory);
+  await emptyDir(distDirectory);
   const buildConfigs = [];
   buildConfigs.push({
     type: 'legacy',

package/dist/js/modern/commands/start.js

@@ -1,6 +1,6 @@
 import { logger, chalk } from '@modern-js/utils';
 import { useAppContext, useResolvedConfigContext } from '@modern-js/core';
-import server from '@modern-js/server';
+import server from '@modern-js/prod-server';
 import { printInstructions } from "../utils/printInstructions";
 export const start = async () => {
   /* eslint-disable react-hooks/rules-of-hooks */

package/dist/js/node/commands/build.js

@@ -36,6 +36,10 @@ const build = async options => {
   /* eslint-enable react-hooks/rules-of-hooks */
 
   if (!existSrc) {
+    const {
+      distDirectory
+    } = appContext;
+    await (0, _utils.emptyDir)(distDirectory);
     await (0, _core.mountHook)().beforeBuild({
       webpackConfigs: []
     });
@@ -68,7 +72,7 @@ const build = async options => {
           if (messages.errors.length === 0) {
             _utils.logger.info(`File sizes after ${label} build:\n`);
 
-            (0, _utils.printFileSizesAfterBuild)(stats, previousFileSizes, outputPath, WARN_AFTER_BUNDLE_GZIP_SIZE, WARN_AFTER_CHUNK_GZIP_SIZE);
+            (0, _utils.printFileSizesAfterBuild)(stats, previousFileSizes, distDirectory, WARN_AFTER_BUNDLE_GZIP_SIZE, WARN_AFTER_CHUNK_GZIP_SIZE);
 
             _utils.logger.log();
           }
@@ -104,11 +108,11 @@ const build = async options => {
     }));
   });
 
-  const outputPath = appContext.distDirectory;
-  const previousFileSizes = await (0, _utils.measureFileSizesBeforeBuild)(outputPath);
-
-  _utils.fs.emptyDirSync(outputPath);
-
+  const {
+    distDirectory
+  } = appContext;
+  const previousFileSizes = await (0, _utils.measureFileSizesBeforeBuild)(distDirectory);
+  await (0, _utils.emptyDir)(distDirectory);
   const buildConfigs = [];
   buildConfigs.push({
     type: 'legacy',

package/dist/js/node/commands/start.js

@@ -9,7 +9,7 @@ var _utils = require("@modern-js/utils");
 
 var _core = require("@modern-js/core");
 
-var _server = _interopRequireDefault(require("@modern-js/server"));
+var _prodServer = _interopRequireDefault(require("@modern-js/prod-server"));
 
 var _printInstructions = require("../utils/printInstructions");
 
@@ -28,7 +28,7 @@ const start = async () => {
 
   _utils.logger.log(_utils.chalk.cyan(`Starting the modern server...`));
 
-  const app = await (0, _server.default)({
+  const app = await (0, _prodServer.default)({
     pwd: appDirectory,
     config: userConfig,
     plugins: appContext.plugins.filter(p => p.server).map(p => p.server)

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

@@ -1,4 +1,4 @@
-import { Server, ModernServerOptions } from '@modern-js/server';
+import { Server, ModernDevServerOptions } from '@modern-js/server';
 export declare const getServer: () => Server | null;
 export declare const closeServer: () => Promise<void>;
-export declare const createServer: (options: ModernServerOptions) => Promise<Server>;
+export declare const createServer: (options: ModernDevServerOptions) => Promise<Server>;

package/lib/types.d.ts

@@ -56,6 +56,98 @@ declare module '*.svg' {
   export default src;
 }
 
+declare module '*.bmp?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.gif?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpg?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpeg?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.png?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.ico?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.webp?inline' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.svg?inline' {
+  import * as React from 'react';
+
+  export const ReactComponent: React.FunctionComponent<
+    React.SVGProps<SVGSVGElement>
+  >;
+
+  const src: string;
+  export default src;
+}
+
+declare module '*.bmp?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.gif?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpg?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.jpeg?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.png?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.ico?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.webp?url' {
+  const src: string;
+  export default src;
+}
+
+declare module '*.svg?url' {
+  import * as React from 'react';
+
+  export const ReactComponent: React.FunctionComponent<
+    React.SVGProps<SVGSVGElement>
+  >;
+
+  const src: string;
+  export default src;
+}
+
 declare module '*.css' {
   const classes: { readonly [key: string]: string };
   export default classes;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.2",
+  "version": "1.4.3",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -49,25 +49,23 @@
     "modern": "./bin/modern.js"
   },
   "dependencies": {
+    "@modern-js/core": "^1.4.4",
     "@babel/runtime": "^7",
-    "@modern-js/types": "^1.3.3",
+    "@modern-js/types": "^1.3.4",
     "@modern-js/i18n-cli-language-detector": "^1.2.1",
-    "@modern-js/new-action": "^1.3.2",
+    "@modern-js/new-action": "^1.3.3",
     "@modern-js/plugin": "^1.2.1",
     "@modern-js/plugin-analyze": "^1.3.3",
     "@modern-js/plugin-fast-refresh": "^1.2.1",
     "@modern-js/plugin-i18n": "^1.2.1",
-    "@modern-js/server": "^1.4.3",
-    "@modern-js/utils": "^1.3.2",
-    "@modern-js/webpack": "^1.4.0",
+    "@modern-js/server": "^1.4.4",
+    "@modern-js/prod-server": "^1.0.1",
+    "@modern-js/utils": "^1.3.3",
+    "@modern-js/webpack": "^1.4.1",
     "inquirer": "^8.2.0",
     "webpack": "^5.54.0"
   },
-  "peerDependencies": {
-    "@modern-js/core": "^1.4.3"
-  },
   "devDependencies": {
-    "@modern-js/core": "^1.4.3",
     "@types/jest": "^26",
     "@types/node": "^14",
     "@types/react": "^17",

package/tests/commands/build.test.ts

@@ -4,19 +4,23 @@ const mockBeforeBuild = jest.fn();
 const mockAfterBuild = jest.fn();
 const mockGenerateRoutes = jest.fn();
 
-jest.mock('@modern-js/core', () => ({
-  __esModule: true,
-  mountHook() {
-    return {
-      beforeBuild: mockBeforeBuild,
-      afterBuild: mockAfterBuild,
-    };
-  },
-  useAppContext: jest.fn(() => ({
-    existSrc: false,
-  })),
-  useResolvedConfigContext: jest.fn(),
-}));
+// eslint-disable-next-line arrow-body-style
+jest.mock('@modern-js/core', () => {
+  return {
+    __esModule: true,
+    mountHook() {
+      return {
+        beforeBuild: mockBeforeBuild,
+        afterBuild: mockAfterBuild,
+      };
+    },
+    useAppContext: jest.fn(() => ({
+      existSrc: false,
+      distDirectory: '',
+    })),
+    useResolvedConfigContext: jest.fn(),
+  };
+});
 
 jest.mock('../../src/utils/routes', () => ({
   __esModule: true,