Merge pull request #769 from aws-amplify/remove-inflight-dep

chore: Remove direct dependency on inflight via glob

Author: phani-srikar

dependency_licenses.txt

@@ -104,7 +104,7 @@
     "eslint-plugin-react": "^7.21.5",
     "eslint-plugin-spellcheck": "^0.0.17",
     "execa": "^5.1.1",
-    "glob": "^7.1.6",
+    "globby": "^11.1.0",
     "graphql-transformer-core": "^8.0.0",
     "husky": "^3.0.3",
     "jest": "^27.0.0",

package.json

@@ -27,7 +27,7 @@
     "dotenv": "^8.6.0",
     "execa": "^4.1.0",
     "fs-extra": "^8.1.0",
-    "glob": "^10.3.9",
+    "globby": "^11.1.0",
     "ini": "^3.0.1",
     "jest-circus": "^27.5.1",
     "jest-environment-node": "^26.6.2",

packages/amplify-codegen-e2e-core/package.json

@@ -1,7 +1,7 @@
 import { nspawn as spawn, ExecutionContext, KEY_DOWN_ARROW, getCLIPath, getProjectMeta, getBackendAmplifyMeta, invokeFunction } from '..';
 import { Lambda } from 'aws-sdk';
 import { singleSelect, multiSelect, moveUp, moveDown } from '../utils/selectors';
-import * as glob from 'glob';
+import { sync } from 'globby';
 import * as path from 'path';
 import _ from 'lodash';
 import { loadFeatureFlags } from '../utils/feature-flags';
