amplify-frontend-android - npm Package Compare versions

Comparing version 3.4.0-geo.1 to 3.4.0

CHANGELOG.md

@@ -6,19 +6,24 @@ # Change Log
 
-# [3.4.0-geo.1](https://github.com/aws-amplify/amplify-cli/compare/amplify-frontend-android@3.3.2...amplify-frontend-android@3.4.0-geo.1) (2022-01-11)
+# [3.4.0](https://github.com/aws-amplify/amplify-cli/compare/amplify-frontend-android@3.3.3...amplify-frontend-android@3.4.0) (2022-04-11)
 
 
-### Bug Fixes
+### Features
 
-* **amplify-category-geo:** merge master ([591b822](https://github.com/aws-amplify/amplify-cli/commit/591b822cfabc374d1fd7516ce58a1bf16b66da2c))
-* **amplify-category-geo:** update package versions due to conflicting tag versions ([5af0437](https://github.com/aws-amplify/amplify-cli/commit/5af04378cb5a61428cb2c5c775e833480da6e646))
+* **amplify-category-geo:** add geo category workflows for maps and search ([1663c8d](https://github.com/aws-amplify/amplify-cli/commit/1663c8d57699b28e0e7cc16b7ef9f3085a0e38b6)), closes [#7566](https://github.com/aws-amplify/amplify-cli/issues/7566) [#7858](https://github.com/aws-amplify/amplify-cli/issues/7858) [#7891](https://github.com/aws-amplify/amplify-cli/issues/7891) [#8031](https://github.com/aws-amplify/amplify-cli/issues/8031) [#8122](https://github.com/aws-amplify/amplify-cli/issues/8122) [#8155](https://github.com/aws-amplify/amplify-cli/issues/8155) [#8182](https://github.com/aws-amplify/amplify-cli/issues/8182) [#8237](https://github.com/aws-amplify/amplify-cli/issues/8237) [#8890](https://github.com/aws-amplify/amplify-cli/issues/8890) [#8822](https://github.com/aws-amplify/amplify-cli/issues/8822) [#9281](https://github.com/aws-amplify/amplify-cli/issues/9281) [#9399](https://github.com/aws-amplify/amplify-cli/issues/9399) [#9453](https://github.com/aws-amplify/amplify-cli/issues/9453) [#9594](https://github.com/aws-amplify/amplify-cli/issues/9594) [#10038](https://github.com/aws-amplify/amplify-cli/issues/10038)
 
 
-### Features
 
-* **amplify-fronted-ios, amplify-frontend-android:** add geo config ([#8237](https://github.com/aws-amplify/amplify-cli/issues/8237)) ([52ac164](https://github.com/aws-amplify/amplify-cli/commit/52ac1645bb157bde29e07344e36b5c3c38484b67))
 
 
+## [3.3.3](https://github.com/aws-amplify/amplify-cli/compare/amplify-frontend-android@3.3.2...amplify-frontend-android@3.3.3) (2022-01-20)
 
 
+### Bug Fixes
 
+* fix amplify pull and init to regenerated frontend configuration  ([#9499](https://github.com/aws-amplify/amplify-cli/issues/9499)) ([e3e9c2d](https://github.com/aws-amplify/amplify-cli/commit/e3e9c2dc8be90432d95751db09c706eb9ace2863))
+
+
+
+
+
 ## [3.3.2](https://github.com/aws-amplify/amplify-cli/compare/amplify-frontend-android@3.3.0...amplify-frontend-android@3.3.2) (2022-01-10)
@@ -25,0 +30,0 @@

lib/amplify-config-helper.js

@@ -195,52 +195,53 @@ function generateConfig(context, newAWSConfig) {
   let geoRegion = metadata.providers.awscloudformation.Region;
-  if (metadata[categoryName] && Object.keys(metadata[categoryName]).length > 0) {
-    let defaultMap = '';
-    const mapConfig = {
-      items: {}
-    };
-    let defaultPlaceIndex = '';
-    const placeIndexConfig = {
-      items: []
-    };
+  if (!metadata[categoryName] || Object.keys(metadata[categoryName]).length <= 0) {
+    return;
+  }
+  let defaultMap = '';
+  const mapConfig = {
+    items: {}
+  };
+  let defaultPlaceIndex = '';
+  const placeIndexConfig = {
+    items: []
+  };
 
-    Object.keys(metadata[categoryName]).forEach(r => {
-      const resourceMeta = metadata[categoryName][r];
-      if (resourceMeta.output) {
-        if (resourceMeta.service === 'Map') {
-          const mapName = resourceMeta.output.Name;
-          geoRegion = resourceMeta.output.Region || geoRegion;
-          mapConfig.items[mapName] = {
-            style: resourceMeta.output.Style
-          }
-          if(resourceMeta.isDefault === true) {
-            defaultMap = mapName;
-          }
+  Object.keys(metadata[categoryName]).forEach(r => {
+    const resourceMeta = metadata[categoryName][r];
+    if (resourceMeta.output) {
+      if (resourceMeta.service === 'Map') {
+        const mapName = resourceMeta.output.Name;
+        geoRegion = resourceMeta.output.Region || geoRegion;
+        mapConfig.items[mapName] = {
+          style: resourceMeta.output.Style
         }
-        else if (resourceMeta.service === 'PlaceIndex') {
-          const placeIndexName = resourceMeta.output.Name;
-          geoRegion = resourceMeta.output.Region || geoRegion;
-          placeIndexConfig.items.push(placeIndexName);
-          if(resourceMeta.isDefault === true) {
-            defaultPlaceIndex = placeIndexName;
-          }
+        if(resourceMeta.isDefault === true) {
+          defaultMap = mapName;
         }
       }
-    });
+      else if (resourceMeta.service === 'PlaceIndex') {
+        const placeIndexName = resourceMeta.output.Name;
+        geoRegion = resourceMeta.output.Region || geoRegion;
+        placeIndexConfig.items.push(placeIndexName);
+        if(resourceMeta.isDefault === true) {
+          defaultPlaceIndex = placeIndexName;
+        }
+      }
+    }
+  });
 
-    mapConfig.default = defaultMap;
-    placeIndexConfig.default = defaultPlaceIndex;
+  mapConfig.default = defaultMap;
+  placeIndexConfig.default = defaultPlaceIndex;
 
-    amplifyConfig[categoryName] = {
-      plugins: {}
-    };
-    amplifyConfig[categoryName].plugins[pluginName] = {
-      region: geoRegion
-    };
-    if (Object.keys(mapConfig.items).length > 0) {
-      amplifyConfig[categoryName].plugins[pluginName]['maps'] = mapConfig;
-    }
-    if (placeIndexConfig.items.length > 0) {
-      amplifyConfig[categoryName].plugins[pluginName]['searchIndices'] = placeIndexConfig;
-    }
+  amplifyConfig[categoryName] = {
+    plugins: {}
+  };
+  amplifyConfig[categoryName].plugins[pluginName] = {
+    region: geoRegion
+  };
+  if (Object.keys(mapConfig.items).length > 0) {
+    amplifyConfig[categoryName].plugins[pluginName]['maps'] = mapConfig;
   }
+  if (placeIndexConfig.items.length > 0) {
+    amplifyConfig[categoryName].plugins[pluginName]['searchIndices'] = placeIndexConfig;
+  }
 }
@@ -247,0 +248,0 @@

lib/frontend-config-creator.js

@@ -16,2 +16,21 @@ const constants = require('./constants');
 
+const AMPLIFY_RESERVED_EXPORT_KEYS = [
+  // cognito
+  'Auth',
+  'CredentialsProvider',
+  'CognitoUserPool',
+  'GoogleSignIn',
+  'FacebookSignIn',
+  // s3
+  'S3TransferUtility',
+  // Analytics
+  'PinpointAnalytics',
+  'PinpointTargeting',
+  // Others
+  'DynamoDBObjectMapper',
+  'AppSync',
+  'Lex',
+  'Sumerian',
+];
+
 const fileNames = ['queries', 'mutations', 'subscriptions'];
@@ -162,7 +181,9 @@
   const customConfigs = {};
-  Object.keys(currentAWSConfig).forEach(key => {
-    if (!cloudAWSConfig[key]) {
-      customConfigs[key] = currentAWSConfig[key];
-    }
-  });
+  Object.keys(currentAWSConfig)
+    .filter(k => !AMPLIFY_RESERVED_EXPORT_KEYS.includes(k))
+    .forEach(key => {
+      if (!cloudAWSConfig[key]) {
+        customConfigs[key] = currentAWSConfig[key];
+      }
+    });
   return customConfigs;
@@ -169,0 +190,0 @@ }

package.json

 {
   "name": "amplify-frontend-android",
-  "version": "3.4.0-geo.1",
+  "version": "3.4.0",
   "description": "amplify-cli front-end plugin for Android project",
@@ -23,3 +23,3 @@ "repository": {
   },
-  "gitHead": "e57f636717f1fd36514aec6e02e6521aa42a7b74"
+  "gitHead": "88ab2022fbbab8eece4faa750a6546fbf21ff29e"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

81328

increased by1.57%

Lines of code

878

increased by2.45%

Number of low quality alerts

1

decreased by-50%

No dependency changes