@zenstackhq/redwood 2.3.3 → 2.4.1
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/setup.js +13 -4
- package/dist/commands/setup.js.map +1 -1
- package/package.json +6 -5
- package/src/commands/setup.ts +17 -5
package/dist/commands/setup.js
CHANGED
|
@@ -18,6 +18,7 @@ const execa_1 = __importDefault(require("execa"));
|
|
|
18
18
|
const fs_1 = __importDefault(require("fs"));
|
|
19
19
|
const listr2_1 = require("listr2");
|
|
20
20
|
const path_1 = __importDefault(require("path"));
|
|
21
|
+
const semver_1 = __importDefault(require("semver"));
|
|
21
22
|
const terminal_link_1 = __importDefault(require("terminal-link"));
|
|
22
23
|
const ts_morph_1 = require("ts-morph");
|
|
23
24
|
const utils_1 = require("../utils");
|
|
@@ -55,8 +56,8 @@ function bootstrapSchema() {
|
|
|
55
56
|
const pkg = JSON.parse(content);
|
|
56
57
|
if (!pkg.zenstack) {
|
|
57
58
|
pkg.zenstack = {
|
|
58
|
-
schema: path_1.default.relative(apiPaths.base, zmodel),
|
|
59
|
-
prisma: path_1.default.relative(apiPaths.base, apiPaths.dbSchema),
|
|
59
|
+
schema: normalizePath(path_1.default.relative(apiPaths.base, zmodel)),
|
|
60
|
+
prisma: normalizePath(path_1.default.relative(apiPaths.base, apiPaths.dbSchema)),
|
|
60
61
|
};
|
|
61
62
|
fs_1.default.writeFileSync(pkgJson, JSON.stringify(pkg, null, 4));
|
|
62
63
|
}
|
|
@@ -64,6 +65,10 @@ function bootstrapSchema() {
|
|
|
64
65
|
},
|
|
65
66
|
};
|
|
66
67
|
}
|
|
68
|
+
// ensures posix path separators are used in package.json
|
|
69
|
+
function normalizePath(_path) {
|
|
70
|
+
return _path.replaceAll(path_1.default.sep, path_1.default.posix.sep);
|
|
71
|
+
}
|
|
67
72
|
// install ZenStack GraphQLYoga plugin
|
|
68
73
|
function installGraphQLPlugin() {
|
|
69
74
|
return {
|
|
@@ -137,9 +142,13 @@ function installGraphQLPlugin() {
|
|
|
137
142
|
if (graphQlSourcePath.endsWith('.ts')) {
|
|
138
143
|
const typeDefPath = path_1.default.join((0, cli_helpers_1.getPaths)().api.src, 'zenstack.d.ts');
|
|
139
144
|
if (!fs_1.default.existsSync(typeDefPath)) {
|
|
140
|
-
const
|
|
145
|
+
const rwVersion = (0, cli_helpers_1.getInstalledRedwoodVersion)();
|
|
146
|
+
const contextModule = rwVersion && semver_1.default.lt(rwVersion, '7.0.0')
|
|
147
|
+
? '@redwoodjs/graphql-server' // pre v7
|
|
148
|
+
: '@redwoodjs/context'; // v7+
|
|
149
|
+
const typeDefSourceFile = project.createSourceFile(typeDefPath, `import type { PrismaClient } from '@zenstackhq/runtime'
|
|
141
150
|
|
|
142
|
-
declare module '
|
|
151
|
+
declare module '${contextModule}' {
|
|
143
152
|
interface GlobalContext {
|
|
144
153
|
db: PrismaClient
|
|
145
154
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"setup.js","sourceRoot":"","sources":["../../src/commands/setup.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@zenstackhq/redwood",
|
|
3
3
|
"displayName": "ZenStack RedwoodJS Integration",
|
|
4
|
-
"version": "2.
|
|
4
|
+
"version": "2.4.1",
|
|
5
5
|
"description": "CLI and runtime for integrating ZenStack with RedwoodJS projects.",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
|
@@ -32,17 +32,18 @@
|
|
|
32
32
|
"homepage": "https://zenstack.dev",
|
|
33
33
|
"license": "MIT",
|
|
34
34
|
"dependencies": {
|
|
35
|
+
"@redwoodjs/cli-helpers": "^7.7.3",
|
|
35
36
|
"colors": "1.4.0",
|
|
36
|
-
"ts-morph": "^16.0.0",
|
|
37
|
-
"@redwoodjs/cli-helpers": "^6.6.0",
|
|
38
37
|
"execa": "^5.0.0",
|
|
39
38
|
"listr2": "^6.0.0",
|
|
39
|
+
"semver": "^7.5.2",
|
|
40
40
|
"terminal-link": "^2.0.0",
|
|
41
|
+
"ts-morph": "^16.0.0",
|
|
41
42
|
"yargs": "^17.7.2",
|
|
42
|
-
"@zenstackhq/runtime": "2.
|
|
43
|
+
"@zenstackhq/runtime": "2.4.1"
|
|
43
44
|
},
|
|
44
45
|
"devDependencies": {
|
|
45
|
-
"@redwoodjs/graphql-server": "^
|
|
46
|
+
"@redwoodjs/graphql-server": "^7.7.3",
|
|
46
47
|
"@types/yargs": "^17.0.32",
|
|
47
48
|
"graphql-yoga": "^5.0.2"
|
|
48
49
|
},
|
package/src/commands/setup.ts
CHANGED
|
@@ -1,9 +1,10 @@
|
|
|
1
|
-
import { getPaths, updateTomlConfig } from '@redwoodjs/cli-helpers';
|
|
1
|
+
import { getInstalledRedwoodVersion, getPaths, updateTomlConfig } from '@redwoodjs/cli-helpers';
|
|
2
2
|
import colors from 'colors';
|
|
3
3
|
import execa from 'execa';
|
|
4
4
|
import fs from 'fs';
|
|
5
5
|
import { Listr, ListrTask } from 'listr2';
|
|
6
6
|
import path from 'path';
|
|
7
|
+
import semver from 'semver';
|
|
7
8
|
import terminalLink from 'terminal-link';
|
|
8
9
|
import { Project, SyntaxKind, type PropertyAssignment } from 'ts-morph';
|
|
9
10
|
import type { CommandModule } from 'yargs';
|
|
@@ -47,8 +48,8 @@ function bootstrapSchema() {
|
|
|
47
48
|
const pkg = JSON.parse(content);
|
|
48
49
|
if (!pkg.zenstack) {
|
|
49
50
|
pkg.zenstack = {
|
|
50
|
-
schema: path.relative(apiPaths.base, zmodel),
|
|
51
|
-
prisma: path.relative(apiPaths.base, apiPaths.dbSchema),
|
|
51
|
+
schema: normalizePath(path.relative(apiPaths.base, zmodel)),
|
|
52
|
+
prisma: normalizePath(path.relative(apiPaths.base, apiPaths.dbSchema)),
|
|
52
53
|
};
|
|
53
54
|
fs.writeFileSync(pkgJson, JSON.stringify(pkg, null, 4));
|
|
54
55
|
}
|
|
@@ -57,6 +58,11 @@ function bootstrapSchema() {
|
|
|
57
58
|
};
|
|
58
59
|
}
|
|
59
60
|
|
|
61
|
+
// ensures posix path separators are used in package.json
|
|
62
|
+
function normalizePath(_path: string) {
|
|
63
|
+
return _path.replaceAll(path.sep, path.posix.sep);
|
|
64
|
+
}
|
|
65
|
+
|
|
60
66
|
// install ZenStack GraphQLYoga plugin
|
|
61
67
|
function installGraphQLPlugin() {
|
|
62
68
|
return {
|
|
@@ -144,11 +150,17 @@ function installGraphQLPlugin() {
|
|
|
144
150
|
if (graphQlSourcePath.endsWith('.ts')) {
|
|
145
151
|
const typeDefPath = path.join(getPaths().api.src, 'zenstack.d.ts');
|
|
146
152
|
if (!fs.existsSync(typeDefPath)) {
|
|
153
|
+
const rwVersion: string = getInstalledRedwoodVersion();
|
|
154
|
+
const contextModule =
|
|
155
|
+
rwVersion && semver.lt(rwVersion, '7.0.0')
|
|
156
|
+
? '@redwoodjs/graphql-server' // pre v7
|
|
157
|
+
: '@redwoodjs/context'; // v7+
|
|
158
|
+
|
|
147
159
|
const typeDefSourceFile = project.createSourceFile(
|
|
148
160
|
typeDefPath,
|
|
149
|
-
`import type { PrismaClient } from '@
|
|
161
|
+
`import type { PrismaClient } from '@zenstackhq/runtime'
|
|
150
162
|
|
|
151
|
-
declare module '
|
|
163
|
+
declare module '${contextModule}' {
|
|
152
164
|
interface GlobalContext {
|
|
153
165
|
db: PrismaClient
|
|
154
166
|
}
|