diff --git a/packages/amplify-category-analytics/lib/kinesis-helper.js b/packages/amplify-category-analytics/lib/kinesis-helper.js index 0324593068b..ab2df5dd037 100644 --- a/packages/amplify-category-analytics/lib/kinesis-helper.js +++ b/packages/amplify-category-analytics/lib/kinesis-helper.js @@ -1,4 +1,4 @@ -const open = require('open'); +const { open } = require('amplify-cli-core'); const constants = require('./constants'); function console(context) { diff --git a/packages/amplify-category-analytics/lib/pinpoint-helper.js b/packages/amplify-category-analytics/lib/pinpoint-helper.js index b179dab8752..a330f932130 100644 --- a/packages/amplify-category-analytics/lib/pinpoint-helper.js +++ b/packages/amplify-category-analytics/lib/pinpoint-helper.js @@ -1,4 +1,4 @@ -const open = require('open'); +const { open } = require('amplify-cli-core'); const constants = require('./constants'); function console(context) { diff --git a/packages/amplify-category-analytics/package.json b/packages/amplify-category-analytics/package.json index c8747cd0de3..5b4917e6522 100644 --- a/packages/amplify-category-analytics/package.json +++ b/packages/amplify-category-analytics/package.json @@ -18,7 +18,6 @@ "amplify-cli-core": "1.14.1", "fs-extra": "^8.1.0", "inquirer": "^7.3.3", - "open": "^7.0.0", "uuid": "^3.4.0" } } diff --git a/packages/amplify-category-api/package.json b/packages/amplify-category-api/package.json index 2147bfe1375..0150ffd2069 100644 --- a/packages/amplify-category-api/package.json +++ b/packages/amplify-category-api/package.json @@ -71,7 +71,6 @@ "graphql-relational-schema-transformer": "2.16.1", "graphql-transformer-core": "6.25.1", "inquirer": "^7.3.3", - "open": "^7.0.0", "ora": "^4.0.3", "uuid": "^3.4.0" }, diff --git a/packages/amplify-category-api/src/provider-utils/awscloudformation/service-walkthroughs/apigw-walkthrough.ts b/packages/amplify-category-api/src/provider-utils/awscloudformation/service-walkthroughs/apigw-walkthrough.ts index 9688332d98b..cfaddf7b33d 100644 --- a/packages/amplify-category-api/src/provider-utils/awscloudformation/service-walkthroughs/apigw-walkthrough.ts +++ b/packages/amplify-category-api/src/provider-utils/awscloudformation/service-walkthroughs/apigw-walkthrough.ts @@ -3,10 +3,9 @@ import path from 'path'; import fs from 'fs-extra'; import os from 'os'; import uuid from 'uuid'; -import open from 'open'; import { rootAssetDir } from '../aws-constants'; import { checkForPathOverlap, validatePathName, formatCFNPathParamsForExpressJs } from '../utils/rest-api-path-utils'; -import { ResourceDoesNotExistError, exitOnNextTick, $TSContext, stateManager } from 'amplify-cli-core'; +import { ResourceDoesNotExistError, exitOnNextTick, $TSContext, stateManager, open } from 'amplify-cli-core'; // keep in sync with ServiceName in amplify-category-function, but probably it will not change const FunctionServiceNameLambdaFunction = 'Lambda'; diff --git a/packages/amplify-category-api/src/provider-utils/awscloudformation/service-walkthroughs/appSync-walkthrough.ts b/packages/amplify-category-api/src/provider-utils/awscloudformation/service-walkthroughs/appSync-walkthrough.ts index b43b927ef64..9a36030b3f5 100644 --- a/packages/amplify-category-api/src/provider-utils/awscloudformation/service-walkthroughs/appSync-walkthrough.ts +++ b/packages/amplify-category-api/src/provider-utils/awscloudformation/service-walkthroughs/appSync-walkthrough.ts @@ -3,7 +3,6 @@ import { dataStoreLearnMore } from '../sync-conflict-handler-assets/syncAssets'; import inquirer from 'inquirer'; import fs from 'fs-extra'; import path from 'path'; -import open from 'open'; import { rootAssetDir } from '../aws-constants'; import { collectDirectivesByTypeNames, readProjectConfiguration, ConflictHandlerType } from 'graphql-transformer-core'; import { category } from '../../../category-constants'; @@ -19,6 +18,7 @@ import { exitOnNextTick, stateManager, $TSContext, + open, } from 'amplify-cli-core'; const serviceName = 'AppSync'; diff --git a/packages/amplify-category-auth/package.json b/packages/amplify-category-auth/package.json index 573e3eb3ac0..64584250b3c 100644 --- a/packages/amplify-category-auth/package.json +++ b/packages/amplify-category-auth/package.json @@ -36,7 +36,6 @@ "inquirer": "^7.3.3", "lodash": "^4.17.19", "mime-types": "^2.1.26", - "open": "^7.0.0", "ora": "^4.0.3", "promise-sequential": "^1.1.1", "uuid": "^3.4.0" diff --git a/packages/amplify-category-auth/src/provider-utils/awscloudformation/index.js b/packages/amplify-category-auth/src/provider-utils/awscloudformation/index.js index 5648a0e0df6..210ceaaeae6 100644 --- a/packages/amplify-category-auth/src/provider-utils/awscloudformation/index.js +++ b/packages/amplify-category-auth/src/provider-utils/awscloudformation/index.js @@ -1,7 +1,6 @@ const inquirer = require('inquirer'); -const open = require('open'); const _ = require('lodash'); -const { stateManager } = require('amplify-cli-core'); +const { stateManager, open } = require('amplify-cli-core'); const { getAuthResourceName } = require('../../utils/getAuthResourceName'); const { copyCfnTemplate, saveResourceParameters } = require('./utils/synthesize-resources'); const { ENV_SPECIFIC_PARAMS, AmplifyAdmin, UserPool, IdentityPool, BothPools, privateKeys } = require('./constants'); diff --git a/packages/amplify-category-function/src/__tests__/provider-utils/awscloudformation/index.test.ts b/packages/amplify-category-function/src/__tests__/provider-utils/awscloudformation/index.test.ts index 309e5c044d8..427f33d3cdd 100644 --- a/packages/amplify-category-function/src/__tests__/provider-utils/awscloudformation/index.test.ts +++ b/packages/amplify-category-function/src/__tests__/provider-utils/awscloudformation/index.test.ts @@ -1,8 +1,8 @@ import { openConsole, isMockable } from '../../../provider-utils/awscloudformation'; import { ServiceName } from '../../../provider-utils/awscloudformation/utils/constants'; -import open from 'open'; +import { open } from 'amplify-cli-core'; -jest.mock('open'); +jest.mock('amplify-cli-core'); describe('awscloudformation function provider', () => { it('opens the correct service console', () => { diff --git a/packages/amplify-category-function/src/provider-utils/awscloudformation/index.ts b/packages/amplify-category-function/src/provider-utils/awscloudformation/index.ts index db1f06446ae..974b384fed9 100644 --- a/packages/amplify-category-function/src/provider-utils/awscloudformation/index.ts +++ b/packages/amplify-category-function/src/provider-utils/awscloudformation/index.ts @@ -17,9 +17,8 @@ import _ from 'lodash'; import { merge, convertToComplete, isComplete } from './utils/funcParamsUtils'; import fs from 'fs-extra'; import path from 'path'; -import open from 'open'; import { IsMockableResponse } from '../..'; -import { JSONUtilities } from 'amplify-cli-core'; +import { JSONUtilities, open } from 'amplify-cli-core'; /** * Entry point for creating a new function diff --git a/packages/amplify-category-hosting/__tests__/lib/S3AndCloudFront/s3Index.test.js b/packages/amplify-category-hosting/__tests__/lib/S3AndCloudFront/s3Index.test.js index 6b0095044d2..454ca5dcbb4 100644 --- a/packages/amplify-category-hosting/__tests__/lib/S3AndCloudFront/s3Index.test.js +++ b/packages/amplify-category-hosting/__tests__/lib/S3AndCloudFront/s3Index.test.js @@ -1,5 +1,6 @@ jest.mock('fs-extra'); jest.mock('open'); +jest.mock('amplify-cli-core'); jest.mock('../../../lib/S3AndCloudFront/configuration-manager'); jest.mock('../../../lib/S3AndCloudFront/helpers/file-uploader'); @@ -7,7 +8,7 @@ jest.mock('../../../lib/S3AndCloudFront/helpers/cloudfront-manager'); const fs = require('fs-extra'); const path = require('path'); -const open = require('open'); +const { open } = require('amplify-cli-core'); const inquirer = require('inquirer'); const mockirer = require('mockirer'); @@ -20,8 +21,6 @@ const internalParametersContents = require('../../../lib/S3AndCloudFront/paramet const mockTemplate = require('../../../__mocks__/mockTemplate'); const mockParameters = require('../../../__mocks__/mockParameters'); -const serviceName = 'S3AndCloudFront'; -const providerPlugin = 'awscloudformation'; const templateFileName = 'template.json'; const parametersFileName = 'parameters.json'; @@ -101,6 +100,7 @@ describe('s3IndexModule', () => { options: {}, }, }; + beforeAll(() => { mockirer(inquirer, mockAnswers); fs.ensureDirSync = jest.fn(); diff --git a/packages/amplify-category-hosting/lib/S3AndCloudFront/index.js b/packages/amplify-category-hosting/lib/S3AndCloudFront/index.js index 56dd2646afa..2ef5228fd9e 100644 --- a/packages/amplify-category-hosting/lib/S3AndCloudFront/index.js +++ b/packages/amplify-category-hosting/lib/S3AndCloudFront/index.js @@ -1,8 +1,8 @@ const fs = require('fs-extra'); const inquirer = require('inquirer'); const path = require('path'); -const open = require('open'); const chalk = require('chalk'); +const { open } = require('amplify-cli-core'); const configManager = require('./configuration-manager'); const fileUPloader = require('./helpers/file-uploader'); const cloudFrontManager = require('./helpers/cloudfront-manager'); diff --git a/packages/amplify-category-hosting/package.json b/packages/amplify-category-hosting/package.json index 8ce7e063002..14eb7500018 100644 --- a/packages/amplify-category-hosting/package.json +++ b/packages/amplify-category-hosting/package.json @@ -18,13 +18,13 @@ "test": "jest --coverage" }, "dependencies": { + "amplify-cli-core": "1.14.1", "chalk": "^3.0.0", "fs-extra": "^8.1.0", "inquirer": "^7.3.3", "mime-types": "^2.1.26", "minimatch": "^3.0.4", "moment": "^2.24.0", - "open": "^7.0.0", "ora": "^4.0.3", "promise-sequential": "^1.1.1" }, diff --git a/packages/amplify-category-notifications/lib/pinpoint-helper.js b/packages/amplify-category-notifications/lib/pinpoint-helper.js index 9a082b5598d..aaa715a35e2 100644 --- a/packages/amplify-category-notifications/lib/pinpoint-helper.js +++ b/packages/amplify-category-notifications/lib/pinpoint-helper.js @@ -1,6 +1,6 @@ -const open = require('open'); const ora = require('ora'); const inquirer = require('inquirer'); +const { open } = require('amplify-cli-core'); const constants = require('./constants'); const authHelper = require('./auth-helper'); diff --git a/packages/amplify-category-notifications/package.json b/packages/amplify-category-notifications/package.json index dd56347b4e7..15d4aa26e2c 100644 --- a/packages/amplify-category-notifications/package.json +++ b/packages/amplify-category-notifications/package.json @@ -20,7 +20,6 @@ "dependencies": { "fs-extra": "^8.1.0", "inquirer": "^7.3.3", - "open": "^7.0.0", "ora": "^4.0.3", "promise-sequential": "^1.1.1" }, diff --git a/packages/amplify-category-predictions/package.json b/packages/amplify-category-predictions/package.json index bb8a2378825..60fa985aed2 100644 --- a/packages/amplify-category-predictions/package.json +++ b/packages/amplify-category-predictions/package.json @@ -15,11 +15,11 @@ "aws" ], "dependencies": { + "amplify-cli-core": "1.14.1", "aws-sdk": "^2.765.0", "chalk": "^3.0.0", "fs-extra": "^8.1.0", "inquirer": "^7.3.3", - "open": "^7.0.0", "uuid": "^3.4.0" } } diff --git a/packages/amplify-category-predictions/provider-utils/awscloudformation/index.js b/packages/amplify-category-predictions/provider-utils/awscloudformation/index.js index 448daf96703..8c5f6f67a38 100644 --- a/packages/amplify-category-predictions/provider-utils/awscloudformation/index.js +++ b/packages/amplify-category-predictions/provider-utils/awscloudformation/index.js @@ -1,8 +1,6 @@ -import open from 'open'; - const path = require('path'); const chalk = require('chalk'); -const { NotImplementedError, ResourceDoesNotExistError, exitOnNextTick } = require('amplify-cli-core'); +const { NotImplementedError, ResourceDoesNotExistError, exitOnNextTick, open } = require('amplify-cli-core'); const parametersFileName = 'parameters.json'; const prefixForAdminTrigger = 'protected/predictions/index-faces/admin'; diff --git a/packages/amplify-category-predictions/provider-utils/awscloudformation/prediction-category-walkthroughs/infer-walkthrough.js b/packages/amplify-category-predictions/provider-utils/awscloudformation/prediction-category-walkthroughs/infer-walkthrough.js index 94ac9c31212..1479c644b10 100644 --- a/packages/amplify-category-predictions/provider-utils/awscloudformation/prediction-category-walkthroughs/infer-walkthrough.js +++ b/packages/amplify-category-predictions/provider-utils/awscloudformation/prediction-category-walkthroughs/infer-walkthrough.js @@ -1,8 +1,7 @@ -import open from 'open'; import inferAssets from '../assets/inferQuestions'; import getAllDefaults from '../default-values/infer-defaults'; import regionMapper from '../assets/regionMapping'; -import { ResourceAlreadyExistsError, ResourceDoesNotExistError, exitOnNextTick } from 'amplify-cli-core'; +import { ResourceAlreadyExistsError, ResourceDoesNotExistError, exitOnNextTick, open } from 'amplify-cli-core'; const inquirer = require('inquirer'); const path = require('path'); const fs = require('fs-extra'); diff --git a/packages/amplify-category-xr/lib/xr-manager.js b/packages/amplify-category-xr/lib/xr-manager.js index 506c592c940..083549dbce0 100644 --- a/packages/amplify-category-xr/lib/xr-manager.js +++ b/packages/amplify-category-xr/lib/xr-manager.js @@ -1,12 +1,12 @@ const fs = require('fs-extra'); const path = require('path'); const inquirer = require('inquirer'); -const open = require('open'); const chalk = require('chalk'); const { URL } = require('url'); const constants = require('./constants'); const authHelper = require('./auth-helper'); +const { open } = require('amplify-cli-core'); const SUMERIAN_CONSOLE_URL = 'https://console.aws.amazon.com/sumerian/home/start'; diff --git a/packages/amplify-category-xr/package.json b/packages/amplify-category-xr/package.json index 4b330781669..42f4ae08532 100644 --- a/packages/amplify-category-xr/package.json +++ b/packages/amplify-category-xr/package.json @@ -19,10 +19,10 @@ "test-watch": "jest --watch" }, "dependencies": { + "amplify-cli-core": "1.14.1", "chalk": "^3.0.0", "fs-extra": "^8.1.0", - "inquirer": "^7.3.3", - "open": "^7.0.0" + "inquirer": "^7.3.3" }, "jest": { "collectCoverage": true, diff --git a/packages/amplify-cli-core/package.json b/packages/amplify-cli-core/package.json index cbdd1be4078..2e7981e3ec5 100644 --- a/packages/amplify-cli-core/package.json +++ b/packages/amplify-cli-core/package.json @@ -26,10 +26,12 @@ "dependencies": { "ajv": "^6.12.3", "amplify-cli-logger": "1.1.0", + "ci-info":"^2.0.0", "dotenv": "^8.2.0", "fs-extra": "^8.1.0", "hjson": "^3.2.1", - "lodash": "^4.17.19" + "lodash": "^4.17.19", + "open": "^7.3.1" }, "devDependencies": { "@types/fs-extra": "^8.0.1", diff --git a/packages/amplify-cli-core/src/index.ts b/packages/amplify-cli-core/src/index.ts index c087f905a4e..9d446ed3bc6 100644 --- a/packages/amplify-cli-core/src/index.ts +++ b/packages/amplify-cli-core/src/index.ts @@ -15,6 +15,7 @@ export * from './isPackaged'; export * from './cliConstants'; export * from './deploymentSecretsHelper'; export * from './deploymentState'; +export * from './utils'; // Temporary types until we can finish full type definition across the whole CLI diff --git a/packages/amplify-cli-core/src/utils/index.ts b/packages/amplify-cli-core/src/utils/index.ts new file mode 100644 index 00000000000..842163ec779 --- /dev/null +++ b/packages/amplify-cli-core/src/utils/index.ts @@ -0,0 +1 @@ +export * from './open'; diff --git a/packages/amplify-cli-core/src/utils/open.ts b/packages/amplify-cli-core/src/utils/open.ts new file mode 100644 index 00000000000..286140d0324 --- /dev/null +++ b/packages/amplify-cli-core/src/utils/open.ts @@ -0,0 +1,16 @@ +import opn from 'open'; +import ciInfo from 'ci-info'; +import { ChildProcess } from 'child_process'; + +/** + * Helper function to Open stuff like URLs, files, executables. Cross-platform and opens only if its run in non-ci environmets + * This is wrapper for https://github.com/sindresorhus/open + * @param target The thing you want to open. Can be a URL, file, or executable. + * @param options + */ +export const open = (target: string, options: opn.Options): Promise => { + if (ciInfo.isCI) { + return Promise.resolve(); + } + return opn(target, options); +}; diff --git a/packages/amplify-cli/src/__tests__/commands/init.test.ts b/packages/amplify-cli/src/__tests__/commands/init.test.ts index cad19f55ada..cbbe91c5fa1 100644 --- a/packages/amplify-cli/src/__tests__/commands/init.test.ts +++ b/packages/amplify-cli/src/__tests__/commands/init.test.ts @@ -7,8 +7,8 @@ import { preInitSetup } from '../../init-steps/preInitSetup'; import { analyzeProject } from '../../init-steps/s0-analyzeProject'; import { initFrontend } from '../../init-steps/s1-initFrontend'; import { scaffoldProjectHeadless } from '../../init-steps/s8-scaffoldHeadless'; - -jest.mock('child_process', () => ({ execSync: jest.fn() })); +import { getPackageManager, normalizePackageManagerForOS } from '../../packageManagerHelpers'; +jest.mock('child_process'); jest.mock('fs-extra'); (readJSON as jest.Mock).mockReturnValue({}); @@ -17,10 +17,7 @@ jest.mock('fs-extra'); (existsSync as jest.Mock).mockReturnValue(true); (readdirSync as jest.Mock).mockReturnValue([]); -jest.mock('../../packageManagerHelpers', () => ({ - getPackageManager: () => 'yarn', - normalizePackageManagerForOS: () => 'yarn', -})); +jest.mock('../../packageManagerHelpers'); describe('amplify init: ', () => { const mockGetProjectConfigFilePath = jest.spyOn(pathManager, 'getProjectConfigFilePath'); @@ -29,6 +26,9 @@ describe('amplify init: ', () => { const mockGetBackendDirPath = jest.spyOn(pathManager, 'getBackendDirPath'); const mockGetGitIgnoreFilePath = jest.spyOn(pathManager, 'getGitIgnoreFilePath'); + (getPackageManager as jest.Mock).mockReturnValue('yarn'); + (normalizePackageManagerForOS as jest.Mock).mockReturnValue('yarn'); + const mockGetProjectConfig = jest.fn(() => ({})); const mockPathManager = { diff --git a/packages/amplify-cli/src/commands/console.ts b/packages/amplify-cli/src/commands/console.ts index 74e4c79903e..c6df0e6cc9f 100644 --- a/packages/amplify-cli/src/commands/console.ts +++ b/packages/amplify-cli/src/commands/console.ts @@ -1,6 +1,5 @@ -import open from 'open'; import { prompt } from 'enquirer'; -import { stateManager } from 'amplify-cli-core'; +import { stateManager, open } from 'amplify-cli-core'; const providerName = 'awscloudformation'; diff --git a/packages/amplify-console-hosting/hosting/cicd/configure.js b/packages/amplify-console-hosting/hosting/cicd/configure.js index 972dfdc2b67..c0744bf8d59 100644 --- a/packages/amplify-console-hosting/hosting/cicd/configure.js +++ b/packages/amplify-console-hosting/hosting/cicd/configure.js @@ -1,4 +1,4 @@ -const open = require('open'); +const { open } = require('amplify-cli-core'); const utils = require('../../utils/amplify-context-utils'); const questions = require('../../modules/questions/question-generator'); diff --git a/packages/amplify-console-hosting/hosting/cicd/enable.js b/packages/amplify-console-hosting/hosting/cicd/enable.js index d477f6a3f9a..a38018ae733 100644 --- a/packages/amplify-console-hosting/hosting/cicd/enable.js +++ b/packages/amplify-console-hosting/hosting/cicd/enable.js @@ -1,5 +1,5 @@ -const open = require('open'); const utils = require('../../utils/amplify-context-utils'); +const { open } = require('amplify-cli-core'); const questions = require('../../modules/questions/question-generator'); const configUtils = require('../../utils/config-utils'); const constants = require('../../constants/plugin-constants'); @@ -38,9 +38,11 @@ async function enable(context) { async function validateCICDApp(context, appId) { const amplifyClient = await clientFactory.getAmplifyClient(context); - const result = await amplifyClient.listBranches({ - appId, - }).promise(); + const result = await amplifyClient + .listBranches({ + appId, + }) + .promise(); if (result.branches.length === 0) { throw new ValidationError("No hosting URL found. Run 'amplify add hosting' again to set up hosting with Amplify Console."); } diff --git a/packages/amplify-console-hosting/hosting/cicd/publish.js b/packages/amplify-console-hosting/hosting/cicd/publish.js index 1669674a380..da851abd96a 100644 --- a/packages/amplify-console-hosting/hosting/cicd/publish.js +++ b/packages/amplify-console-hosting/hosting/cicd/publish.js @@ -1,5 +1,5 @@ -const open = require('open'); const utils = require('../../utils/amplify-context-utils'); +const { open } = require('amplify-cli-core'); const questions = require('../../modules/questions/question-generator'); async function publish(context) { diff --git a/packages/amplify-console-hosting/hosting/cicd/serve.js b/packages/amplify-console-hosting/hosting/cicd/serve.js index 99441184c95..d36648a61ff 100644 --- a/packages/amplify-console-hosting/hosting/cicd/serve.js +++ b/packages/amplify-console-hosting/hosting/cicd/serve.js @@ -1,4 +1,4 @@ -const open = require('open'); +const { open } = require('amplify-cli-core'); const utils = require('../../utils/amplify-context-utils'); const questions = require('../../modules/questions/question-generator'); const constants = require('../../constants/plugin-constants'); diff --git a/packages/amplify-console-hosting/hosting/manual/configure.js b/packages/amplify-console-hosting/hosting/manual/configure.js index 95b5920e3c8..9d3153e15b5 100644 --- a/packages/amplify-console-hosting/hosting/manual/configure.js +++ b/packages/amplify-console-hosting/hosting/manual/configure.js @@ -1,5 +1,5 @@ -const open = require('open'); const utils = require('../../utils/amplify-context-utils'); +const { open } = require('amplify-cli-core'); const questions = require('../../modules/questions/question-generator'); async function configure(context) { diff --git a/packages/amplify-console-hosting/hosting/manual/serve.js b/packages/amplify-console-hosting/hosting/manual/serve.js index 06a2dbc4847..f8f5c9948d0 100644 --- a/packages/amplify-console-hosting/hosting/manual/serve.js +++ b/packages/amplify-console-hosting/hosting/manual/serve.js @@ -1,6 +1,6 @@ -const open = require('open'); const utils = require('../../utils/amplify-context-utils'); const amplifyUtils = require('../../utils/amplify-console-utils'); +const { open } = require('amplify-cli-core'); async function serve(context) { const appId = utils.getAppIdForCurrEnv(context); diff --git a/packages/amplify-console-hosting/package.json b/packages/amplify-console-hosting/package.json index cea31e5a34f..58b2fff99a3 100644 --- a/packages/amplify-console-hosting/package.json +++ b/packages/amplify-console-hosting/package.json @@ -16,7 +16,6 @@ "glob": "^7.1.6", "inquirer": "^7.3.3", "node-fetch": "^2.6.1", - "open": "^7.0.0", "ora": "^4.0.3" } } diff --git a/packages/amplify-container-hosting/lib/ElasticContainer/index.js b/packages/amplify-container-hosting/lib/ElasticContainer/index.js index 0695ad77da9..65961dea7c5 100644 --- a/packages/amplify-container-hosting/lib/ElasticContainer/index.js +++ b/packages/amplify-container-hosting/lib/ElasticContainer/index.js @@ -3,11 +3,11 @@ const { getS3Client, uploadFile } = require('./file-uploader'); const fs = require('fs-extra'); const inquirer = require('inquirer'); const path = require('path'); -const open = require('open'); const constants = require('../constants'); const { EcsAlbStack, NETWORK_STACK_LOGICAL_ID, DEPLOYMENT_MECHANISM, processDockerConfig } = require('amplify-category-api'); +const { open } = require('amplify-cli-core'); const serviceName = 'ElasticContainer'; const categoryName = 'hosting'; diff --git a/packages/amplify-container-hosting/package.json b/packages/amplify-container-hosting/package.json index 31859558cb2..aa103f4be8f 100644 --- a/packages/amplify-container-hosting/package.json +++ b/packages/amplify-container-hosting/package.json @@ -25,7 +25,6 @@ "mime-types": "^2.1.26", "minimatch": "^3.0.4", "moment": "^2.24.0", - "open": "^7.0.0", "ora": "^4.0.3", "promise-sequential": "^1.1.1" }, diff --git a/packages/amplify-provider-awscloudformation/src/console.js b/packages/amplify-provider-awscloudformation/src/console.js index d20828f9098..76ffb902e03 100644 --- a/packages/amplify-provider-awscloudformation/src/console.js +++ b/packages/amplify-provider-awscloudformation/src/console.js @@ -1,4 +1,4 @@ -const open = require('open'); +const { open } = require('amplify-cli-core'); const constants = require('./constants'); function run(context) { diff --git a/packages/amplify-provider-awscloudformation/src/setup-new-user.js b/packages/amplify-provider-awscloudformation/src/setup-new-user.js index 0e03a6eb829..1664b35b4f3 100644 --- a/packages/amplify-provider-awscloudformation/src/setup-new-user.js +++ b/packages/amplify-provider-awscloudformation/src/setup-new-user.js @@ -1,4 +1,3 @@ -const open = require('open'); const chalk = require('chalk'); const inquirer = require('inquirer'); @@ -6,6 +5,7 @@ const awsRegions = require('./aws-regions.js').regions; const constants = require('./constants.js'); const systemConfigManager = require('./system-config-manager'); const obfuscationUtil = require('./utility-obfuscate'); +const { open } = require('amplify-cli-core'); async function run(context) { const awsConfig = { diff --git a/yarn.lock b/yarn.lock index 54b62a2d93a..aa2dc76d005 100644 --- a/yarn.lock +++ b/yarn.lock @@ -17825,6 +17825,14 @@ open@^7.0.0, open@^7.0.2: is-docker "^2.0.0" is-wsl "^2.1.1" +open@^7.3.1: + version "7.3.1" + resolved "https://registry.npmjs.org/open/-/open-7.3.1.tgz#111119cb919ca1acd988f49685c4fdd0f4755356" + integrity sha512-f2wt9DCBKKjlFbjzGb8MOAW8LH8F0mrs1zc7KTjAJ9PZNQbfenzWbNP1VZJvw6ICMG9r14Ah6yfwPn7T7i646A== + dependencies: + is-docker "^2.0.0" + is-wsl "^2.1.1" + opencollective-postinstall@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz#7a0fff978f6dbfa4d006238fbac98ed4198c3259"