resolve conflicts

Author: Aparna Raj

.changeset/38881e12/changes.json

@@ -7,15 +7,15 @@ job-setup: &job-setup
 
 restore-cache: &restore-cache
   keys:
-    - v1-dependencies-{{ checksum "package.json" }}
+    - v3-dependencies-{{ checksum "yarn.lock" }}
     # fallback to using the latest cache if no exact match is found
-    - v1-dependencies-
+    - v3-dependencies-
 
 save-cache: &save-cache
   paths:
     - node_modules
     - ~/.cache
-  key: v1-dependencies-{{ checksum "package.json" }}
+  key: v3-dependencies-{{ checksum "yarn.lock" }}
 
 install-bolt: &install-bolt
   name: Install Bolt
@@ -54,7 +54,6 @@ jobs:
           name: Lint Files
           command: bolt lint
 
-
   unit_tests:
     <<: *job-setup
     steps:
@@ -73,8 +72,6 @@ jobs:
       - store_test_results:
           path: test-reports/junit
 
-
-
   integration_tests:
     <<: *job-setup
     steps:
@@ -90,14 +87,13 @@ jobs:
 
       - run:
           name: Start up website
-          command: bolt start
+          command: bolt start:website
           background: true
 
       - run:
           name: Cypress Suite
           command: node_modules/.bin/wait-on http://localhost:8080 && bolt cypress
 
-
 workflows:
   version: 2
   build:
@@ -111,4 +107,4 @@ workflows:
             - install
       - integration_tests:
           requires:
-            - install
+            - install

.changeset/38881e12/changes.md

@@ -9,6 +9,7 @@
   ],
   "plugins": ["emotion"],
   "rules": {
+    "import/no-unresolved": "off",
     "emotion/jsx-import": "error",
     "react/jsx-filename-extension": "off",
     "react/require-default-props": "off",

.changeset/b9002cdc/changes.json

@@ -1,2 +1,3 @@
 .next
 *.json
+dist

.changeset/b9002cdc/changes.md

@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [email protected]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq

.changeset/bb3940f7/changes.json

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2019 brisk-docs
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

.changeset/bb3940f7/changes.md

@@ -1,9 +1,5 @@
 module.exports = {
-  presets: [
-    '@babel/preset-env',
-    '@babel/preset-react',
-    '@babel/preset-typescript',
-  ],
+  presets: ['next/babel', '@zeit/next-typescript/babel'],
   plugins: [
     'emotion',
     [
@@ -14,7 +10,6 @@ module.exports = {
         preprocess: false,
       },
     ],
-    'transform-flow-strip-types',
     '@babel/proposal-class-properties',
     '@babel/proposal-object-rest-spread',
     '@babel/transform-runtime',

.changeset/e47ad29f/changes.json

@@ -1,5 +1,8 @@
+const preconstruct = require('preconstruct');
+
 module.exports = {
   setupFiles: ['./jest-setup.js'],
+  moduleNameMapper: preconstruct.aliases.jest(__dirname),
   testPathIgnorePatterns: ['./cypress/', '__fixtures__'],
   transformIgnorePatterns: ['node_modules/(?!(@atlaskit)/)'],
 };