Merge branch 'main' into edge-testing-2

Author: david-mcafee

README.md

@@ -185,6 +185,6 @@ If you can't migrate to [aws-sdk-js-v3](https://github.com/aws/aws-sdk-js-v3) or
   import { Auth } from 'aws-amplify';
   ```
 
-### DataStore Docs
+### DataStore Docs:
 
 For more information on contributing to DataStore / how DataStore works, see the [DataStore Docs](packages/datastore/README.md)

package.json

@@ -18,6 +18,7 @@
 		"build:esm:watch": "lerna run build:esm:watch --parallel",
 		"build:cjs:watch": "lerna run build:cjs:watch --parallel",
 		"clean": "lerna run clean --parallel",
+		"clean:size": "lerna run clean:size --parallel",
 		"format": "lerna run format",
 		"lint": "lerna run lint",
 		"link-all": "yarn unlink-all && lerna exec --no-bail --parallel yarn link",
@@ -73,7 +74,6 @@
 		"@types/node": "^8.9.5",
 		"@types/puppeteer": "1.3.0",
 		"babel-loader": "^8.0.0",
-		"bundlewatch": "^0.3.1",
 		"codecov": "^3.6.5",
 		"compression-webpack-plugin": "^1.1.3",
 		"cypress": "^3.2.0",
@@ -107,14 +107,6 @@
 		"winston": "^3.2.1",
 		"wml": "0.0.83"
 	},
-	"bundlewatch": {
-		"files": [
-			{
-				"path": "packages/*/dist/*.min.js",
-				"maxSize": "400kB"
-			}
-		]
-	},
 	"jest": {
 		"resetMocks": true,
 		"verbose": true

packages/analytics/package.json

@@ -22,7 +22,8 @@
 		"build:cjs:watch": "node ./build es5 --watch",
 		"build:esm:watch": "node ./build es6 --watch",
 		"build": "npm run clean && npm run build:esm && npm run build:cjs",
-		"clean": "rimraf lib-esm lib dist dual-publish-tmp",
+		"clean": "npm run clean:size && rimraf lib-esm lib dist",
+		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
 		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 69.26"

packages/api-graphql/package.json

@@ -24,7 +24,8 @@
     "build:cjs:watch": "node ./build es5 --watch",
     "build:esm:watch": "node ./build es6 --watch",
     "build": "npm run clean && npm run build:esm && npm run build:cjs",
-    "clean": "rimraf lib-esm lib dist dual-publish-tmp",
+    "clean": "npm run clean:size && rimraf lib-esm lib dist",
+    "clean:size": "rimraf dual-publish-tmp tmp*",
     "format": "echo \"Not implemented\"",
     "lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
     "ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 75.62"

packages/api-rest/package.json

@@ -24,7 +24,8 @@
     "build:cjs:watch": "node ./build es5 --watch",
     "build:esm:watch": "node ./build es6 --watch",
     "build": "npm run clean && npm run build:esm && npm run build:cjs",
-    "clean": "rimraf lib-esm lib dist dual-publish-tmp",
+    "clean": "npm run clean:size && rimraf lib-esm lib dist",
+    "clean:size": "rimraf dual-publish-tmp tmp*",
     "format": "echo \"Not implemented\"",
     "lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
     "ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 65.41"

packages/api/package.json

@@ -31,7 +31,8 @@
 		"build:cjs:watch": "node ./build es5 --watch",
 		"build:esm:watch": "node ./build es6 --watch",
 		"build": "npm run clean && npm run build:esm && npm run build:cjs",
-		"clean": "rimraf lib-esm lib dist dual-publish-tmp",
+		"clean": "npm run clean:size && rimraf lib-esm lib dist",
+		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
 		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 91.93"

packages/auth/package.json

@@ -24,7 +24,8 @@
     "build:cjs:watch": "node ./build es5 --watch",
     "build:esm:watch": "node ./build es6 --watch",
     "build": "npm run clean && npm run build:esm && npm run build:cjs",
-    "clean": "rimraf lib-esm lib dist dual-publish-tmp",
+    "clean": "npm run clean:size && rimraf lib-esm lib dist",
+    "clean:size": "rimraf dual-publish-tmp tmp*",
     "format": "echo \"Not implemented\"",
     "lint": "tslint '{__tests__,src}/**/*.ts' && npm run ts-coverage",
     "ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 77.44"

packages/cache/package.json

@@ -26,7 +26,8 @@
     "build:cjs:watch": "node ./build es5 --watch",
     "build:esm:watch": "node ./build es6 --watch",
     "build": "npm run clean && npm run build:esm && npm run build:cjs",
-    "clean": "rimraf lib-esm lib dist dual-publish-tmp",
+    "clean": "npm run clean:size && rimraf lib-esm lib dist",
+    "clean:size": "rimraf dual-publish-tmp tmp*",
     "format": "echo \"Not implemented\"",
     "lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
     "ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 87.74"

packages/core/package.json

@@ -24,7 +24,8 @@
 		"build:esm:watch": "rimraf lib-esm && node ./build es6 --watch",
 		"build": "npm run clean && npm run generate-version && npm run build:esm && npm run build:cjs",
 		"generate-version": "genversion src/Platform/version.ts --es6 --semi",
-		"clean": "rimraf lib-esm lib dist dual-publish-tmp",
+		"clean": "npm run clean:size && rimraf lib-esm lib dist",
+		"clean:size": "rimraf dual-publish-tmp tmp*",
 		"format": "echo \"Not implemented\"",
 		"lint": "tslint 'src/**/*.ts' && npm run ts-coverage",
 		"ts-coverage": "typescript-coverage-report -p ./tsconfig.build.json -t 76.41"

packages/datastore-storage-adapter/__tests__/SQLiteUtils.test.ts

@@ -201,14 +201,22 @@ describe('SQLiteUtils tests', () => {
 			});
 
 			const expected = [
-				'INSERT INTO "Model" ("field1", "dateCreated", "id", "_version", "_lastChangedAt", "_deleted") VALUES (?, ?, ?, ?, ?, ?)',
+				'INSERT INTO "Model" ("field1", "dateCreated", "id", "_version", "_lastChangedAt", "_deleted", "optionalField1", "emails", "ips", "metadata", "createdAt", "updatedAt") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)',
 				[
 					model.field1,
 					model.dateCreated,
 					model.id,
+					// meta-data fields are not user-defined fields and therefore not
+					// part of normalization today. they are `undefined` by default.
 					undefined,
 					undefined,
 					undefined,
+					null,
+					null,
+					null,
+					null,
+					null,
+					null,
 				],
 			];
 
@@ -224,13 +232,21 @@ describe('SQLiteUtils tests', () => {
 			});
 
 			const expected = [
-				`UPDATE "Model" SET "field1"=?, "dateCreated"=?, "_version"=?, "_lastChangedAt"=?, "_deleted"=? WHERE id=?`,
+				'UPDATE "Model" SET "field1"=?, "dateCreated"=?, "_version"=?, "_lastChangedAt"=?, "_deleted"=?, "optionalField1"=?, "emails"=?, "ips"=?, "metadata"=?, "createdAt"=?, "updatedAt"=? WHERE id=?',
 				[
 					model.field1,
 					model.dateCreated,
+					// meta-data fields are not user-defined fields and therefore not
+					// part of normalization today. they are `undefined` by default.
 					undefined,
 					undefined,
 					undefined,
+					null,
+					null,
+					null,
+					null,
+					null,
+					null,
 					model.id,
 				],
 			];