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

chore(prisma): type discovery + fast builds + clean monorepo #8497

Merged
merged 69 commits into from Aug 2, 2021

Conversation

millsp
Copy link
Member

@millsp millsp commented Jul 29, 2021

It's all in the title ☝️

closes #8443

@millsp millsp changed the title Integration/type discovery chore(prisma): type discovery Jul 29, 2021
@millsp millsp marked this pull request as ready for review July 30, 2021 15:53
@millsp millsp added this to the 2.29.0 milestone Jul 30, 2021
@millsp
Copy link
Member Author

millsp commented Jul 30, 2021

thanks @williamluke4 🎉

@millsp millsp self-assigned this Jul 31, 2021
@Jolg42
Copy link
Member

Jolg42 commented Aug 2, 2021

I merged my PR before that one and it looks like it created a conflict 🙈

# Conflicts:
#	packages/migrate/package.json
@Jolg42
Copy link
Member

Jolg42 commented Aug 2, 2021

I just tried it and so far it works like a charm 💚

Comment on lines +1 to +31
import { PrismaClient } from '.'
import { expectError } from 'tsd'

// tslint:disable

const prisma = new PrismaClient({
datasources: {
db: {
url: 'file:dev.db',
},
},
})

;(async () => {
expectError(
await prisma.$transaction(
[prisma.user.findMany(), prisma.$queryRaw`SELECT 1`, 'random string'],
{},
),
)
expectError(await prisma.$transaction([prisma.$connect()]))
expectError(await prisma.$transaction([prisma.$disconnect()]))
expectError(
await prisma.$transaction([
new Promise((res) => res('You Shall Not Pass')),
]),
)
expectError(await prisma.$transaction([5]))
expectError(await prisma.$transaction(['str']))
expectError(await prisma.$transaction([{}]))
})()
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like an unrelated addition, but nice!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! That should be removed

