Merge branch 'main' into mk/background-functions

Author: ascorbic

.eslintignore

@@ -3,6 +3,6 @@ node_modules
 test
 lib
 demos
-plugin/src/templates/edge
-plugin/lib
-plugin/dist-types
+packages/runtime/src/templates/edge
+packages/runtime/lib
+packages/runtime/dist-types

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -39,11 +39,11 @@ body:
   - type: markdown
     attributes:
       value: |
-        Check out [CONTRIBUTING.md](https://github.com/netlify/netlify-plugin-nextjs/blob/main/CONTRIBUTING.md#what-is-a-reproducible-test-case) for advice on producing a reproduction repo.
+        Check out [CONTRIBUTING.md](https://github.com/netlify/next-runtime/blob/main/CONTRIBUTING.md#what-is-a-reproducible-test-case) for advice on producing a reproduction repo.
   - type: input
-    id: plugin-version
+    id: runtime-version
     attributes:
-      label: Plugin version
+      label: Next Runtime version
       description: The version of `@netlify/plugin-nextjs` that you are using. (This is in the build logs)
       placeholder: x.x.x
     validations:
@@ -74,7 +74,7 @@ body:
       value: |
         <details>
           <summary>`netlify.toml`</summary>
-          
+
         ```toml
         # Paste content of your `netlify.toml` file here
         ```
@@ -89,7 +89,7 @@ body:
       value: |
         <details>
           <summary>`_redirects`</summary>
-          
+
         ```toml
         # Paste content of your `_redirects` file here
         ```
@@ -104,7 +104,7 @@ body:
       value: |
         <details>
           <summary>`next.config.js`</summary>
-          
+
         ```toml
         # Paste content of your `next.config.js` file here. Check there is no private info in there.
         ```
@@ -118,7 +118,7 @@ body:
       value: |
         <details>
           <summary>Build logs</summary>
-          
+
         ```
         # Paste logs here
         ```
@@ -133,7 +133,7 @@ body:
       value: |
         <details>
           <summary>Function logs</summary>
-          
+
         ```
         # Paste logs here
         ```
@@ -150,7 +150,7 @@ body:
       value: |
         <details>
           <summary>generated .next JSON files</summary>
-          
+
         ```
         # Paste file contents here. Please check there isn't any private info in them
         # You can either build locally, or download the deploy from Netlify by clicking the arrow next to the deploy time.

.github/workflows/cypress-canary.yml

@@ -63,7 +63,7 @@ jobs:
           record: true
           parallel: true
           config-file: cypress/config/canary.json
-          group: 'Next Plugin - Demo Canary'
+          group: 'Next Runtime - Demo Canary'
           spec: cypress/integration/canary/*
         env:
           DEBUG: '@cypress/github-action'

.github/workflows/cypress-demo-nx.yml

@@ -63,7 +63,7 @@ jobs:
           record: true
           parallel: true
           config-file: cypress/config/nx-demo.json
-          group: 'Next Plugin - Demo NX'
+          group: 'Next Runtime - Demo NX'
           spec: cypress/integration/nx/*
         env:
           DEBUG: '@cypress/github-action'

.github/workflows/cypress-demo-static.yml

@@ -63,7 +63,7 @@ jobs:
           record: true
           parallel: true
           config-file: cypress/config/static-root.json
-          group: 'Next Plugin - Demo Static'
+          group: 'Next Runtime - Demo Static'
           spec: cypress/integration/static-root/*
         env:
           DEBUG: '@cypress/github-action'

.github/workflows/cypress-demo.yml

@@ -63,7 +63,7 @@ jobs:
           record: true
           parallel: true
           config-file: cypress/config/ci.json
-          group: 'Next Plugin - Demo'
+          group: 'Next Runtime - Demo'
           spec: cypress/integration/default/*
         env:
           DEBUG: '@cypress/github-action'

.github/workflows/cypress-middleware.yml

@@ -63,7 +63,7 @@ jobs:
           record: true
           parallel: true
           config-file: cypress/config/middleware.json
-          group: 'Next Plugin - Middleware'
+          group: 'Next Runtime - Middleware'
           spec: cypress/integration/middleware/*
         env:
           DEBUG: '@cypress/github-action'

.github/workflows/pre-release.yml

@@ -11,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '*'
+          node-version: 'lts/*'
           cache: 'npm'
           check-latest: true
           registry-url: 'https://registry.npmjs.org'

.github/workflows/release-please.yml

@@ -21,22 +21,24 @@ jobs:
         if: ${{ steps.release.outputs.releases_created }}
       - uses: actions/setup-node@v2
         with:
-          node-version: '*'
+          node-version: 'lts/*'
           cache: 'npm'
           check-latest: true
           registry-url: 'https://registry.npmjs.org'
         if: ${{ steps.release.outputs.releases_created }}
       - name: Install dependencies
         run: CI=1 npm ci
-        working-directory: plugin
-        if: ${{ steps.release.outputs.releases_created }}
-      - run: npm publish
-        working-directory: plugin
         if: ${{ steps.release.outputs.releases_created }}
+      - run: npm publish packages/runtime/
+        if: ${{ steps.release.outputs['packages/runtime--version'] }}
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
+      - run: npm publish packages/next/
+        if: ${{ steps.release.outputs['packages/next--version'] }}
         env:
           NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}
       - uses: netlify/submit-build-plugin-action@v1
-        if: ${{ steps.release.outputs.releases_created }}
+        if: ${{ steps.release.outputs['packages/runtime--version'] }}
         with:
           github-token: ${{ steps.get-token.outputs.token }}
-          package-json-dir: plugin
+          package-json-dir: packages/runtime

.github/workflows/test.yml

@@ -1,4 +1,4 @@
-name: Plugin Tests
+name: Next Runtime Tests
 
 on:
   pull_request:
@@ -25,22 +25,22 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - name: Installing with latest Node.js
+      - name: Installing with LTS Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '*'
+          node-version: 'lts/*'
           check-latest: true
       - name: NPM Install
         run: npm install
       - name: Switching to Node.js ${{ matrix.node-version }} to run tests
         uses: actions/setup-node@v2
-        if: "${{ matrix.node-version != '*' }}"
+        if: "${{ matrix.node-version != 'lts/*' }}"
         with:
           node-version: ${{ matrix.node-version }}
           check-latest: true
       - name: Linting
         run: npm run format:ci
-        if: "${{ matrix.node-version == '*' }}"
+        if: "${{ matrix.node-version == 'lts/*' }}"
       - name: Run tests against next@latest
         run: npm test
   canary:
@@ -61,18 +61,18 @@ jobs:
     if: github.ref_name == 'main'
     steps:
       - uses: actions/checkout@v2
-      - name: Installing with latest Node.js
+      - name: Installing with LTS Node.js
         uses: actions/setup-node@v2
         with:
-          node-version: '*'
+          node-version: 'lts/*'
           check-latest: true
       - name: NPM Install
         run: npm install
       - name: Install Next.js Canary
         run: npm install -D next@canary --legacy-peer-deps
       - name: Switching to Node.js ${{ matrix.node-version }} to run tests
         uses: actions/setup-node@v2
-        if: "${{ matrix.node-version != '*' }}"
+        if: "${{ matrix.node-version != 'lts/*' }}"
         with:
           node-version: ${{ matrix.node-version }}
           check-latest: true

.gitignore

@@ -146,8 +146,7 @@ Temporary Items
 .netlify
 demos/default/.next
 .parcel-cache
-plugin/lib
-plugin/dist-types
+packages/*/lib
 
 # Cypress
 cypress/screenshots

.prettierignore

@@ -22,6 +22,6 @@ lib
 tsconfig.json
 demos/nx-next-monorepo-demo
 
-plugin/CHANGELOG.md
-plugin/lib
-plugin/dist-types
+packages/runtime/CHANGELOG.md
+packages/runtime/lib
+packages/runtime/dist-types

.release-please-manifest.json

@@ -1,3 +1,4 @@
 {
-  "plugin": "4.14.1"
+  "packages/runtime": "4.17.0",
+  "packages/next": "0.0.1"
 }

.vscode/feat-test.code-snippets

@@ -1,9 +1,9 @@
 {
-	// Place your netlify-plugin-nextjs workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and 
-	// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope 
-	// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is 
-	// used to trigger the snippet and the body will be expanded and inserted. Possible variables are: 
-	// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. 
+	// Place your next-runtime workspace snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
+	// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
+	// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
+	// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
+	// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
 	// Placeholders with the same ids are connected.
 	// Example:
 	"Create Next Test Feature": {
@@ -27,4 +27,4 @@
 		],
 		"description": "Log output to console"
 	}
-}
+}

.vscode/settings.json

@@ -1,9 +1,8 @@
 {
   "deno.enablePaths": [
-    "plugin/src/templates/edge",
+    "packages/runtime/src/templates/edge",
     "demos/middleware/.netlify/edge-functions",
     "demos/server-components/.netlify/edge-functions",
   ],
-  "deno.unstable": true,
-  "deno.importMap": "demos/server-components/.netlify/edge-functions-import-map.json"
+  "deno.unstable": true
 }