merge: merge with master

webiny · Jul 13, 2020 · 58ef8b1 · 58ef8b1
2 parents 654a62f + ce2d080
commit 58ef8b1
Show file tree

Hide file tree

Showing 446 changed files with 10,141 additions and 2,234 deletions.
diff --git a/.adiorc.js b/.adiorc.js
@@ -39,14 +39,14 @@ module.exports = {
     ignoreDirs: ["node_modules/", "dist/", "build/"],
     packages: [
         "packages/*",
-        "sample-project/api/apolloGateway",
-        "sample-project/api/settingsManager",
-        "sample-project/api/databaseProxy",
-        "sample-project/api/files/*",
-        "sample-project/api/formBuilder",
-        "sample-project/api/cms/*",
-        "sample-project/api/i18n/*",
-        "sample-project/api/pageBuilder",
-        "sample-project/api/security/*"
+        "api/apolloGateway",
+        "api/settingsManager",
+        "api/databaseProxy",
+        "api/files/*",
+        "api/formBuilder",
+        "api/cms/*",
+        "api/i18n/*",
+        "api/pageBuilder",
+        "api/security/*"
     ]
 };
diff --git a/.github/workflows/masterBranchPush.yml b/.github/workflows/masterBranchPush.yml
@@ -2,7 +2,7 @@ name: Build (latest)
 
 on:
   push:
-    branches: [ master ]
+    branches: [master]
 
 env:
   NODE_OPTIONS: --max_old_space_size=4096
@@ -16,7 +16,7 @@ jobs:
 
       - uses: actions/setup-node@v2-beta
         with:
-          node-version: '12'
+          node-version: "12"
 
       - name: Install dependencies
         run: yarn --frozen-lockfile

diff --git a/.github/workflows/pullRequests.yml b/.github/workflows/pullRequests.yml
@@ -2,18 +2,38 @@ name: Pull Request Actions
 
 on:
   pull_request:
-    branches: [ master ]
+    branches: [master]
 
 env:
   NODE_OPTIONS: --max_old_space_size=4096
 
 jobs:
+  # Unlike in the "Build (beta)" workflow, if some of these fail, we want the rest of the jobs
+  # to continue running so that we can also find out if there are any errors in the actual code.
+  initial-checks:
+    name: Initial checks
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: actions/setup-node@v2-beta
+        with:
+          node-version: "12"
+
+      - name: Install dependencies
+        run: yarn --frozen-lockfile
+
+      - name: Check code formatting
+        run: yarn prettier:check
+
+      - name: Check dependencies
+        run: yarn adio
+
   validate-commits:
     name: Validate commit messages
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-
       - uses: webiny/action-conventional-commits@v1.0.2
 
   build-test:
@@ -24,14 +44,11 @@ jobs:
 
       - uses: actions/setup-node@v2-beta
         with:
-          node-version: '12'
+          node-version: "12"
 
       - name: Install dependencies
         run: yarn --frozen-lockfile
 
-      - name: Check dependencies
-        run: yarn adio
-
       - name: Build packages
         run: yarn build
 

diff --git a/.github/workflows/releaseBeta.yml b/.github/workflows/releaseBeta.yml
@@ -2,7 +2,7 @@ name: Build (beta)
 
 on:
   push:
-    branches: [ release-** ]
+    branches: [release-**]
 
 env:
   GH_TOKEN: ${{ secrets.GH_TOKEN }}
@@ -16,18 +16,21 @@ jobs:
     steps:
       - uses: actions/checkout@v2
         with:
-          fetch-depth: '0'
+          fetch-depth: "0"
 
       - uses: actions/setup-node@v2-beta
         with:
-          node-version: '12'
+          node-version: "12"
 
       - name: Create ".npmrc" file in the project root
         run: echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc
 
       - name: Install dependencies
         run: yarn --frozen-lockfile
 
+      - name: Check code formatting
+        run: yarn prettier:check
+
       - name: Check dependencies
         run: yarn adio
 

diff --git a/.github/workflows/releaseLatest.yml b/.github/workflows/releaseLatest.yml
@@ -5,6 +5,8 @@ on:
     types: [release-latest]
 
 env:
+  GH_TOKEN: ${{ secrets.GH_TOKEN }}
+  NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
   NODE_OPTIONS: --max_old_space_size=4096
 
 jobs:
@@ -13,10 +15,16 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.event.client_payload.branch }}
+          fetch-depth: 0
 
       - uses: actions/setup-node@v2-beta
         with:
-          node-version: '12'
+          node-version: "12"
+
+      - name: Create ".npmrc" file in the project root
+        run: echo "//registry.npmjs.org/:_authToken=\${NPM_TOKEN}" > .npmrc
 
       - name: Install dependencies
         run: yarn --frozen-lockfile
@@ -29,3 +37,15 @@ jobs:
 
       - name: Run tests
         run: yarn test
