Skip to content
Open
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
2 changes: 1 addition & 1 deletion e2e/nx-firebase-e2e/tests/test-workspace.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe('workspace setup', () => {
expect(packageJson.dependencies['firebase-functions']).toBeDefined()
expect(
packageJson.devDependencies['firebase-functions-test'],
).toBeDefined()
).toBeUndefined()

// check that plugin init generator adds @google-cloud/functions-framework if pnpm is being used
// Use tmpProjPath() to detect the package manager in the e2e workspace, not the main project
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 0 additions & 5 deletions packages/nx-firebase/src/generators/function/function.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
} from '@nx/devkit'
import { applicationGenerator as nodeApplicationGenerator } from '@nx/node'

import { initGenerator } from '../init/init'
import { getFirebaseConfigFromProject, updateTsConfig } from '../../utils'

import { addFunctionConfig, createFiles, updateProject } from './lib'
Expand Down Expand Up @@ -104,10 +103,6 @@ export async function functionGenerator(

// const options = normalizeOptions(host, schema)

// initialise plugin
const initTask = await initGenerator(host, {})
tasks.push(initTask)

// We use @nx/node:app to scaffold our function application, then modify as required
// `nx g @nx/node:app function-name --directory functions/dir --e2eTestRunner=none --framework=none --unitTestRunner=jest --bundler=esbuild --tags=firebase:firebase-app`

Expand Down
7 changes: 0 additions & 7 deletions packages/nx-firebase/src/generators/init/init.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,9 +80,6 @@ describe('init generator', () => {
`^${packageVersions.firebaseFunctions}`,
)

expect(packageJson.devDependencies['firebase-functions-test']).toBe(
`^${packageVersions.firebaseFunctionsTest}`,
)
expect(packageJson.devDependencies['firebase-tools']).toBe(
`^${packageVersions.firebaseTools}`,
)
Expand Down Expand Up @@ -115,7 +112,6 @@ describe('init generator', () => {

packageJsonDefault.devDependencies['firebase-tools'] = testVersion
packageJsonDefault.devDependencies['kill-port'] = testVersion
packageJsonDefault.devDependencies['firebase-functions-test'] = testVersion

devkit.writeJson(tree, 'package.json', packageJsonDefault)

Expand All @@ -126,9 +122,6 @@ describe('init generator', () => {
expect(packageJson.dependencies['firebase']).toBe(testVersion)
expect(packageJson.dependencies['firebase-admin']).toBe(testVersion)
expect(packageJson.dependencies['firebase-functions']).toBe(testVersion)
expect(packageJson.devDependencies['firebase-functions-test']).toBe(
testVersion,
)
expect(packageJson.devDependencies['firebase-tools']).toBe(testVersion)
expect(packageJson.devDependencies['kill-port']).toBe(testVersion)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,10 +74,6 @@ export function addDependencies(tree: Tree): GeneratorCallback {
'firebase-tools',
`^${packageVersions.firebaseTools}`,
)
addDevDependencyIfNotPresent(
'firebase-functions-test',
`^${packageVersions.firebaseFunctionsTest}`,
)

// kill-port is used by the emulate target to ensure clean emulator startup
// since Nx doesn't kill processes cleanly atm
Expand Down
14 changes: 4 additions & 10 deletions packages/nx-firebase/src/generators/sync/sync.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,13 @@ import {
joinPathFragments,
logger,
readProjectConfiguration,
runTasksInSerial,
Tree,
updateProjectConfiguration,
writeJson,
} from '@nx/devkit'

import { SyncGeneratorSchema } from './schema'
import { setFirebaseConfigFromCommand } from '../../utils'
import initGenerator from '../init/init'

import {
debugInfo,
Expand All @@ -35,13 +33,7 @@ export async function syncGenerator(
tree: Tree,
options: SyncGeneratorSchema,
): Promise<GeneratorCallback> {
const tasks: GeneratorCallback[] = []

// initialise plugin
const initTask = await initGenerator(tree, {})
tasks.push(initTask)

// otherwise, sync the workspace.
// sync the workspace.
// build lists of firebase apps & functions that have been deleted or renamed
debugInfo('- Syncing workspace')

Expand Down Expand Up @@ -407,7 +399,9 @@ export async function syncGenerator(
)
}

return runTasksInSerial(...tasks)
return () => {
// noop - no install tasks needed
}
}

export default syncGenerator
1 change: 0 additions & 1 deletion tools/generate-package-versions.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export const packageVersions = {
firebase: '${packageJson.devDependencies['firebase']}',
firebaseAdmin: '${packageJson.devDependencies['firebase-admin']}',
firebaseFunctions: '${packageJson.devDependencies['firebase-functions']}',
firebaseFunctionsTest: '${packageJson.devDependencies['firebase-functions-test']}',
firebaseTools: '${packageJson.devDependencies['firebase-tools']}',
killPort: '${packageJson.devDependencies['kill-port']}',
nodeEngine: '${nodeVersion}',
Expand Down