@@ -24,8 +24,6 @@ Debug.enable = (namespace: string): void => {

Debug.enabled = (namespace: string): boolean => DebugNode.enabled(namespace)

export declare type Debugger = DebugLib.Debugger
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did we use this somewhere?

Comment on lines +11 to +13
const { size } = fs.statSync(id)

console.log('BINARY_SIZE', size)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks unrelated to types discovery, what is it for?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh yes, that was a debug for tests not passing. Good catch!

Copy link
Member

@Jolg42 Jolg42 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Love it 💚

@Jolg42 Jolg42 merged commit 0d0dc83 into master Aug 2, 2021
@Jolg42 Jolg42 deleted the integration/type-discovery branch August 2, 2021 12:42
Jolg42 added a commit that referenced this pull request Aug 2, 2021
* master: (40 commits)
  chore(deps): update engines to 2.29.0-5.8062e306decdf2fe2c2dcb8409c513a2023c8653 (#8533)
  chore(deps): update fkirc/skip-duplicate-actions action to v3.4.1 (#8528)
  chore: move buildkite folder + fix publish (#8531)
  chore(prisma): type discovery + fast builds + clean monorepo (#8497)
  fix(migrate): fix cases where migrate engine was not stopped after an error (#8482)
  chore: add dash to studio update branch for better branch names (#8507)
  chore(deps): update dependency @prisma/studio-server to v0.418.0
  fix(tar): upgrade to 6.1.2 (#8501)
  ci: create action for studio updates (#8502)
  chore(deps): update dependency rollup to v2.55.0 (#8477)
  chore(deps): update dependency ts-jest to v27.0.4 (#8474)
  chore(deps): update devdependencies (non-major)
  chore(deps): update react-prisma
  chore(deps): update definitelytyped
  chore: update renovate: ignore engines wrapper pkgs (#8113)
  docs: remove "(ORM Replacement)" from repo (#8456)
  fix(deps): update engines to v2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27
  chore(deps): update dependency @prisma/studio-server to v0.417.0
  chore(deps): update codecov-action action to v2 [skip ci] (#8352)
  chore(deps): update engines to 2.28.0-15.d616ac2e761de0623c4f0494620b4199161d9019 (#8412)
  ...
Jolg42 added a commit that referenced this pull request Aug 2, 2021
* master: (45 commits)
  chore: pin dependencies (#8534)
  chore(deps): update engines to 2.29.0-5.8062e306decdf2fe2c2dcb8409c513a2023c8653 (#8533)
  chore(deps): update fkirc/skip-duplicate-actions action to v3.4.1 (#8528)
  chore: move buildkite folder + fix publish (#8531)
  chore(prisma): type discovery + fast builds + clean monorepo (#8497)
  fix(migrate): fix cases where migrate engine was not stopped after an error (#8482)
  chore: add dash to studio update branch for better branch names (#8507)
  chore(deps): update dependency @prisma/studio-server to v0.418.0
  fix(tar): upgrade to 6.1.2 (#8501)
  ci: create action for studio updates (#8502)
  chore(deps): update dependency rollup to v2.55.0 (#8477)
  chore(deps): update dependency ts-jest to v27.0.4 (#8474)
  chore(deps): update devdependencies (non-major)
  chore(deps): update react-prisma
  chore(deps): update definitelytyped
  chore: update renovate: ignore engines wrapper pkgs (#8113)
  docs: remove "(ORM Replacement)" from repo (#8456)
  fix(deps): update engines to v2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27
  chore(deps): update dependency @prisma/studio-server to v0.417.0
  chore(deps): update codecov-action action to v2 [skip ci] (#8352)
  ...

# Conflicts:
#	scripts/ci/publish.ts
Jolg42 added a commit that referenced this pull request Aug 2, 2021
* master: (50 commits)
  chore: pin dependencies (#8534)
  chore(deps): update engines to 2.29.0-5.8062e306decdf2fe2c2dcb8409c513a2023c8653 (#8533)
  chore(deps): update fkirc/skip-duplicate-actions action to v3.4.1 (#8528)
  chore: move buildkite folder + fix publish (#8531)
  chore(prisma): type discovery + fast builds + clean monorepo (#8497)
  fix(migrate): fix cases where migrate engine was not stopped after an error (#8482)
  chore: add dash to studio update branch for better branch names (#8507)
  chore(deps): update dependency @prisma/studio-server to v0.418.0
  fix(tar): upgrade to 6.1.2 (#8501)
  ci: create action for studio updates (#8502)
  chore(deps): update dependency rollup to v2.55.0 (#8477)
  chore(deps): update dependency ts-jest to v27.0.4 (#8474)
  chore(deps): update devdependencies (non-major)
  chore(deps): update react-prisma
  chore(deps): update definitelytyped
  chore: update renovate: ignore engines wrapper pkgs (#8113)
  docs: remove "(ORM Replacement)" from repo (#8456)
  fix(deps): update engines to v2.28.0-17.89facabd0366f63911d089156a7a70125bfbcd27
  chore(deps): update dependency @prisma/studio-server to v0.417.0
  chore(deps): update codecov-action action to v2 [skip ci] (#8352)
  ...
Jolg42 added a commit that referenced this pull request Aug 3, 2021
* master: (21 commits)
  chore(deps): update engines to 2.29.0-7.10fbb58853d626be41afb2930e56e0a36afefb9f (#8538)
  chore: disable migrate logging
  feat(migrate): Allow migration engine to log to stdout (#7896)
  chore: pin dependencies (#8534)
  chore(deps): update engines to 2.29.0-5.8062e306decdf2fe2c2dcb8409c513a2023c8653 (#8533)
  chore(deps): update fkirc/skip-duplicate-actions action to v3.4.1 (#8528)
  chore: move buildkite folder + fix publish (#8531)
  chore(prisma): type discovery + fast builds + clean monorepo (#8497)
  fix(migrate): fix cases where migrate engine was not stopped after an error (#8482)
  chore: add dash to studio update branch for better branch names (#8507)
  chore(deps): update dependency @prisma/studio-server to v0.418.0
  fix(tar): upgrade to 6.1.2 (#8501)
  ci: create action for studio updates (#8502)
  chore(deps): update dependency rollup to v2.55.0 (#8477)
  chore(deps): update dependency ts-jest to v27.0.4 (#8474)
  chore(deps): update devdependencies (non-major)
  chore(deps): update react-prisma
  chore(deps): update definitelytyped
  chore: update renovate: ignore engines wrapper pkgs (#8113)
  docs: remove "(ORM Replacement)" from repo (#8456)
  ...
Jolg42 added a commit that referenced this pull request Aug 3, 2021
* master:
  fix(db pull): only output schema to stdout when using --print (#8551)
  chore(deps): update engines to 2.29.0-12.8b139c140bd01ba4dd6c98f44a1edac48baa58e2 (#8552)
  ci: fix publish
  ci: debug publish
  ci: prepare for major bump (#8240)
  Update update-studio-version.yml
  fix(migrate): db push after reset if unexecutable step (#8540)
  chore(deps): update engines to 2.29.0-10.e60a94c3a98104c76460aa8ab556c33fab0e3781 (#8545)
  chore(deps): update engines to 2.29.0-9.b0d6f0c282944bba506eed792838c02fdbdab0f8 (#8542)
  chore(deps): update engines to 2.29.0-7.10fbb58853d626be41afb2930e56e0a36afefb9f (#8538)
  chore: disable migrate logging
  feat(migrate): Allow migration engine to log to stdout (#7896)
  chore: pin dependencies (#8534)
  chore(deps): update engines to 2.29.0-5.8062e306decdf2fe2c2dcb8409c513a2023c8653 (#8533)
  chore(deps): update fkirc/skip-duplicate-actions action to v3.4.1 (#8528)
  chore: move buildkite folder + fix publish (#8531)
  chore(prisma): type discovery + fast builds + clean monorepo (#8497)
Andrew-Colman pushed a commit to Andrew-Colman/prisma that referenced this pull request Aug 7, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Enable Type Discovery
2 participants