@modern-js/app-tools 1.4.2 → 1.4.5

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/modern.config.js

@@ -1,6 +1,7 @@
 /** @type {import('@modern-js/module-tools').UserConfig} */
 module.exports = {
   output: {
+    packageMode: 'node-js',
     disableSourceMap: true,
   },
 };

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.2",
+  "version": "1.4.5",
   "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.6.0",
     "@babel/runtime": "^7",
-    "@modern-js/types": "^1.3.3",
+    "@modern-js/types": "^1.3.5",
     "@modern-js/i18n-cli-language-detector": "^1.2.1",
-    "@modern-js/new-action": "^1.3.2",
-    "@modern-js/plugin": "^1.2.1",
-    "@modern-js/plugin-analyze": "^1.3.3",
-    "@modern-js/plugin-fast-refresh": "^1.2.1",
+    "@modern-js/new-action": "^1.3.3",
+    "@modern-js/plugin": "^1.3.2",
+    "@modern-js/plugin-analyze": "^1.3.4",
+    "@modern-js/plugin-fast-refresh": "^1.2.2",
     "@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.8",
+    "@modern-js/prod-server": "^1.0.5",
+    "@modern-js/utils": "^1.3.6",
+    "@modern-js/webpack": "^1.5.0",
     "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",
@@ -79,17 +77,13 @@
     "@types/inquirer": "^8.2.0"
   },
   "sideEffects": false,
-  "modernConfig": {
-    "output": {
-      "packageMode": "node-js"
-    }
-  },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
   "scripts": {
     "new": "modern new",
+    "dev": "modern build --watch",
     "build": "modern build",
     "test": "jest --passWithNoTests"
   },

package/tests/.eslintrc.js

@@ -0,0 +1,8 @@
+module.exports = {
+  root: true,
+  extends: ['@modern-js'],
+  parserOptions: {
+    tsconfigRootDir: __dirname,
+    project: ['./tsconfig.json'],
+  },
+};

package/tests/commands/build.test.ts

@@ -1,23 +1,8 @@
+import { manager } from '@modern-js/core';
 import { build } from '../../src/commands/build';
 
-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(),
-}));
-
 jest.mock('../../src/utils/routes', () => ({
   __esModule: true,
   generateRoutes: () => mockGenerateRoutes(),
@@ -29,9 +14,29 @@ describe('command build', () => {
   });
 
   test('existSrc is false', async () => {
-    await build();
-    expect(mockBeforeBuild).toBeCalled();
-    expect(mockGenerateRoutes).toBeCalled();
-    expect(mockAfterBuild).toBeCalled();
+    const mockBeforeBuild = jest.fn();
+    const mockAfterBuild = jest.fn();
+    const mockAPI = {
+      useAppContext: jest.fn((): any => ({
+        existSrc: false,
+        distDirectory: '',
+      })),
+      useResolvedConfigContext: jest.fn(),
+      useHookRunners: (): any => ({
+        afterBuild: mockAfterBuild,
+        beforeBuild: mockBeforeBuild,
+      }),
+    };
+
+    const cloned = manager.clone(mockAPI);
+    cloned.usePlugin({
+      async setup(api) {
+        await build(api);
+        expect(mockBeforeBuild).toBeCalled();
+        expect(mockGenerateRoutes).toBeCalled();
+        expect(mockAfterBuild).toBeCalled();
+      },
+    });
+    await cloned.init();
   });
 });