@@ -467,7 +467,7 @@ const getRuntimeDisplayName = (runtime: FunctionRuntimes) => {
 
 export function validateNodeModulesDirRemoval(projRoot) {
   let functionDir = path.join(projRoot, 'amplify', '#current-cloud-backend', 'function');
-  const nodeModulesDirs = glob.sync('**/node_modules', {
+  const nodeModulesDirs = sync('**/node_modules', {
     cwd: functionDir,
     absolute: true,
   });

packages/amplify-codegen-e2e-core/src/categories/lambda-function.ts

@@ -27,7 +27,7 @@
     "@graphql-codegen/core": "2.6.6",
     "chalk": "^3.0.0",
     "fs-extra": "^8.1.0",
-    "glob-all": "^3.1.0",
+    "globby": "^11.1.0",
     "glob-parent": "^6.0.2",
     "graphql": "^15.5.0",
     "graphql-config": "^2.2.1",

packages/amplify-codegen/package.json

@@ -1,13 +1,14 @@
 const path = require('path');
 const fs = require('fs-extra');
-const glob = require('glob-all');
+const globby = require('globby');
 const { FeatureFlags, pathManager } = require('@aws-amplify/amplify-cli-core');
 const { generateModels: generateModelsHelper } = require('@aws-amplify/graphql-generator');
 const { validateAmplifyFlutterMinSupportedVersion } = require('../utils/validateAmplifyFlutterMinSupportedVersion');
 const defaultDirectiveDefinitions = require('../utils/defaultDirectiveDefinitions');
 const getProjectRoot = require('../utils/getProjectRoot');
 const { getModelSchemaPathParam, hasModelSchemaPathParam } = require('../utils/getModelSchemaPathParam');
 const { isDataStoreEnabled } = require('graphql-transformer-core');
+const { normalizePathForGlobPattern } = require('../utils/input-params-manager');
 
 /**
  * Amplify Context type.
@@ -305,7 +306,7 @@ function loadSchema(apiResourcePath) {
   }
   if (fs.pathExistsSync(schemaDirectory) && fs.lstatSync(schemaDirectory).isDirectory()) {
     // search recursively for graphql schema files inside `schema` directory
-    const schemas = glob.sync([path.join(schemaDirectory, '**/*.graphql')]);
+    const schemas = globby.sync([path.join(schemaDirectory, '**/*.graphql')].map((path) => normalizePathForGlobPattern(path)));
     return schemas.map(file => fs.readFileSync(file, 'utf8')).join('\n');
   }
 

packages/amplify-codegen/src/commands/models.js

@@ -1,14 +1,15 @@
 const path = require('path');
 const fs = require('fs-extra');
 const Ora = require('ora');
-const glob = require('glob-all');
+const globby = require('globby');
 const { Source } = require('graphql');
 
 const constants = require('../constants');
 const { loadConfig } = require('../codegen-config');
 const { ensureIntrospectionSchema, getFrontEndHandler, getAppSyncAPIDetails, getAppSyncAPIInfoFromProject } = require('../utils');
 const { generateTypes: generateTypesHelper } = require('@aws-amplify/graphql-generator');
 const { extractDocumentFromJavascript } = require('@aws-amplify/graphql-types-generator');
+const { normalizePathForGlobPattern } = require('../utils/input-params-manager');
 
 async function generateTypes(context, forceDownloadSchema, withoutInit = false, decoupleFrontend = '') {
   let frontend = decoupleFrontend;
@@ -58,7 +59,8 @@ async function generateTypes(context, forceDownloadSchema, withoutInit = false,
         const target = cfg.amplifyExtension.codeGenTarget;
 
         const excludes = cfg.excludes.map(pattern => `!${pattern}`);
-        const queryFilePaths = glob.sync([...includeFiles, ...excludes], {
+        const normalizedPatterns = [...includeFiles, ...excludes].map((path) => normalizePathForGlobPattern(path));
+        const queryFilePaths = globby.sync(normalizedPatterns, {
           cwd: projectPath,
           absolute: true,
         });

packages/amplify-codegen/src/commands/types.js

@@ -1,4 +1,5 @@
 const constants = require('../constants');
+const path = require('path');
 
 function normalizeInputParams(context) {
   let inputParams;
@@ -66,6 +67,12 @@ function normalizeValue(key, value) {
   return value;
 }
 
+function normalizePathForGlobPattern(pattern) {
+  const splits = pattern.split(path.win32.sep);
+  return splits.join(path.posix.sep);
+}
+
 module.exports = {
   normalizeInputParams,
+  normalizePathForGlobPattern,
 };

packages/amplify-codegen/src/utils/input-params-manager.js

@@ -1,4 +1,4 @@
-const { sync } = require('glob-all');
+const globby = require('globby');
 const path = require('path');
 const { generateTypes: generateTypesHelper } = require('@aws-amplify/graphql-generator');
 const fs = require('fs-extra');
@@ -19,7 +19,7 @@ const MOCK_CONTEXT = {
   },
 };
 
-jest.mock('glob-all');
+jest.mock('globby');
 jest.mock('@aws-amplify/graphql-generator');
 jest.mock('@aws-amplify/graphql-types-generator');
 jest.mock('../../src/codegen-config');
@@ -47,7 +47,7 @@ const MOCK_PROJECT = {
     region: MOCK_REGION,
   },
 };
-sync.mockReturnValue(MOCK_QUERIES);
+globby.sync.mockReturnValue(MOCK_QUERIES);
 const MOCK_APIS = [
   {
     id: MOCK_API_ID,
@@ -80,7 +80,7 @@ describe('command - types', () => {
     await generateTypes(MOCK_CONTEXT, forceDownload);
     expect(getFrontEndHandler).toHaveBeenCalledWith(MOCK_CONTEXT);
     expect(loadConfig).toHaveBeenCalledWith(MOCK_CONTEXT, false);
-    expect(sync).toHaveBeenCalledWith([MOCK_INCLUDE_PATH, `!${MOCK_EXCLUDE_PATH}`], {
+    expect(globby.sync).toHaveBeenCalledWith([MOCK_INCLUDE_PATH, `!${MOCK_EXCLUDE_PATH}`], {
       cwd: MOCK_PROJECT_ROOT,
       absolute: true,
     });
@@ -154,13 +154,13 @@ describe('command - types', () => {
     MOCK_PROJECT.includes = [];
     await generateTypes(MOCK_CONTEXT, true);
     expect(generateTypesHelper).not.toHaveBeenCalled();
-    expect(sync).not.toHaveBeenCalled();
+    expect(globby.sync).not.toHaveBeenCalled();
   });
 
   it('should not generate type when generatedFileName is missing', async () => {
     MOCK_PROJECT.amplifyExtension.generatedFileName = '';
     await generateTypes(MOCK_CONTEXT, true);
     expect(generateTypesHelper).not.toHaveBeenCalled();
-    expect(sync).not.toHaveBeenCalled();
+    expect(globby.sync).not.toHaveBeenCalled();
   });
 });

packages/amplify-codegen/tests/commands/types.test.js

@@ -43,7 +43,7 @@
     "common-tags": "^1.8.0",
     "core-js": "^3.6.4",
     "fs-extra": "^8.1.0",
-    "glob": "^7.1.6",
+    "globby": "^11.1.0",
     "graphql": "^15.5.0",
     "inflected": "^2.0.4",
     "prettier": "^1.19.1",
@@ -55,7 +55,6 @@
     "@types/babel-generator": "^6.25.0",
     "@types/common-tags": "^1.8.0",
     "@types/fs-extra": "^8.1.0",
-    "@types/glob": "^7.1.1",
     "@types/inflected": "^1.1.29",
     "@types/node": "^10.17.13",
     "@types/prettier": "^1.19.0",