Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(crwa): remove yarn-install option for yarn 1 #9881

Merged
merged 2 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 36 additions & 8 deletions packages/create-redwood-app/src/create-redwood-app.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,20 @@ const { telemetry } = Parser(hideBin(process.argv), {

const tui = new RedwoodTUI()

function isYarnBerryOrNewer() {
const { npm_config_user_agent: npmConfigUserAgent } = process.env

if (npmConfigUserAgent) {
const match = npmConfigUserAgent.match(/yarn\/(\d+)/)

if (match && match[1]) {
return parseInt(match[1], 10) >= 2
}
}

return false
}

const USE_GITPOD_TEXT = [
` As an alternative solution, you can launch a Redwood project using GitPod instead. GitPod is a an online IDE.`,
` See: ${terminalLink(
Expand Down Expand Up @@ -669,18 +683,24 @@ async function createRedwoodApp() {
type: 'string',
describe: 'Commit message for the initial commit',
})
.option('yarn-install', {
default: null,
type: 'boolean',
describe: 'Install node modules. Skip via --no-yarn-install.',
})
.option('telemetry', {
default: true,
type: 'boolean',
describe:
'Enables sending telemetry events for this create command and all Redwood CLI commands https://telemetry.redwoodjs.com',
})

const _isYarnBerryOrNewer = isYarnBerryOrNewer()

// Only add the yarn-install flag if the yarn version is >= 2
if (_isYarnBerryOrNewer) {
cli.option('yarn-install', {
default: null,
type: 'boolean',
describe: 'Install node modules. Skip via --no-yarn-install.',
})
}

const parsedFlags = cli.parse()

tui.drawText(
Expand All @@ -696,7 +716,9 @@ async function createRedwoodApp() {
// Extract the args as provided by the user in the command line
// TODO: Make all flags have the 'flag' suffix
const args = parsedFlags._
const yarnInstallFlag = parsedFlags['yarn-install'] ?? parsedFlags.yes
const yarnInstallFlag =
parsedFlags['yarn-install'] ??
(_isYarnBerryOrNewer ? parsedFlags.yes : null)
const typescriptFlag = parsedFlags.typescript ?? parsedFlags.yes
const overwrite = parsedFlags.overwrite
const gitInitFlag = parsedFlags['git-init'] ?? parsedFlags.yes
Expand Down Expand Up @@ -734,7 +756,11 @@ async function createRedwoodApp() {
commitMessage = await handleCommitMessagePreference(commitMessageFlag)
}

const yarnInstall = await handleYarnInstallPreference(yarnInstallFlag)
let yarnInstall = false

if (_isYarnBerryOrNewer) {
yarnInstall = await handleYarnInstallPreference(yarnInstallFlag)
}

let newAppDir = path.resolve(process.cwd(), targetDir)

Expand All @@ -750,7 +776,9 @@ async function createRedwoodApp() {
.getActiveSpan()
?.setAttribute('yarn-install-time', Date.now() - yarnInstallStart)
} else {
tui.drawText(`${RedwoodStyling.info('ℹ')} Skipped yarn install step`)
if (_isYarnBerryOrNewer) {
tui.drawText(`${RedwoodStyling.info('ℹ')} Skipped yarn install step`)
}
}

// Generate types
Expand Down
4 changes: 2 additions & 2 deletions packages/create-redwood-app/tests/e2e.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ describe('create-redwood-app', () => {
--git-init, --git Initialize a git repository [boolean] [default: null]
-m, --commit-message Commit message for the initial commit
[string] [default: null]
--yarn-install Install node modules. Skip via --no-yarn-install.
[boolean] [default: null]
--telemetry Enables sending telemetry events for this create
command and all Redwood CLI commands
https://telemetry.redwoodjs.com
[boolean] [default: true]
--yarn-install Install node modules. Skip via --no-yarn-install.
[boolean] [default: null]

Examples:
create-redwood-app my-redwood-app
Expand Down
Loading