style: add prettier

.codebuild/lint.yml

@@ -4,4 +4,5 @@ env:
 phases:
   build:
     commands:
-      - source ./shared-scripts.sh && _lint
+      - source ./shared-scripts.sh && _lint
+      - yarn prettier-check

.prettierignore

@@ -7,3 +7,16 @@
 **/tsconfig.json
 packages/*/CHANGELOG.md
 scripts/components/private_packages.ts
+.yarn
+packages/*/build
+packages/*/lib
+packages/*/dist
+coverage
+node_modules
+API.md
+CHANGELOG.md
+packages/*/CHANGELOG.md
+packages/amplify-codegen-e2e-tests/amplify-e2e-reports
+packages/graphql-types-generator/fixtures
+packages/appsync-modelgen-plugin/schemas/introspection/1/ModelIntrospectionSchema.json
+packages/appsync-modelgen-plugin/src/validate-cjs.js

.prettierrc

@@ -1,12 +1,10 @@
 {
-  "semi": true,
+  "trailingComma": "all",
+  "singleQuote": true,
   "printWidth": 140,
   "tabWidth": 2,
-  "singleQuote": true,
   "bracketSpacing": true,
-  "jsxBracketSameLine": false,
+  "semi": true,
   "useTabs": false,
-  "arrowParens": "avoid",
-  "jsxSingleQuote": true,
-  "trailingComma": "all"
+  "bracketSameLine": false
 }

.vscode/settings.json

@@ -18,5 +18,11 @@
   },
   "jest.enableInlineErrorMessages": true,
   "jest.showCoverageOnLoad": true,
-  "jest.runAllTestsFirst": false
+  "jest.runAllTestsFirst": false,
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[typescript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  }
 }

package.json

@@ -47,7 +47,9 @@
     "authenticate-e2e-profile": "source scripts/cloud-utils.sh && authenticateWithE2EProfile",
     "extract-dependency-licenses": "./scripts/extract-dependency-licenses.sh",
     "verify-dependency-licenses-extract": "yarn extract-dependency-licenses && ./scripts/verify-dependency-licenses.sh",
-    "deprecate": "ts-node scripts/deprecate_release.ts"
+    "deprecate": "ts-node scripts/deprecate_release.ts",
+    "prettier-check": "yarn prettier --check .",
+    "prettier-write": "yarn prettier --write ."
   },
   "bugs": {
     "url": "https://github.com/aws-amplify/amplify-codegen/issues"
@@ -63,9 +65,15 @@
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
       "pre-push": "npm run lint && npm run test-changed",
-      "pre-commit": "yarn split-e2e-tests && yarn extract-dependency-licenses"
+      "pre-commit": "yarn split-e2e-tests && lint-staged && yarn extract-dependency-licenses"
     }
   },
+  "lint-staged": {
+    "*.{md,yml,yaml,json,graphql}": "prettier --write",
+    "*.{js,ts,jsx,tsx}": [
+      "prettier --write"
+    ]
+  },
   "author": "Amazon Web Services",
   "license": "Apache-2.0",
   "dependencies": {
@@ -114,8 +122,9 @@
     "jest-circus": "^27.0.0",
     "jest-junit": "^12.0.0",
     "js-yaml": "^4.0.0",
+    "lint-staged": "^13.2.2",
     "lnk": "1.1.0",
-    "prettier": "^1.19.1",
+    "prettier": "^2.8.8",
     "pretty-quick": "^3.1.0",
     "rimraf": "^3.0.0",
     "ts-jest": "^27.0.0",

packages/amplify-codegen/tests/commands/mock-fs-setup.js

@@ -16,12 +16,33 @@ function setupMocks(mockFs, loadConfig, apiId, frontend, target, generatedFileNa
   };
   const generatedFileName = generatedFileNameOverride || getOutputFileName('API', target);
   const schemaFilePath = 'schema.json';
+  const nodeModulesPrettierGraphqlGenerator = path.resolve(path.join(__dirname, '../../../graphql-generator/node_modules/prettier'));
+  const nodeModulesPrettierTypesGenerator = path.resolve(path.join(__dirname, '../../../graphql-types-generator/node_modules/prettier'));
+  const nodeModulesPrettierGraphqlGeneratorWindows = path.resolve(
+    path.join(__dirname, '../../../../node_modules/@aws-amplify/graphql-generator/node_modules/prettier'),
+  );
+  const nodeModulesPrettierTypesGeneratorWindows = path.resolve(
+    path.join(__dirname, '../../../../node_modules/@aws-amplify/graphql-types-generator/node_modules/prettier'),
+  );
+
   const nodeModulesPrettier = path.resolve(path.join(__dirname, '../../../../node_modules/prettier'));
   const mockedFiles = {
     // load actual prettier module to avoid error
     // Cannot find module './parser-graphql' from '../../node_modules/prettier/index.js'
     // It's not clear why other modules don't need to be loaded
-    [nodeModulesPrettier]: mockFs.load(nodeModulesPrettier, {
+    [nodeModulesPrettierGraphqlGenerator]: mockFs.load(nodeModulesPrettierGraphqlGenerator, {
+      recursive: true,
+      lazy: true,
+    }),
+    [nodeModulesPrettierTypesGenerator]: mockFs.load(nodeModulesPrettierTypesGenerator, {
+      recursive: true,
+      lazy: true,
+    }),
+    [nodeModulesPrettierGraphqlGeneratorWindows]: mockFs.load(nodeModulesPrettierGraphqlGeneratorWindows, {
+      recursive: true,
+      lazy: true,
+    }),
+    [nodeModulesPrettierTypesGeneratorWindows]: mockFs.load(nodeModulesPrettierTypesGeneratorWindows, {
       recursive: true,
       lazy: true,
     }),