Skip to content

Commit

Permalink
feat: init empty aws-exports with amplify-app
Browse files Browse the repository at this point in the history
  • Loading branch information
edwardfoyle committed Nov 18, 2020
1 parent c484a24 commit 39d12b2
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 45 deletions.
4 changes: 4 additions & 0 deletions packages/amplify-app/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ const ini = require('ini');
const semver = require('semver');
const stripAnsi = require('strip-ansi');
const { engines } = require('../package.json');
const { initializeAwsExports } = require('amplify-frontend-javascript');

const npm = /^win/.test(process.platform) ? 'npm.cmd' : 'npm';
const amplify = /^win/.test(process.platform) ? 'amplify.cmd' : 'amplify';
Expand Down Expand Up @@ -119,6 +120,9 @@ async function createAmplifySkeletonProject() {
.then(projectConfig => {
const projectConfigFilePath = path.join('amplify', '.config', 'project-config.json');
fs.writeFileSync(projectConfigFilePath, JSON.stringify(projectConfig, null, 4));
if (!!projectConfig.javascript) {
initializeAwsExports(path.resolve('src'));
}
console.log(`${emoji.get('boom')} Successfully created base Amplify Project`);
resolve(projectConfig.frontend);
})
Expand Down
11 changes: 11 additions & 0 deletions packages/amplify-frontend-javascript/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
const path = require('path');
const fs = require('fs-extra');

const initializer = require('./lib/initializer');
const projectScanner = require('./lib/project-scanner');
Expand All @@ -10,6 +11,8 @@ const { createAWSExports, deleteAmplifyConfig } = require('./lib/frontend-config

const pluginName = 'javascript';

const emptyAwsExportsPath = path.join(__dirname, 'lib', 'aws-exports.empty.js');

function scanProject(projectPath) {
return projectScanner.run(projectPath);
}
Expand All @@ -29,6 +32,13 @@ async function createFrontendConfigs(context, amplifyResources, amplifyCloudReso
return await createAWSExports(context, newOutputsForFrontend, cloudOutputsForFrontend);
}

const initializeAwsExports = destDir => {
const dest = path.resolve(destDir, 'aws-exports.js');
if (!fs.existsSync(dest)) {
fs.copySync(emptyAwsExportsPath, dest);
}
};

function configure(context) {
return configManager.configure(context);
}
Expand Down Expand Up @@ -67,6 +77,7 @@ module.exports = {
publish,
run,
createFrontendConfigs,
initializeAwsExports,
executeAmplifyCommand,
handleAmplifyEvent,
deleteConfig: deleteAmplifyConfig,
Expand Down
6 changes: 6 additions & 0 deletions packages/amplify-frontend-javascript/lib/aws-exports.empty.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/* eslint-disable */
// WARNING: DO NOT EDIT. This file is automatically generated by AWS Amplify. It will be overwritten.

const awsmobile = {};

export default awsmobile;
45 changes: 0 additions & 45 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6024,51 +6024,6 @@ amdefine@>=0.0.4:
resolved "https://registry.yarnpkg.com/amdefine/-/amdefine-1.0.1.tgz#4a5282ac164729e93619bcfd3ad151f817ce91f5"
integrity sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=

[email protected]:
version "2.17.17"
resolved "https://registry.npmjs.org/amplify-app/-/amplify-app-2.17.17.tgz#4ca6339d36604c3a74f132e3be249afaedd15302"
integrity sha512-wSdlr8SyzMHupydbSsb8o0StXrBZD9uMmwBQuc4SQNM23JrRULzLqoHWqPu9fjxQ5wQo4lidgzIoneJQe9mI5w==
dependencies:
amplify-frontend-android "2.13.5"
amplify-frontend-ios "2.13.8"
amplify-frontend-javascript "2.17.2"
chalk "^3.0.0"
fs-extra "^8.1.0"
graphql "^14.5.8"
ini "^1.3.5"
inquirer "^7.3.3"
node-emoji "^1.10.0"
rimraf "^3.0.0"
semver "^7.1.1"
strip-ansi "^6.0.0"
xcode "^2.1.0"
yargs "^15.1.0"

[email protected]:
version "1.5.1"
resolved "https://registry.npmjs.org/amplify-cli-core/-/amplify-cli-core-1.5.1.tgz#7c5d2b460ef5cc6ec23292d864378098bed5503b"
integrity sha512-gzUNO/AiPGtowYgyVO20ofMZXukcbyK5908QlBYaStsUOqL71zzeK8H+S5n6nHAgiMAB/C+hr51mVlzCaoqp5Q==
dependencies:
ajv "^6.12.3"
dotenv "^8.2.0"
fs-extra "^8.1.0"
hjson "^3.2.1"
lodash "^4.17.19"

[email protected]:
version "2.17.2"
resolved "https://registry.npmjs.org/amplify-frontend-javascript/-/amplify-frontend-javascript-2.17.2.tgz#275b0490b8c8596c32da7675af74985d480e32c5"
integrity sha512-mZDD9SYVjzGJiEhMXu8lv7M71U0D383PujODBGkc2QP5yc4BYMnAE74dp7MONEZQcgsJ3nMgsDjYsuhGJn8C1A==
dependencies:
amplify-cli-core "1.5.1"
chalk "^3.0.0"
execa "^4.0.0"
fs-extra "^8.1.0"
graphql-config "^2.2.1"
inquirer "^7.3.3"
lodash "^4.17.19"
promise-sequential "^1.1.1"

ansi-align@^3.0.0:
version "3.0.0"
resolved "https://registry.yarnpkg.com/ansi-align/-/ansi-align-3.0.0.tgz#b536b371cf687caaef236c18d3e21fe3797467cb"
Expand Down

0 comments on commit 39d12b2

Please sign in to comment.