@stoker-platform/cli 0.5.166 → 0.5.167

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.
Files changed (6) hide show
  1. package/init-files/.gitattributes +3 -0
  2. package/init-files/bin/build.js +16 -11
  3. package/init-files/functions/.eslintrc.cjs +1 -0
  4. package/lib/package.json +1 -1
  5. package/lib/src/deploy/deployProject.js +1 -1
  6. package/package.json +1 -1
package/init-files/.gitattributes ADDED
@@ -0,0 +1,3 @@
1
+ * text=auto eol=lf
2
+ *.png binary
3
+ *.jpg binary
package/init-files/bin/build.js CHANGED
@@ -86,7 +86,12 @@ try {
86
86
  } else {
87
87
  envFile = await readFile(join(__dirname, "..", ".env", ".env"), "utf8")
88
88
  }
89
- const envFileLines = envFile.split("\n")
89
+ const envFileLines = envFile.split(/\r?\n/)
90
+ const envValue = (line) =>
91
+ line
92
+ .slice(line.indexOf("=") + 1)
93
+ .trim()
94
+ .replace(/^"|"$/g, "")
90
95
  const databaseRegion = envFileLines.find((line) => line.startsWith("FB_FIRESTORE_REGION="))
91
96
 
92
97
  const mailRegion = envFileLines.find((line) => line.startsWith("MAIL_REGION="))
@@ -94,7 +99,7 @@ try {
94
99
  const mailSmtpConnectionUri = envFileLines.find((line) => line.startsWith("MAIL_SMTP_CONNECTION_URI="))
95
100
 
96
101
  const extensionEnvFile = await readFile(join(__dirname, "..", "extensions", "firestore-send-email.env"), "utf8")
97
- const extensionEnvFileLines = extensionEnvFile.split("\n")
102
+ const extensionEnvFileLines = extensionEnvFile.split(/\r?\n/)
98
103
  const linesToRemove = [
99
104
  "EVENTARC_CHANNEL=",
100
105
  "DEFAULT_FROM=",
@@ -108,13 +113,13 @@ try {
108
113
  (line) => !linesToRemove.some((removeStr) => line.startsWith(removeStr)),
109
114
  )
110
115
  filteredLines.push(
111
- `EVENTARC_CHANNEL=projects/\${param:PROJECT_ID}/locations/${mailRegion.split("=")[1].replace(/^"|"$/g, "")}/channels/firebase`,
116
+ `EVENTARC_CHANNEL=projects/\${param:PROJECT_ID}/locations/${envValue(mailRegion)}/channels/firebase`,
112
117
  )
113
118
  filteredLines.push(`firebaseextensions.v1beta.function/location=${process.env.FB_FUNCTIONS_REGION}`)
114
- filteredLines.push(`DEFAULT_FROM=${mailSender.split("=")[1].replace(/^"|"$/g, "")}`)
115
- filteredLines.push(`DEFAULT_REPLY_TO=${mailSender.split("=")[1].replace(/^"|"$/g, "")}`)
116
- filteredLines.push(`SMTP_CONNECTION_URI=${mailSmtpConnectionUri.split("=")[1].replace(/^"|"$/g, "")}`)
117
- filteredLines.push(`DATABASE_REGION=${databaseRegion.split("=")[1].replace(/^"|"$/g, "")}`)
119
+ filteredLines.push(`DEFAULT_FROM=${envValue(mailSender)}`)
120
+ filteredLines.push(`DEFAULT_REPLY_TO=${envValue(mailSender)}`)
121
+ filteredLines.push(`SMTP_CONNECTION_URI=${envValue(mailSmtpConnectionUri)}`)
122
+ filteredLines.push(`DATABASE_REGION=${envValue(databaseRegion)}`)
118
123
  filteredLines.push(`DATABASE=${getFirestoreDatabaseId(process.env.FB_FIRESTORE_EDITION, process.env.GCP_PROJECT)}`)
119
124
  await writeFile(join(__dirname, "..", "extensions", "firestore-send-email.env"), filteredLines.join("\n"))
120
125
 
@@ -134,8 +139,8 @@ try {
134
139
  ? await readFile(projectSpecificEnvFile, "utf8")
135
140
  : ""
136
141
 
137
- const allLines = [...projectEnvContent.split("\n"), ...projectSpecificContent.split("\n")]
138
- const filteredLines = allLines.filter((line) => envPattern.test(line.trim()))
142
+ const allLines = [...projectEnvContent.split(/\r?\n/), ...projectSpecificContent.split(/\r?\n/)]
143
+ const filteredLines = allLines.map((line) => line.trim()).filter((line) => envPattern.test(line))
139
144
  envContent = filteredLines.join("\n")
140
145
  } else {
141
146
  const defaultContent = existsSync(defaultEnvFile) ? await readFile(defaultEnvFile, "utf8") : ""
@@ -143,8 +148,8 @@ try {
143
148
  ? await readFile(projectSpecificEnvFile, "utf8")
144
149
  : ""
145
150
 
146
- const allLines = [...defaultContent.split("\n"), ...projectSpecificContent.split("\n")]
147
- const filteredLines = allLines.filter((line) => envPattern.test(line.trim()))
151
+ const allLines = [...defaultContent.split(/\r?\n/), ...projectSpecificContent.split(/\r?\n/)]
152
+ const filteredLines = allLines.map((line) => line.trim()).filter((line) => envPattern.test(line))
148
153
  envContent = filteredLines.join("\n")
149
154
  }
150
155
  if (!/^\s*GENKIT_ENV\s*=/m.test(envContent)) {
package/init-files/functions/.eslintrc.cjs CHANGED
@@ -24,5 +24,6 @@ module.exports = {
24
24
  quotes: ["error", "double"],
25
25
  "import/no-unresolved": 0,
26
26
  indent: ["error", 4],
27
+ "linebreak-style": 0,
27
28
  },
28
29
  }
package/lib/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@stoker-platform/cli",
3
- "version": "0.5.165",
3
+ "version": "0.5.166",
4
4
  "type": "module",
5
5
  "license": "SEE LICENSE IN LICENSE.md",
6
6
  "main": "./lib/src/main.js",
package/lib/src/deploy/deployProject.js CHANGED
@@ -87,7 +87,7 @@ export const deployProject = async (options) => {
87
87
  await writeFile(firebaseJsonPath, JSON.stringify(firebaseJson, null, 4), "utf8");
88
88
  const extensionEnvPath = join(process.cwd(), "extensions", "firestore-send-email.env");
89
89
  const extensionEnvFile = await readFile(extensionEnvPath, "utf8");
90
- const extensionEnvFileLines = extensionEnvFile.split("\n");
90
+ const extensionEnvFileLines = extensionEnvFile.split(/\r?\n/);
91
91
  const linesToRemove = ["DATABASE="];
92
92
  const filteredLines = extensionEnvFileLines.filter((line) => !linesToRemove.some((removeStr) => line.startsWith(removeStr)));
93
93
  filteredLines.push(
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@stoker-platform/cli",
3
- "version": "0.5.166",
3
+ "version": "0.5.167",
4
4
  "type": "module",
5
5
  "license": "SEE LICENSE IN LICENSE.md",
6
6
  "main": "./lib/src/main.js",