chore: Monorepo restructure (#534)

.github/workflows/CI.yml

@@ -32,6 +32,5 @@ jobs:
       #*/*/node_modules
       #key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}
       - run: yarn --frozen-lockfile
-      - run: cd integration/app-with-serverless-offline && yarn --frozen-lockfile && cd ../../
       - run: yarn test
       - run: yarn integration

jest.integration.config.json

@@ -1,5 +1,4 @@
 {
   "testMatch": ["**/integration/**/*.test.[jt]s?(x)"],
-  "watchPathIgnorePatterns": ["/fixture/"],
-  "modulePathIgnorePatterns": ["<rootDir>/integration/basic-app"]
+  "watchPathIgnorePatterns": ["/fixture/"]
 }

lerna.json

@@ -11,5 +11,5 @@
       "npmClientArgs": ["--no-package-lock"]
     }
   },
-  "packages": ["packages/*"]
+  "packages": ["packages/compat-layers/*", "packages/serverless-components/*", "packages/libs/*", "packages/deprecated/*"]
 }

package.json

@@ -39,8 +39,8 @@
   "homepage": "https://github.com/danielcondemarin/serverless-next.js#readme",
   "devDependencies": {
     "@babel/preset-typescript": "^7.10.4",
-    "@sls-next/lambda-at-edge": "link:./packages/lambda-at-edge",
-    "@sls-next/next-aws-cloudfront": "link:./packages/lambda-at-edge-compat",
+    "@sls-next/lambda-at-edge": "link:./packages/libs/lambda-at-edge",
+    "@sls-next/next-aws-cloudfront": "link:./packages/compat-layers/lambda-at-edge-compat",
     "@types/fs-extra": "^9.0.1",
     "@types/jest": "^26.0.3",
     "@types/react": "^16.9.41",
@@ -78,8 +78,8 @@
     },
     "coverageDirectory": "<rootDir>/coverage/",
     "coveragePathIgnorePatterns": [
-      "<rootDir>/packages/serverless-plugin/utils/yml/cfSchema.js",
-      "<rootDir>/packages/serverless-plugin/utils/test",
+      "<rootDir>/packages/deprecated/serverless-plugin/utils/yml/cfSchema.js",
+      "<rootDir>/packages/deprecated/serverless-plugin/utils/test",
       "/.serverless_nextjs/",
       "/fixtures/",
       "/fixture/",
@@ -92,6 +92,7 @@
       "/fixtures/"
     ],
     "testPathIgnorePatterns": [
+      "<rootDir>/packages/deprecated/serverless-plugin/*",
       "/.next/",
       "/node_modules/",
       "/fixtures/",

packages/apigw-lambda-compat/package.json → packages/compat-layers/apigw-lambda-compat/package.json

@@ -20,7 +20,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/danielcondemarin/serverless-next.js.git",
-    "directory": "packages/next-aws-lambda"
+    "directory": "packages/compat-layers/apigw-lambda-compat"
   },
   "author": "Daniel Conde Marin <danielconde9@gmail.com>",
   "license": "MIT"

packages/compat-layers/apigw-lambda-compat/yarn.lock

@@ -0,0 +1,4 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+

packages/lambda-at-edge-compat/package.json → packages/compat-layers/lambda-at-edge-compat/package.json

@@ -10,7 +10,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/danielcondemarin/serverless-next.js.git",
-    "directory": "packages/lambda-at-edge-compat"
+    "directory": "packages/compat-layers/lambda-at-edge-compat"
   },
   "keywords": [
     "AWS",

packages/compat-layers/lambda-at-edge-compat/yarn.lock

@@ -0,0 +1,8 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@types/aws-lambda@^8.10.50":
+  version "8.10.59"
+  resolved "https://registry.npmjs.org/@types/aws-lambda/-/aws-lambda-8.10.59.tgz#64f602aef1cac9b21a74aad6705bf350c4a5173a"
+  integrity sha512-X/JclTKqHvo3nMTkHzClHhRz0yxn/VAr7J7LO6jBqaksZlhcDAWuU4oT1Yrt3E9MvX5jyyVIZtrwAI7oPXzXIg==

packages/serverless-plugin/package.json → packages/deprecated/serverless-plugin/package.json

@@ -25,7 +25,7 @@
   },
   "dependencies": {
     "@mapbox/s3urls": "^1.5.3",
-    "@sls-next/next-aws-lambda": "link:../apigw-lambda-compat",
+    "@sls-next/next-aws-lambda": "link:../../compat-layers/apigw-lambda-compat",
     "chalk": "^2.4.2",
     "debug": "^4.1.1",
     "fs-extra": "^7.0.1",