feat: install dependencies in sub blocks

packages/umi-build-dev/src/fixtures/block/test-blocks/demo-with-dependencies/package.json

@@ -5,7 +5,7 @@
     "dev": "umi dev"
   },
   "dependencies": {
-    "antd": "^3.10.9"
+    "antd": "^3.10.0"
   },
   "devDependencies": {
     "umi": "^2.3.0",

packages/umi-build-dev/src/fixtures/block/test-blocks/demo/package.json

@@ -5,7 +5,8 @@
     "dev": "umi dev"
   },
   "dependencies": {
-    "antd": "^3.10.9"
+    "antd": "^3.8.0",
+    "rc-select": "~2.1.0"
   },
   "devDependencies": {
     "umi": "^2.3.0",

packages/umi-build-dev/src/plugins/commands/block/getBlockGenerator.js

@@ -36,6 +36,41 @@ function checkConflict(blockDeps, projectDeps) {
   return [lacks, conflicts];
 }
 
+export function getAllBlockDependencies(rootDir, pkg) {
+  const { blockConfig = {}, dependencies = {} } = pkg;
+  const { dependencies: depBlocks = [] } = blockConfig;
+  const allDependencies = {};
+
+  function mergeDependencies(parent, sub) {
+    const [lacks, conflicts] = checkConflict(sub, parent);
+    if (conflicts.length) {
+      throw new Error(`
+      find dependencies conflict between blocks:
+      ${conflicts
+        .map(info => {
+          return `* ${info[0]}: ${info[2]} not compatible with ${info[1]}`;
+        })
+        .join('\n')}`);
+    }
+    lacks.forEach(lack => {
+      const [name, version] = lack;
+      parent[name] = version;
+    });
+    return parent;
+  }
+
+  depBlocks.forEach(block => {
+    const rubBlockDeps = getAllBlockDependencies(
+      rootDir,
+      // eslint-disable-next-line
+      require(join(rootDir, block, 'package.json')),
+    );
+    mergeDependencies(allDependencies, rubBlockDeps);
+  });
+  mergeDependencies(allDependencies, dependencies);
+  return allDependencies;
+}
+
 export function dependenciesConflictCheck(
   blockPkgDeps = {},
   projectPkgDeps = {},

packages/umi-build-dev/src/plugins/commands/block/getBlockGenerator.test.js

@@ -1,9 +1,11 @@
+import { join } from 'path';
 import {
   dependenciesConflictCheck,
   getNameFromPkg,
   parseContentToSingular,
   getSingularName,
   getMockDependencies,
+  getAllBlockDependencies,
 } from './getBlockGenerator';
 
 describe('test block generate', () => {
@@ -129,4 +131,88 @@ export default {
       qs: '4.0.0',
     });
   });
+
+  it('getAllBlockDependencies', () => {
+    expect(
+      getAllBlockDependencies(
+        join(__dirname, '../../../fixtures/block/test-blocks'),
+        {
+          blockConfig: {
+            dependencies: ['demo'],
+          },
+          dependencies: {},
+        },
+      ),
+    ).toEqual({
+      antd: '^3.8.0',
+      'rc-select': '~2.1.0',
+    });
+
+    expect(
+      getAllBlockDependencies(
+        join(__dirname, '../../../fixtures/block/test-blocks'),
+        {
+          dependencies: {
+            moment: '2.3.2',
+          },
+        },
+      ),
+    ).toEqual({
+      moment: '2.3.2',
+    });
+
+    expect(
+      getAllBlockDependencies(
+        join(__dirname, '../../../fixtures/block/test-blocks'),
+        {
+          blockConfig: {
+            dependencies: ['demo', 'demo-with-dependencies'],
+          },
+          dependencies: {
+            moment: '2.3.2',
+          },
+        },
+      ),
+    ).toEqual({
+      moment: '2.3.2',
+      antd: '^3.8.0',
+      'rc-select': '~2.1.0',
+    });
+
+    expect(
+      getAllBlockDependencies(
+        join(__dirname, '../../../fixtures/block/test-blocks'),
+        {
+          blockConfig: {
+            dependencies: ['demo-with-dependencies'],
+          },
+        },
+      ),
+    ).toEqual({
+      antd: '^3.8.0',
+      'rc-select': '~2.1.0',
+    });
+
+    try {
+      expect(
+        getAllBlockDependencies(
+          join(__dirname, '../../../fixtures/block/test-blocks'),
+          {
+            blockConfig: {
+              dependencies: ['demo-with-dependencies'],
+            },
+            dependencies: {
+              antd: '2.0.0',
+            },
+          },
+        ),
+      ).toEqual({
+        antd: '^3.10.0',
+      });
+    } catch (error) {
+      expect(error.message).toContain(
+        '* antd: ^3.8.0 not compatible with 2.0.0',
+      );
+    }
+  });
 });

packages/umi-build-dev/src/plugins/commands/block/index.js

@@ -4,12 +4,11 @@ import { existsSync, readFileSync } from 'fs';
 import { dirname, join } from 'path';
 import execa from 'execa';
 import ora from 'ora';
-import { merge } from 'lodash';
+import { merge, isPlainObject } from 'lodash';
 import clipboardy from 'clipboardy';
-import { isPlainObject } from 'lodash';
 import { getParsedData, makeSureMaterialsTempPathExist } from './download';
 import writeNewRoute from '../../../utils/writeNewRoute';
-import { dependenciesConflictCheck, getNameFromPkg, getMockDependencies } from './getBlockGenerator';
+import { dependenciesConflictCheck, getNameFromPkg, getMockDependencies, getAllBlockDependencies } from './getBlockGenerator';
 import appendBlockToContainer from './appendBlockToContainer';
 
 export default api => {
@@ -225,10 +224,11 @@ export default api => {
       if (existsSync(mockFilePath)) {
         devDependencies = getMockDependencies(readFileSync(mockFilePath, 'utf-8'), ctx.pkg);
       }
+      const allBlockDependencies = getAllBlockDependencies(ctx.templateTmpDirPath, ctx.pkg);
       // get confilict dependencies and lack dependencies
       const { conflicts, lacks, devConflicts, devLacks } = applyPlugins('_modifyBlockDependencies', {
         initialValue: dependenciesConflictCheck(
-          ctx.pkg.dependencies,
+          allBlockDependencies,
           projectPkg.dependencies,
           devDependencies,
           {