Skip to content

Commit

Permalink
Merge branch 'main' of github.com:redwoodjs/redwood into feat/dc-rc-c…
Browse files Browse the repository at this point in the history
…ors-db-auth

* 'main' of github.com:redwoodjs/redwood: (366 commits)
  fixi(prisma): Set default cwd for runCommand task to base (#4604)
  Tailwind: Generate prettier-approved code (#4541)
  Webhook verifiers: Add Base64Sha256 version for Svix webhooks used by Clerk auth (#4598)
  Update dependency cypress to v9.5.1 (#4602)
  Update dependency typescript to v4.6.2 (#4603)
  Update dependency yargs-parser to v21.0.1 (#4595)
  Update typescript-eslint monorepo to v5.13.0 (#4601)
  fix dbAuth Auth template roles logic and types, run type-check on Smoke-test CI, and resolve TS errors (#4566)
  Update seed.ts to reflect correct input type (#4560)
  feat(exec): Allow listing of scripts with rw exec to improve dx (#4600)
  Update dependency zx to v5.2.0 (#4596)
  remove packageManager yarn v3 from fixture
  Update dependency @types/lodash to v4.14.179 (#4582)
  Bump url-parse in /__fixtures__/example-todo-main-with-errors (#4584)
  Bump url-parse from 1.5.7 to 1.5.10 in /__fixtures__/example-todo-main (#4585)
  Update dependency @supabase/supabase-js to v1.30.7 (#4589)
  Checking jest config web api (#4529)
  Add Codemod to Update Fatal Error Page to support Development version (#4577)
  Update dependency eslint-plugin-react to v7.29.2 (#4586)
  Update dependency systeminformation to v5.11.5 (#4587)
  ...
  • Loading branch information
dac09 committed Mar 1, 2022
2 parents b5dfe39 + 6c5c823 commit aff7172
Show file tree
Hide file tree
Showing 415 changed files with 170,524 additions and 11,682 deletions.
3 changes: 2 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -127,14 +127,15 @@ module.exports = {
'packages/api-server/src/**',
'packages/cli/src/**',
'packages/core/config/**',
'packages/create-redwood-app/src/create-redwood-app.js',
'packages/create-redwood-app/src/*.js',
'packages/internal/src/**',
'packages/prerender/src/**',
'packages/structure/src/**',
'packages/testing/src/**',
'packages/testing/config/**',
'packages/eslint-config/*.js',
'packages/record/src/**',
'packages/telemetry/src/**',
],
env: {
es6: true,
Expand Down
8 changes: 8 additions & 0 deletions .github/actions/setup_test_project/action.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
name: 'Setup test project'
description: 'Setup for CLI checks and telemetry benchmarks'
outputs:
test_project_path:
description: 'Path to the test project'
runs:
using: 'node16'
main: 'setup_test_project.mjs'
35 changes: 35 additions & 0 deletions .github/actions/setup_test_project/setup_test_project.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import os from 'node:os'
import path from 'node:path'
import fs from 'fs-extra'

import { exec } from '@actions/exec'
import * as core from '@actions/core'

const test_project_path = path.join(
os.tmpdir(),
'test-project',
// ":" is problematic with paths
new Date().toISOString().split(':').join('-')
)

console.log({
test_project_path
})

core.setOutput('test_project_path', test_project_path)

await exec(`yarn build:test-project --ts --link ${test_project_path}`)

try {
if (
!fs.existsSync(path.join(test_project_path, 'web/tsconfig.json')) ||
!fs.existsSync(path.join(test_project_path, 'api/tsconfig.json'))
) {
throw ('Test-project is not TypeScript')
}
} catch(e) {
console.log('********************************')
console.error('\nError: Test-project is expected to be TypeScript\nExiting test-project setup.\n')
console.log('********************************')
process.exit(1)
}
17 changes: 11 additions & 6 deletions .github/issue_template.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,20 @@
---
name: Holiday issue template
about: Project Status over the Holidays
name: Issue template
about: v1-rc info
title: ''
labels: ''
assignees: ''

---

Happy Holidays!🎄🎉
The Redwood v1 release candidate has been published, and we're actively working toward a 1.0.0 GA. 🎯

Redwood project activity will be slow until Monday, January 3rd. Read the following "Redwood Holiday Updates" to learn more:
- https://github.com/redwoodjs/redwood/issues/3992
Read @mojombo's post about what to expect, what this means for current priorities, and how to help:
- v1-rc Announcement: https://community.redwoodjs.com/t/what-the-1-0-release-candidate-phase-means-and-when-1-0-will-drop/2604
- v1-rc Priorities that need community help: https://redwoodjs.com/good-first-issue

To proceed with your Issue, just delete this message. Core Team maintainers will get back to you in 2022! 😃
New Issues and PRs are always welcome and helpful! 😀 We will respond and prioritize. If you need help faster than what we can provide here, you can reach out via the community chat or forums:
- Discord Chat: https://discord.gg/jjSYEQd
- Discourse Forum: https://community.redwoodjs.com/

**When you're ready to proceed, just delete this message.**
13 changes: 9 additions & 4 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Happy Holidays!🎄🎉
The Redwood v1 release candidate has been published, and we're actively working toward a 1.0.0 GA. 🎯

Redwood project activity will be slow until Monday, January 3rd. Read the following "Redwood Holiday Updates" to learn more:
- https://github.com/redwoodjs/redwood/issues/3992
Read @mojombo's post about what to expect, what this means for current priorities, and how to help:
- v1-rc Announcement: https://community.redwoodjs.com/t/what-the-1-0-release-candidate-phase-means-and-when-1-0-will-drop/2604
- v1-rc Priorities that need community help: https://redwoodjs.com/good-first-issue

To proceed with your PR, just delete this message. Core Team maintainers will get back to you in 2022! 😃
New Issues and PRs are always welcome and helpful! 😀 We will respond and prioritize. If you need help faster than what we can provide here, you can reach out via the community chat or forums:
- Discord Chat: https://discord.gg/jjSYEQd
- Discourse Forum: https://community.redwoodjs.com/

**When you're ready to proceed, just delete this message.**
53 changes: 35 additions & 18 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
{
"extends": [
"config:base"
"extends": ["config:base"],
"postUpdateOptions": ["yarnDedupeHighest"],
"assignees": ["@jtoar"],
"labels": ["release:chore"],
"packageRules": [
{
"matchUpdateTypes": [
"minor",
"patch"
],
"automerge": true
}
],
"ignoreDeps": [
"boxen",
Expand All @@ -15,20 +25,27 @@
"@types/node-fetch",
"chalk",
"pascalcase",
"node-fetch"
],
"packageRules": [
{
"matchUpdateTypes": [
"minor",
"patch"
],
"automerge": true
}
],
"postUpdateOptions": ["yarnDedupeHighest"],
"assignees": [
"@jtoar"
],
"labels": ["release:chore"]
"node-fetch",
"@redwoodjs/api",
"@redwoodjs/api-server",
"@redwoodjs/auth",
"@redwoodjs/cli",
"@redwoodjs/codemods",
"@redwoodjs/core",
"@redwoodjs/create-redwood-app",
"@redwoodjs/eslint-config",
"@redwoodjs/forms",
"@redwoodjs/graphql-server",
"@redwoodjs/internal",
"@redwoodjs/prerender",
"@redwoodjs/record",
"@redwoodjs/router",
"@redwoodjs/structure",
"@redwoodjs/telemetry",
"@redwoodjs/testing",
"@redwoodjs/web",
"lru-cache",
"pretty-bytes",
"is-port-reachable"
]
}
16 changes: 8 additions & 8 deletions .github/workflows/build-eslint-jest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,26 @@ jobs:
strategy:
matrix:
os: ['ubuntu-latest', 'windows-latest']
node-version: ['14', '16']
node-version: ['14', '16.10']
fail-fast: true
runs-on: ${{ matrix.os }}
name: ${{ matrix.os }} | Node ${{ matrix.node-version }} latest
steps:
- uses: actions/checkout@v2

- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

- name: Get yarn cache directory path
id: yarn-cache-dir-path
run: echo "::set-output name=dir::$(yarn config get cacheFolder)"

- name: Remove the tsc problem matcher if not ubuntu-node-16
if: (matrix.os == 'ubuntu-latest' && matrix.node-version == '16.10') == false
run: echo "echo "::remove-matcher owner=tsc::""

- name: Cache yarn
uses: actions/cache@v2
id: yarn-cache
Expand All @@ -37,12 +41,8 @@ jobs:
- name: Install dependencies
run: yarn install --immutable

- name: 'Check Yarn constraints (fix w/ "yarn constraints --fix")'
run: yarn constraints

- name: 'Check for duplicate dependencies (fix w/ "yarn dedupe")'
if: steps.yarn-cache.outputs.cache-hit != 'true'
run: yarn dedupe --check
- name: Check constraints, dependencies, and package.json's
uses: ./tasks/check

- name: Build
run: yarn build
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create-pr-artifact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
uses: actions/checkout@v2

- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: 14

Expand Down
36 changes: 1 addition & 35 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v2

- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}

Expand Down Expand Up @@ -82,40 +82,6 @@ jobs:
working-directory: ./tasks/e2e
spec: |
cypress/integration/01-tutorial/*.spec.js
cypress/integration/03-storybook/*.spec.js
cypress/integration/04-logger/*.spec.js
- name: Prepare for CLI checks by restoring 01-tutorial end state
run: |
git restore . && git clean -df
working-directory: ${{ steps.createpath.outputs.project_path }}

- name: Run `rw test api`
run: yarn rw test api --no-watch
working-directory: ${{ steps.createpath.outputs.project_path }}

- name: Run `rw test web`
run: yarn rw test web --no-watch
working-directory: ${{ steps.createpath.outputs.project_path }}

- name: Run `rw build` (no prerender)
run: yarn rw build --no-prerender --verbose
working-directory: ${{ steps.createpath.outputs.project_path }}
- name: Run `rw prerender`
run: yarn rw prerender --verbose
# TODO: We should have a script that verifies this.
working-directory: ${{ steps.createpath.outputs.project_path }}

- name: Run `rwfw lint`
# choosing a simple command to verify; --help requires prompt input
run: RWFW_PATH=${{ steps.createpath.outputs.framework_path }} yarn rwfw lint
working-directory: ${{ steps.createpath.outputs.project_path }}

- name: Run `rw exec` generate and execute
run: yarn rw g script testScript && yarn rw exec testScript
working-directory: ${{ steps.createpath.outputs.project_path }}

- name: Run `rw data-migrate up`
run: yarn rw dm up
working-directory: ${{ steps.createpath.outputs.project_path }}
80 changes: 0 additions & 80 deletions .github/workflows/projects_beta_automation.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/publish-npm-canary.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
with:
fetch-depth: 0 # Required because lerna uses tags to determine the version.
- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '14'

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish-npm-rc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
fetch-depth: 0 # Required because lerna uses tags to determine the version.

- name: Setup node
uses: actions/setup-node@v2
uses: actions/setup-node@v3
with:
node-version: '14'

Expand Down
Loading

0 comments on commit aff7172

Please sign in to comment.