fix(nx): update the migrate command to handle edge cases

nrwl · Sep 11, 2019 · 4ef3a77 · 4ef3a77
1 parent 5daf211
commit 4ef3a77
Show file tree

Hide file tree

Showing 9 changed files with 235 additions and 163 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ matrix:
   include:
     - os: linux
       language: node_js
-      node_js: 10
+      node_js: 12
       dist: trusty
       sudo: required
       cache:
@@ -21,7 +21,7 @@ matrix:
         - yarn test:all
     - os: linux
       language: node_js
-      node_js: 10
+      node_js: 12
       dist: trusty
       sudo: required
       cache:
@@ -36,7 +36,7 @@ matrix:
         - yarn e2e --cli nx
     - os: linux
       language: node_js
-      node_js: 10
+      node_js: 12
       dist: trusty
       sudo: required
       cache:

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -110,6 +110,7 @@ body
 
 The type must be one of the following:
 
+- chore
 - build
 - feat
 - fix

diff --git a/e2e/migrate.test.ts b/e2e/migrate.test.ts
@@ -89,7 +89,7 @@ forEachCli(() => {
                       }
                     },
                     packageJsonUpdates: {
-                      'run-11': {version: '1.1.0', packages: {'migrate-child-package': {version: '9.0.0'}}},
+                      'run-11': {version: '1.1.0', packages: {'migrate-child-package': {version: '9.0.0', alwaysAddToPackageJson: true}}},
                     }
                   });
                 } else {
@@ -102,13 +102,12 @@ forEachCli(() => {
         }
       );
 
-      runCLI('migrate migrate-parent-package@2.0.0');
+      runCLI(
+        'migrate migrate-parent-package@2.0.0 --from="migrate-parent-package@1.0.0"'
+      );
 
       // updates package.json
       const packageJson = readJson(`package.json`);
-      expect(packageJson.dependencies['migrate-parent-package']).toEqual(
-        '2.0.0'
-      );
       expect(packageJson.dependencies['migrate-child-package']).toEqual(
         '9.0.0'
       );

diff --git a/e2e/next.test.ts b/e2e/next.test.ts
@@ -45,7 +45,7 @@ module.exports = {
       expect(readFile(`dist/apps/${appName}/BUILD_ID`)).toEqual('fixed');
     }, 120000);
 
