@cedarjs/cli-helpers 6.0.0-canary.2661 → 6.0.0-canary.2663
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.
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authTasks.d.ts","sourceRoot":"","sources":["../../src/auth/authTasks.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"authTasks.d.ts","sourceRoot":"","sources":["../../src/auth/authTasks.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AA2BxE,eAAO,MAAM,aAAa,cAA2B,CAAA;AAwDrD,eAAO,MAAM,YAAY,GAAI,+CAG1B;IACD,qBAAqB,EAAE,OAAO,CAAA;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,SAgDA,CAAA;AAmCD,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,YAE9C,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,WA6CjD,CAAA;AAoED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,SAAS,OAAO,aAAa,OAClC,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CA8CxC,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,EAAE,UAAU,OAAO;;gBAgC1C,gBAAgB;CA0CrC,CAAA;AAED,eAAO,MAAM,iBAAiB;;;CAmB7B,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAI,QAAQ,SAAS,OAAO,aAAa,EACxE,SAAS,MAAM,EACf,UAAU,OAAO,KAChB,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CAgDtC,CAAA;AASD,eAAO,MAAM,qBAAqB,GAChC,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,oBAAoB,MAAM;;gBAInB,gBAAgB,SACd,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CAcvE,CAAA;AAEF,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,SAAS,GACT,SAAS,GACT,SAAS,CAAA;AAEb,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,aAAa,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;CACf;AAED,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,OAAO,OAAO;;gBAKL,gBAAgB,QACf,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CA2CzE,CAAA"}
|
package/dist/auth/authTasks.js
CHANGED
|
@@ -13,6 +13,10 @@ import {
|
|
|
13
13
|
import { apiSideFiles, generateUniqueFileNames } from "./authFiles.js";
|
|
14
14
|
const AUTH_PROVIDER_HOOK_IMPORT = `import { AuthProvider, useAuth } from './auth.js'`;
|
|
15
15
|
const AUTH_HOOK_IMPORT = `import { useAuth } from './auth.js'`;
|
|
16
|
+
const APOLLO_PROVIDER_COMPONENT_NAMES = [
|
|
17
|
+
"CedarApolloProvider",
|
|
18
|
+
"RedwoodApolloProvider"
|
|
19
|
+
];
|
|
16
20
|
const getWebAppPath = () => getPaths().web.app;
|
|
17
21
|
function addAuthDecoderToCreateGraphQLHandler(content) {
|
|
18
22
|
if (!new RegExp("(?=(^.*?createGraphQLHandler))\\1.*\\bauthDecoder", "s").test(
|
|
@@ -184,13 +188,16 @@ const addConfigToWebApp = () => {
|
|
|
184
188
|
);
|
|
185
189
|
}
|
|
186
190
|
content = addAuthProviderToApp(content, ctx.setupMode);
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
|
|
191
|
+
const apolloProviderComponentName = APOLLO_PROVIDER_COMPONENT_NAMES.find(
|
|
192
|
+
(componentName) => new RegExp(`\\s*<${componentName}`).test(content)
|
|
193
|
+
);
|
|
194
|
+
if (apolloProviderComponentName) {
|
|
195
|
+
if (!hasUseAuthHook(apolloProviderComponentName, content)) {
|
|
196
|
+
content = addUseAuthHook(apolloProviderComponentName, content);
|
|
190
197
|
}
|
|
191
198
|
} else {
|
|
192
199
|
task.output = colors.warning(
|
|
193
|
-
"Could not find <
|
|
200
|
+
"Could not find <CedarApolloProvider>.\nIf you are using a custom GraphQL Client you will have to make sure it gets access to your `useAuth`, if it needs it."
|
|
194
201
|
);
|
|
195
202
|
}
|
|
196
203
|
fs.writeFileSync(webAppPath, content);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authTasks.d.ts","sourceRoot":"","sources":["../../../src/auth/authTasks.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;
|
|
1
|
+
{"version":3,"file":"authTasks.d.ts","sourceRoot":"","sources":["../../../src/auth/authTasks.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,aAAa,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAA;AA2BxE,eAAO,MAAM,aAAa,cAA2B,CAAA;AAwDrD,eAAO,MAAM,YAAY,GAAI,+CAG1B;IACD,qBAAqB,EAAE,OAAO,CAAA;IAC9B,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC3B,SAgDA,CAAA;AAmCD,eAAO,MAAM,eAAe,GAAI,SAAS,MAAM,YAE9C,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,SAAS,MAAM,WA6CjD,CAAA;AAoED;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,SAAS,OAAO,aAAa,OAClC,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CA8CxC,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,SAAS,MAAM,EAAE,UAAU,OAAO;;gBAgC1C,gBAAgB;CA0CrC,CAAA;AAED,eAAO,MAAM,iBAAiB;;;CAmB7B,CAAA;AAED;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAAI,QAAQ,SAAS,OAAO,aAAa,EACxE,SAAS,MAAM,EACf,UAAU,OAAO,KAChB,SAAS,CAAC,gBAAgB,EAAE,QAAQ,CAgDtC,CAAA;AASD,eAAO,MAAM,qBAAqB,GAChC,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,oBAAoB,MAAM;;gBAInB,gBAAgB,SACd,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CAcvE,CAAA;AAEF,MAAM,MAAM,aAAa,GACrB,OAAO,GACP,SAAS,GACT,SAAS,GACT,SAAS,CAAA;AAEb,MAAM,WAAW,gBAAgB;IAC/B,SAAS,EAAE,aAAa,CAAA;IACxB,QAAQ,EAAE,MAAM,CAAA;IAChB,KAAK,EAAE,OAAO,CAAA;CACf;AAED,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,SAAS,OAAO,aAAa,EACrC,gBAAgB,SAAS,OAAO,aAAa,EAE7C,OAAO,OAAO;;gBAKL,gBAAgB,QACf,gBAAgB,CAAC,gBAAgB,EAAE,QAAQ,EAAE,gBAAgB,CAAC;CA2CzE,CAAA"}
|
|
@@ -51,6 +51,10 @@ var import_project = require("../lib/project.js");
|
|
|
51
51
|
var import_authFiles = require("./authFiles.js");
|
|
52
52
|
const AUTH_PROVIDER_HOOK_IMPORT = `import { AuthProvider, useAuth } from './auth.js'`;
|
|
53
53
|
const AUTH_HOOK_IMPORT = `import { useAuth } from './auth.js'`;
|
|
54
|
+
const APOLLO_PROVIDER_COMPONENT_NAMES = [
|
|
55
|
+
"CedarApolloProvider",
|
|
56
|
+
"RedwoodApolloProvider"
|
|
57
|
+
];
|
|
54
58
|
const getWebAppPath = () => (0, import_paths.getPaths)().web.app;
|
|
55
59
|
function addAuthDecoderToCreateGraphQLHandler(content) {
|
|
56
60
|
if (!new RegExp("(?=(^.*?createGraphQLHandler))\\1.*\\bauthDecoder", "s").test(
|
|
@@ -222,13 +226,16 @@ const addConfigToWebApp = () => {
|
|
|
222
226
|
);
|
|
223
227
|
}
|
|
224
228
|
content = addAuthProviderToApp(content, ctx.setupMode);
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
229
|
+
const apolloProviderComponentName = APOLLO_PROVIDER_COMPONENT_NAMES.find(
|
|
230
|
+
(componentName) => new RegExp(`\\s*<${componentName}`).test(content)
|
|
231
|
+
);
|
|
232
|
+
if (apolloProviderComponentName) {
|
|
233
|
+
if (!hasUseAuthHook(apolloProviderComponentName, content)) {
|
|
234
|
+
content = addUseAuthHook(apolloProviderComponentName, content);
|
|
228
235
|
}
|
|
229
236
|
} else {
|
|
230
237
|
task.output = import_colors.colors.warning(
|
|
231
|
-
"Could not find <
|
|
238
|
+
"Could not find <CedarApolloProvider>.\nIf you are using a custom GraphQL Client you will have to make sure it gets access to your `useAuth`, if it needs it."
|
|
232
239
|
);
|
|
233
240
|
}
|
|
234
241
|
import_node_fs.default.writeFileSync(webAppPath, content);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@cedarjs/cli-helpers",
|
|
3
|
-
"version": "6.0.0-canary.
|
|
3
|
+
"version": "6.0.0-canary.2663",
|
|
4
4
|
"repository": {
|
|
5
5
|
"type": "git",
|
|
6
6
|
"url": "git+https://github.com/cedarjs/cedar.git",
|
|
@@ -105,8 +105,8 @@
|
|
|
105
105
|
},
|
|
106
106
|
"dependencies": {
|
|
107
107
|
"@babel/core": "^7.26.10",
|
|
108
|
-
"@cedarjs/project-config": "6.0.0-canary.
|
|
109
|
-
"@cedarjs/telemetry": "6.0.0-canary.
|
|
108
|
+
"@cedarjs/project-config": "6.0.0-canary.2663",
|
|
109
|
+
"@cedarjs/telemetry": "6.0.0-canary.2663",
|
|
110
110
|
"@listr2/prompt-adapter-enquirer": "4.2.1",
|
|
111
111
|
"@opentelemetry/api": "1.9.1",
|
|
112
112
|
"ansis": "4.2.0",
|
|
@@ -125,7 +125,7 @@
|
|
|
125
125
|
"yargs-parser": "21.1.1"
|
|
126
126
|
},
|
|
127
127
|
"devDependencies": {
|
|
128
|
-
"@cedarjs/framework-tools": "6.0.0-canary.
|
|
128
|
+
"@cedarjs/framework-tools": "6.0.0-canary.2663",
|
|
129
129
|
"@types/dotenv-defaults": "^5.0.0",
|
|
130
130
|
"@types/lodash": "4.17.24",
|
|
131
131
|
"@types/pascalcase": "1.0.3",
|