+
+      - name: Set git email
+        run: git config --global user.email "info@webiny.com"
+
+      - name: Set git username
+        run: git config --global user.name "webiny"
+
+      - name: Create a release on GitHub
+        run: yarn lerna version --force-publish --conventional-graduate --yes
+
+      - name: Release packages to NPM
+        run: yarn lerna publish from-package --yes
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/...le-project/api/apolloGateway/package.json → api/apolloGateway/package.json b/...le-project/api/apolloGateway/package.json → api/apolloGateway/package.json
diff --git a/...le-project/api/apolloGateway/src/index.ts → api/apolloGateway/src/index.ts b/...le-project/api/apolloGateway/src/index.ts → api/apolloGateway/src/index.ts
diff --git a/api/apolloGateway/tsconfig.json b/api/apolloGateway/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig",
+  "references": [
+    { "path": "../../packages/handler" },
+    { "path": "../../packages/handler-apollo-gateway" }
+  ]
+}
diff --git a/...roject/api/apolloGateway/webiny.config.js → api/apolloGateway/webiny.config.js b/...roject/api/apolloGateway/webiny.config.js → api/apolloGateway/webiny.config.js
diff --git a/sample-project/api/cms/content/package.json → api/cms/content/package.json b/sample-project/api/cms/content/package.json → api/cms/content/package.json
diff --git a/sample-project/api/cms/content/src/index.ts → api/cms/content/src/index.ts b/sample-project/api/cms/content/src/index.ts → api/cms/content/src/index.ts
diff --git a/api/cms/content/tsconfig.json b/api/cms/content/tsconfig.json
@@ -0,0 +1,11 @@
+{
+  "extends": "../../../tsconfig",
+  "references": [
+    { "path": "../../../packages/api-plugin-commodo-db-proxy" },
+    { "path": "../../../packages/api-headless-cms" },
+    { "path": "../../../packages/api-i18n" },
+    { "path": "../../../packages/api-security" },
+    { "path": "../../../packages/api-settings-manager" },
+    { "path": "../../../packages/handler" }
+  ]
+}
diff --git a/...-project/api/cms/content/webiny.config.js → api/cms/content/webiny.config.js b/...-project/api/cms/content/webiny.config.js → api/cms/content/webiny.config.js
diff --git a/...-project/api/cms/dataManager/package.json → api/cms/dataManager/package.json b/...-project/api/cms/dataManager/package.json → api/cms/dataManager/package.json
diff --git a/...-project/api/cms/dataManager/src/index.ts → api/cms/dataManager/src/index.ts b/...-project/api/cms/dataManager/src/index.ts → api/cms/dataManager/src/index.ts
diff --git a/api/cms/dataManager/tsconfig.json b/api/cms/dataManager/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../../tsconfig",
+  "references": [
+    { "path": "../../../packages/api-i18n" },
+    { "path": "../../../packages/api-plugin-commodo-mongodb" },
+    { "path": "../../../packages/api-headless-cms" },
+    { "path": "../../../packages/graphql" },
+    { "path": "../../../packages/handler" }
+  ]
+}
diff --git a/...ject/api/cms/dataManager/webiny.config.js → api/cms/dataManager/webiny.config.js b/...ject/api/cms/dataManager/webiny.config.js → api/cms/dataManager/webiny.config.js
diff --git a/sample-project/api/cms/graphql/package.json → api/cms/graphql/package.json b/sample-project/api/cms/graphql/package.json → api/cms/graphql/package.json
diff --git a/sample-project/api/cms/graphql/src/index.ts → api/cms/graphql/src/index.ts b/sample-project/api/cms/graphql/src/index.ts → api/cms/graphql/src/index.ts
diff --git a/sample-project/api/pageBuilder/tsconfig.json → api/cms/graphql/tsconfig.json b/sample-project/api/pageBuilder/tsconfig.json → api/cms/graphql/tsconfig.json
@@ -2,13 +2,9 @@
   "extends": "../../../tsconfig",
   "references": [
     { "path": "../../../packages/api-plugin-commodo-db-proxy" },
+    { "path": "../../../packages/api-headless-cms" },
     { "path": "../../../packages/api-security" },
     { "path": "../../../packages/api-settings-manager" },
-    { "path": "../../../packages/api-page-builder" },
-    { "path": "../../../packages/api-plugin-page-builder-resolvers-mongodb" },
-    { "path": "../../../packages/api-mailchimp" },
-    { "path": "../../../packages/api-cookie-policy" },
-    { "path": "../../../packages/api-google-tag-manager" },
     { "path": "../../../packages/handler" },
     { "path": "../../../packages/handler-apollo-server" }
   ]