-    it('should generate a Next.js app dynamically loading a lib', async () => {
+    xit('should generate a Next.js app dynamically loading a lib', async () => {
       ensureProject();
       const appName = uniq('app');
       const libName = uniq('lib');

diff --git a/e2e/utils.ts b/e2e/utils.ts
@@ -202,7 +202,6 @@ export function copyMissingPackages(): void {
     '@babel/plugin-proposal-decorators',
     'babel-loader',
     'babel-plugin-macros',
-
     'eslint-plugin-import',
     'eslint-plugin-jsx-a11y',
     'eslint-plugin-react',

diff --git a/packages/tao/src/commands/migrate.spec.ts b/packages/tao/src/commands/migrate.spec.ts
@@ -5,7 +5,9 @@ describe('Migration', () => {
     it('should throw an error when the target package is not available', async () => {
       const migrator = new Migrator({
         versions: () => null,
-        fetch: (p, v) => null,
+        fetch: (p, v) => {
+          throw new Error('cannot fetch');
+        },
         from: {},
         to: {}
       });
@@ -14,7 +16,7 @@ describe('Migration', () => {
         await migrator.updatePackageJson('mypackage', 'myversion');
         throw new Error('fail');
       } catch (e) {
-        expect(e.message).toEqual(`Cannot find package "mypackage" installed.`);
+        expect(e.message).toEqual(`cannot fetch`);
       }
     });
 
@@ -29,7 +31,7 @@ describe('Migration', () => {
       expect(await migrator.updatePackageJson('mypackage', '2.0.0')).toEqual({
         migrations: [],
         packageJson: {
-          mypackage: '2.0.0'
+          mypackage: { version: '2.0.0', alwaysAddToPackageJson: false }
         }
       });
     });
@@ -45,14 +47,17 @@ describe('Migration', () => {
                 version2: {
                   version: '2.0.0',
                   packages: {
-                    child: { version: '2.0.0' }
+                    child: { version: '2.0.0' },
+                    newChild: { version: '3.0.0', alwaysAddToPackageJson: true }
                   }
                 }
               },
               schematics: {}
             });
           } else if (p === 'child') {
             return Promise.resolve({ version: '2.0.0' });
+          } else if (p === 'newChild') {
+            return Promise.resolve({ version: '2.0.0' });
           } else {
             return Promise.resolve(null);
           }
@@ -64,8 +69,9 @@ describe('Migration', () => {
       expect(await migrator.updatePackageJson('parent', '2.0.0')).toEqual({
         migrations: [],
         packageJson: {
-          parent: '2.0.0',
-          child: '2.0.0'
+          parent: { version: '2.0.0', alwaysAddToPackageJson: false },
+          child: { version: '2.0.0', alwaysAddToPackageJson: false },
+          newChild: { version: '2.0.0', alwaysAddToPackageJson: true }
         }
       });
     });
@@ -111,8 +117,8 @@ describe('Migration', () => {
       expect(await migrator.updatePackageJson('parent', '2.0.0')).toEqual({
         migrations: [],
         packageJson: {
-          parent: '2.0.0',
-          child: '2.0.0'
+          parent: { version: '2.0.0', alwaysAddToPackageJson: false },
+          child: { version: '2.0.0', alwaysAddToPackageJson: false }
         }
       });
     });
@@ -172,10 +178,10 @@ describe('Migration', () => {
       expect(await migrator.updatePackageJson('parent', '2.0.0')).toEqual({
         migrations: [],
         packageJson: {
-          parent: '2.0.0',
-          child1: '2.0.0',
-          child2: '2.0.0',
-          grandchild: '4.0.0'
+          parent: { version: '2.0.0', alwaysAddToPackageJson: false },
+          child1: { version: '2.0.0', alwaysAddToPackageJson: false },
+          child2: { version: '2.0.0', alwaysAddToPackageJson: false },
+          grandchild: { version: '4.0.0', alwaysAddToPackageJson: false }
         }
       });
     });
@@ -221,8 +227,8 @@ describe('Migration', () => {
       expect(await migrator.updatePackageJson('parent', '2.0.0')).toEqual({
         migrations: [],
         packageJson: {
-          parent: '2.0.0',
-          child: '2.0.0'
+          parent: { version: '2.0.0', alwaysAddToPackageJson: false },
+          child: { version: '2.0.0', alwaysAddToPackageJson: false }
         }
       });
     });
@@ -263,8 +269,8 @@ describe('Migration', () => {
       expect(await migrator.updatePackageJson('parent', '2.0.0')).toEqual({
         migrations: [],
         packageJson: {
-          parent: '2.0.0',
-          child1: '2.0.0'
+          parent: { version: '2.0.0', alwaysAddToPackageJson: false },
+          child1: { version: '2.0.0', alwaysAddToPackageJson: false }
         }
       });
     });
@@ -273,7 +279,11 @@ describe('Migration', () => {
   describe('migrations', () => {
     it('should create a list of migrations to run', async () => {
       const migrator = new Migrator({
-        versions: p => (p !== 'not-installed' ? '1.0.0' : null),
+        versions: p => {
+          if (p === 'parent') return '1.0.0';
+          if (p === 'child') return '1.0.0';
+          return null;
+        },
         fetch: (p, v) => {
           if (p === 'parent') {
             return Promise.resolve({
@@ -282,7 +292,10 @@ describe('Migration', () => {
                 version2: {
                   version: '2.0.0',
                   packages: {
-                    child: { version: '2.0.0' }
+                    child: { version: '2.0.0' },
+                    newChild: {
+                      version: '3.0.0'
+                    }
                   }
                 }
               },
@@ -303,6 +316,16 @@ describe('Migration', () => {
                 }
               }
             });
+          } else if (p === 'newChild') {
+            return Promise.resolve({
+              version: '3.0.0',
+              schematics: {
+                version2: {
+                  version: '2.0.0',
+                  factory: 'new-child-factory'
+                }
+              }
+            });
           } else {
             return Promise.resolve(null);
           }
@@ -326,8 +349,9 @@ describe('Migration', () => {
           }
         ],
         packageJson: {
-          parent: '2.0.0',
-          child: '2.0.0'
+          parent: { version: '2.0.0', alwaysAddToPackageJson: false },
+          child: { version: '2.0.0', alwaysAddToPackageJson: false },
+          newChild: { version: '3.0.0', alwaysAddToPackageJson: false }
         }
       });
     });
-Original file line number
+Diff line change
@@ Expand Up / @@ -110,6 +110,7 @@ body @@
     The type must be one of the following:
+    - chore
     - build
     - feat
     - fix
@@ Expand Down @@