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: CTA cache and vite build #1806

Merged
merged 10 commits into from
May 12, 2021
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changes/cta-vite-esbuild-install-direct.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"create-tauri-app": patch
---

Work around bugs between esbuild and npm by installing directly at the end of the sequence. Also default to using the latest on all of the installs instead of npx's cache.
16 changes: 14 additions & 2 deletions .github/workflows/test-cta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ on:
inputs:
branch:
default: "dev"
platform:
default: "ubuntu"
pull_request:
paths:
- "tooling/create-tauri-app/**"
Expand All @@ -19,7 +21,7 @@ env:
jobs:
create-recipe-with-npm:
name: "node@${{ matrix.node }} + npm@${{ matrix.manager }}: ${{ matrix.recipe }}"
runs-on: ubuntu-latest
runs-on: ${{ github.event.inputs.branch || 'ubuntu' }}-latest

strategy:
fail-fast: false
Expand All @@ -45,9 +47,18 @@ jobs:
npm-version: ${{ matrix.manager }}
yarn-version: 1.22.5
- name: install webkit2gtk
if: (github.event.inputs.branch || 'ubuntu') == 'ubuntu'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0 libappindicator3-dev
- run: yarn
working-directory: tooling/cli.js
- run: yarn build
working-directory: tooling/cli.js
- run: yarn
working-directory: tooling/api
- run: yarn build
working-directory: tooling/api
- run: yarn
working-directory: tooling/create-tauri-app
- run: yarn build
Expand All @@ -60,7 +71,7 @@ jobs:

create-recipe-with-yarn:
name: "node@${{ matrix.node }} + yarn@1: ${{ matrix.recipe }}"
runs-on: ubuntu-latest
runs-on: ${{ github.event.inputs.branch || 'ubuntu' }}-latest

strategy:
fail-fast: false
Expand All @@ -81,6 +92,7 @@ jobs:
node-version: ${{ matrix.node }}
yarn-version: 1.22.5
- name: install webkit2gtk
if: (github.event.inputs.branch || 'ubuntu') == 'ubuntu'
run: |
sudo apt-get update
sudo apt-get install -y libgtk-3-dev libgtksourceview-3.0-dev webkit2gtk-4.0 libappindicator3-dev
Expand Down
23 changes: 8 additions & 15 deletions tooling/create-tauri-app/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import minimist from 'minimist'
import inquirer from 'inquirer'
import { bold, cyan, green, reset, yellow } from 'chalk'
import { platform } from 'os'
import { resolve, join } from 'path'
import { resolve, join, relative } from 'path'
import { cra } from './recipes/react'
import { vuecli } from './recipes/vue-cli'
import { vanillajs } from './recipes/vanilla'
Expand Down Expand Up @@ -323,26 +323,19 @@ const runInit = async (argv: Argv): Promise<void> => {
}
}, [])

const tauriCLIVersion = !argv.dev
? 'latest'
: `file:${relative(appDirectory, join(__dirname, '../../cli.js'))}`

// Vue CLI plugin automatically runs these
if (recipe.shortName !== 'vuecli') {
logStep('Installing any additional needed dependencies')
if (argv.dev) {
await shell(packageManager, ['link', '@tauri-apps/cli'], {
cwd: appDirectory
})
await shell(packageManager, ['link', '@tauri-apps/api'], {
cwd: appDirectory
})
}

await install({
appDir: appDirectory,
dependencies: recipe.extraNpmDependencies,
devDependencies: argv.dev
? [...recipe.extraNpmDevDependencies]
: [argv.dev ? '@tauri-apps/cli' : ''].concat(
recipe.extraNpmDevDependencies
),
devDependencies: [`@tauri-apps/cli@${tauriCLIVersion}`].concat(
recipe.extraNpmDevDependencies
),
packageManager
})

Expand Down
2 changes: 1 addition & 1 deletion tooling/create-tauri-app/src/recipes/react.ts
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export const cra: Recipe = {
await shell(
'npx',
[
'create-react-app',
'create-react-app@latest',
...(template === 'cra.ts' ? ['--template', 'typescript'] : []),
`${cfg.appName}`,
'--use-npm'
Expand Down
21 changes: 16 additions & 5 deletions tooling/create-tauri-app/src/recipes/vite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,23 +88,34 @@ const vite: Recipe = {
cwd
}
)
await shell('yarn', ['install'], { cwd })
} else {
await shell(
'npx',
['@vitejs/create-app', `${cfg.appName}`, '--template', `${template}`],
[
'@vitejs/create-app@latest',
`${cfg.appName}`,
'--template',
`${template}`
],
{
cwd
}
)
await shell('npm', ['install'], { cwd })
}

await afterViteCA(cwd, cfg.appName, template)
},
postInit: async ({ packageManager }) => {
postInit: async ({ cwd, packageManager }) => {
// we don't have a consistent way to rebuild and
// esbuild has hit all the bugs and struggles to install on the postinstall
await shell('node', ['./node_modules/esbuild/install.js'], { cwd })
if (packageManager === 'yarn') {
await shell('yarn', ['build'], { cwd })
} else {
await shell('npm', ['run', 'build'], { cwd })
}
console.log(`
Your installation completed.
Your installation completed. Change directories to \`${cwd}\`.
To start, run ${packageManager === 'yarn' ? 'yarn' : 'npm run'} tauri ${
packageManager === 'npm' ? '--' : ''
} dev
Expand Down
2 changes: 1 addition & 1 deletion tooling/create-tauri-app/src/recipes/vue-cli.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ const vuecli: Recipe = {
await shell(
'npx',
[
'@vue/cli',
'@vue/cli@latest',
'create',
`${cfg.appName}`,
'--packageManager',
Expand Down
41 changes: 3 additions & 38 deletions tooling/create-tauri-app/test/index.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,45 +20,10 @@ const timeoutLong = 900000
const timeoutLittleLonger = 930000
const logOut = false ? 'inherit' : 'pipe'

beforeAll(async () => {
const installCLI = await execa('yarn', [], {
stdio: logOut,
cwd: clijs,
timeout: timeoutLong
})

const buildCLI = await execa('yarn', ['build-release'], {
stdio: logOut,
cwd: clijs,
timeout: timeoutLong
})

const linkCLI = await execa('yarn', ['link'], {
stdio: logOut,
cwd: clijs,
timeout: timeoutLong
})

const installAPI = await execa('yarn', [], {
stdio: logOut,
cwd: api,
timeout: timeoutLong
})

const buildAPI = await execa('yarn', ['build'], {
stdio: logOut,
cwd: api,
timeout: timeoutLong
})

const linkAPI = await execa('yarn', ['link'], {
stdio: logOut,
cwd: path.join(api, 'dist'),
timeout: timeoutLong
})
}, timeoutLittleLonger)

describe('CTA', () => {
console.warn(
'NOTE: You need to have installed and built cli.js and api before running the tests.'
)
describe.each(recipes.map((recipe) => [recipe, 'tauri-app']))(
`%s recipe`,
(recipe: string, appName: string) => {
Expand Down