diff --git a/...-project/api/cms/graphql/webiny.config.js → api/cms/graphql/webiny.config.js b/...-project/api/cms/graphql/webiny.config.js → api/cms/graphql/webiny.config.js
diff --git a/...le-project/api/databaseProxy/package.json → api/databaseProxy/package.json b/...le-project/api/databaseProxy/package.json → api/databaseProxy/package.json
diff --git a/...le-project/api/databaseProxy/src/index.ts → api/databaseProxy/src/index.ts b/...le-project/api/databaseProxy/src/index.ts → api/databaseProxy/src/index.ts
diff --git a/api/databaseProxy/tsconfig.json b/api/databaseProxy/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig",
+  "references": [
+    { "path": "../../packages/handler" },
+    { "path": "../../packages/api-plugin-commodo-db-proxy" }
+  ]
+}
diff --git a/...roject/api/databaseProxy/webiny.config.js → api/databaseProxy/webiny.config.js b/...roject/api/databaseProxy/webiny.config.js → api/databaseProxy/webiny.config.js
diff --git a/sample-project/api/example.env.json → api/example.env.json b/sample-project/api/example.env.json → api/example.env.json
diff --git a/...e-project/api/files/download/package.json → api/files/download/package.json b/...e-project/api/files/download/package.json → api/files/download/package.json
diff --git a/...e-project/api/files/download/src/index.ts → api/files/download/src/index.ts b/...e-project/api/files/download/src/index.ts → api/files/download/src/index.ts
diff --git a/api/files/download/tsconfig.json b/api/files/download/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../tsconfig",
+  "references": [
+    { "path": "../../../packages/serverless-files" },
+    { "path": "../../../packages/handler" }
+  ]
+}
diff --git a/...oject/api/files/download/webiny.config.js → api/files/download/webiny.config.js b/...oject/api/files/download/webiny.config.js → api/files/download/webiny.config.js
diff --git a/...le-project/api/files/graphql/package.json → api/files/graphql/package.json b/...le-project/api/files/graphql/package.json → api/files/graphql/package.json
diff --git a/...le-project/api/files/graphql/src/index.ts → api/files/graphql/src/index.ts b/...le-project/api/files/graphql/src/index.ts → api/files/graphql/src/index.ts
diff --git a/api/files/graphql/tsconfig.json b/api/files/graphql/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../../../tsconfig",
+  "references": [
+    { "path": "../../../packages/api-plugin-commodo-db-proxy" },
+    { "path": "../../../packages/api-security" },
+    { "path": "../../../packages/api-settings-manager" },
+    { "path": "../../../packages/api-files" },
+    { "path": "../../../packages/api-plugin-files-resolvers-mongodb" },
+    { "path": "../../../packages/handler" },
+    { "path": "../../../packages/handler-apollo-server" }
+  ]
+}
diff --git a/...roject/api/files/graphql/webiny.config.js → api/files/graphql/webiny.config.js b/...roject/api/files/graphql/webiny.config.js → api/files/graphql/webiny.config.js
diff --git a/sample-project/api/files/manage/package.json → api/files/manage/package.json b/sample-project/api/files/manage/package.json → api/files/manage/package.json
diff --git a/sample-project/api/files/manage/src/index.ts → api/files/manage/src/index.ts b/sample-project/api/files/manage/src/index.ts → api/files/manage/src/index.ts
diff --git a/api/files/manage/tsconfig.json b/api/files/manage/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../tsconfig",
+  "references": [
+    { "path": "../../../packages/serverless-files" },
+    { "path": "../../../packages/handler" }
+  ]
+}
diff --git a/...project/api/files/manage/webiny.config.js → api/files/manage/webiny.config.js b/...project/api/files/manage/webiny.config.js → api/files/manage/webiny.config.js
diff --git a/...-project/api/files/transform/package.json → api/files/transform/package.json b/...-project/api/files/transform/package.json → api/files/transform/package.json
diff --git a/...-project/api/files/transform/src/index.ts → api/files/transform/src/index.ts b/...-project/api/files/transform/src/index.ts → api/files/transform/src/index.ts
diff --git a/api/files/transform/tsconfig.json b/api/files/transform/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../../tsconfig",
+  "references": [
+    { "path": "../../../packages/serverless-files" },
+    { "path": "../../../packages/handler" }
+  ]
+}
diff --git a/...ject/api/files/transform/webiny.config.js → api/files/transform/webiny.config.js b/...ject/api/files/transform/webiny.config.js → api/files/transform/webiny.config.js
diff --git a/sample-project/api/formBuilder/package.json → api/formBuilder/package.json b/sample-project/api/formBuilder/package.json → api/formBuilder/package.json
diff --git a/sample-project/api/formBuilder/src/index.ts → api/formBuilder/src/index.ts b/sample-project/api/formBuilder/src/index.ts → api/formBuilder/src/index.ts
diff --git a/api/formBuilder/tsconfig.json b/api/formBuilder/tsconfig.json
@@ -0,0 +1,12 @@
+{
+  "extends": "../../tsconfig",
+  "references": [
+    { "path": "../../packages/api-plugin-commodo-db-proxy" },
+    { "path": "../../packages/api-i18n" },
+    { "path": "../../packages/api-security" },
+    { "path": "../../packages/api-settings-manager" },
+    { "path": "../../packages/api-form-builder" },
+    { "path": "../../packages/handler" },
+    { "path": "../../packages/handler-apollo-server" }
+  ]
+}
diff --git a/...-project/api/formBuilder/webiny.config.js → api/formBuilder/webiny.config.js b/...-project/api/formBuilder/webiny.config.js → api/formBuilder/webiny.config.js
diff --git a/sample-project/api/i18n/graphql/package.json → api/i18n/graphql/package.json b/sample-project/api/i18n/graphql/package.json → api/i18n/graphql/package.json
diff --git a/sample-project/api/i18n/graphql/src/index.ts → api/i18n/graphql/src/index.ts b/sample-project/api/i18n/graphql/src/index.ts → api/i18n/graphql/src/index.ts
diff --git a/sample-project/api/formBuilder/tsconfig.json → api/i18n/graphql/tsconfig.json b/sample-project/api/formBuilder/tsconfig.json → api/i18n/graphql/tsconfig.json
@@ -5,7 +5,6 @@
     { "path": "../../../packages/api-i18n" },
     { "path": "../../../packages/api-security" },
     { "path": "../../../packages/api-settings-manager" },
