Merge branch 'main' into mk/no-beta

Author: ascorbic

.github/workflows/pre-release.yml

@@ -0,0 +1,46 @@
+name: prerelease
+on:
+  push:
+    branches:
+      # releases/<tag>/<version>
+      - releases/*/*
+jobs:
+  prerelease:
+    runs-on: ubuntu-latest
+    environment: production
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '*'
+          cache: 'npm'
+          check-latest: true
+          registry-url: 'https://registry.npmjs.org'
+      - name: Install core dependencies
+        run: npm ci --no-audit
+      - name: Extract tag and version
+        id: extract
+        run: |-
+          ref=${{ github.ref }}
+          branch=${ref:11}
+          tag_version=${branch:9}
+          tag=${tag_version%/*}
+          version=${tag_version##*/}
+          echo "::set-output name=tag::${tag}"
+          echo "::set-output name=version::${version}"
+      - name: Log versions
+        run: |-
+          echo tag=${{ steps.extract.outputs.tag }}
+          echo version=${{ steps.extract.outputs.version }}
+      - name: Setup git user
+        run: git config --global user.name github-actions
+      - name: Setup git email
+        run: git config --global user.email [email protected]
+      - name: Run npm version
+        run: npm version ${{ steps.extract.outputs.version }}-${{ steps.extract.outputs.tag }} --allow-same-version
+      - name: Push changes
+        run: git push --follow-tags
+      - name: Run npm publish
+        run: npm publish --tag=${{ steps.extract.outputs.tag }}
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

.github/workflows/release-please.yml

@@ -6,14 +6,29 @@ on:
 jobs:
   release-please:
     runs-on: ubuntu-latest
+    environment: production
     steps:
       - uses: navikt/github-app-token-generator@a9cd374e271b8aef573b8c16ac46c44fb89b02db
         id: get-token
         with:
           private-key: ${{ secrets.TOKENS_PRIVATE_KEY }}
           app-id: ${{ secrets.TOKENS_APP_ID }}
       - uses: GoogleCloudPlatform/release-please-action@v2
+        id: release
         with:
           token: ${{ steps.get-token.outputs.token }}
           release-type: node
           package-name: '@netlify/plugin-nextjs'
+      - uses: actions/checkout@v2
+        if: ${{ steps.release.outputs.release_created }}
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '*'
+          cache: 'npm'
+          check-latest: true
+          registry-url: 'https://registry.npmjs.org'
+        if: ${{ steps.release.outputs.release_created }}
+      - run: npm publish
+        if: ${{ steps.release.outputs.release_created }}
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.NPM_TOKEN}}

cypress/config/ci.json

@@ -4,5 +4,6 @@
   "pluginsFile": "../../cypress/plugins",
   "screenshotsFolder": "../../cypress/screenshots",
   "supportFile": "../../cypress/support/index.js",
-  "videoFolder": "../../cypress/videos"
+  "videoFolder": "../../cypress/videos",
+  "projectId": "66va58"
 }

cypress/config/nx-demo.json

@@ -4,5 +4,6 @@
   "pluginsFile": "../../cypress/plugins",
   "screenshotsFolder": "../../cypress/screenshots",
   "supportFile": "../../cypress/support/index.js",
-  "videoFolder": "../../cypress/videos"
+  "videoFolder": "../../cypress/videos",
+  "projectId": "ijcdpo"
 }

cypress/config/static-root.json

@@ -4,5 +4,6 @@
   "pluginsFile": "../../cypress/plugins",
   "screenshotsFolder": "../../cypress/screenshots",
   "supportFile": "../../cypress/support/index.js",
-  "videoFolder": "../../cypress/videos"
+  "videoFolder": "../../cypress/videos",
+  "projectId": "3tvrbe"
 }

demos/default/local-plugin/package-lock.json

@@ -1,12 +1,14 @@
 [build]
 command = "next build"
 publish = ".next"
-ignore = "echo CACHED_COMMIT_REF: $CACHED_COMMIT_REF COMMIT_REF: $COMMIT_REF && git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../../"
 
+# ignore = "echo CACHED_COMMIT_REF: $CACHED_COMMIT_REF COMMIT_REF: $COMMIT_REF && git diff --exit-code $CACHED_COMMIT_REF $COMMIT_REF ../../"
 [build.environment]
 # cache Cypress binary in local "node_modules" folder
 # so Netlify caches it
 CYPRESS_CACHE_FOLDER = "../node_modules/.CypressBinary"
+# set TERM variable for terminal output
+TERM = "xterm"
 
 [dev]
 framework = "#static"
@@ -21,4 +23,5 @@ package = "@netlify/plugin-local-install-core"
 package = "netlify-plugin-cypress"
 
 [context.deploy-preview.plugins.inputs]
+record = true
 configFile = "../../cypress/config/ci.json"

demos/default/netlify.toml

@@ -1,8 +1,8 @@
 [build]
 command = "npm run build"
 publish = "dist/apps/demo-monorepo/.next"
-ignore = "git diff --quiet $CACHED_COMMIT_REF $COMMIT_REF ../../"
 
+# ignore = "git diff --exit-code $CACHED_COMMIT_REF $COMMIT_REF ../../"
 [dev]
 command = "npm run start"
 targetPort = 4200
@@ -14,6 +14,8 @@ package = "./local-plugin"
 # cache Cypress binary in local "node_modules" folder
 # so Netlify caches it
 CYPRESS_CACHE_FOLDER = "../node_modules/.CypressBinary"
+# set TERM variable for terminal output
+TERM = "xterm"
 
 [[plugins]]
 package = "@netlify/plugin-local-install-core"
@@ -22,4 +24,5 @@ package = "@netlify/plugin-local-install-core"
 package = "netlify-plugin-cypress"
 
 [context.deploy-preview.plugins.inputs]
+record = true
 configFile = "../../cypress/config/nx-demo.json"