@cedarjs/cli 7.0.0 → 8.0.0-canary.3263
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/build/buildHandler.js +2 -1
- package/dist/commands/build.js +1 -1
- package/dist/commands/check.js +2 -1
- package/dist/commands/deploy/baremetal/baremetalHandler.js +1 -1
- package/dist/commands/deploy/baremetal.js +1 -1
- package/dist/commands/deploy/flightcontrolHandler.js +1 -1
- package/dist/commands/deploy/helpers/deployHandler.js +1 -1
- package/dist/commands/deploy/netlify.js +1 -1
- package/dist/commands/deploy/renderHandler.js +1 -1
- package/dist/commands/deploy/serverlessHandler.js +2 -1
- package/dist/commands/deploy/vercel.js +1 -1
- package/dist/commands/destroy/handlerHelpers.js +1 -1
- package/dist/commands/destroy/page/pageHandler.js +2 -1
- package/dist/commands/destroy/scaffold/scaffoldHandler.js +2 -1
- package/dist/commands/destroy/sdl/sdlHandler.js +2 -1
- package/dist/commands/dev/devHandler.js +3 -4
- package/dist/commands/dev/packageWatchCommands.js +8 -3
- package/dist/commands/dev.js +1 -1
- package/dist/commands/execHandler.js +2 -1
- package/dist/commands/experimental/live-queries/liveQueries.js +1 -1
- package/dist/commands/experimental/live-queries/liveQueriesHandler.js +3 -3
- package/dist/commands/experimental/setupInngest.js +1 -1
- package/dist/commands/experimental/setupInngestHandler.js +1 -1
- package/dist/commands/experimental/setupOpentelemetry.js +1 -1
- package/dist/commands/experimental/setupOpentelemetryHandler.js +2 -1
- package/dist/commands/experimental/setupReactCompiler.js +1 -1
- package/dist/commands/experimental/setupReactCompilerHandler.js +4 -4
- package/dist/commands/experimental/setupRsc.js +1 -1
- package/dist/commands/experimental/setupRscHandler.js +2 -1
- package/dist/commands/experimental/setupStreamingSsr.js +1 -1
- package/dist/commands/experimental/setupStreamingSsrHandler.js +3 -2
- package/dist/commands/generate/cell/cell.js +20 -0
- package/dist/commands/generate/cell/cellHandler.js +68 -20
- package/dist/commands/generate/cell/templates/cell.tsx.template +21 -2
- package/dist/commands/generate/cell/templates/cellFragment.tsx.template +43 -0
- package/dist/commands/generate/cell/templates/cellList.tsx.template +21 -2
- package/dist/commands/generate/cell/templates/storiesFragment.tsx.template +23 -0
- package/dist/commands/generate/cell/templates/test.js.template +1 -1
- package/dist/commands/generate/cell/templates/testFragment.js.template +30 -0
- package/dist/commands/generate/dataMigration/dataMigration.js +2 -1
- package/dist/commands/generate/dbAuth/dbAuthHandler.js +23 -3
- package/dist/commands/generate/dbAuth/templates/login.oauth.tsx.template +164 -0
- package/dist/commands/generate/dbAuth/templates/signup.oauth.tsx.template +147 -0
- package/dist/commands/generate/directive/directiveHandler.js +2 -1
- package/dist/commands/generate/function/functionHandler.js +2 -1
- package/dist/commands/generate/job/jobHandler.js +2 -1
- package/dist/commands/generate/model/modelHandler.js +2 -1
- package/dist/commands/generate/ogImage/ogImageHandler.js +2 -1
- package/dist/commands/generate/package/filesTask.js +9 -12
- package/dist/commands/generate/package/packageHandler.js +3 -4
- package/dist/commands/generate/page/pageHandler.js +2 -1
- package/dist/commands/generate/realtime/realtime.js +1 -1
- package/dist/commands/generate/realtime/realtimeHandler.js +2 -9
- package/dist/commands/generate/realtime/templates/subscriptions/blank/blank.ts.template +1 -1
- package/dist/commands/generate/scaffold/scaffoldHandler.js +10 -5
- package/dist/commands/generate/scaffold/templates/components/NameForm.tsx.template +3 -3
- package/dist/commands/generate/scaffold/templates/lib/formatters.test.tsx.template +11 -0
- package/dist/commands/generate/scaffold/templates/lib/formatters.tsx.template +13 -1
- package/dist/commands/generate/script/scriptHandler.js +2 -1
- package/dist/commands/generate/sdl/sdlHandler.js +2 -1
- package/dist/commands/generate/secret/secret.js +1 -1
- package/dist/commands/generate/service/serviceHandler.js +47 -38
- package/dist/commands/generate/service/templates/service.ts.template +22 -8
- package/dist/commands/generate/service/templates/test.ts.template +1 -1
- package/dist/commands/generate/yargsCommandHelpers.js +1 -1
- package/dist/commands/generate/yargsHandlerHelpers.js +2 -1
- package/dist/commands/generate.js +1 -1
- package/dist/commands/info.js +1 -1
- package/dist/commands/lint.js +1 -1
- package/dist/commands/prerenderHandler.js +11 -4
- package/dist/commands/prismaHandler.js +7 -2
- package/dist/commands/record/init.js +1 -1
- package/dist/commands/serve.js +2 -1
- package/dist/commands/setup/auth/auth.js +2 -4
- package/dist/commands/setup/cache/cache.js +1 -1
- package/dist/commands/setup/cache/cacheHandler.js +2 -1
- package/dist/commands/setup/database/postgres.js +1 -1
- package/dist/commands/setup/database/postgresHandler.js +3 -1
- package/dist/commands/setup/deploy/providers/baremetalHandler.js +2 -1
- package/dist/commands/setup/deploy/providers/coherence.js +1 -1
- package/dist/commands/setup/deploy/providers/coherenceHandler.js +7 -6
- package/dist/commands/setup/deploy/providers/flightcontrolHandler.js +2 -1
- package/dist/commands/setup/deploy/providers/netlifyHandler.js +2 -1
- package/dist/commands/setup/deploy/providers/renderHandler.js +2 -1
- package/dist/commands/setup/deploy/providers/serverlessHandler.js +2 -1
- package/dist/commands/setup/deploy/providers/universalDeployHandler.js +4 -6
- package/dist/commands/setup/deploy/providers/vercelHandler.js +2 -1
- package/dist/commands/setup/docker/docker.js +1 -1
- package/dist/commands/setup/docker/dockerHandler.js +2 -1
- package/dist/commands/setup/generator/generator.js +1 -1
- package/dist/commands/setup/generator/generatorHandler.js +1 -1
- package/dist/commands/setup/graphql/features/fragments/fragments.js +1 -1
- package/dist/commands/setup/graphql/features/fragments/fragmentsHandler.js +3 -5
- package/dist/commands/setup/graphql/features/trustedDocuments/trustedDocuments.js +1 -1
- package/dist/commands/setup/graphql/features/trustedDocuments/trustedDocumentsHandler.js +2 -1
- package/dist/commands/setup/i18n/i18n.js +1 -1
- package/dist/commands/setup/i18n/i18nHandler.js +1 -1
- package/dist/commands/setup/jobs/jobs.js +1 -1
- package/dist/commands/setup/jobs/jobsHandler.js +2 -1
- package/dist/commands/setup/mailer/mailer.js +1 -1
- package/dist/commands/setup/mailer/mailerHandler.js +2 -1
- package/dist/commands/setup/middleware/ogImage/ogImage.js +1 -1
- package/dist/commands/setup/middleware/ogImage/ogImageHandler.js +2 -1
- package/dist/commands/setup/monitoring/sentry/sentry.js +1 -1
- package/dist/commands/setup/monitoring/sentry/sentryHandler.js +8 -7
- package/dist/commands/setup/neon/neon.js +1 -1
- package/dist/commands/setup/neon/neonHandler.js +5 -9
- package/dist/commands/setup/package/package.js +1 -1
- package/dist/commands/setup/package/packageHandler.js +4 -4
- package/dist/commands/setup/realtime/addRealtimeToGraphql.js +1 -1
- package/dist/commands/setup/realtime/realtime.js +1 -1
- package/dist/commands/setup/realtime/realtimeHandler.js +4 -16
- package/dist/commands/setup/realtime/templates/subscriptions/countdown/countdown.ts.template +1 -1
- package/dist/commands/setup/realtime/templates/subscriptions/newMessage/newMessage.ts.template +1 -1
- package/dist/commands/setup/server-file/serverFile.js +1 -1
- package/dist/commands/setup/server-file/serverFileHandler.js +2 -1
- package/dist/commands/setup/tenancy/authCodemod.js +66 -0
- package/dist/commands/setup/tenancy/dbCodemod.js +64 -0
- package/dist/commands/setup/tenancy/graphqlCodemod.js +88 -0
- package/dist/commands/setup/tenancy/preflight.js +49 -0
- package/dist/commands/setup/tenancy/schemaPrisma.js +81 -0
- package/dist/commands/setup/tenancy/signupCodemod.js +153 -0
- package/dist/commands/setup/tenancy/templates/InvitePage.tsx.template +63 -0
- package/dist/commands/setup/tenancy/templates/OrgScope.tsx.template +40 -0
- package/dist/commands/setup/tenancy/templates/ensureDefaultOrganizations.dataMigration.ts.template +39 -0
- package/dist/commands/setup/tenancy/templates/organizations.scenarios.ts.template +59 -0
- package/dist/commands/setup/tenancy/templates/organizations.sdl.ts.template +89 -0
- package/dist/commands/setup/tenancy/templates/organizations.test.ts.template +389 -0
- package/dist/commands/setup/tenancy/templates/organizations.ts.template +394 -0
- package/dist/commands/setup/tenancy/templates/requireMembership.test.ts.template +35 -0
- package/dist/commands/setup/tenancy/templates/requireMembership.ts.template +25 -0
- package/dist/commands/setup/tenancy/tenancy.js +30 -0
- package/dist/commands/setup/tenancy/tenancyHandler.js +425 -0
- package/dist/commands/setup/ui/libraries/chakra-uiHandler.js +2 -1
- package/dist/commands/setup/ui/libraries/mantineHandler.js +2 -1
- package/dist/commands/setup/ui/libraries/tailwindcssHandler.js +2 -1
- package/dist/commands/setup/uploads/schemaPrisma.js +41 -0
- package/dist/commands/setup/uploads/serverFile.js +151 -0
- package/dist/commands/setup/uploads/templates/requireUploadToken.ts.template +15 -0
- package/dist/commands/setup/uploads/templates/srcLibUploads.ts.template +23 -24
- package/dist/commands/setup/uploads/templates/uploads.sdl.ts.template +79 -0
- package/dist/commands/setup/uploads/templates/uploads.ts.template +89 -0
- package/dist/commands/setup/uploads/templates/withDataUri.ts.template +14 -0
- package/dist/commands/setup/uploads/templates/withSignedUrl.ts.template +16 -0
- package/dist/commands/setup/uploads/uploads.js +49 -7
- package/dist/commands/setup/uploads/uploadsHandler.js +256 -69
- package/dist/commands/setup.js +2 -1
- package/dist/commands/studio.js +1 -1
- package/dist/commands/test/testHandler.js +25 -71
- package/dist/commands/test/viteVersionCheck.js +75 -0
- package/dist/commands/test.js +10 -18
- package/dist/commands/type-checkHandler.js +1 -1
- package/dist/commands/upgrade/preUpgradeScripts.js +3 -3
- package/dist/commands/upgrade/upgrade.js +1 -1
- package/dist/commands/upgrade/upgradeHandler.js +2 -1
- package/dist/index.js +5 -8
- package/dist/lib/exit.js +1 -1
- package/dist/lib/index.js +6 -25
- package/dist/lib/loadEnvFiles.js +1 -1
- package/dist/lib/plugin.js +1 -1
- package/dist/lib/test.js +1 -1
- package/dist/lib/updateCheck.js +4 -4
- package/dist/middleware/checkNodeVersion.js +4 -4
- package/package.json +18 -18
- package/dist/commands/setup/uploads/dbCodemod.js +0 -28
- package/dist/commands/setup/uploads/templates/signedUrl.ts.template +0 -21
- package/dist/commands/test/testHandlerEsm.js +0 -109
- package/dist/commands/testEsm.js +0 -41
package/dist/commands/test.js
CHANGED
|
@@ -1,39 +1,31 @@
|
|
|
1
1
|
import { terminalLink } from "termi-link";
|
|
2
|
-
import { colors as c } from "@cedarjs/cli-helpers";
|
|
2
|
+
import { colors as c } from "@cedarjs/cli-helpers/colors";
|
|
3
3
|
import { workspaces } from "../lib/project.js";
|
|
4
4
|
const command = "test [filter..]";
|
|
5
|
-
const description = "Run
|
|
5
|
+
const description = "Run Vitest tests. Defaults to watch mode";
|
|
6
6
|
const builder = (yargs) => {
|
|
7
|
+
const cliDocsLink = terminalLink(
|
|
8
|
+
"CedarJS CLI Reference",
|
|
9
|
+
"https://cedarjs.com/docs/cli-commands#test"
|
|
10
|
+
);
|
|
11
|
+
const vitestTip = c.tip("yarn vitest --help");
|
|
7
12
|
yargs.strict(false).positional("filter", {
|
|
8
13
|
default: workspaces(),
|
|
9
14
|
description: "Which side(s) to test, and/or a regular expression to match against your test files to filter by",
|
|
10
15
|
type: "string",
|
|
11
16
|
array: true
|
|
12
|
-
}).option("watch", {
|
|
13
|
-
describe: "Run tests related to changed files based on hg/git. Specify the name or path to a file to focus on a specific set of tests",
|
|
14
|
-
type: "boolean",
|
|
15
|
-
default: true
|
|
16
|
-
}).option("collect-coverage", {
|
|
17
|
-
describe: "Show test coverage summary and output info to coverage directory",
|
|
18
|
-
type: "boolean",
|
|
19
|
-
default: false
|
|
20
17
|
}).option("db-push", {
|
|
21
18
|
describe: "Syncs the test database with your Prisma schema without requiring a migration. It creates a test database if it doesn't already exist.",
|
|
22
19
|
type: "boolean",
|
|
23
20
|
default: true
|
|
24
21
|
}).option("force", {
|
|
25
|
-
describe: "
|
|
22
|
+
describe: "Skip any confirmation prompts and run tests without interruption. Useful in CI or scripted environments.",
|
|
26
23
|
type: "boolean",
|
|
27
24
|
default: false
|
|
28
25
|
}).epilogue(
|
|
29
|
-
`For all available flags, run
|
|
30
|
-
"yarn jest --help"
|
|
31
|
-
)}
|
|
26
|
+
`For all available flags, run vitest cli directly ${vitestTip}
|
|
32
27
|
|
|
33
|
-
Also see the ${
|
|
34
|
-
"CedarJS CLI Reference",
|
|
35
|
-
"https://cedarjs.com/docs/cli-commands#test"
|
|
36
|
-
)}
|
|
28
|
+
Also see the ${cliDocsLink}
|
|
37
29
|
`
|
|
38
30
|
);
|
|
39
31
|
};
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import path from "node:path";
|
|
2
2
|
import concurrently from "concurrently";
|
|
3
3
|
import { Listr } from "listr2";
|
|
4
|
-
import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
|
|
5
4
|
import { formatRunBinCommand } from "@cedarjs/cli-helpers/packageManager/display";
|
|
6
5
|
import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
|
|
6
|
+
import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
|
|
7
7
|
import { generatePrismaClient } from "../lib/generatePrismaClient.js";
|
|
8
8
|
import { getPaths } from "../lib/index.js";
|
|
9
9
|
const isConcurrentlyErrorArray = (value) => {
|
|
@@ -3,7 +3,7 @@ import { builtinModules } from "node:module";
|
|
|
3
3
|
import os from "node:os";
|
|
4
4
|
import path from "node:path";
|
|
5
5
|
import execa from "execa";
|
|
6
|
-
import
|
|
6
|
+
import { tryParse } from "verkit";
|
|
7
7
|
const MAIN_BRANCH_PRERELEASE_TAGS = ["canary"];
|
|
8
8
|
function isExecaError(e) {
|
|
9
9
|
return e instanceof Error && ("stdout" in e || "stderr" in e || "exitCode" in e);
|
|
@@ -13,7 +13,7 @@ async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
|
|
|
13
13
|
return;
|
|
14
14
|
}
|
|
15
15
|
const version = typeof ctx.versionToUpgradeTo === "string" ? ctx.versionToUpgradeTo : void 0;
|
|
16
|
-
const parsed =
|
|
16
|
+
const parsed = version ? tryParse(version) : null;
|
|
17
17
|
const baseUrl = "https://raw.githubusercontent.com/cedarjs/cedar/main/upgrade-scripts/";
|
|
18
18
|
const manifestUrl = `${baseUrl}manifest.json`;
|
|
19
19
|
let manifest = [];
|
|
@@ -34,7 +34,7 @@ async function runPreUpgradeScripts(ctx, task, { verbose, force }) {
|
|
|
34
34
|
if (!Array.isArray(manifest) || manifest.length === 0) {
|
|
35
35
|
return;
|
|
36
36
|
}
|
|
37
|
-
const prereleaseTag = parsed?.prerelease[0];
|
|
37
|
+
const prereleaseTag = parsed?.prerelease?.[0];
|
|
38
38
|
const isMainBranchPrerelease = typeof prereleaseTag === "string" && MAIN_BRANCH_PRERELEASE_TAGS.includes(prereleaseTag);
|
|
39
39
|
const checkLevels = [];
|
|
40
40
|
if (parsed && isMainBranchPrerelease) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { terminalLink } from "termi-link";
|
|
2
|
-
import { colors as c } from "@cedarjs/cli-helpers";
|
|
2
|
+
import { colors as c } from "@cedarjs/cli-helpers/colors";
|
|
3
3
|
import { dedupeIsSupported } from "@cedarjs/cli-helpers/packageManager";
|
|
4
4
|
import { isValidCedarJSTag } from "./tags.js";
|
|
5
5
|
const SEMVER_REGEX = /(?<=^v?|\sv?)(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)\.(?:0|[1-9]\d*)(?:-(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*)(?:\.(?:0|[1-9]\d*|[\da-z-]*[a-z-][\da-z-]*))*)?(?:\+[\da-z-]+(?:\.[\da-z-]+)*)?(?=$|\s)/i;
|
|
@@ -5,7 +5,7 @@ import execa from "execa";
|
|
|
5
5
|
import latestVersion from "latest-version";
|
|
6
6
|
import { Listr } from "listr2";
|
|
7
7
|
import { terminalLink } from "termi-link";
|
|
8
|
-
import {
|
|
8
|
+
import { colors as c } from "@cedarjs/cli-helpers/colors";
|
|
9
9
|
import {
|
|
10
10
|
dedupe,
|
|
11
11
|
dedupeIsSupported,
|
|
@@ -13,6 +13,7 @@ import {
|
|
|
13
13
|
installationErrorMessage,
|
|
14
14
|
prettyPrintCedarCommand
|
|
15
15
|
} from "@cedarjs/cli-helpers/packageManager";
|
|
16
|
+
import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
|
|
16
17
|
import { getConfig } from "@cedarjs/project-config";
|
|
17
18
|
import { getPackageManager } from "@cedarjs/project-config/packageManager";
|
|
18
19
|
import { generatePrismaClient } from "../../lib/generatePrismaClient.js";
|
package/dist/index.js
CHANGED
|
@@ -4,12 +4,10 @@ import path from "path";
|
|
|
4
4
|
import { trace, SpanStatusCode } from "@opentelemetry/api";
|
|
5
5
|
import { hideBin, Parser } from "yargs/helpers";
|
|
6
6
|
import yargs from "yargs/yargs";
|
|
7
|
-
import {
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
} from "@cedarjs/cli-helpers";
|
|
12
|
-
import { findUp, projectIsEsm, getConfigPath } from "@cedarjs/project-config";
|
|
7
|
+
import { colors as c } from "@cedarjs/cli-helpers/colors";
|
|
8
|
+
import { loadEnvFiles } from "@cedarjs/cli-helpers/loadEnvFiles";
|
|
9
|
+
import { recordTelemetryAttributes } from "@cedarjs/cli-helpers/telemetry";
|
|
10
|
+
import { findUp, getConfigPath } from "@cedarjs/project-config";
|
|
13
11
|
import { telemetryMiddleware } from "@cedarjs/telemetry";
|
|
14
12
|
import * as buildCommand from "./commands/build.js";
|
|
15
13
|
import * as checkCommand from "./commands/check.js";
|
|
@@ -30,7 +28,6 @@ import * as serveCommand from "./commands/serve.js";
|
|
|
30
28
|
import * as setupCommand from "./commands/setup.js";
|
|
31
29
|
import * as studioCommand from "./commands/studio.js";
|
|
32
30
|
import * as testCommand from "./commands/test.js";
|
|
33
|
-
import * as testCommandEsm from "./commands/testEsm.js";
|
|
34
31
|
import * as typeCheckCommand from "./commands/type-check.js";
|
|
35
32
|
import * as upgradeCommand from "./commands/upgrade/upgrade.js";
|
|
36
33
|
import { exitWithError } from "./lib/exit.js";
|
|
@@ -134,7 +131,7 @@ async function runYargs() {
|
|
|
134
131
|
}).example(
|
|
135
132
|
"yarn cedar g page home /",
|
|
136
133
|
"Create a page component named 'Home' at path '/'"
|
|
137
|
-
).demandCommand().strict().exitProcess(false).alias("h", "help").command(buildCommand).command(checkCommand).command(consoleCommand).command(deployCommand).command(destroyCommand).command(devCommand).command(execCommand).command(experimentalCommand).command(generateCommand).command(infoCommand).command(jobsCommand).command(lintCommand).command(prerenderCommand).command(prismaCommand).command(recordCommand).command(serveCommand).command(setupCommand).command(studioCommand).command(
|
|
134
|
+
).demandCommand().strict().exitProcess(false).alias("h", "help").command(buildCommand).command(checkCommand).command(consoleCommand).command(deployCommand).command(destroyCommand).command(devCommand).command(execCommand).command(experimentalCommand).command(generateCommand).command(infoCommand).command(jobsCommand).command(lintCommand).command(prerenderCommand).command(prismaCommand).command(recordCommand).command(serveCommand).command(setupCommand).command(studioCommand).command(testCommand).command(typeCheckCommand).command(upgradeCommand);
|
|
138
135
|
await loadPlugins(yarg);
|
|
139
136
|
const pkgJson = await import("../package.json", { with: { type: "json" } });
|
|
140
137
|
yarg.version(pkgJson.default["version"]);
|
package/dist/lib/exit.js
CHANGED
|
@@ -4,7 +4,7 @@ import { v4 as uuidv4 } from "uuid";
|
|
|
4
4
|
import {
|
|
5
5
|
recordTelemetryAttributes,
|
|
6
6
|
recordTelemetryError
|
|
7
|
-
} from "@cedarjs/cli-helpers";
|
|
7
|
+
} from "@cedarjs/cli-helpers/telemetry";
|
|
8
8
|
const discordLink = terminalLink("Discord", "https://cedarjs.com/discord");
|
|
9
9
|
const githubLink = terminalLink("GitHub", "https://github.com/cedarjs/cedar");
|
|
10
10
|
const DEFAULT_ERROR_EPILOGUE = [
|
package/dist/lib/index.js
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import fs from "node:fs";
|
|
2
2
|
import https from "node:https";
|
|
3
3
|
import path from "node:path";
|
|
4
|
-
import * as babel from "@babel/core";
|
|
5
4
|
import boxen from "boxen";
|
|
6
5
|
import camelcase from "camelcase";
|
|
7
6
|
import { paramCase } from "change-case";
|
|
@@ -12,11 +11,12 @@ import memoize from "lodash/memoize.js";
|
|
|
12
11
|
import template from "lodash/template.js";
|
|
13
12
|
import pascalcase from "pascalcase";
|
|
14
13
|
import { format } from "prettier";
|
|
15
|
-
import { colors as c } from "@cedarjs/cli-helpers";
|
|
14
|
+
import { colors as c } from "@cedarjs/cli-helpers/colors";
|
|
16
15
|
import {
|
|
17
16
|
addRootPackages,
|
|
18
17
|
addWorkspacePackages
|
|
19
18
|
} from "@cedarjs/cli-helpers/packageManager/packages";
|
|
19
|
+
import { transpileTSToJS } from "@cedarjs/cli-helpers/transpileTSToJS";
|
|
20
20
|
import {
|
|
21
21
|
getConfig as getCedarConfig,
|
|
22
22
|
getPaths as getCedarPaths,
|
|
@@ -206,29 +206,10 @@ const getPrettierOptions = async () => {
|
|
|
206
206
|
}
|
|
207
207
|
};
|
|
208
208
|
const transformTSToJS = async (filename, content) => {
|
|
209
|
-
|
|
210
|
-
filename,
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
cwd: process.env.NODE_ENV === "test" ? void 0 : getPaths().base,
|
|
214
|
-
configFile: false,
|
|
215
|
-
plugins: [
|
|
216
|
-
[
|
|
217
|
-
"@babel/plugin-transform-typescript",
|
|
218
|
-
{
|
|
219
|
-
isTSX: true,
|
|
220
|
-
allExtensions: true
|
|
221
|
-
}
|
|
222
|
-
]
|
|
223
|
-
],
|
|
224
|
-
retainLines: true
|
|
225
|
-
});
|
|
226
|
-
if (result?.code == null) {
|
|
227
|
-
throw new Error(
|
|
228
|
-
`Could not transform ${filename} from TypeScript to JavaScript`
|
|
229
|
-
);
|
|
230
|
-
}
|
|
231
|
-
return prettify(filename.replace(/\.ts(x)?$/, ".js$1"), result.code);
|
|
209
|
+
return prettify(
|
|
210
|
+
filename.replace(/\.ts(x)?$/, ".js$1"),
|
|
211
|
+
transpileTSToJS(filename, content)
|
|
212
|
+
);
|
|
232
213
|
};
|
|
233
214
|
const transformTSToJSMap = async (files, typescript) => {
|
|
234
215
|
return files.reduce(
|
package/dist/lib/loadEnvFiles.js
CHANGED
package/dist/lib/plugin.js
CHANGED
|
@@ -2,7 +2,7 @@ import fs from "node:fs";
|
|
|
2
2
|
import path from "path";
|
|
3
3
|
import ansis from "ansis";
|
|
4
4
|
import enquirer from "enquirer";
|
|
5
|
-
import { getCompatibilityData } from "@cedarjs/cli-helpers";
|
|
5
|
+
import { getCompatibilityData } from "@cedarjs/cli-helpers/version";
|
|
6
6
|
import { installModule, isModuleInstalled } from "./packages.js";
|
|
7
7
|
import { getPaths } from "./index.js";
|
|
8
8
|
const { Select } = enquirer;
|
package/dist/lib/test.js
CHANGED
|
@@ -80,7 +80,7 @@ vi.mock("@cedarjs/project-config/packageManager", () => ({
|
|
|
80
80
|
getPackageManager: vi.fn(() => "yarn"),
|
|
81
81
|
resetPackageManagerCache: vi.fn()
|
|
82
82
|
}));
|
|
83
|
-
vi.mock("@cedarjs/cli-helpers", async (importOriginal) => {
|
|
83
|
+
vi.mock("@cedarjs/cli-helpers/project", async (importOriginal) => {
|
|
84
84
|
const originalCliHelpers = await importOriginal();
|
|
85
85
|
return {
|
|
86
86
|
...originalCliHelpers,
|
package/dist/lib/updateCheck.js
CHANGED
|
@@ -3,7 +3,7 @@ import path from "path";
|
|
|
3
3
|
import ansis from "ansis";
|
|
4
4
|
import boxen from "boxen";
|
|
5
5
|
import latestVersion from "latest-version";
|
|
6
|
-
import
|
|
6
|
+
import { isGreaterThan, isValid } from "verkit";
|
|
7
7
|
import { formatCedarCommand } from "@cedarjs/cli-helpers/packageManager/display";
|
|
8
8
|
import { getNodeRunnerArgs } from "@cedarjs/cli-helpers/packageManager/exec";
|
|
9
9
|
import { getConfig } from "@cedarjs/project-config";
|
|
@@ -34,7 +34,7 @@ function getLocalVersion() {
|
|
|
34
34
|
} catch {
|
|
35
35
|
return void 0;
|
|
36
36
|
}
|
|
37
|
-
if (typeof version === "string" &&
|
|
37
|
+
if (typeof version === "string" && isValid(version)) {
|
|
38
38
|
return version;
|
|
39
39
|
}
|
|
40
40
|
return void 0;
|
|
@@ -106,7 +106,7 @@ function shouldShow() {
|
|
|
106
106
|
const data = readUpdateDataFile();
|
|
107
107
|
let newerVersion = false;
|
|
108
108
|
data.remoteVersions.forEach((version) => {
|
|
109
|
-
newerVersion ||=
|
|
109
|
+
newerVersion ||= isGreaterThan(version, localVersion);
|
|
110
110
|
});
|
|
111
111
|
return data.shownAt < (/* @__PURE__ */ new Date()).getTime() - SHOW_PERIOD && newerVersion;
|
|
112
112
|
}
|
|
@@ -120,7 +120,7 @@ function getUpdateMessage() {
|
|
|
120
120
|
let updateCount = 0;
|
|
121
121
|
let message = ` New updates to Cedar are available via \`${formatCedarCommand(["upgrade#REPLACEME#"])}\` `;
|
|
122
122
|
data.remoteVersions.forEach((version, tag) => {
|
|
123
|
-
if (
|
|
123
|
+
if (isGreaterThan(version, data.localVersion)) {
|
|
124
124
|
updateCount += 1;
|
|
125
125
|
if (tag === localTag) {
|
|
126
126
|
message += `
|
|
@@ -1,16 +1,16 @@
|
|
|
1
|
-
import
|
|
2
|
-
import { colors as c } from "@cedarjs/cli-helpers";
|
|
1
|
+
import { clean, isGreaterThanOrEqual } from "verkit";
|
|
2
|
+
import { colors as c } from "@cedarjs/cli-helpers/colors";
|
|
3
3
|
function checkNodeVersion() {
|
|
4
4
|
const checks = { ok: true };
|
|
5
5
|
const pVersion = process.version;
|
|
6
|
-
const pVersionC =
|
|
6
|
+
const pVersionC = clean(pVersion);
|
|
7
7
|
const LOWER_BOUND = "v24.0.0";
|
|
8
8
|
if (!pVersionC) {
|
|
9
9
|
checks.ok = false;
|
|
10
10
|
checks.message = `Invalid Node.js version: ${pVersion}`;
|
|
11
11
|
return checks;
|
|
12
12
|
}
|
|
13
|
-
if (
|
|
13
|
+
if (isGreaterThanOrEqual(pVersionC, LOWER_BOUND)) {
|
|
14
14
|
return checks;
|
|
15
15
|
}
|
|
16
16
|
checks.ok = false;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cedarjs/cli",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "8.0.0-canary.3263",
|
|
4
4
|
"description": "The CedarJS Command Line",
|
|
5
5
|
"repository": {
|
|
6
6
|
"type": "git",
|
|
@@ -36,17 +36,17 @@
|
|
|
36
36
|
"@babel/preset-typescript": "7.29.7",
|
|
37
37
|
"@babel/traverse": "7.29.8",
|
|
38
38
|
"@babel/types": "7.29.8",
|
|
39
|
-
"@cedarjs/api-server": "
|
|
40
|
-
"@cedarjs/babel-config": "
|
|
41
|
-
"@cedarjs/cli-helpers": "
|
|
42
|
-
"@cedarjs/internal": "
|
|
43
|
-
"@cedarjs/prerender": "
|
|
44
|
-
"@cedarjs/project-config": "
|
|
45
|
-
"@cedarjs/structure": "
|
|
46
|
-
"@cedarjs/telemetry": "
|
|
47
|
-
"@cedarjs/utils": "
|
|
48
|
-
"@cedarjs/vite": "
|
|
49
|
-
"@cedarjs/web-server": "
|
|
39
|
+
"@cedarjs/api-server": "8.0.0-canary.3263",
|
|
40
|
+
"@cedarjs/babel-config": "8.0.0-canary.3263",
|
|
41
|
+
"@cedarjs/cli-helpers": "8.0.0-canary.3263",
|
|
42
|
+
"@cedarjs/internal": "8.0.0-canary.3263",
|
|
43
|
+
"@cedarjs/prerender": "8.0.0-canary.3263",
|
|
44
|
+
"@cedarjs/project-config": "8.0.0-canary.3263",
|
|
45
|
+
"@cedarjs/structure": "8.0.0-canary.3263",
|
|
46
|
+
"@cedarjs/telemetry": "8.0.0-canary.3263",
|
|
47
|
+
"@cedarjs/utils": "8.0.0-canary.3263",
|
|
48
|
+
"@cedarjs/vite": "8.0.0-canary.3263",
|
|
49
|
+
"@cedarjs/web-server": "8.0.0-canary.3263",
|
|
50
50
|
"@listr2/prompt-adapter-enquirer": "4.3.2",
|
|
51
51
|
"@opentelemetry/api": "1.9.1",
|
|
52
52
|
"@opentelemetry/core": "2.11.0",
|
|
@@ -54,7 +54,7 @@
|
|
|
54
54
|
"@opentelemetry/resources": "2.11.0",
|
|
55
55
|
"@opentelemetry/sdk-trace-node": "2.11.0",
|
|
56
56
|
"@opentelemetry/semantic-conventions": "1.43.0",
|
|
57
|
-
"@prisma/internals": "7.
|
|
57
|
+
"@prisma/internals": "7.10.0",
|
|
58
58
|
"ansis": "4.4.0",
|
|
59
59
|
"archiver": "7.0.1",
|
|
60
60
|
"boxen": "5.1.2",
|
|
@@ -79,10 +79,9 @@
|
|
|
79
79
|
"pascalcase": "1.0.0",
|
|
80
80
|
"pluralize": "8.0.0",
|
|
81
81
|
"portfinder": "1.0.38",
|
|
82
|
-
"prettier": "3.9.
|
|
82
|
+
"prettier": "3.9.9",
|
|
83
83
|
"prisma": "7.10.0",
|
|
84
84
|
"prompts": "2.4.2",
|
|
85
|
-
"semver": "7.8.5",
|
|
86
85
|
"smol-toml": "1.8.0",
|
|
87
86
|
"srvx": "0.12.8",
|
|
88
87
|
"string-env-interpolation": "1.0.1",
|
|
@@ -91,13 +90,14 @@
|
|
|
91
90
|
"title-case": "3.0.3",
|
|
92
91
|
"unionfs": "4.6.0",
|
|
93
92
|
"uuid": "11.1.1",
|
|
93
|
+
"verkit": "0.5.0",
|
|
94
94
|
"yargs": "17.7.3"
|
|
95
95
|
},
|
|
96
96
|
"devDependencies": {
|
|
97
|
-
"@cedarjs/framework-tools": "
|
|
98
|
-
"@prisma/dmmf": "7.
|
|
97
|
+
"@cedarjs/framework-tools": "8.0.0-canary.3263",
|
|
98
|
+
"@prisma/dmmf": "7.10.0",
|
|
99
99
|
"@types/archiver": "^7.0.0",
|
|
100
|
-
"memfs": "4.
|
|
100
|
+
"memfs": "4.79.0",
|
|
101
101
|
"node-ssh": "13.2.1",
|
|
102
102
|
"ts-dedent": "2.3.0",
|
|
103
103
|
"typescript": "5.9.3",
|
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
import j from "jscodeshift";
|
|
2
|
-
function transform(fileInfo) {
|
|
3
|
-
const root = j(fileInfo.source);
|
|
4
|
-
const imports = root.find(j.ImportDeclaration);
|
|
5
|
-
imports.at(-1).insertAfter(
|
|
6
|
-
j.importDeclaration(
|
|
7
|
-
[j.importSpecifier(j.identifier("storagePrismaExtension"))],
|
|
8
|
-
j.literal("./uploads.js")
|
|
9
|
-
)
|
|
10
|
-
);
|
|
11
|
-
root.find(j.VariableDeclaration, { declarations: [{ id: { name: "db" } }] }).forEach((path) => {
|
|
12
|
-
const dbDeclaration = path.node.declarations[0];
|
|
13
|
-
if (j.VariableDeclarator.check(dbDeclaration) && j.NewExpression.check(dbDeclaration.init)) {
|
|
14
|
-
throw new Error("RW_CODEMOD_ERR_OLD_FORMAT");
|
|
15
|
-
}
|
|
16
|
-
if (j.VariableDeclarator.check(dbDeclaration) && j.Expression.check(dbDeclaration.init)) {
|
|
17
|
-
const newInit = j.callExpression(
|
|
18
|
-
j.memberExpression(dbDeclaration.init, j.identifier("$extends")),
|
|
19
|
-
[j.identifier("storagePrismaExtension")]
|
|
20
|
-
);
|
|
21
|
-
dbDeclaration.init = newInit;
|
|
22
|
-
}
|
|
23
|
-
});
|
|
24
|
-
return root.toSource();
|
|
25
|
-
}
|
|
26
|
-
export {
|
|
27
|
-
transform as default
|
|
28
|
-
};
|
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
import type { APIGatewayEvent, Context } from 'aws-lambda'
|
|
2
|
-
|
|
3
|
-
import type { SignatureValidationArgs } from '@cedarjs/storage/UrlSigner'
|
|
4
|
-
|
|
5
|
-
import { urlSigner, fsStorage } from 'src/lib/uploads'
|
|
6
|
-
|
|
7
|
-
export const handler = async (event: APIGatewayEvent, _context: Context) => {
|
|
8
|
-
const fileToReturn = urlSigner.validateSignature(
|
|
9
|
-
event.queryStringParameters as SignatureValidationArgs
|
|
10
|
-
)
|
|
11
|
-
|
|
12
|
-
const { contents, type } = await fsStorage.read(fileToReturn)
|
|
13
|
-
|
|
14
|
-
return {
|
|
15
|
-
statusCode: 200,
|
|
16
|
-
headers: {
|
|
17
|
-
'Content-Type': type,
|
|
18
|
-
},
|
|
19
|
-
body: contents,
|
|
20
|
-
}
|
|
21
|
-
}
|
|
@@ -1,109 +0,0 @@
|
|
|
1
|
-
import { recordTelemetryAttributes } from "@cedarjs/cli-helpers";
|
|
2
|
-
import { runBin } from "@cedarjs/cli-helpers/packageManager/exec";
|
|
3
|
-
import { ensurePosixPath } from "@cedarjs/project-config";
|
|
4
|
-
import { errorTelemetry, timedTelemetry } from "@cedarjs/telemetry";
|
|
5
|
-
import { getPaths } from "../../lib/index.js";
|
|
6
|
-
import * as project from "../../lib/project.js";
|
|
7
|
-
import { warnIfNonStandardDatasourceUrl } from "./datasourceWarning.js";
|
|
8
|
-
function hasStringMessage(value) {
|
|
9
|
-
return typeof value === "object" && value !== null && "message" in value && value.message === "string";
|
|
10
|
-
}
|
|
11
|
-
function getExitCode(value) {
|
|
12
|
-
if (!value || typeof value !== "object" || !("exitCode" in value) || typeof value.exitCode !== "number") {
|
|
13
|
-
return void 0;
|
|
14
|
-
}
|
|
15
|
-
return value.exitCode;
|
|
16
|
-
}
|
|
17
|
-
const handler = async ({
|
|
18
|
-
filter: filterParams = [],
|
|
19
|
-
dbPush = true,
|
|
20
|
-
force = false,
|
|
21
|
-
...others
|
|
22
|
-
}) => {
|
|
23
|
-
recordTelemetryAttributes({
|
|
24
|
-
command: "test",
|
|
25
|
-
dbPush
|
|
26
|
-
});
|
|
27
|
-
let watch = true;
|
|
28
|
-
const rwjsPaths = getPaths();
|
|
29
|
-
const forwardVitestFlags = Object.keys(others).flatMap((flagName) => {
|
|
30
|
-
if (["db-push", "force", "loadEnvFiles", "$0", "_"].includes(flagName)) {
|
|
31
|
-
return [];
|
|
32
|
-
}
|
|
33
|
-
const flag = flagName.length > 1 ? `--${flagName}` : `-${flagName}`;
|
|
34
|
-
const flagValue = others[flagName];
|
|
35
|
-
if (flagName === "watch") {
|
|
36
|
-
watch = flagValue === true;
|
|
37
|
-
} else if (flagName === "run" && flagValue) {
|
|
38
|
-
watch = false;
|
|
39
|
-
}
|
|
40
|
-
if (Array.isArray(flagValue)) {
|
|
41
|
-
return flagValue.flatMap((val) => [flag, val]);
|
|
42
|
-
}
|
|
43
|
-
return [flag, flagValue];
|
|
44
|
-
});
|
|
45
|
-
const sides = filterParams.filter(
|
|
46
|
-
(filterString) => project.workspaces().includes(filterString)
|
|
47
|
-
);
|
|
48
|
-
const vitestFilterArgs = [
|
|
49
|
-
...filterParams.filter(
|
|
50
|
-
(filterString) => !project.workspaces().includes(filterString)
|
|
51
|
-
)
|
|
52
|
-
];
|
|
53
|
-
const vitestArgs = [
|
|
54
|
-
...vitestFilterArgs,
|
|
55
|
-
...forwardVitestFlags,
|
|
56
|
-
"--passWithNoTests"
|
|
57
|
-
].filter((flagOrValue) => flagOrValue !== null);
|
|
58
|
-
if (process.env.CI) {
|
|
59
|
-
vitestArgs.push("--run");
|
|
60
|
-
}
|
|
61
|
-
if (!others["config"]) {
|
|
62
|
-
sides.forEach((side) => vitestArgs.push("--project", side));
|
|
63
|
-
if (!sides.length) {
|
|
64
|
-
project.workspaces().forEach((side) => sides.push(side));
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
try {
|
|
68
|
-
const cacheDirDb = `file:${ensurePosixPath(
|
|
69
|
-
rwjsPaths.generated.base
|
|
70
|
-
)}/test.db`;
|
|
71
|
-
const mainDatabaseUrl = process.env.DATABASE_URL;
|
|
72
|
-
const DATABASE_URL = process.env.TEST_DATABASE_URL || cacheDirDb;
|
|
73
|
-
if (sides.includes("api") && !dbPush) {
|
|
74
|
-
process.env.SKIP_DB_PUSH = "1";
|
|
75
|
-
}
|
|
76
|
-
if (sides.includes("api")) {
|
|
77
|
-
await warnIfNonStandardDatasourceUrl({ force });
|
|
78
|
-
}
|
|
79
|
-
const runCommand = async () => {
|
|
80
|
-
await runBin("vitest", vitestArgs, {
|
|
81
|
-
cwd: rwjsPaths.base,
|
|
82
|
-
stdio: "inherit",
|
|
83
|
-
env: {
|
|
84
|
-
...process.env,
|
|
85
|
-
DATABASE_URL,
|
|
86
|
-
// Always set, even to '', so CedarApiVitestEnv can tell "there's
|
|
87
|
-
// no real DATABASE_URL to compare against" apart from "this isn't
|
|
88
|
-
// running through `cedar test` at all" (e.g. a direct `vitest`
|
|
89
|
-
// invocation, whose own DATABASE_URL hasn't been touched yet).
|
|
90
|
-
CEDAR_APP_DATABASE_URL: mainDatabaseUrl ?? ""
|
|
91
|
-
}
|
|
92
|
-
});
|
|
93
|
-
};
|
|
94
|
-
if (watch) {
|
|
95
|
-
await runCommand();
|
|
96
|
-
} else {
|
|
97
|
-
await timedTelemetry(process.argv, { type: "test" }, async () => {
|
|
98
|
-
await runCommand();
|
|
99
|
-
});
|
|
100
|
-
}
|
|
101
|
-
} catch (error) {
|
|
102
|
-
const message = hasStringMessage(error) ? error.message : "Test command failed";
|
|
103
|
-
errorTelemetry(process.argv, message);
|
|
104
|
-
process.exit(getExitCode(error) ?? 1);
|
|
105
|
-
}
|
|
106
|
-
};
|
|
107
|
-
export {
|
|
108
|
-
handler
|
|
109
|
-
};
|
package/dist/commands/testEsm.js
DELETED
|
@@ -1,41 +0,0 @@
|
|
|
1
|
-
import { terminalLink } from "termi-link";
|
|
2
|
-
import { colors as c } from "@cedarjs/cli-helpers";
|
|
3
|
-
import { workspaces } from "../lib/project.js";
|
|
4
|
-
const command = "test [filter..]";
|
|
5
|
-
const description = "Run Vitest tests. Defaults to watch mode";
|
|
6
|
-
const builder = (yargs) => {
|
|
7
|
-
const cliDocsLink = terminalLink(
|
|
8
|
-
"CedarJS CLI Reference",
|
|
9
|
-
"https://cedarjs.com/docs/cli-commands#test"
|
|
10
|
-
);
|
|
11
|
-
const vitestTip = c.tip("yarn vitest --help");
|
|
12
|
-
yargs.strict(false).positional("filter", {
|
|
13
|
-
default: workspaces(),
|
|
14
|
-
description: "Which side(s) to test, and/or a regular expression to match against your test files to filter by",
|
|
15
|
-
type: "string",
|
|
16
|
-
array: true
|
|
17
|
-
}).option("db-push", {
|
|
18
|
-
describe: "Syncs the test database with your Prisma schema without requiring a migration. It creates a test database if it doesn't already exist.",
|
|
19
|
-
type: "boolean",
|
|
20
|
-
default: true
|
|
21
|
-
}).option("force", {
|
|
22
|
-
describe: "Skip any confirmation prompts and run tests without interruption. Useful in CI or scripted environments.",
|
|
23
|
-
type: "boolean",
|
|
24
|
-
default: false
|
|
25
|
-
}).epilogue(
|
|
26
|
-
`For all available flags, run vitest cli directly ${vitestTip}
|
|
27
|
-
|
|
28
|
-
Also see the ${cliDocsLink}
|
|
29
|
-
`
|
|
30
|
-
);
|
|
31
|
-
};
|
|
32
|
-
const handler = async (options) => {
|
|
33
|
-
const { handler: handler2 } = await import("./test/testHandlerEsm.js");
|
|
34
|
-
return handler2(options);
|
|
35
|
-
};
|
|
36
|
-
export {
|
|
37
|
-
builder,
|
|
38
|
-
command,
|
|
39
|
-
description,
|
|
40
|
-
handler
|
|
41
|
-
};
|