Merge branch 'main' into mk/no-beta

Author: ascorbic

.github/workflows/pre-release.yml

@@ -7,7 +7,6 @@ on:
 jobs:
   prerelease:
     runs-on: ubuntu-latest
-    environment: production
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2

.github/workflows/release-please.yml

@@ -6,7 +6,6 @@ on:
 jobs:
   release-please:
     runs-on: ubuntu-latest
-    environment: production
     steps:
       - uses: navikt/github-app-token-generator@a9cd374e271b8aef573b8c16ac46c44fb89b02db
         id: get-token

cypress/integration/static-root/i18n.spec.ts

@@ -27,7 +27,9 @@ describe('Localization', () => {
   it('should use Accept-Language to choose a locale', () => {
     cy.visit('/', {
       headers: {
-        'Accept-Language': 'fr-FR,fr;q=0.5',
+        // FIXME: switch back once libredirect bug is fixed
+        'Accept-Language': 'fr-FR',
+        // 'Accept-Language': 'fr-FR,fr;q=0.5',
       },
     })
     cy.url().should('eq', `${Cypress.config().baseUrl}/fr/`)
@@ -39,7 +41,9 @@ describe('Localization', () => {
     cy.visit({
       url: '/',
       headers: {
-        'Accept-Language': 'fr-FR,fr;q=0.5',
+        // FIXME: switch back once libredirect bug is fixed
+        'Accept-Language': 'fr-FR',
+        // 'Accept-Language': 'fr-FR,fr;q=0.5',
       },
     })
     cy.url().should('eq', `${Cypress.config().baseUrl}/`)

demos/default/netlify.toml

@@ -1,8 +1,8 @@
 [build]
 command = "next build"
 publish = ".next"
+ignore = "echo CACHED_COMMIT_REF: $CACHED_COMMIT_REF COMMIT_REF: $COMMIT_REF && git diff --exit-code $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

demos/nx-next-monorepo-demo/netlify.toml

@@ -1,8 +1,8 @@
 [build]
 command = "npm run build"
 publish = "dist/apps/demo-monorepo/.next"
+ignore = "git diff --exit-code $CACHED_COMMIT_REF $COMMIT_REF ../../"
 
-# ignore = "git diff --exit-code $CACHED_COMMIT_REF $COMMIT_REF ../../"
 [dev]
 command = "npm run start"
 targetPort = 4200