Add blockly import migration and rename manual test files to .js

Author: RoboErikG

plugins/migration/bin/fix-imports.js

@@ -99,6 +99,13 @@ const database = [
     newImport: `import * as libraryBlocks from 'blockly/blocks';`,
     newRequire: `const libraryBlocks = require('blockly/blocks');`,
   },
+  {
+    import: 'blockly',
+    oldIdentifier: 'Blockly',
+    newIdentifier: 'Blockly', // no-op
+    newImport: `import * as Blockly from 'blockly';`,
+    newRequire: `const Blockly = require('blockly');`, // no-op
+  },
 ];
 
 /**
@@ -125,9 +132,17 @@ function migrateContents(contents) {
  */
 function fixImport(contents, migrationData) {
   const identifier = getIdentifier(contents, migrationData);
+  // Don't need to run if there are no references.
   if (!identifier) return contents;
-  const newContents = replaceReferences(contents, migrationData, identifier);
-  if (newContents !== contents) return addImport(newContents, migrationData);
+  // If the identifier changed, update all references to it and the import
+  if (migrationData.oldIdentifier !== migrationData.newIdentifier) {
+    const newContents = replaceReferences(contents, migrationData, identifier);
+    if (newContents !== contents) {
+      return addImport(newContents, migrationData);
+    }
+  } else { // Just the import changed
+    return addImport(contents, migrationData);
+  }
   return contents;
 }
 

plugins/migration/test/manual-test-data/fix-imports/import.js

@@ -1,6 +1,6 @@
 // Manual test data for the renamings migration.
 // Run using:
-//   node ./bin/migrate fix-imports --from <version> ./test/manual-test-data/fix-imports/import.txt
+//   node ./bin/migrate fix-imports --from <version> ./test/manual-test-data/fix-imports/import.js
 
 import Blockly from 'blockly';
 import * as BlocklyDart from "blockly/dart";
@@ -31,3 +31,5 @@ Some.Other.identifer;
 Blockly.libraryBlocks.something;
 const something = Blockly.libraryBlocks.something;
 Some.Other.identifer;
+
+Blockly.zelos;

…manual-test-data/fix-imports/mixed-1.txt …/manual-test-data/fix-imports/mixed-1.jsplugins/migration/test/manual-test-data/fix-imports/mixed-1.txt renamed to plugins/migration/test/manual-test-data/fix-imports/mixed-1.js plugins/migration/test/manual-test-data/fix-imports/mixed-1.txt renamed to plugins/migration/test/manual-test-data/fix-imports/mixed-1.js

@@ -31,3 +31,5 @@ Some.Other.identifer;
 Blockly.libraryBlocks.something;
 const something = Blockly.libraryBlocks.something;
 Some.Other.identifer;
+
+Blockly.zelos;

…manual-test-data/fix-imports/mixed-2.txt …/manual-test-data/fix-imports/mixed-2.jsplugins/migration/test/manual-test-data/fix-imports/mixed-2.txt renamed to plugins/migration/test/manual-test-data/fix-imports/mixed-2.js plugins/migration/test/manual-test-data/fix-imports/mixed-2.txt renamed to plugins/migration/test/manual-test-data/fix-imports/mixed-2.js

@@ -31,3 +31,5 @@ Some.Other.identifer;
 Blockly.libraryBlocks.something;
 const something = Blockly.libraryBlocks.something;
 Some.Other.identifer;
+
+Blockly.zelos;

…manual-test-data/fix-imports/require.txt …/manual-test-data/fix-imports/require.jsplugins/migration/test/manual-test-data/fix-imports/require.txt renamed to plugins/migration/test/manual-test-data/fix-imports/require.js plugins/migration/test/manual-test-data/fix-imports/require.txt renamed to plugins/migration/test/manual-test-data/fix-imports/require.js

@@ -31,3 +31,5 @@ Some.Other.identifer;
 Blockly.libraryBlocks.something;
 const something = Blockly.libraryBlocks.something;
 Some.Other.identifer;
+
+Blockly.zelos;