-    { "path": "../../../packages/api-form-builder" },
     { "path": "../../../packages/handler" },
     { "path": "../../../packages/handler-apollo-server" }
   ]

diff --git a/...project/api/i18n/graphql/webiny.config.js → api/i18n/graphql/webiny.config.js b/...project/api/i18n/graphql/webiny.config.js → api/i18n/graphql/webiny.config.js
diff --git a/sample-project/api/i18n/locales/package.json → api/i18n/locales/package.json b/sample-project/api/i18n/locales/package.json → api/i18n/locales/package.json
diff --git a/sample-project/api/i18n/locales/src/index.ts → api/i18n/locales/src/index.ts b/sample-project/api/i18n/locales/src/index.ts → api/i18n/locales/src/index.ts
diff --git a/...project/api/settingsManager/tsconfig.json → api/i18n/locales/tsconfig.json b/...project/api/settingsManager/tsconfig.json → api/i18n/locales/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "extends": "../../../tsconfig",
   "references": [
-    { "path": "../../../packages/api-settings-manager" },
     { "path": "../../../packages/api-plugin-commodo-db-proxy" },
+    { "path": "../../../packages/api-i18n" },
     { "path": "../../../packages/handler" }
   ]
 }
diff --git a/...project/api/i18n/locales/webiny.config.js → api/i18n/locales/webiny.config.js b/...project/api/i18n/locales/webiny.config.js → api/i18n/locales/webiny.config.js
diff --git a/sample-project/api/pageBuilder/package.json → api/pageBuilder/package.json b/sample-project/api/pageBuilder/package.json → api/pageBuilder/package.json
diff --git a/sample-project/api/pageBuilder/src/index.ts → api/pageBuilder/src/index.ts b/sample-project/api/pageBuilder/src/index.ts → api/pageBuilder/src/index.ts
diff --git a/api/pageBuilder/tsconfig.json b/api/pageBuilder/tsconfig.json
@@ -0,0 +1,15 @@
+{
+  "extends": "../../tsconfig",
+  "references": [
+    { "path": "../../packages/api-plugin-commodo-db-proxy" },
+    { "path": "../../packages/api-security" },
+    { "path": "../../packages/api-settings-manager" },
+    { "path": "../../packages/api-page-builder" },
+    { "path": "../../packages/api-plugin-page-builder-resolvers-mongodb" },
+    { "path": "../../packages/api-mailchimp" },
+    { "path": "../../packages/api-cookie-policy" },
+    { "path": "../../packages/api-google-tag-manager" },
+    { "path": "../../packages/handler" },
+    { "path": "../../packages/handler-apollo-server" }
+  ]
+}
diff --git a/...-project/api/pageBuilder/webiny.config.js → api/pageBuilder/webiny.config.js b/...-project/api/pageBuilder/webiny.config.js → api/pageBuilder/webiny.config.js
diff --git a/sample-project/api/resources.js → api/resources.js b/sample-project/api/resources.js → api/resources.js
diff --git a/...project/api/security/graphql/package.json → api/security/graphql/package.json b/...project/api/security/graphql/package.json → api/security/graphql/package.json
diff --git a/...project/api/security/graphql/src/index.ts → api/security/graphql/src/index.ts b/...project/api/security/graphql/src/index.ts → api/security/graphql/src/index.ts
diff --git a/api/security/graphql/tsconfig.json b/api/security/graphql/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../../tsconfig",
+  "references": [
+    { "path": "../../../packages/api-plugin-commodo-db-proxy" },
+    { "path": "../../../packages/api-security" },
+    { "path": "../../../packages/api-settings-manager" },
+    { "path": "../../../packages/handler" },
+    { "path": "../../../packages/handler-apollo-server" }
+  ]
+}
diff --git a/...ect/api/security/graphql/webiny.config.js → api/security/graphql/webiny.config.js b/...ect/api/security/graphql/webiny.config.js → api/security/graphql/webiny.config.js
diff --git a/...security/validateAccessToken/package.json → ...security/validateAccessToken/package.json b/...security/validateAccessToken/package.json → ...security/validateAccessToken/package.json
diff --git a/...security/validateAccessToken/src/index.ts → ...security/validateAccessToken/src/index.ts b/...security/validateAccessToken/src/index.ts → ...security/validateAccessToken/src/index.ts
diff --git a/api/security/validateAccessToken/tsconfig.json b/api/security/validateAccessToken/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../../tsconfig",
+  "references": [
+    { "path": "../../../packages/api-plugin-commodo-db-proxy" },
+    { "path": "../../../packages/api-security" },
+    { "path": "../../../packages/handler" },
+    { "path": "../../../packages/handler-apollo-server" }
+  ]
+}
diff --git a/...rity/validateAccessToken/webiny.config.js → ...rity/validateAccessToken/webiny.config.js b/...rity/validateAccessToken/webiny.config.js → ...rity/validateAccessToken/webiny.config.js
diff --git a/...-project/api/settingsManager/package.json → api/settingsManager/package.json b/...-project/api/settingsManager/package.json → api/settingsManager/package.json
diff --git a/...-project/api/settingsManager/src/index.ts → api/settingsManager/src/index.ts b/...-project/api/settingsManager/src/index.ts → api/settingsManager/src/index.ts
diff --git a/api/settingsManager/tsconfig.json b/api/settingsManager/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "extends": "../../tsconfig",
+  "references": [
+    { "path": "../../packages/api-settings-manager" },
+    { "path": "../../packages/api-plugin-commodo-db-proxy" },
+    { "path": "../../packages/handler" }
+  ]
+}
diff --git a/...ject/api/settingsManager/webiny.config.js → api/settingsManager/webiny.config.js b/...ject/api/settingsManager/webiny.config.js → api/settingsManager/webiny.config.js
diff --git a/sample-project/apps/admin/.gitignore → apps/admin/.gitignore b/sample-project/apps/admin/.gitignore → apps/admin/.gitignore
diff --git a/sample-project/apps/admin/example.env.json → apps/admin/example.env.json b/sample-project/apps/admin/example.env.json → apps/admin/example.env.json
diff --git a/sample-project/apps/admin/package.json → apps/admin/package.json b/sample-project/apps/admin/package.json → apps/admin/package.json
diff --git a/...ublic/favicons/android-chrome-192x192.png → ...ublic/favicons/android-chrome-192x192.png b/...ublic/favicons/android-chrome-192x192.png → ...ublic/favicons/android-chrome-192x192.png
diff --git a/...dmin/public/favicons/apple-touch-icon.png → ...dmin/public/favicons/apple-touch-icon.png b/...dmin/public/favicons/apple-touch-icon.png → ...dmin/public/favicons/apple-touch-icon.png
diff --git a/...s/admin/public/favicons/browserconfig.xml → apps/admin/public/favicons/browserconfig.xml b/...s/admin/public/favicons/browserconfig.xml → apps/admin/public/favicons/browserconfig.xml
diff --git a/...s/admin/public/favicons/favicon-16x16.png → apps/admin/public/favicons/favicon-16x16.png b/...s/admin/public/favicons/favicon-16x16.png → apps/admin/public/favicons/favicon-16x16.png
diff --git a/...s/admin/public/favicons/favicon-32x32.png → apps/admin/public/favicons/favicon-32x32.png b/...s/admin/public/favicons/favicon-32x32.png → apps/admin/public/favicons/favicon-32x32.png
diff --git a/...ct/apps/admin/public/favicons/favicon.ico → apps/admin/public/favicons/favicon.ico b/...ct/apps/admin/public/favicons/favicon.ico → apps/admin/public/favicons/favicon.ico
diff --git a/.../admin/public/favicons/mstile-150x150.png → .../admin/public/favicons/mstile-150x150.png b/.../admin/public/favicons/mstile-150x150.png → .../admin/public/favicons/mstile-150x150.png
diff --git a/...min/public/favicons/safari-pinned-tab.svg → ...min/public/favicons/safari-pinned-tab.svg b/...min/public/favicons/safari-pinned-tab.svg → ...min/public/favicons/safari-pinned-tab.svg
diff --git a/sample-project/apps/admin/public/index.html → apps/admin/public/index.html b/sample-project/apps/admin/public/index.html → apps/admin/public/index.html
diff --git a/...e-project/apps/admin/public/manifest.json → apps/admin/public/manifest.json b/...e-project/apps/admin/public/manifest.json → apps/admin/public/manifest.json
diff --git a/sample-project/apps/admin/src/App.scss → apps/admin/src/App.scss b/sample-project/apps/admin/src/App.scss → apps/admin/src/App.scss
diff --git a/sample-project/apps/admin/src/App.tsx → apps/admin/src/App.tsx b/sample-project/apps/admin/src/App.tsx → apps/admin/src/App.tsx
diff --git a/sample-project/apps/admin/src/index.tsx → apps/admin/src/index.tsx b/sample-project/apps/admin/src/index.tsx → apps/admin/src/index.tsx
diff --git a/apps/admin/tsconfig.json b/apps/admin/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "extends": "../../tsconfig",
+  "include": ["src"],
+  "exclude": ["../../packages/app-template-admin-full"],
+  "references": [
+    { "path": "../../packages/app-template-admin-full/tsconfig.build.json" }
+  ]
+}
diff --git a/sample-project/apps/admin/webiny.config.js → apps/admin/webiny.config.js b/sample-project/apps/admin/webiny.config.js → apps/admin/webiny.config.js
diff --git a/sample-project/apps/adminSlate/.gitignore → apps/adminSlate/.gitignore b/sample-project/apps/adminSlate/.gitignore → apps/adminSlate/.gitignore
diff --git a/sample-project/apps/adminSlate/package.json → apps/adminSlate/package.json b/sample-project/apps/adminSlate/package.json → apps/adminSlate/package.json
diff --git a/sample-project/apps/cmsOnly/.gitignore → apps/cmsOnly/.gitignore b/sample-project/apps/cmsOnly/.gitignore → apps/cmsOnly/.gitignore
diff --git a/sample-project/apps/cmsOnly/package.json → apps/cmsOnly/package.json b/sample-project/apps/cmsOnly/package.json → apps/cmsOnly/package.json
diff --git a/...ublic/favicons/android-chrome-192x192.png → ...ublic/favicons/android-chrome-192x192.png b/...ublic/favicons/android-chrome-192x192.png → ...ublic/favicons/android-chrome-192x192.png
diff --git a/...late/public/favicons/apple-touch-icon.png → ...Only/public/favicons/apple-touch-icon.png b/...late/public/favicons/apple-touch-icon.png → ...Only/public/favicons/apple-touch-icon.png
diff --git a/...inSlate/public/favicons/browserconfig.xml → ...cmsOnly/public/favicons/browserconfig.xml b/...inSlate/public/favicons/browserconfig.xml → ...cmsOnly/public/favicons/browserconfig.xml
diff --git a/...inSlate/public/favicons/favicon-16x16.png → ...cmsOnly/public/favicons/favicon-16x16.png b/...inSlate/public/favicons/favicon-16x16.png → ...cmsOnly/public/favicons/favicon-16x16.png
diff --git a/...inSlate/public/favicons/favicon-32x32.png → ...cmsOnly/public/favicons/favicon-32x32.png b/...inSlate/public/favicons/favicon-32x32.png → ...cmsOnly/public/favicons/favicon-32x32.png
diff --git a/...ps/adminSlate/public/favicons/favicon.ico → apps/cmsOnly/public/favicons/favicon.ico b/...ps/adminSlate/public/favicons/favicon.ico → apps/cmsOnly/public/favicons/favicon.ico
diff --git a/...nSlate/public/favicons/mstile-150x150.png → ...msOnly/public/favicons/mstile-150x150.png b/...nSlate/public/favicons/mstile-150x150.png → ...msOnly/public/favicons/mstile-150x150.png
diff --git a/...ate/public/favicons/safari-pinned-tab.svg → ...nly/public/favicons/safari-pinned-tab.svg b/...ate/public/favicons/safari-pinned-tab.svg → ...nly/public/favicons/safari-pinned-tab.svg
diff --git a/...le-project/apps/cmsOnly/public/index.html → apps/cmsOnly/public/index.html b/...le-project/apps/cmsOnly/public/index.html → apps/cmsOnly/public/index.html
diff --git a/...ject/apps/adminSlate/public/manifest.json → apps/cmsOnly/public/manifest.json b/...ject/apps/adminSlate/public/manifest.json → apps/cmsOnly/public/manifest.json
diff --git a/sample-project/apps/cmsOnly/src/App.scss → apps/cmsOnly/src/App.scss b/sample-project/apps/cmsOnly/src/App.scss → apps/cmsOnly/src/App.scss
diff --git a/sample-project/apps/cmsOnly/src/App.tsx → apps/cmsOnly/src/App.tsx b/sample-project/apps/cmsOnly/src/App.tsx → apps/cmsOnly/src/App.tsx
diff --git a/sample-project/apps/adminSlate/src/index.tsx → apps/cmsOnly/src/index.tsx b/sample-project/apps/adminSlate/src/index.tsx → apps/cmsOnly/src/index.tsx
diff --git a/apps/cmsOnly/tsconfig.json b/apps/cmsOnly/tsconfig.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig",
+  "include": ["src"],
+  "exclude": ["../../packages/app-template-admin", "../../packages/app-headless-cms"],
+  "references": [
+    { "path": "../../packages/app-template-admin/tsconfig.build.json" },
+    { "path": "../../packages/app-headless-cms/tsconfig.build.json" }
+  ]
+}
diff --git a/...-project/apps/adminSlate/webiny.config.js → apps/cmsOnly/webiny.config.js b/...-project/apps/adminSlate/webiny.config.js → apps/cmsOnly/webiny.config.js
diff --git a/...e-project/apps/databaseProxy/package.json → apps/databaseProxy/package.json b/...e-project/apps/databaseProxy/package.json → apps/databaseProxy/package.json
diff --git a/...e-project/apps/databaseProxy/src/index.ts → apps/databaseProxy/src/index.ts b/...e-project/apps/databaseProxy/src/index.ts → apps/databaseProxy/src/index.ts
diff --git a/apps/databaseProxy/tsconfig.json b/apps/databaseProxy/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig",
+  "references": [
+    { "path": "../../packages/handler" },
+    { "path": "../../packages/api-plugin-commodo-db-proxy" }
+  ]
+}
diff --git a/...oject/apps/databaseProxy/webiny.config.js → apps/databaseProxy/webiny.config.js b/...oject/apps/databaseProxy/webiny.config.js → apps/databaseProxy/webiny.config.js
diff --git a/...roject/apps/future/secure-site/.gitignore → apps/future/secure-site/.gitignore b/...roject/apps/future/secure-site/.gitignore → apps/future/secure-site/.gitignore
diff --git a/...t/apps/future/secure-site/.rescriptsrc.js → apps/future/secure-site/.rescriptsrc.js b/...t/apps/future/secure-site/.rescriptsrc.js → apps/future/secure-site/.rescriptsrc.js
diff --git a/...project/apps/future/secure-site/README.md → apps/future/secure-site/README.md b/...project/apps/future/secure-site/README.md → apps/future/secure-site/README.md
diff --git a/.../apps/future/secure-site/example.env.json → apps/future/secure-site/example.env.json b/.../apps/future/secure-site/example.env.json → apps/future/secure-site/example.env.json
diff --git a/...pps/future/secure-site/handler/handler.js → apps/future/secure-site/handler/handler.js b/...pps/future/secure-site/handler/handler.js → apps/future/secure-site/handler/handler.js
@@ -55,7 +55,9 @@ module.exports.handler = async event => {
     try {
         const buffer = await new Promise((resolve, reject) => {
             fs.readFile(filePath, (err, data) => {
-                if (err) return reject(err);
+                if (err) {
+                    return reject(err);
+                }
                 resolve(data);
             });
         });

diff --git a/...ure/secure-site/handler/webpack.config.js → ...ure/secure-site/handler/webpack.config.js b/...ure/secure-site/handler/webpack.config.js → ...ure/secure-site/handler/webpack.config.js
diff --git a/...ject/apps/future/secure-site/package.json → apps/future/secure-site/package.json b/...ject/apps/future/secure-site/package.json → apps/future/secure-site/package.json
diff --git a/...apps/future/secure-site/public/index.html → apps/future/secure-site/public/index.html b/...apps/future/secure-site/public/index.html → apps/future/secure-site/public/index.html
diff --git a/...roject/apps/future/secure-site/src/App.js → apps/future/secure-site/src/App.js b/...roject/apps/future/secure-site/src/App.js → apps/future/secure-site/src/App.js
diff --git a/...ject/apps/future/secure-site/src/App.scss → apps/future/secure-site/src/App.scss b/...ject/apps/future/secure-site/src/App.scss → apps/future/secure-site/src/App.scss
diff --git a/...ure/secure-site/src/components/UserBar.js → ...ure/secure-site/src/components/UserBar.js b/...ure/secure-site/src/components/UserBar.js → ...ure/secure-site/src/components/UserBar.js
diff --git a/...s/future/secure-site/src/config/apollo.js → apps/future/secure-site/src/config/apollo.js b/...s/future/secure-site/src/config/apollo.js → apps/future/secure-site/src/config/apollo.js
diff --git a/...ject/apps/future/secure-site/src/index.js → apps/future/secure-site/src/index.js b/...ject/apps/future/secure-site/src/index.js → apps/future/secure-site/src/index.js
diff --git a/...s/future/secure-site/src/plugins/index.js → apps/future/secure-site/src/plugins/index.js b/...s/future/secure-site/src/plugins/index.js → apps/future/secure-site/src/plugins/index.js
diff --git a/.../plugins/white-logo-with-icon-on-left.svg → .../plugins/white-logo-with-icon-on-left.svg b/.../plugins/white-logo-with-icon-on-left.svg → .../plugins/white-logo-with-icon-on-left.svg
diff --git a/...roject/apps/future/secure-site/src/ssr.js → apps/future/secure-site/src/ssr.js b/...roject/apps/future/secure-site/src/ssr.js → apps/future/secure-site/src/ssr.js
diff --git a/...ct/apps/future/secure-site/ssr/handler.js → apps/future/secure-site/ssr/handler.js b/...ct/apps/future/secure-site/ssr/handler.js → apps/future/secure-site/ssr/handler.js
diff --git a/...s/future/secure-site/ssr/injectContent.js → apps/future/secure-site/ssr/injectContent.js b/...s/future/secure-site/ssr/injectContent.js → apps/future/secure-site/ssr/injectContent.js
diff --git a/...roject/apps/future/secure-site/ssr/ssr.js → apps/future/secure-site/ssr/ssr.js b/...roject/apps/future/secure-site/ssr/ssr.js → apps/future/secure-site/ssr/ssr.js
diff --git a/.../future/secure-site/ssr/webpack.config.js → .../future/secure-site/ssr/webpack.config.js b/.../future/secure-site/ssr/webpack.config.js → .../future/secure-site/ssr/webpack.config.js
diff --git a/...apps/future/site-ssr-handler/package.json → apps/future/site-ssr-handler/package.json b/...apps/future/site-ssr-handler/package.json → apps/future/site-ssr-handler/package.json
diff --git a/...apps/future/site-ssr-handler/src/index.js → apps/future/site-ssr-handler/src/index.js b/...apps/future/site-ssr-handler/src/index.js → apps/future/site-ssr-handler/src/index.js
diff --git a/.../future/site-ssr-handler/webiny.config.js → .../future/site-ssr-handler/webiny.config.js b/.../future/site-ssr-handler/webiny.config.js → .../future/site-ssr-handler/webiny.config.js
diff --git a/...project/apps/future/site-ssr/package.json → apps/future/site-ssr/package.json b/...project/apps/future/site-ssr/package.json → apps/future/site-ssr/package.json
diff --git a/...oject/apps/future/site-ssr/src/handler.js → apps/future/site-ssr/src/handler.js b/...oject/apps/future/site-ssr/src/handler.js → apps/future/site-ssr/src/handler.js
diff --git a/...ject/apps/future/site-ssr/src/renderer.js → apps/future/site-ssr/src/renderer.js b/...ject/apps/future/site-ssr/src/renderer.js → apps/future/site-ssr/src/renderer.js
diff --git a/...ect/apps/future/site-ssr/webiny.config.js → apps/future/site-ssr/webiny.config.js b/...ect/apps/future/site-ssr/webiny.config.js → apps/future/site-ssr/webiny.config.js
diff --git a/sample-project/apps/resources.js → apps/resources.js b/sample-project/apps/resources.js → apps/resources.js
diff --git a/sample-project/apps/site/.gitignore → apps/site/.gitignore b/sample-project/apps/site/.gitignore → apps/site/.gitignore
diff --git a/sample-project/apps/site/example.env.json → apps/site/example.env.json b/sample-project/apps/site/example.env.json → apps/site/example.env.json
diff --git a/sample-project/apps/site/package.json → apps/site/package.json b/sample-project/apps/site/package.json → apps/site/package.json
diff --git a/sample-project/apps/site/public/index.html → apps/site/public/index.html b/sample-project/apps/site/public/index.html → apps/site/public/index.html
diff --git a/sample-project/apps/site/src/App.scss → apps/site/src/App.scss b/sample-project/apps/site/src/App.scss → apps/site/src/App.scss
diff --git a/sample-project/apps/site/src/App.tsx → apps/site/src/App.tsx b/sample-project/apps/site/src/App.tsx → apps/site/src/App.tsx
diff --git a/sample-project/apps/site/src/index.tsx → apps/site/src/index.tsx b/sample-project/apps/site/src/index.tsx → apps/site/src/index.tsx
diff --git a/apps/site/tsconfig.json b/apps/site/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "extends": "../../tsconfig",
+  "include": ["src"],
+  "exclude": ["../../packages/app-template-site"],
+  "references": [
+    { "path": "../../packages/app-template-site/tsconfig.build.json" }
+  ]
+}
diff --git a/sample-project/apps/site/webiny.config.js → apps/site/webiny.config.js b/sample-project/apps/site/webiny.config.js → apps/site/webiny.config.js