@webiny/project 6.0.0-rc.4 → 6.0.0-rc.6

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 (13) hide show
  1. package/extensions/Project/EnsureTelemetryEnabledForOss.js +1 -1
  2. package/extensions/Project/EnsureTelemetryEnabledForOss.js.map +1 -1
  3. package/extensions/Project/SetAdminAppEnvVarsBeforeBuild.js +1 -0
  4. package/extensions/Project/SetAdminAppEnvVarsBeforeBuild.js.map +1 -1
  5. package/extensions/Project/SetAdminAppEnvVarsBeforeWatch.js +1 -0
  6. package/extensions/Project/SetAdminAppEnvVarsBeforeWatch.js.map +1 -1
  7. package/package.json +12 -12
  8. package/services/GetProjectIdService/GetProjectIdService.js +1 -1
  9. package/services/GetProjectIdService/GetProjectIdService.js.map +1 -1
  10. package/services/InitProjectSdkService/applyWcpEnvVars.js +10 -8
  11. package/services/InitProjectSdkService/applyWcpEnvVars.js.map +1 -1
  12. package/services/ProjectInfoService/ProjectInfoService.js +2 -2
  13. package/services/ProjectInfoService/ProjectInfoService.js.map +1 -1
package/extensions/Project/EnsureTelemetryEnabledForOss.js CHANGED
@@ -23,7 +23,7 @@ class EnsureTelemetryEnabledForOssImpl {
23
23
 
24
24
  // If telemetry is disabled and WCP is not connected, throw an error
25
25
  if (!telemetryEnabled && !wcpEnabled) {
26
- const message = [`You are trying to deploy your project, but telemetry is currently disabled.`, `The open-source edition of Webiny requires telemetry to be enabled.`, `Please re-enable telemetry to proceed with the deployment, or connect your project to Webiny Control Panel (WCP).`, `Learn more: https://webiny.link/telemetry-oss`].join(" ");
26
+ const message = [`You are trying to deploy your project, but telemetry is currently disabled.`, `The open-source edition of Webiny requires telemetry to be enabled.`, `To proceed with the deployment, please re-enable telemetry or upgrade your project via https://www.webiny.com/pricing.`, `Learn more: https://webiny.link/telemetry-oss`].join(" ");
27
27
  const error = new Error("Cannot deploy with telemetry disabled in OSS edition.");
28
28
  throw GracefulError.from(error, message);
29
29
  }
package/extensions/Project/EnsureTelemetryEnabledForOss.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["BeforeDeploy","IsCi","IsTelemetryEnabled","IsWcpEnabled","IsWebinyJsRepo","GracefulError","EnsureTelemetryEnabledForOssImpl","constructor","isTelemetryEnabled","isWcpEnabled","isWebinyJsRepo","isCi","execute","isDevRepo","telemetryEnabled","wcpEnabled","message","join","error","Error","from","EnsureTelemetryEnabledForOss","createImplementation","implementation","dependencies"],"sources":["EnsureTelemetryEnabledForOss.ts"],"sourcesContent":["import {\n BeforeDeploy,\n IsCi,\n IsTelemetryEnabled,\n IsWcpEnabled,\n IsWebinyJsRepo\n} from \"~/abstractions/index.js\";\nimport { GracefulError } from \"@webiny/project\";\n\nclass EnsureTelemetryEnabledForOssImpl implements BeforeDeploy.Interface {\n constructor(\n private isTelemetryEnabled: IsTelemetryEnabled.Interface,\n private isWcpEnabled: IsWcpEnabled.Interface,\n private isWebinyJsRepo: IsWebinyJsRepo.Interface,\n private isCi: IsCi.Interface\n ) {}\n\n async execute() {\n // Skip telemetry checks in CI environments\n if (this.isCi.execute()) {\n return;\n }\n\n // Don't enforce telemetry validation in the webiny-js development repository\n const isDevRepo = this.isWebinyJsRepo.execute();\n if (isDevRepo) {\n return;\n }\n\n const telemetryEnabled = await this.isTelemetryEnabled.execute();\n const wcpEnabled = await this.isWcpEnabled.execute();\n\n // If telemetry is disabled and WCP is not connected, throw an error\n if (!telemetryEnabled && !wcpEnabled) {\n const message = [\n `You are trying to deploy your project, but telemetry is currently disabled.`,\n `The open-source edition of Webiny requires telemetry to be enabled.`,\n `Please re-enable telemetry to proceed with the deployment, or connect your project to Webiny Control Panel (WCP).`,\n `Learn more: https://webiny.link/telemetry-oss`\n ].join(\" \");\n\n const error = new Error(\"Cannot deploy with telemetry disabled in OSS edition.\");\n\n throw GracefulError.from(error, message);\n }\n }\n}\n\nexport const EnsureTelemetryEnabledForOss = BeforeDeploy.createImplementation({\n implementation: EnsureTelemetryEnabledForOssImpl,\n dependencies: [IsTelemetryEnabled, IsWcpEnabled, IsWebinyJsRepo, IsCi]\n});\n"],"mappings":"AAAA,SACIA,YAAY,EACZC,IAAI,EACJC,kBAAkB,EAClBC,YAAY,EACZC,cAAc;AAElB,SAASC,aAAa,QAAQ,iBAAiB;AAE/C,MAAMC,gCAAgC,CAAmC;EACrEC,WAAWA,CACCC,kBAAgD,EAChDC,YAAoC,EACpCC,cAAwC,EACxCC,IAAoB,EAC9B;IAAA,KAJUH,kBAAgD,GAAhDA,kBAAgD;IAAA,KAChDC,YAAoC,GAApCA,YAAoC;IAAA,KACpCC,cAAwC,GAAxCA,cAAwC;IAAA,KACxCC,IAAoB,GAApBA,IAAoB;EAC7B;EAEH,MAAMC,OAAOA,CAAA,EAAG;IACZ;IACA,IAAI,IAAI,CAACD,IAAI,CAACC,OAAO,CAAC,CAAC,EAAE;MACrB;IACJ;;IAEA;IACA,MAAMC,SAAS,GAAG,IAAI,CAACH,cAAc,CAACE,OAAO,CAAC,CAAC;IAC/C,IAAIC,SAAS,EAAE;MACX;IACJ;IAEA,MAAMC,gBAAgB,GAAG,MAAM,IAAI,CAACN,kBAAkB,CAACI,OAAO,CAAC,CAAC;IAChE,MAAMG,UAAU,GAAG,MAAM,IAAI,CAACN,YAAY,CAACG,OAAO,CAAC,CAAC;;IAEpD;IACA,IAAI,CAACE,gBAAgB,IAAI,CAACC,UAAU,EAAE;MAClC,MAAMC,OAAO,GAAG,CACZ,6EAA6E,EAC7E,qEAAqE,EACrE,mHAAmH,EACnH,+CAA+C,CAClD,CAACC,IAAI,CAAC,GAAG,CAAC;MAEX,MAAMC,KAAK,GAAG,IAAIC,KAAK,CAAC,uDAAuD,CAAC;MAEhF,MAAMd,aAAa,CAACe,IAAI,CAACF,KAAK,EAAEF,OAAO,CAAC;IAC5C;EACJ;AACJ;AAEA,OAAO,MAAMK,4BAA4B,GAAGrB,YAAY,CAACsB,oBAAoB,CAAC;EAC1EC,cAAc,EAAEjB,gCAAgC;EAChDkB,YAAY,EAAE,CAACtB,kBAAkB,EAAEC,YAAY,EAAEC,cAAc,EAAEH,IAAI;AACzE,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["BeforeDeploy","IsCi","IsTelemetryEnabled","IsWcpEnabled","IsWebinyJsRepo","GracefulError","EnsureTelemetryEnabledForOssImpl","constructor","isTelemetryEnabled","isWcpEnabled","isWebinyJsRepo","isCi","execute","isDevRepo","telemetryEnabled","wcpEnabled","message","join","error","Error","from","EnsureTelemetryEnabledForOss","createImplementation","implementation","dependencies"],"sources":["EnsureTelemetryEnabledForOss.ts"],"sourcesContent":["import {\n BeforeDeploy,\n IsCi,\n IsTelemetryEnabled,\n IsWcpEnabled,\n IsWebinyJsRepo\n} from \"~/abstractions/index.js\";\nimport { GracefulError } from \"@webiny/project\";\n\nclass EnsureTelemetryEnabledForOssImpl implements BeforeDeploy.Interface {\n constructor(\n private isTelemetryEnabled: IsTelemetryEnabled.Interface,\n private isWcpEnabled: IsWcpEnabled.Interface,\n private isWebinyJsRepo: IsWebinyJsRepo.Interface,\n private isCi: IsCi.Interface\n ) {}\n\n async execute() {\n // Skip telemetry checks in CI environments\n if (this.isCi.execute()) {\n return;\n }\n\n // Don't enforce telemetry validation in the webiny-js development repository\n const isDevRepo = this.isWebinyJsRepo.execute();\n if (isDevRepo) {\n return;\n }\n\n const telemetryEnabled = await this.isTelemetryEnabled.execute();\n const wcpEnabled = await this.isWcpEnabled.execute();\n\n // If telemetry is disabled and WCP is not connected, throw an error\n if (!telemetryEnabled && !wcpEnabled) {\n const message = [\n `You are trying to deploy your project, but telemetry is currently disabled.`,\n `The open-source edition of Webiny requires telemetry to be enabled.`,\n `To proceed with the deployment, please re-enable telemetry or upgrade your project via https://www.webiny.com/pricing.`,\n `Learn more: https://webiny.link/telemetry-oss`\n ].join(\" \");\n\n const error = new Error(\"Cannot deploy with telemetry disabled in OSS edition.\");\n\n throw GracefulError.from(error, message);\n }\n }\n}\n\nexport const EnsureTelemetryEnabledForOss = BeforeDeploy.createImplementation({\n implementation: EnsureTelemetryEnabledForOssImpl,\n dependencies: [IsTelemetryEnabled, IsWcpEnabled, IsWebinyJsRepo, IsCi]\n});\n"],"mappings":"AAAA,SACIA,YAAY,EACZC,IAAI,EACJC,kBAAkB,EAClBC,YAAY,EACZC,cAAc;AAElB,SAASC,aAAa,QAAQ,iBAAiB;AAE/C,MAAMC,gCAAgC,CAAmC;EACrEC,WAAWA,CACCC,kBAAgD,EAChDC,YAAoC,EACpCC,cAAwC,EACxCC,IAAoB,EAC9B;IAAA,KAJUH,kBAAgD,GAAhDA,kBAAgD;IAAA,KAChDC,YAAoC,GAApCA,YAAoC;IAAA,KACpCC,cAAwC,GAAxCA,cAAwC;IAAA,KACxCC,IAAoB,GAApBA,IAAoB;EAC7B;EAEH,MAAMC,OAAOA,CAAA,EAAG;IACZ;IACA,IAAI,IAAI,CAACD,IAAI,CAACC,OAAO,CAAC,CAAC,EAAE;MACrB;IACJ;;IAEA;IACA,MAAMC,SAAS,GAAG,IAAI,CAACH,cAAc,CAACE,OAAO,CAAC,CAAC;IAC/C,IAAIC,SAAS,EAAE;MACX;IACJ;IAEA,MAAMC,gBAAgB,GAAG,MAAM,IAAI,CAACN,kBAAkB,CAACI,OAAO,CAAC,CAAC;IAChE,MAAMG,UAAU,GAAG,MAAM,IAAI,CAACN,YAAY,CAACG,OAAO,CAAC,CAAC;;IAEpD;IACA,IAAI,CAACE,gBAAgB,IAAI,CAACC,UAAU,EAAE;MAClC,MAAMC,OAAO,GAAG,CACZ,6EAA6E,EAC7E,qEAAqE,EACrE,wHAAwH,EACxH,+CAA+C,CAClD,CAACC,IAAI,CAAC,GAAG,CAAC;MAEX,MAAMC,KAAK,GAAG,IAAIC,KAAK,CAAC,uDAAuD,CAAC;MAEhF,MAAMd,aAAa,CAACe,IAAI,CAACF,KAAK,EAAEF,OAAO,CAAC;IAC5C;EACJ;AACJ;AAEA,OAAO,MAAMK,4BAA4B,GAAGrB,YAAY,CAACsB,oBAAoB,CAAC;EAC1EC,cAAc,EAAEjB,gCAAgC;EAChDkB,YAAY,EAAE,CAACtB,kBAAkB,EAAEC,YAAY,EAAEC,cAAc,EAAEH,IAAI;AACzE,CAAC,CAAC","ignoreList":[]}
package/extensions/Project/SetAdminAppEnvVarsBeforeBuild.js CHANGED
@@ -12,6 +12,7 @@ class SetAdminAppEnvVarsBeforeBuildImpl {
12
12
  const projectVersion = this.getProjectVersionService.execute();
13
13
  const telemetry = await this.isTelemetryEnabled.execute();
14
14
  if (projectId) {
15
+ process.env.REACT_APP_WEBINY_PROJECT_ID = projectId;
15
16
  process.env.REACT_APP_WCP_PROJECT_ID = projectId;
16
17
  }
17
18
  if (!("REACT_APP_WEBINY_TELEMETRY" in process.env)) {
package/extensions/Project/SetAdminAppEnvVarsBeforeBuild.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["AdminBeforeBuild","GetProjectIdService","GetProjectVersionService","IsTelemetryEnabled","globalConfig","isCI","SetAdminAppEnvVarsBeforeBuildImpl","constructor","isTelemetryEnabled","getProjectIdService","getProjectVersionService","execute","projectId","projectVersion","telemetry","process","env","REACT_APP_WCP_PROJECT_ID","REACT_APP_WEBINY_TELEMETRY","String","REACT_APP_WEBINY_TELEMETRY_USER_ID","get","newUser","Boolean","toString","REACT_APP_WEBINY_TELEMETRY_NEW_USER","INLINE_RUNTIME_CHUNK","REACT_APP_IS_CI","REACT_APP_WEBINY_VERSION","SetAdminAppEnvVarsBeforeBuild","createImplementation","implementation","dependencies"],"sources":["SetAdminAppEnvVarsBeforeBuild.ts"],"sourcesContent":["import {\n AdminBeforeBuild,\n GetProjectIdService,\n GetProjectVersionService,\n IsTelemetryEnabled\n} from \"~/abstractions/index.js\";\nimport { globalConfig } from \"@webiny/global-config\";\nimport { isCI } from \"ci-info\";\n\nclass SetAdminAppEnvVarsBeforeBuildImpl implements AdminBeforeBuild.Interface {\n constructor(\n private isTelemetryEnabled: IsTelemetryEnabled.Interface,\n private getProjectIdService: GetProjectIdService.Interface,\n private getProjectVersionService: GetProjectVersionService.Interface\n ) {}\n\n async execute() {\n const projectId = await this.getProjectIdService.execute();\n const projectVersion = this.getProjectVersionService.execute();\n\n const telemetry = await this.isTelemetryEnabled.execute();\n\n if (projectId) {\n process.env.REACT_APP_WCP_PROJECT_ID = projectId;\n }\n\n if (!(\"REACT_APP_WEBINY_TELEMETRY\" in process.env)) {\n process.env.REACT_APP_WEBINY_TELEMETRY = String(telemetry);\n }\n\n if (!(\"REACT_APP_WEBINY_TELEMETRY_USER_ID\" in process.env)) {\n process.env.REACT_APP_WEBINY_TELEMETRY_USER_ID = globalConfig.get(\"id\");\n }\n\n if (!(\"REACT_APP_WEBINY_TELEMETRY_NEW_USER\" in process.env)) {\n const newUser = Boolean(globalConfig.get(\"newUser\")).toString();\n process.env.REACT_APP_WEBINY_TELEMETRY_NEW_USER = newUser;\n }\n\n if (!(\"INLINE_RUNTIME_CHUNK\" in process.env)) {\n process.env.INLINE_RUNTIME_CHUNK = \"true\";\n }\n\n if (!(\"REACT_APP_IS_CI\" in process.env)) {\n process.env.REACT_APP_IS_CI = Boolean(isCI).toString();\n }\n\n if (!(\"REACT_APP_WEBINY_VERSION\" in process.env)) {\n process.env.REACT_APP_WEBINY_VERSION = projectVersion;\n }\n }\n}\n\nexport const SetAdminAppEnvVarsBeforeBuild = AdminBeforeBuild.createImplementation({\n implementation: SetAdminAppEnvVarsBeforeBuildImpl,\n dependencies: [IsTelemetryEnabled, GetProjectIdService, GetProjectVersionService]\n});\n"],"mappings":"AAAA,SACIA,gBAAgB,EAChBC,mBAAmB,EACnBC,wBAAwB,EACxBC,kBAAkB;AAEtB,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SAASC,IAAI,QAAQ,SAAS;AAE9B,MAAMC,iCAAiC,CAAuC;EAC1EC,WAAWA,CACCC,kBAAgD,EAChDC,mBAAkD,EAClDC,wBAA4D,EACtE;IAAA,KAHUF,kBAAgD,GAAhDA,kBAAgD;IAAA,KAChDC,mBAAkD,GAAlDA,mBAAkD;IAAA,KAClDC,wBAA4D,GAA5DA,wBAA4D;EACrE;EAEH,MAAMC,OAAOA,CAAA,EAAG;IACZ,MAAMC,SAAS,GAAG,MAAM,IAAI,CAACH,mBAAmB,CAACE,OAAO,CAAC,CAAC;IAC1D,MAAME,cAAc,GAAG,IAAI,CAACH,wBAAwB,CAACC,OAAO,CAAC,CAAC;IAE9D,MAAMG,SAAS,GAAG,MAAM,IAAI,CAACN,kBAAkB,CAACG,OAAO,CAAC,CAAC;IAEzD,IAAIC,SAAS,EAAE;MACXG,OAAO,CAACC,GAAG,CAACC,wBAAwB,GAAGL,SAAS;IACpD;IAEA,IAAI,EAAE,4BAA4B,IAAIG,OAAO,CAACC,GAAG,CAAC,EAAE;MAChDD,OAAO,CAACC,GAAG,CAACE,0BAA0B,GAAGC,MAAM,CAACL,SAAS,CAAC;IAC9D;IAEA,IAAI,EAAE,oCAAoC,IAAIC,OAAO,CAACC,GAAG,CAAC,EAAE;MACxDD,OAAO,CAACC,GAAG,CAACI,kCAAkC,GAAGhB,YAAY,CAACiB,GAAG,CAAC,IAAI,CAAC;IAC3E;IAEA,IAAI,EAAE,qCAAqC,IAAIN,OAAO,CAACC,GAAG,CAAC,EAAE;MACzD,MAAMM,OAAO,GAAGC,OAAO,CAACnB,YAAY,CAACiB,GAAG,CAAC,SAAS,CAAC,CAAC,CAACG,QAAQ,CAAC,CAAC;MAC/DT,OAAO,CAACC,GAAG,CAACS,mCAAmC,GAAGH,OAAO;IAC7D;IAEA,IAAI,EAAE,sBAAsB,IAAIP,OAAO,CAACC,GAAG,CAAC,EAAE;MAC1CD,OAAO,CAACC,GAAG,CAACU,oBAAoB,GAAG,MAAM;IAC7C;IAEA,IAAI,EAAE,iBAAiB,IAAIX,OAAO,CAACC,GAAG,CAAC,EAAE;MACrCD,OAAO,CAACC,GAAG,CAACW,eAAe,GAAGJ,OAAO,CAAClB,IAAI,CAAC,CAACmB,QAAQ,CAAC,CAAC;IAC1D;IAEA,IAAI,EAAE,0BAA0B,IAAIT,OAAO,CAACC,GAAG,CAAC,EAAE;MAC9CD,OAAO,CAACC,GAAG,CAACY,wBAAwB,GAAGf,cAAc;IACzD;EACJ;AACJ;AAEA,OAAO,MAAMgB,6BAA6B,GAAG7B,gBAAgB,CAAC8B,oBAAoB,CAAC;EAC/EC,cAAc,EAAEzB,iCAAiC;EACjD0B,YAAY,EAAE,CAAC7B,kBAAkB,EAAEF,mBAAmB,EAAEC,wBAAwB;AACpF,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["AdminBeforeBuild","GetProjectIdService","GetProjectVersionService","IsTelemetryEnabled","globalConfig","isCI","SetAdminAppEnvVarsBeforeBuildImpl","constructor","isTelemetryEnabled","getProjectIdService","getProjectVersionService","execute","projectId","projectVersion","telemetry","process","env","REACT_APP_WEBINY_PROJECT_ID","REACT_APP_WCP_PROJECT_ID","REACT_APP_WEBINY_TELEMETRY","String","REACT_APP_WEBINY_TELEMETRY_USER_ID","get","newUser","Boolean","toString","REACT_APP_WEBINY_TELEMETRY_NEW_USER","INLINE_RUNTIME_CHUNK","REACT_APP_IS_CI","REACT_APP_WEBINY_VERSION","SetAdminAppEnvVarsBeforeBuild","createImplementation","implementation","dependencies"],"sources":["SetAdminAppEnvVarsBeforeBuild.ts"],"sourcesContent":["import {\n AdminBeforeBuild,\n GetProjectIdService,\n GetProjectVersionService,\n IsTelemetryEnabled\n} from \"~/abstractions/index.js\";\nimport { globalConfig } from \"@webiny/global-config\";\nimport { isCI } from \"ci-info\";\n\nclass SetAdminAppEnvVarsBeforeBuildImpl implements AdminBeforeBuild.Interface {\n constructor(\n private isTelemetryEnabled: IsTelemetryEnabled.Interface,\n private getProjectIdService: GetProjectIdService.Interface,\n private getProjectVersionService: GetProjectVersionService.Interface\n ) {}\n\n async execute() {\n const projectId = await this.getProjectIdService.execute();\n const projectVersion = this.getProjectVersionService.execute();\n\n const telemetry = await this.isTelemetryEnabled.execute();\n\n if (projectId) {\n process.env.REACT_APP_WEBINY_PROJECT_ID = projectId;\n process.env.REACT_APP_WCP_PROJECT_ID = projectId;\n }\n\n if (!(\"REACT_APP_WEBINY_TELEMETRY\" in process.env)) {\n process.env.REACT_APP_WEBINY_TELEMETRY = String(telemetry);\n }\n\n if (!(\"REACT_APP_WEBINY_TELEMETRY_USER_ID\" in process.env)) {\n process.env.REACT_APP_WEBINY_TELEMETRY_USER_ID = globalConfig.get(\"id\");\n }\n\n if (!(\"REACT_APP_WEBINY_TELEMETRY_NEW_USER\" in process.env)) {\n const newUser = Boolean(globalConfig.get(\"newUser\")).toString();\n process.env.REACT_APP_WEBINY_TELEMETRY_NEW_USER = newUser;\n }\n\n if (!(\"INLINE_RUNTIME_CHUNK\" in process.env)) {\n process.env.INLINE_RUNTIME_CHUNK = \"true\";\n }\n\n if (!(\"REACT_APP_IS_CI\" in process.env)) {\n process.env.REACT_APP_IS_CI = Boolean(isCI).toString();\n }\n\n if (!(\"REACT_APP_WEBINY_VERSION\" in process.env)) {\n process.env.REACT_APP_WEBINY_VERSION = projectVersion;\n }\n }\n}\n\nexport const SetAdminAppEnvVarsBeforeBuild = AdminBeforeBuild.createImplementation({\n implementation: SetAdminAppEnvVarsBeforeBuildImpl,\n dependencies: [IsTelemetryEnabled, GetProjectIdService, GetProjectVersionService]\n});\n"],"mappings":"AAAA,SACIA,gBAAgB,EAChBC,mBAAmB,EACnBC,wBAAwB,EACxBC,kBAAkB;AAEtB,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SAASC,IAAI,QAAQ,SAAS;AAE9B,MAAMC,iCAAiC,CAAuC;EAC1EC,WAAWA,CACCC,kBAAgD,EAChDC,mBAAkD,EAClDC,wBAA4D,EACtE;IAAA,KAHUF,kBAAgD,GAAhDA,kBAAgD;IAAA,KAChDC,mBAAkD,GAAlDA,mBAAkD;IAAA,KAClDC,wBAA4D,GAA5DA,wBAA4D;EACrE;EAEH,MAAMC,OAAOA,CAAA,EAAG;IACZ,MAAMC,SAAS,GAAG,MAAM,IAAI,CAACH,mBAAmB,CAACE,OAAO,CAAC,CAAC;IAC1D,MAAME,cAAc,GAAG,IAAI,CAACH,wBAAwB,CAACC,OAAO,CAAC,CAAC;IAE9D,MAAMG,SAAS,GAAG,MAAM,IAAI,CAACN,kBAAkB,CAACG,OAAO,CAAC,CAAC;IAEzD,IAAIC,SAAS,EAAE;MACXG,OAAO,CAACC,GAAG,CAACC,2BAA2B,GAAGL,SAAS;MACnDG,OAAO,CAACC,GAAG,CAACE,wBAAwB,GAAGN,SAAS;IACpD;IAEA,IAAI,EAAE,4BAA4B,IAAIG,OAAO,CAACC,GAAG,CAAC,EAAE;MAChDD,OAAO,CAACC,GAAG,CAACG,0BAA0B,GAAGC,MAAM,CAACN,SAAS,CAAC;IAC9D;IAEA,IAAI,EAAE,oCAAoC,IAAIC,OAAO,CAACC,GAAG,CAAC,EAAE;MACxDD,OAAO,CAACC,GAAG,CAACK,kCAAkC,GAAGjB,YAAY,CAACkB,GAAG,CAAC,IAAI,CAAC;IAC3E;IAEA,IAAI,EAAE,qCAAqC,IAAIP,OAAO,CAACC,GAAG,CAAC,EAAE;MACzD,MAAMO,OAAO,GAAGC,OAAO,CAACpB,YAAY,CAACkB,GAAG,CAAC,SAAS,CAAC,CAAC,CAACG,QAAQ,CAAC,CAAC;MAC/DV,OAAO,CAACC,GAAG,CAACU,mCAAmC,GAAGH,OAAO;IAC7D;IAEA,IAAI,EAAE,sBAAsB,IAAIR,OAAO,CAACC,GAAG,CAAC,EAAE;MAC1CD,OAAO,CAACC,GAAG,CAACW,oBAAoB,GAAG,MAAM;IAC7C;IAEA,IAAI,EAAE,iBAAiB,IAAIZ,OAAO,CAACC,GAAG,CAAC,EAAE;MACrCD,OAAO,CAACC,GAAG,CAACY,eAAe,GAAGJ,OAAO,CAACnB,IAAI,CAAC,CAACoB,QAAQ,CAAC,CAAC;IAC1D;IAEA,IAAI,EAAE,0BAA0B,IAAIV,OAAO,CAACC,GAAG,CAAC,EAAE;MAC9CD,OAAO,CAACC,GAAG,CAACa,wBAAwB,GAAGhB,cAAc;IACzD;EACJ;AACJ;AAEA,OAAO,MAAMiB,6BAA6B,GAAG9B,gBAAgB,CAAC+B,oBAAoB,CAAC;EAC/EC,cAAc,EAAE1B,iCAAiC;EACjD2B,YAAY,EAAE,CAAC9B,kBAAkB,EAAEF,mBAAmB,EAAEC,wBAAwB;AACpF,CAAC,CAAC","ignoreList":[]}
package/extensions/Project/SetAdminAppEnvVarsBeforeWatch.js CHANGED
@@ -12,6 +12,7 @@ class SetAdminAppEnvVarsBeforeWatchImpl {
12
12
  const projectVersion = this.getProjectVersionService.execute();
13
13
  const telemetry = await this.isTelemetryEnabled.execute();
14
14
  if (projectId) {
15
+ process.env.REACT_APP_WEBINY_PROJECT_ID = projectId;
15
16
  process.env.REACT_APP_WCP_PROJECT_ID = projectId;
16
17
  }
17
18
  if (!("REACT_APP_WEBINY_TELEMETRY" in process.env)) {
package/extensions/Project/SetAdminAppEnvVarsBeforeWatch.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["AdminBeforeWatch","IsTelemetryEnabled","GetProjectIdService","GetProjectVersionService","globalConfig","isCI","SetAdminAppEnvVarsBeforeWatchImpl","constructor","isTelemetryEnabled","getProjectIdService","getProjectVersionService","execute","projectId","projectVersion","telemetry","process","env","REACT_APP_WCP_PROJECT_ID","REACT_APP_WEBINY_TELEMETRY","String","REACT_APP_WEBINY_TELEMETRY_USER_ID","get","newUser","Boolean","toString","REACT_APP_WEBINY_TELEMETRY_NEW_USER","INLINE_RUNTIME_CHUNK","REACT_APP_IS_CI","REACT_APP_WEBINY_VERSION","SetAdminAppEnvVarsBeforeWatch","createImplementation","implementation","dependencies"],"sources":["SetAdminAppEnvVarsBeforeWatch.ts"],"sourcesContent":["import {\n AdminBeforeWatch,\n IsTelemetryEnabled,\n GetProjectIdService,\n GetProjectVersionService\n} from \"~/abstractions/index.js\";\nimport { globalConfig } from \"@webiny/global-config\";\nimport { isCI } from \"ci-info\";\n\nclass SetAdminAppEnvVarsBeforeWatchImpl implements AdminBeforeWatch.Interface {\n constructor(\n private isTelemetryEnabled: IsTelemetryEnabled.Interface,\n private getProjectIdService: GetProjectIdService.Interface,\n private getProjectVersionService: GetProjectVersionService.Interface\n ) {}\n\n async execute() {\n const projectId = await this.getProjectIdService.execute();\n const projectVersion = this.getProjectVersionService.execute();\n\n const telemetry = await this.isTelemetryEnabled.execute();\n\n if (projectId) {\n process.env.REACT_APP_WCP_PROJECT_ID = projectId;\n }\n\n if (!(\"REACT_APP_WEBINY_TELEMETRY\" in process.env)) {\n process.env.REACT_APP_WEBINY_TELEMETRY = String(telemetry);\n }\n\n if (!(\"REACT_APP_WEBINY_TELEMETRY_USER_ID\" in process.env)) {\n process.env.REACT_APP_WEBINY_TELEMETRY_USER_ID = globalConfig.get(\"id\");\n }\n\n if (!(\"REACT_APP_WEBINY_TELEMETRY_NEW_USER\" in process.env)) {\n const newUser = Boolean(globalConfig.get(\"newUser\")).toString();\n process.env.REACT_APP_WEBINY_TELEMETRY_NEW_USER = newUser;\n }\n\n if (!(\"INLINE_RUNTIME_CHUNK\" in process.env)) {\n process.env.INLINE_RUNTIME_CHUNK = \"true\";\n }\n\n if (!(\"REACT_APP_IS_CI\" in process.env)) {\n process.env.REACT_APP_IS_CI = Boolean(isCI).toString();\n }\n\n if (!(\"REACT_APP_WEBINY_VERSION\" in process.env)) {\n process.env.REACT_APP_WEBINY_VERSION = projectVersion;\n }\n }\n}\n\nexport const SetAdminAppEnvVarsBeforeWatch = AdminBeforeWatch.createImplementation({\n implementation: SetAdminAppEnvVarsBeforeWatchImpl,\n dependencies: [IsTelemetryEnabled, GetProjectIdService, GetProjectVersionService]\n});\n"],"mappings":"AAAA,SACIA,gBAAgB,EAChBC,kBAAkB,EAClBC,mBAAmB,EACnBC,wBAAwB;AAE5B,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SAASC,IAAI,QAAQ,SAAS;AAE9B,MAAMC,iCAAiC,CAAuC;EAC1EC,WAAWA,CACCC,kBAAgD,EAChDC,mBAAkD,EAClDC,wBAA4D,EACtE;IAAA,KAHUF,kBAAgD,GAAhDA,kBAAgD;IAAA,KAChDC,mBAAkD,GAAlDA,mBAAkD;IAAA,KAClDC,wBAA4D,GAA5DA,wBAA4D;EACrE;EAEH,MAAMC,OAAOA,CAAA,EAAG;IACZ,MAAMC,SAAS,GAAG,MAAM,IAAI,CAACH,mBAAmB,CAACE,OAAO,CAAC,CAAC;IAC1D,MAAME,cAAc,GAAG,IAAI,CAACH,wBAAwB,CAACC,OAAO,CAAC,CAAC;IAE9D,MAAMG,SAAS,GAAG,MAAM,IAAI,CAACN,kBAAkB,CAACG,OAAO,CAAC,CAAC;IAEzD,IAAIC,SAAS,EAAE;MACXG,OAAO,CAACC,GAAG,CAACC,wBAAwB,GAAGL,SAAS;IACpD;IAEA,IAAI,EAAE,4BAA4B,IAAIG,OAAO,CAACC,GAAG,CAAC,EAAE;MAChDD,OAAO,CAACC,GAAG,CAACE,0BAA0B,GAAGC,MAAM,CAACL,SAAS,CAAC;IAC9D;IAEA,IAAI,EAAE,oCAAoC,IAAIC,OAAO,CAACC,GAAG,CAAC,EAAE;MACxDD,OAAO,CAACC,GAAG,CAACI,kCAAkC,GAAGhB,YAAY,CAACiB,GAAG,CAAC,IAAI,CAAC;IAC3E;IAEA,IAAI,EAAE,qCAAqC,IAAIN,OAAO,CAACC,GAAG,CAAC,EAAE;MACzD,MAAMM,OAAO,GAAGC,OAAO,CAACnB,YAAY,CAACiB,GAAG,CAAC,SAAS,CAAC,CAAC,CAACG,QAAQ,CAAC,CAAC;MAC/DT,OAAO,CAACC,GAAG,CAACS,mCAAmC,GAAGH,OAAO;IAC7D;IAEA,IAAI,EAAE,sBAAsB,IAAIP,OAAO,CAACC,GAAG,CAAC,EAAE;MAC1CD,OAAO,CAACC,GAAG,CAACU,oBAAoB,GAAG,MAAM;IAC7C;IAEA,IAAI,EAAE,iBAAiB,IAAIX,OAAO,CAACC,GAAG,CAAC,EAAE;MACrCD,OAAO,CAACC,GAAG,CAACW,eAAe,GAAGJ,OAAO,CAAClB,IAAI,CAAC,CAACmB,QAAQ,CAAC,CAAC;IAC1D;IAEA,IAAI,EAAE,0BAA0B,IAAIT,OAAO,CAACC,GAAG,CAAC,EAAE;MAC9CD,OAAO,CAACC,GAAG,CAACY,wBAAwB,GAAGf,cAAc;IACzD;EACJ;AACJ;AAEA,OAAO,MAAMgB,6BAA6B,GAAG7B,gBAAgB,CAAC8B,oBAAoB,CAAC;EAC/EC,cAAc,EAAEzB,iCAAiC;EACjD0B,YAAY,EAAE,CAAC/B,kBAAkB,EAAEC,mBAAmB,EAAEC,wBAAwB;AACpF,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["AdminBeforeWatch","IsTelemetryEnabled","GetProjectIdService","GetProjectVersionService","globalConfig","isCI","SetAdminAppEnvVarsBeforeWatchImpl","constructor","isTelemetryEnabled","getProjectIdService","getProjectVersionService","execute","projectId","projectVersion","telemetry","process","env","REACT_APP_WEBINY_PROJECT_ID","REACT_APP_WCP_PROJECT_ID","REACT_APP_WEBINY_TELEMETRY","String","REACT_APP_WEBINY_TELEMETRY_USER_ID","get","newUser","Boolean","toString","REACT_APP_WEBINY_TELEMETRY_NEW_USER","INLINE_RUNTIME_CHUNK","REACT_APP_IS_CI","REACT_APP_WEBINY_VERSION","SetAdminAppEnvVarsBeforeWatch","createImplementation","implementation","dependencies"],"sources":["SetAdminAppEnvVarsBeforeWatch.ts"],"sourcesContent":["import {\n AdminBeforeWatch,\n IsTelemetryEnabled,\n GetProjectIdService,\n GetProjectVersionService\n} from \"~/abstractions/index.js\";\nimport { globalConfig } from \"@webiny/global-config\";\nimport { isCI } from \"ci-info\";\n\nclass SetAdminAppEnvVarsBeforeWatchImpl implements AdminBeforeWatch.Interface {\n constructor(\n private isTelemetryEnabled: IsTelemetryEnabled.Interface,\n private getProjectIdService: GetProjectIdService.Interface,\n private getProjectVersionService: GetProjectVersionService.Interface\n ) {}\n\n async execute() {\n const projectId = await this.getProjectIdService.execute();\n const projectVersion = this.getProjectVersionService.execute();\n\n const telemetry = await this.isTelemetryEnabled.execute();\n\n if (projectId) {\n process.env.REACT_APP_WEBINY_PROJECT_ID = projectId;\n process.env.REACT_APP_WCP_PROJECT_ID = projectId;\n }\n\n if (!(\"REACT_APP_WEBINY_TELEMETRY\" in process.env)) {\n process.env.REACT_APP_WEBINY_TELEMETRY = String(telemetry);\n }\n\n if (!(\"REACT_APP_WEBINY_TELEMETRY_USER_ID\" in process.env)) {\n process.env.REACT_APP_WEBINY_TELEMETRY_USER_ID = globalConfig.get(\"id\");\n }\n\n if (!(\"REACT_APP_WEBINY_TELEMETRY_NEW_USER\" in process.env)) {\n const newUser = Boolean(globalConfig.get(\"newUser\")).toString();\n process.env.REACT_APP_WEBINY_TELEMETRY_NEW_USER = newUser;\n }\n\n if (!(\"INLINE_RUNTIME_CHUNK\" in process.env)) {\n process.env.INLINE_RUNTIME_CHUNK = \"true\";\n }\n\n if (!(\"REACT_APP_IS_CI\" in process.env)) {\n process.env.REACT_APP_IS_CI = Boolean(isCI).toString();\n }\n\n if (!(\"REACT_APP_WEBINY_VERSION\" in process.env)) {\n process.env.REACT_APP_WEBINY_VERSION = projectVersion;\n }\n }\n}\n\nexport const SetAdminAppEnvVarsBeforeWatch = AdminBeforeWatch.createImplementation({\n implementation: SetAdminAppEnvVarsBeforeWatchImpl,\n dependencies: [IsTelemetryEnabled, GetProjectIdService, GetProjectVersionService]\n});\n"],"mappings":"AAAA,SACIA,gBAAgB,EAChBC,kBAAkB,EAClBC,mBAAmB,EACnBC,wBAAwB;AAE5B,SAASC,YAAY,QAAQ,uBAAuB;AACpD,SAASC,IAAI,QAAQ,SAAS;AAE9B,MAAMC,iCAAiC,CAAuC;EAC1EC,WAAWA,CACCC,kBAAgD,EAChDC,mBAAkD,EAClDC,wBAA4D,EACtE;IAAA,KAHUF,kBAAgD,GAAhDA,kBAAgD;IAAA,KAChDC,mBAAkD,GAAlDA,mBAAkD;IAAA,KAClDC,wBAA4D,GAA5DA,wBAA4D;EACrE;EAEH,MAAMC,OAAOA,CAAA,EAAG;IACZ,MAAMC,SAAS,GAAG,MAAM,IAAI,CAACH,mBAAmB,CAACE,OAAO,CAAC,CAAC;IAC1D,MAAME,cAAc,GAAG,IAAI,CAACH,wBAAwB,CAACC,OAAO,CAAC,CAAC;IAE9D,MAAMG,SAAS,GAAG,MAAM,IAAI,CAACN,kBAAkB,CAACG,OAAO,CAAC,CAAC;IAEzD,IAAIC,SAAS,EAAE;MACXG,OAAO,CAACC,GAAG,CAACC,2BAA2B,GAAGL,SAAS;MACnDG,OAAO,CAACC,GAAG,CAACE,wBAAwB,GAAGN,SAAS;IACpD;IAEA,IAAI,EAAE,4BAA4B,IAAIG,OAAO,CAACC,GAAG,CAAC,EAAE;MAChDD,OAAO,CAACC,GAAG,CAACG,0BAA0B,GAAGC,MAAM,CAACN,SAAS,CAAC;IAC9D;IAEA,IAAI,EAAE,oCAAoC,IAAIC,OAAO,CAACC,GAAG,CAAC,EAAE;MACxDD,OAAO,CAACC,GAAG,CAACK,kCAAkC,GAAGjB,YAAY,CAACkB,GAAG,CAAC,IAAI,CAAC;IAC3E;IAEA,IAAI,EAAE,qCAAqC,IAAIP,OAAO,CAACC,GAAG,CAAC,EAAE;MACzD,MAAMO,OAAO,GAAGC,OAAO,CAACpB,YAAY,CAACkB,GAAG,CAAC,SAAS,CAAC,CAAC,CAACG,QAAQ,CAAC,CAAC;MAC/DV,OAAO,CAACC,GAAG,CAACU,mCAAmC,GAAGH,OAAO;IAC7D;IAEA,IAAI,EAAE,sBAAsB,IAAIR,OAAO,CAACC,GAAG,CAAC,EAAE;MAC1CD,OAAO,CAACC,GAAG,CAACW,oBAAoB,GAAG,MAAM;IAC7C;IAEA,IAAI,EAAE,iBAAiB,IAAIZ,OAAO,CAACC,GAAG,CAAC,EAAE;MACrCD,OAAO,CAACC,GAAG,CAACY,eAAe,GAAGJ,OAAO,CAACnB,IAAI,CAAC,CAACoB,QAAQ,CAAC,CAAC;IAC1D;IAEA,IAAI,EAAE,0BAA0B,IAAIV,OAAO,CAACC,GAAG,CAAC,EAAE;MAC9CD,OAAO,CAACC,GAAG,CAACa,wBAAwB,GAAGhB,cAAc;IACzD;EACJ;AACJ;AAEA,OAAO,MAAMiB,6BAA6B,GAAG9B,gBAAgB,CAAC+B,oBAAoB,CAAC;EAC/EC,cAAc,EAAE1B,iCAAiC;EACjD2B,YAAY,EAAE,CAAChC,kBAAkB,EAAEC,mBAAmB,EAAEC,wBAAwB;AACpF,CAAC,CAAC","ignoreList":[]}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@webiny/project",
3
- "version": "6.0.0-rc.4",
3
+ "version": "6.0.0-rc.6",
4
4
  "type": "module",
5
5
  "main": "index.js",
6
6
  "repository": {
@@ -10,17 +10,17 @@
10
10
  "description": "An SDK for managing Webiny projects.",
11
11
  "license": "MIT",
12
12
  "dependencies": {
13
- "@webiny/aws-sdk": "6.0.0-rc.4",
14
- "@webiny/build-tools": "6.0.0-rc.4",
13
+ "@webiny/aws-sdk": "6.0.0-rc.6",
14
+ "@webiny/build-tools": "6.0.0-rc.6",
15
15
  "@webiny/di": "0.2.3",
16
- "@webiny/feature-flags": "6.0.0-rc.4",
17
- "@webiny/global-config": "6.0.0-rc.4",
18
- "@webiny/pulumi-sdk": "6.0.0-rc.4",
19
- "@webiny/react-properties": "6.0.0-rc.4",
20
- "@webiny/system-requirements": "6.0.0-rc.4",
21
- "@webiny/telemetry": "6.0.0-rc.4",
22
- "@webiny/utils": "6.0.0-rc.4",
23
- "@webiny/wcp": "6.0.0-rc.4",
16
+ "@webiny/feature-flags": "6.0.0-rc.6",
17
+ "@webiny/global-config": "6.0.0-rc.6",
18
+ "@webiny/pulumi-sdk": "6.0.0-rc.6",
19
+ "@webiny/react-properties": "6.0.0-rc.6",
20
+ "@webiny/system-requirements": "6.0.0-rc.6",
21
+ "@webiny/telemetry": "6.0.0-rc.6",
22
+ "@webiny/utils": "6.0.0-rc.6",
23
+ "@webiny/wcp": "6.0.0-rc.6",
24
24
  "chalk": "4.1.2",
25
25
  "chokidar": "4.0.3",
26
26
  "ci-info": "4.4.0",
@@ -76,5 +76,5 @@
76
76
  "access": "public",
77
77
  "directory": "dist"
78
78
  },
79
- "gitHead": "e2758ee1cfa3b9a7152e9bb995a90ccabd33266f"
79
+ "gitHead": "a2a076532809feabf674a6873464f09071d86c72"
80
80
  }
package/services/GetProjectIdService/GetProjectIdService.js CHANGED
@@ -10,7 +10,7 @@ class DefaultGetProjectIdService {
10
10
  if (this.cachedProjectId) {
11
11
  return this.cachedProjectId;
12
12
  }
13
- const envProjectId = process.env.WCP_PROJECT_ID;
13
+ const envProjectId = process.env.WEBINY_PROJECT_ID || process.env.WCP_PROJECT_ID;
14
14
  if (envProjectId) {
15
15
  this.cachedProjectId = envProjectId;
16
16
  return this.cachedProjectId;
package/services/GetProjectIdService/GetProjectIdService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["createImplementation","GetProjectConfigService","GetProjectIdService","ProjectId","ProjectIdExt","DefaultGetProjectIdService","cachedProjectId","constructor","getProjectConfigService","execute","envProjectId","process","env","WCP_PROJECT_ID","projectConfig","projectIdExtension","extensionsByType","params","id","getProjectIdService","abstraction","implementation","dependencies"],"sources":["GetProjectIdService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport { GetProjectConfigService, GetProjectIdService } from \"~/abstractions/index.js\";\nimport { ProjectId as ProjectIdExt } from \"~/extensions/ProjectId.js\";\n\nclass DefaultGetProjectIdService implements GetProjectIdService.Interface {\n cachedProjectId: string | null = null;\n\n constructor(private getProjectConfigService: GetProjectConfigService.Interface) {}\n\n async execute() {\n if (this.cachedProjectId) {\n return this.cachedProjectId;\n }\n\n const envProjectId = process.env.WCP_PROJECT_ID;\n if (envProjectId) {\n this.cachedProjectId = envProjectId;\n return this.cachedProjectId;\n }\n\n const projectConfig = await this.getProjectConfigService.execute();\n const [projectIdExtension] = projectConfig.extensionsByType(ProjectIdExt);\n\n if (projectIdExtension) {\n this.cachedProjectId = projectIdExtension.params.id;\n }\n\n return this.cachedProjectId;\n }\n}\n\nexport const getProjectIdService = createImplementation({\n abstraction: GetProjectIdService,\n implementation: DefaultGetProjectIdService,\n dependencies: [GetProjectConfigService]\n});\n"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,YAAY;AACjD,SAASC,uBAAuB,EAAEC,mBAAmB;AACrD,SAASC,SAAS,IAAIC,YAAY;AAElC,MAAMC,0BAA0B,CAA0C;EACtEC,eAAe,GAAkB,IAAI;EAErCC,WAAWA,CAASC,uBAA0D,EAAE;IAAA,KAA5DA,uBAA0D,GAA1DA,uBAA0D;EAAG;EAEjF,MAAMC,OAAOA,CAAA,EAAG;IACZ,IAAI,IAAI,CAACH,eAAe,EAAE;MACtB,OAAO,IAAI,CAACA,eAAe;IAC/B;IAEA,MAAMI,YAAY,GAAGC,OAAO,CAACC,GAAG,CAACC,cAAc;IAC/C,IAAIH,YAAY,EAAE;MACd,IAAI,CAACJ,eAAe,GAAGI,YAAY;MACnC,OAAO,IAAI,CAACJ,eAAe;IAC/B;IAEA,MAAMQ,aAAa,GAAG,MAAM,IAAI,CAACN,uBAAuB,CAACC,OAAO,CAAC,CAAC;IAClE,MAAM,CAACM,kBAAkB,CAAC,GAAGD,aAAa,CAACE,gBAAgB,CAACZ,YAAY,CAAC;IAEzE,IAAIW,kBAAkB,EAAE;MACpB,IAAI,CAACT,eAAe,GAAGS,kBAAkB,CAACE,MAAM,CAACC,EAAE;IACvD;IAEA,OAAO,IAAI,CAACZ,eAAe;EAC/B;AACJ;AAEA,OAAO,MAAMa,mBAAmB,GAAGnB,oBAAoB,CAAC;EACpDoB,WAAW,EAAElB,mBAAmB;EAChCmB,cAAc,EAAEhB,0BAA0B;EAC1CiB,YAAY,EAAE,CAACrB,uBAAuB;AAC1C,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["createImplementation","GetProjectConfigService","GetProjectIdService","ProjectId","ProjectIdExt","DefaultGetProjectIdService","cachedProjectId","constructor","getProjectConfigService","execute","envProjectId","process","env","WEBINY_PROJECT_ID","WCP_PROJECT_ID","projectConfig","projectIdExtension","extensionsByType","params","id","getProjectIdService","abstraction","implementation","dependencies"],"sources":["GetProjectIdService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport { GetProjectConfigService, GetProjectIdService } from \"~/abstractions/index.js\";\nimport { ProjectId as ProjectIdExt } from \"~/extensions/ProjectId.js\";\n\nclass DefaultGetProjectIdService implements GetProjectIdService.Interface {\n cachedProjectId: string | null = null;\n\n constructor(private getProjectConfigService: GetProjectConfigService.Interface) {}\n\n async execute() {\n if (this.cachedProjectId) {\n return this.cachedProjectId;\n }\n\n const envProjectId = process.env.WEBINY_PROJECT_ID || process.env.WCP_PROJECT_ID;\n if (envProjectId) {\n this.cachedProjectId = envProjectId;\n return this.cachedProjectId;\n }\n\n const projectConfig = await this.getProjectConfigService.execute();\n const [projectIdExtension] = projectConfig.extensionsByType(ProjectIdExt);\n\n if (projectIdExtension) {\n this.cachedProjectId = projectIdExtension.params.id;\n }\n\n return this.cachedProjectId;\n }\n}\n\nexport const getProjectIdService = createImplementation({\n abstraction: GetProjectIdService,\n implementation: DefaultGetProjectIdService,\n dependencies: [GetProjectConfigService]\n});\n"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,YAAY;AACjD,SAASC,uBAAuB,EAAEC,mBAAmB;AACrD,SAASC,SAAS,IAAIC,YAAY;AAElC,MAAMC,0BAA0B,CAA0C;EACtEC,eAAe,GAAkB,IAAI;EAErCC,WAAWA,CAASC,uBAA0D,EAAE;IAAA,KAA5DA,uBAA0D,GAA1DA,uBAA0D;EAAG;EAEjF,MAAMC,OAAOA,CAAA,EAAG;IACZ,IAAI,IAAI,CAACH,eAAe,EAAE;MACtB,OAAO,IAAI,CAACA,eAAe;IAC/B;IAEA,MAAMI,YAAY,GAAGC,OAAO,CAACC,GAAG,CAACC,iBAAiB,IAAIF,OAAO,CAACC,GAAG,CAACE,cAAc;IAChF,IAAIJ,YAAY,EAAE;MACd,IAAI,CAACJ,eAAe,GAAGI,YAAY;MACnC,OAAO,IAAI,CAACJ,eAAe;IAC/B;IAEA,MAAMS,aAAa,GAAG,MAAM,IAAI,CAACP,uBAAuB,CAACC,OAAO,CAAC,CAAC;IAClE,MAAM,CAACO,kBAAkB,CAAC,GAAGD,aAAa,CAACE,gBAAgB,CAACb,YAAY,CAAC;IAEzE,IAAIY,kBAAkB,EAAE;MACpB,IAAI,CAACV,eAAe,GAAGU,kBAAkB,CAACE,MAAM,CAACC,EAAE;IACvD;IAEA,OAAO,IAAI,CAACb,eAAe;EAC/B;AACJ;AAEA,OAAO,MAAMc,mBAAmB,GAAGpB,oBAAoB,CAAC;EACpDqB,WAAW,EAAEnB,mBAAmB;EAChCoB,cAAc,EAAEjB,0BAA0B;EAC1CkB,YAAY,EAAE,CAACtB,uBAAuB;AAC1C,CAAC,CAAC","ignoreList":[]}
package/services/InitProjectSdkService/applyWcpEnvVars.js CHANGED
@@ -4,19 +4,19 @@ export const applyWcpEnvVars = async container => {
4
4
  /**
5
5
  * The environment variables we set via these hooks are the following:
6
6
  * - WCP_PROJECT_ENVIRONMENT - contains encrypted data about the deployed project environment
7
- * - WCP_PROJECT_ENVIRONMENT_API_KEY - for easier access, we also set the API key
7
+ * - WEBINY_PROJECT_API_KEY / WCP_PROJECT_ENVIRONMENT_API_KEY - for easier access, we also set the API key
8
8
  * - WCP_PROJECT_LICENSE - contains encrypted license data
9
9
  */
10
10
 
11
11
  /**
12
12
  * There are multiple ways the hooks below prepare the WCP-enabled project for deployment.
13
13
  * 1. If `WCP_PROJECT_ENVIRONMENT` metadata env var is defined, we decrypt it, retrieve the
14
- * API key from it, and assign it as the `WCP_PROJECT_ENVIRONMENT_API_KEY` env var.
15
- * 2. If `WCP_PROJECT_ENVIRONMENT_API_KEY` env var is defined, then we use that as the
14
+ * API key from it, and assign it as the `WEBINY_PROJECT_API_KEY` and `WCP_PROJECT_ENVIRONMENT_API_KEY` env vars.
15
+ * 2. If `WEBINY_PROJECT_API_KEY` or `WCP_PROJECT_ENVIRONMENT_API_KEY` env var is defined, then we use that as the
16
16
  * project environment API key. We use that to load the project environment data
17
17
  * and to also assign the `WCP_PROJECT_ENVIRONMENT` metadata env var.
18
18
  * 3. If none of the above is defined, we retrieve (or create) the project environment,
19
- * retrieve its API key and again assign it as `WCP_PROJECT_ENVIRONMENT_API_KEY` env var.
19
+ * retrieve its API key and again assign it as `WEBINY_PROJECT_API_KEY` and `WCP_PROJECT_ENVIRONMENT_API_KEY` env vars.
20
20
  * As in 2), we also assign the `WCP_PROJECT_ENVIRONMENT` metadata env var.
21
21
  */
22
22
 
@@ -35,8 +35,9 @@ export const applyWcpEnvVars = async container => {
35
35
  // Case 1: For development purposes, we allow setting the WCP_PROJECT_ENVIRONMENT env var directly.
36
36
  if (process.env.WCP_PROJECT_ENVIRONMENT) {
37
37
  loggerService.info('The "WCP_PROJECT_ENVIRONMENT" env var is already set. Using that value and skipping the rest of the process.');
38
- // If we have WCP_PROJECT_ENVIRONMENT env var, we set the WCP_PROJECT_ENVIRONMENT_API_KEY too.
38
+ // If we have WCP_PROJECT_ENVIRONMENT env var, we set the WEBINY_PROJECT_API_KEY and WCP_PROJECT_ENVIRONMENT_API_KEY too.
39
39
  const decryptedProjectEnvironment = decrypt(process.env.WCP_PROJECT_ENVIRONMENT);
40
+ process.env.WEBINY_PROJECT_API_KEY = decryptedProjectEnvironment.apiKey;
40
41
  process.env.WCP_PROJECT_ENVIRONMENT_API_KEY = decryptedProjectEnvironment.apiKey;
41
42
  return;
42
43
  }
@@ -44,8 +45,8 @@ export const applyWcpEnvVars = async container => {
44
45
  // The `id` has the orgId/projectId structure, for example `my-org-x/my-project-y`.
45
46
  const [orgId, projectId] = wcpProjectId.split("/");
46
47
 
47
- // Check if API key is already set
48
- const apiKey = process.env.WCP_PROJECT_ENVIRONMENT_API_KEY;
48
+ // Check if API key is already set (prefer WEBINY_PROJECT_API_KEY over WCP_PROJECT_ENVIRONMENT_API_KEY).
49
+ const apiKey = process.env.WEBINY_PROJECT_API_KEY || process.env.WCP_PROJECT_ENVIRONMENT_API_KEY;
49
50
  const sdkParams = projectSdkParamsService.get();
50
51
  const env = sdkParams.env;
51
52
  let projectEnvironment;
@@ -109,7 +110,7 @@ export const applyWcpEnvVars = async container => {
109
110
  });
110
111
  }
111
112
 
112
- // Assign `WCP_PROJECT_ENVIRONMENT`, `WCP_PROJECT_ENVIRONMENT_API_KEY`, and `WCP_PROJECT_LICENSE`
113
+ // Assign `WCP_PROJECT_ENVIRONMENT`, `WEBINY_PROJECT_API_KEY`, `WCP_PROJECT_ENVIRONMENT_API_KEY`, and `WCP_PROJECT_LICENSE`.
113
114
  const wcpProjectEnvironment = {
114
115
  id: projectEnvironment.id,
115
116
  apiKey: projectEnvironment.apiKey,
@@ -121,6 +122,7 @@ export const applyWcpEnvVars = async container => {
121
122
  }
122
123
  };
123
124
  process.env.WCP_PROJECT_ENVIRONMENT = encrypt(wcpProjectEnvironment);
125
+ process.env.WEBINY_PROJECT_API_KEY = projectEnvironment.apiKey;
124
126
  process.env.WCP_PROJECT_ENVIRONMENT_API_KEY = projectEnvironment.apiKey;
125
127
  if (license) {
126
128
  const licenseDto = license.toDto();
package/services/InitProjectSdkService/applyWcpEnvVars.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["encrypt","decrypt","GetProjectIdService","LoggerService","ProjectSdkParamsService","WcpService","applyWcpEnvVars","container","getProjectIdService","resolve","wcpService","loggerService","projectSdkParamsService","wcpProjectId","execute","debug","process","env","WCP_PROJECT_ENVIRONMENT","info","decryptedProjectEnvironment","WCP_PROJECT_ENVIRONMENT_API_KEY","apiKey","orgId","projectId","split","sdkParams","get","projectEnvironment","getProjectEnvironment","isValidId","error","Error","user","getUser","project","projects","find","item","id","name","userId","environmentId","org","status","license","getProjectLicense","wcpProjectEnvironment","licenseDto","toDto","WCP_PROJECT_LICENSE","JSON","stringify","replace"],"sources":["applyWcpEnvVars.ts"],"sourcesContent":["import { encrypt, decrypt } from \"@webiny/wcp\";\nimport type { ILicense } from \"@webiny/wcp/types\";\nimport { Container } from \"@webiny/di\";\nimport {\n GetProjectIdService,\n LoggerService,\n ProjectSdkParamsService,\n WcpService\n} from \"~/abstractions/index.js\";\n\nexport const applyWcpEnvVars = async (container: Container) => {\n /**\n * The environment variables we set via these hooks are the following:\n * - WCP_PROJECT_ENVIRONMENT - contains encrypted data about the deployed project environment\n * - WCP_PROJECT_ENVIRONMENT_API_KEY - for easier access, we also set the API key\n * - WCP_PROJECT_LICENSE - contains encrypted license data\n */\n\n /**\n * There are multiple ways the hooks below prepare the WCP-enabled project for deployment.\n * 1. If `WCP_PROJECT_ENVIRONMENT` metadata env var is defined, we decrypt it, retrieve the\n * API key from it, and assign it as the `WCP_PROJECT_ENVIRONMENT_API_KEY` env var.\n * 2. If `WCP_PROJECT_ENVIRONMENT_API_KEY` env var is defined, then we use that as the\n * project environment API key. We use that to load the project environment data\n * and to also assign the `WCP_PROJECT_ENVIRONMENT` metadata env var.\n * 3. If none of the above is defined, we retrieve (or create) the project environment,\n * retrieve its API key and again assign it as `WCP_PROJECT_ENVIRONMENT_API_KEY` env var.\n * As in 2), we also assign the `WCP_PROJECT_ENVIRONMENT` metadata env var.\n */\n\n const getProjectIdService = container.resolve(GetProjectIdService);\n const wcpService = container.resolve(WcpService);\n const loggerService = container.resolve(LoggerService);\n const projectSdkParamsService = container.resolve(ProjectSdkParamsService);\n\n const wcpProjectId = await getProjectIdService.execute();\n\n // If the project isn't linked with WCP, do nothing.\n if (!wcpProjectId) {\n loggerService.debug(\n 'Was not able to determine the WCP project ID. Skipping the setting of \"WCP_PROJECT_ENVIRONMENT\" and \"WCP_PROJECT_ENVIRONMENT_API_KEY\" env vars.'\n );\n return;\n }\n\n // Case 1: For development purposes, we allow setting the WCP_PROJECT_ENVIRONMENT env var directly.\n if (process.env.WCP_PROJECT_ENVIRONMENT) {\n loggerService.info(\n 'The \"WCP_PROJECT_ENVIRONMENT\" env var is already set. Using that value and skipping the rest of the process.'\n );\n // If we have WCP_PROJECT_ENVIRONMENT env var, we set the WCP_PROJECT_ENVIRONMENT_API_KEY too.\n const decryptedProjectEnvironment = decrypt(process.env.WCP_PROJECT_ENVIRONMENT);\n process.env.WCP_PROJECT_ENVIRONMENT_API_KEY = decryptedProjectEnvironment.apiKey;\n return;\n }\n\n // The `id` has the orgId/projectId structure, for example `my-org-x/my-project-y`.\n const [orgId, projectId] = wcpProjectId.split(\"/\");\n\n // Check if API key is already set\n const apiKey = process.env.WCP_PROJECT_ENVIRONMENT_API_KEY;\n\n const sdkParams = projectSdkParamsService.get();\n const env = sdkParams.env;\n\n let projectEnvironment;\n if (apiKey) {\n projectEnvironment = await wcpService.getProjectEnvironment({ apiKey });\n } else {\n const isValidId = orgId && projectId;\n if (!isValidId) {\n loggerService.error(\n { orgId, projectId, wcpProjectId },\n `The project ID, specified in \"webiny.config.tsx\" file, seems to be invalid.`\n );\n throw new Error(\n `It seems the project ID, specified in \"webiny.config.tsx\" file, is invalid.`\n );\n }\n\n // If there is no API key, that means we need to retrieve the currently logged-in user.\n const user = await wcpService.getUser();\n if (!user) {\n throw new Error(\n `It seems you are not logged into your WCP project. Please log in using the \"yarn webiny login\" command.`\n );\n }\n\n const project = user.projects.find(item => item.id === projectId);\n if (!project) {\n loggerService.error(\n { projects: user.projects },\n `The \"${projectId}\" project doesn't exist or you don't belong to it.`\n );\n throw new Error(\n `It seems you don't belong to the current project or the current project has been deleted.`\n );\n }\n\n loggerService.debug(\n `Retrieving the \"${env}\" project environment for the \"${project.name}\" project.`\n );\n\n projectEnvironment = await wcpService.getProjectEnvironment({\n orgId,\n projectId,\n userId: user.id,\n environmentId: env\n });\n }\n\n // Validate the project environment belongs to the correct org and project\n if (projectEnvironment.org.id !== orgId) {\n loggerService.error(\n `The \"${projectEnvironment.name}\" project environment doesn't belong to the \"${orgId}\" organization.`\n );\n throw new Error(\n `Cannot retrieve project environment because the \"${projectEnvironment.name}\" project environment doesn't belong to the \"${orgId}\" organization. Please check your WCP project ID (currently set to \"${wcpProjectId}\").`\n );\n }\n\n if (projectEnvironment.project.id !== projectId) {\n loggerService.error(\n `The \"${projectEnvironment.name}\" project environment doesn't belong to the \"${projectId}\" project.`\n );\n throw new Error(\n `Cannot retrieve project environment because the \"${projectEnvironment.name}\" project environment doesn't belong to the \"${wcpProjectId}\" project. Please check your WCP project ID (currently set to \"${wcpProjectId}\").`\n );\n }\n\n if (projectEnvironment && projectEnvironment.status !== \"enabled\") {\n loggerService.error(\n `The \"${projectEnvironment.name}\" project environment has been disabled.`\n );\n throw new Error(\n `Cannot retrieve project environment because the \"${projectEnvironment.name}\" project environment has been disabled.`\n );\n }\n\n // Fetch license\n let license: ILicense | null = null;\n if (projectEnvironment.apiKey) {\n license = await wcpService.getProjectLicense({\n apiKey: projectEnvironment.apiKey,\n orgId,\n projectId\n });\n }\n\n // Assign `WCP_PROJECT_ENVIRONMENT`, `WCP_PROJECT_ENVIRONMENT_API_KEY`, and `WCP_PROJECT_LICENSE`\n const wcpProjectEnvironment = {\n id: projectEnvironment.id,\n apiKey: projectEnvironment.apiKey,\n org: { id: projectEnvironment.org.id },\n project: { id: projectEnvironment.project.id }\n };\n\n process.env.WCP_PROJECT_ENVIRONMENT = encrypt(wcpProjectEnvironment);\n process.env.WCP_PROJECT_ENVIRONMENT_API_KEY = projectEnvironment.apiKey;\n if (license) {\n const licenseDto = license.toDto();\n if (licenseDto) {\n process.env.WCP_PROJECT_LICENSE = JSON.stringify(licenseDto);\n }\n }\n\n loggerService.debug(\n {\n id: projectEnvironment.id,\n apiKey: projectEnvironment.apiKey.replace(/./g, \"#\"),\n org: { id: projectEnvironment.org.id },\n project: { id: projectEnvironment.project.id },\n license: license ? \"present\" : \"not fetched\"\n },\n `WCP project environment \"${projectEnvironment.name}\" (ID: ${projectEnvironment.id}) has been set.`\n );\n};\n"],"mappings":"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","ignoreList":[]}
1
+ {"version":3,"names":["encrypt","decrypt","GetProjectIdService","LoggerService","ProjectSdkParamsService","WcpService","applyWcpEnvVars","container","getProjectIdService","resolve","wcpService","loggerService","projectSdkParamsService","wcpProjectId","execute","debug","process","env","WCP_PROJECT_ENVIRONMENT","info","decryptedProjectEnvironment","WEBINY_PROJECT_API_KEY","apiKey","WCP_PROJECT_ENVIRONMENT_API_KEY","orgId","projectId","split","sdkParams","get","projectEnvironment","getProjectEnvironment","isValidId","error","Error","user","getUser","project","projects","find","item","id","name","userId","environmentId","org","status","license","getProjectLicense","wcpProjectEnvironment","licenseDto","toDto","WCP_PROJECT_LICENSE","JSON","stringify","replace"],"sources":["applyWcpEnvVars.ts"],"sourcesContent":["import { encrypt, decrypt } from \"@webiny/wcp\";\nimport type { ILicense } from \"@webiny/wcp/types\";\nimport { Container } from \"@webiny/di\";\nimport {\n GetProjectIdService,\n LoggerService,\n ProjectSdkParamsService,\n WcpService\n} from \"~/abstractions/index.js\";\n\nexport const applyWcpEnvVars = async (container: Container) => {\n /**\n * The environment variables we set via these hooks are the following:\n * - WCP_PROJECT_ENVIRONMENT - contains encrypted data about the deployed project environment\n * - WEBINY_PROJECT_API_KEY / WCP_PROJECT_ENVIRONMENT_API_KEY - for easier access, we also set the API key\n * - WCP_PROJECT_LICENSE - contains encrypted license data\n */\n\n /**\n * There are multiple ways the hooks below prepare the WCP-enabled project for deployment.\n * 1. If `WCP_PROJECT_ENVIRONMENT` metadata env var is defined, we decrypt it, retrieve the\n * API key from it, and assign it as the `WEBINY_PROJECT_API_KEY` and `WCP_PROJECT_ENVIRONMENT_API_KEY` env vars.\n * 2. If `WEBINY_PROJECT_API_KEY` or `WCP_PROJECT_ENVIRONMENT_API_KEY` env var is defined, then we use that as the\n * project environment API key. We use that to load the project environment data\n * and to also assign the `WCP_PROJECT_ENVIRONMENT` metadata env var.\n * 3. If none of the above is defined, we retrieve (or create) the project environment,\n * retrieve its API key and again assign it as `WEBINY_PROJECT_API_KEY` and `WCP_PROJECT_ENVIRONMENT_API_KEY` env vars.\n * As in 2), we also assign the `WCP_PROJECT_ENVIRONMENT` metadata env var.\n */\n\n const getProjectIdService = container.resolve(GetProjectIdService);\n const wcpService = container.resolve(WcpService);\n const loggerService = container.resolve(LoggerService);\n const projectSdkParamsService = container.resolve(ProjectSdkParamsService);\n\n const wcpProjectId = await getProjectIdService.execute();\n\n // If the project isn't linked with WCP, do nothing.\n if (!wcpProjectId) {\n loggerService.debug(\n 'Was not able to determine the WCP project ID. Skipping the setting of \"WCP_PROJECT_ENVIRONMENT\" and \"WCP_PROJECT_ENVIRONMENT_API_KEY\" env vars.'\n );\n return;\n }\n\n // Case 1: For development purposes, we allow setting the WCP_PROJECT_ENVIRONMENT env var directly.\n if (process.env.WCP_PROJECT_ENVIRONMENT) {\n loggerService.info(\n 'The \"WCP_PROJECT_ENVIRONMENT\" env var is already set. Using that value and skipping the rest of the process.'\n );\n // If we have WCP_PROJECT_ENVIRONMENT env var, we set the WEBINY_PROJECT_API_KEY and WCP_PROJECT_ENVIRONMENT_API_KEY too.\n const decryptedProjectEnvironment = decrypt(process.env.WCP_PROJECT_ENVIRONMENT);\n process.env.WEBINY_PROJECT_API_KEY = decryptedProjectEnvironment.apiKey;\n process.env.WCP_PROJECT_ENVIRONMENT_API_KEY = decryptedProjectEnvironment.apiKey;\n return;\n }\n\n // The `id` has the orgId/projectId structure, for example `my-org-x/my-project-y`.\n const [orgId, projectId] = wcpProjectId.split(\"/\");\n\n // Check if API key is already set (prefer WEBINY_PROJECT_API_KEY over WCP_PROJECT_ENVIRONMENT_API_KEY).\n const apiKey =\n process.env.WEBINY_PROJECT_API_KEY || process.env.WCP_PROJECT_ENVIRONMENT_API_KEY;\n\n const sdkParams = projectSdkParamsService.get();\n const env = sdkParams.env;\n\n let projectEnvironment;\n if (apiKey) {\n projectEnvironment = await wcpService.getProjectEnvironment({ apiKey });\n } else {\n const isValidId = orgId && projectId;\n if (!isValidId) {\n loggerService.error(\n { orgId, projectId, wcpProjectId },\n `The project ID, specified in \"webiny.config.tsx\" file, seems to be invalid.`\n );\n throw new Error(\n `It seems the project ID, specified in \"webiny.config.tsx\" file, is invalid.`\n );\n }\n\n // If there is no API key, that means we need to retrieve the currently logged-in user.\n const user = await wcpService.getUser();\n if (!user) {\n throw new Error(\n `It seems you are not logged into your WCP project. Please log in using the \"yarn webiny login\" command.`\n );\n }\n\n const project = user.projects.find(item => item.id === projectId);\n if (!project) {\n loggerService.error(\n { projects: user.projects },\n `The \"${projectId}\" project doesn't exist or you don't belong to it.`\n );\n throw new Error(\n `It seems you don't belong to the current project or the current project has been deleted.`\n );\n }\n\n loggerService.debug(\n `Retrieving the \"${env}\" project environment for the \"${project.name}\" project.`\n );\n\n projectEnvironment = await wcpService.getProjectEnvironment({\n orgId,\n projectId,\n userId: user.id,\n environmentId: env\n });\n }\n\n // Validate the project environment belongs to the correct org and project\n if (projectEnvironment.org.id !== orgId) {\n loggerService.error(\n `The \"${projectEnvironment.name}\" project environment doesn't belong to the \"${orgId}\" organization.`\n );\n throw new Error(\n `Cannot retrieve project environment because the \"${projectEnvironment.name}\" project environment doesn't belong to the \"${orgId}\" organization. Please check your WCP project ID (currently set to \"${wcpProjectId}\").`\n );\n }\n\n if (projectEnvironment.project.id !== projectId) {\n loggerService.error(\n `The \"${projectEnvironment.name}\" project environment doesn't belong to the \"${projectId}\" project.`\n );\n throw new Error(\n `Cannot retrieve project environment because the \"${projectEnvironment.name}\" project environment doesn't belong to the \"${wcpProjectId}\" project. Please check your WCP project ID (currently set to \"${wcpProjectId}\").`\n );\n }\n\n if (projectEnvironment && projectEnvironment.status !== \"enabled\") {\n loggerService.error(\n `The \"${projectEnvironment.name}\" project environment has been disabled.`\n );\n throw new Error(\n `Cannot retrieve project environment because the \"${projectEnvironment.name}\" project environment has been disabled.`\n );\n }\n\n // Fetch license\n let license: ILicense | null = null;\n if (projectEnvironment.apiKey) {\n license = await wcpService.getProjectLicense({\n apiKey: projectEnvironment.apiKey,\n orgId,\n projectId\n });\n }\n\n // Assign `WCP_PROJECT_ENVIRONMENT`, `WEBINY_PROJECT_API_KEY`, `WCP_PROJECT_ENVIRONMENT_API_KEY`, and `WCP_PROJECT_LICENSE`.\n const wcpProjectEnvironment = {\n id: projectEnvironment.id,\n apiKey: projectEnvironment.apiKey,\n org: { id: projectEnvironment.org.id },\n project: { id: projectEnvironment.project.id }\n };\n\n process.env.WCP_PROJECT_ENVIRONMENT = encrypt(wcpProjectEnvironment);\n process.env.WEBINY_PROJECT_API_KEY = projectEnvironment.apiKey;\n process.env.WCP_PROJECT_ENVIRONMENT_API_KEY = projectEnvironment.apiKey;\n if (license) {\n const licenseDto = license.toDto();\n if (licenseDto) {\n process.env.WCP_PROJECT_LICENSE = JSON.stringify(licenseDto);\n }\n }\n\n loggerService.debug(\n {\n id: projectEnvironment.id,\n apiKey: projectEnvironment.apiKey.replace(/./g, \"#\"),\n org: { id: projectEnvironment.org.id },\n project: { id: projectEnvironment.project.id },\n license: license ? \"present\" : \"not fetched\"\n },\n `WCP project environment \"${projectEnvironment.name}\" (ID: ${projectEnvironment.id}) has been set.`\n );\n};\n"],"mappings":"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","ignoreList":[]}
package/services/ProjectInfoService/ProjectInfoService.js CHANGED
@@ -10,10 +10,10 @@ export class DefaultProjectInfoService {
10
10
  this.getProjectVersion = getProjectVersion;
11
11
  }
12
12
  async execute() {
13
- const wcpProjectId = process.env.WCP_PROJECT_ID || "";
13
+ const wcpProjectId = process.env.WEBINY_PROJECT_ID || process.env.WCP_PROJECT_ID || "";
14
14
  // const wcpUser = await getUser().catch(() => null);
15
15
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
16
- const wcpUsingProjectEnvironmentApiKey = Boolean(process.env.WCP_ENVIRONMENT_API_KEY);
16
+ const wcpUsingProjectEnvironmentApiKey = Boolean(process.env.WEBINY_PROJECT_API_KEY || process.env.WCP_PROJECT_ENVIRONMENT_API_KEY || process.env.WCP_ENVIRONMENT_API_KEY);
17
17
  const isCI = this.getIsCi.execute();
18
18
  const npmVersion = this.getNpmVersion.execute();
19
19
  const npxVersion = this.getNpxVersion.execute();
package/services/ProjectInfoService/ProjectInfoService.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"names":["createImplementation","ProjectInfoService","GetIsCiService","GetNpmVersionService","GetNpxVersionService","GetPulumiVersionService","GetYarnVersionService","GetProjectVersionService","DefaultProjectInfoService","constructor","getIsCi","getNpmVersion","getNpxVersion","getPulumiVersion","getYarnVersion","getProjectVersion","execute","wcpProjectId","process","env","WCP_PROJECT_ID","wcpUsingProjectEnvironmentApiKey","Boolean","WCP_ENVIRONMENT_API_KEY","isCI","npmVersion","npxVersion","yarnVersion","pulumiVersion","pulumiAwsVersion","webiny","version","debugEnabled","DEBUG","featureFlags","WEBINY_FEATURE_FLAGS","wcp","projectId","usingProjectEnvironmentApiKey","host","os","platform","arch","nodeJs","npm","npx","yarn","pulumi","secretsProvider","PULUMI_SECRETS_PROVIDER","usingPassword","PULUMI_CONFIG_PASSPHRASE","projectInfoService","abstraction","implementation","dependencies"],"sources":["ProjectInfoService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport {\n ProjectInfoService,\n GetIsCiService,\n GetNpmVersionService,\n GetNpxVersionService,\n GetPulumiVersionService,\n GetYarnVersionService,\n GetProjectVersionService\n} from \"~/abstractions/index.js\";\nimport { IProjectInfoServiceResult } from \"~/abstractions/services/ProjectInfoService/ProjectInfoService.js\";\n\nexport class DefaultProjectInfoService implements ProjectInfoService.Interface {\n constructor(\n private getIsCi: GetIsCiService.Interface,\n private getNpmVersion: GetNpmVersionService.Interface,\n private getNpxVersion: GetNpxVersionService.Interface,\n private getPulumiVersion: GetPulumiVersionService.Interface,\n private getYarnVersion: GetYarnVersionService.Interface,\n private getProjectVersion: GetProjectVersionService.Interface\n ) {}\n\n async execute() {\n const wcpProjectId = process.env.WCP_PROJECT_ID || \"\";\n // const wcpUser = await getUser().catch(() => null);\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const wcpUsingProjectEnvironmentApiKey = Boolean(process.env.WCP_ENVIRONMENT_API_KEY);\n\n const isCI = this.getIsCi.execute();\n const npmVersion = this.getNpmVersion.execute();\n const npxVersion = this.getNpxVersion.execute();\n const yarnVersion = this.getYarnVersion.execute();\n const [pulumiVersion, pulumiAwsVersion] = this.getPulumiVersion.execute();\n\n return {\n webiny: {\n version: this.getProjectVersion.execute(),\n debugEnabled: process.env.DEBUG === \"true\",\n featureFlags: process.env.WEBINY_FEATURE_FLAGS || {}\n },\n wcp: {\n projectId: wcpProjectId,\n // user: wcpUser?.email || \"N/A\",\n usingProjectEnvironmentApiKey: false // wcpUsingProject\n },\n host: {\n os: `${process.platform} (${process.arch})`,\n nodeJs: process.version,\n npm: npmVersion,\n npx: npxVersion,\n yarn: yarnVersion,\n isCI: isCI\n },\n pulumi: {\n \"@pulumi/pulumi\": pulumiVersion,\n \"@pulumi/aws\": pulumiAwsVersion,\n secretsProvider: process.env.PULUMI_SECRETS_PROVIDER || \"\",\n usingPassword: !!process.env.PULUMI_CONFIG_PASSPHRASE\n }\n } as IProjectInfoServiceResult;\n }\n}\n\nexport const projectInfoService = createImplementation({\n abstraction: ProjectInfoService,\n implementation: DefaultProjectInfoService,\n dependencies: [\n GetIsCiService,\n GetNpmVersionService,\n GetNpxVersionService,\n GetPulumiVersionService,\n GetYarnVersionService,\n GetProjectVersionService\n ]\n});\n"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,YAAY;AACjD,SACIC,kBAAkB,EAClBC,cAAc,EACdC,oBAAoB,EACpBC,oBAAoB,EACpBC,uBAAuB,EACvBC,qBAAqB,EACrBC,wBAAwB;AAI5B,OAAO,MAAMC,yBAAyB,CAAyC;EAC3EC,WAAWA,CACCC,OAAiC,EACjCC,aAA6C,EAC7CC,aAA6C,EAC7CC,gBAAmD,EACnDC,cAA+C,EAC/CC,iBAAqD,EAC/D;IAAA,KANUL,OAAiC,GAAjCA,OAAiC;IAAA,KACjCC,aAA6C,GAA7CA,aAA6C;IAAA,KAC7CC,aAA6C,GAA7CA,aAA6C;IAAA,KAC7CC,gBAAmD,GAAnDA,gBAAmD;IAAA,KACnDC,cAA+C,GAA/CA,cAA+C;IAAA,KAC/CC,iBAAqD,GAArDA,iBAAqD;EAC9D;EAEH,MAAMC,OAAOA,CAAA,EAAG;IACZ,MAAMC,YAAY,GAAGC,OAAO,CAACC,GAAG,CAACC,cAAc,IAAI,EAAE;IACrD;IACA;IACA,MAAMC,gCAAgC,GAAGC,OAAO,CAACJ,OAAO,CAACC,GAAG,CAACI,uBAAuB,CAAC;IAErF,MAAMC,IAAI,GAAG,IAAI,CAACd,OAAO,CAACM,OAAO,CAAC,CAAC;IACnC,MAAMS,UAAU,GAAG,IAAI,CAACd,aAAa,CAACK,OAAO,CAAC,CAAC;IAC/C,MAAMU,UAAU,GAAG,IAAI,CAACd,aAAa,CAACI,OAAO,CAAC,CAAC;IAC/C,MAAMW,WAAW,GAAG,IAAI,CAACb,cAAc,CAACE,OAAO,CAAC,CAAC;IACjD,MAAM,CAACY,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAI,CAAChB,gBAAgB,CAACG,OAAO,CAAC,CAAC;IAEzE,OAAO;MACHc,MAAM,EAAE;QACJC,OAAO,EAAE,IAAI,CAAChB,iBAAiB,CAACC,OAAO,CAAC,CAAC;QACzCgB,YAAY,EAAEd,OAAO,CAACC,GAAG,CAACc,KAAK,KAAK,MAAM;QAC1CC,YAAY,EAAEhB,OAAO,CAACC,GAAG,CAACgB,oBAAoB,IAAI,CAAC;MACvD,CAAC;MACDC,GAAG,EAAE;QACDC,SAAS,EAAEpB,YAAY;QACvB;QACAqB,6BAA6B,EAAE,KAAK,CAAC;MACzC,CAAC;MACDC,IAAI,EAAE;QACFC,EAAE,EAAE,GAAGtB,OAAO,CAACuB,QAAQ,KAAKvB,OAAO,CAACwB,IAAI,GAAG;QAC3CC,MAAM,EAAEzB,OAAO,CAACa,OAAO;QACvBa,GAAG,EAAEnB,UAAU;QACfoB,GAAG,EAAEnB,UAAU;QACfoB,IAAI,EAAEnB,WAAW;QACjBH,IAAI,EAAEA;MACV,CAAC;MACDuB,MAAM,EAAE;QACJ,gBAAgB,EAAEnB,aAAa;QAC/B,aAAa,EAAEC,gBAAgB;QAC/BmB,eAAe,EAAE9B,OAAO,CAACC,GAAG,CAAC8B,uBAAuB,IAAI,EAAE;QAC1DC,aAAa,EAAE,CAAC,CAAChC,OAAO,CAACC,GAAG,CAACgC;MACjC;IACJ,CAAC;EACL;AACJ;AAEA,OAAO,MAAMC,kBAAkB,GAAGpD,oBAAoB,CAAC;EACnDqD,WAAW,EAAEpD,kBAAkB;EAC/BqD,cAAc,EAAE9C,yBAAyB;EACzC+C,YAAY,EAAE,CACVrD,cAAc,EACdC,oBAAoB,EACpBC,oBAAoB,EACpBC,uBAAuB,EACvBC,qBAAqB,EACrBC,wBAAwB;AAEhC,CAAC,CAAC","ignoreList":[]}
1
+ {"version":3,"names":["createImplementation","ProjectInfoService","GetIsCiService","GetNpmVersionService","GetNpxVersionService","GetPulumiVersionService","GetYarnVersionService","GetProjectVersionService","DefaultProjectInfoService","constructor","getIsCi","getNpmVersion","getNpxVersion","getPulumiVersion","getYarnVersion","getProjectVersion","execute","wcpProjectId","process","env","WEBINY_PROJECT_ID","WCP_PROJECT_ID","wcpUsingProjectEnvironmentApiKey","Boolean","WEBINY_PROJECT_API_KEY","WCP_PROJECT_ENVIRONMENT_API_KEY","WCP_ENVIRONMENT_API_KEY","isCI","npmVersion","npxVersion","yarnVersion","pulumiVersion","pulumiAwsVersion","webiny","version","debugEnabled","DEBUG","featureFlags","WEBINY_FEATURE_FLAGS","wcp","projectId","usingProjectEnvironmentApiKey","host","os","platform","arch","nodeJs","npm","npx","yarn","pulumi","secretsProvider","PULUMI_SECRETS_PROVIDER","usingPassword","PULUMI_CONFIG_PASSPHRASE","projectInfoService","abstraction","implementation","dependencies"],"sources":["ProjectInfoService.ts"],"sourcesContent":["import { createImplementation } from \"@webiny/di\";\nimport {\n ProjectInfoService,\n GetIsCiService,\n GetNpmVersionService,\n GetNpxVersionService,\n GetPulumiVersionService,\n GetYarnVersionService,\n GetProjectVersionService\n} from \"~/abstractions/index.js\";\nimport { IProjectInfoServiceResult } from \"~/abstractions/services/ProjectInfoService/ProjectInfoService.js\";\n\nexport class DefaultProjectInfoService implements ProjectInfoService.Interface {\n constructor(\n private getIsCi: GetIsCiService.Interface,\n private getNpmVersion: GetNpmVersionService.Interface,\n private getNpxVersion: GetNpxVersionService.Interface,\n private getPulumiVersion: GetPulumiVersionService.Interface,\n private getYarnVersion: GetYarnVersionService.Interface,\n private getProjectVersion: GetProjectVersionService.Interface\n ) {}\n\n async execute() {\n const wcpProjectId = process.env.WEBINY_PROJECT_ID || process.env.WCP_PROJECT_ID || \"\";\n // const wcpUser = await getUser().catch(() => null);\n // eslint-disable-next-line @typescript-eslint/no-unused-vars\n const wcpUsingProjectEnvironmentApiKey = Boolean(\n process.env.WEBINY_PROJECT_API_KEY ||\n process.env.WCP_PROJECT_ENVIRONMENT_API_KEY ||\n process.env.WCP_ENVIRONMENT_API_KEY\n );\n\n const isCI = this.getIsCi.execute();\n const npmVersion = this.getNpmVersion.execute();\n const npxVersion = this.getNpxVersion.execute();\n const yarnVersion = this.getYarnVersion.execute();\n const [pulumiVersion, pulumiAwsVersion] = this.getPulumiVersion.execute();\n\n return {\n webiny: {\n version: this.getProjectVersion.execute(),\n debugEnabled: process.env.DEBUG === \"true\",\n featureFlags: process.env.WEBINY_FEATURE_FLAGS || {}\n },\n wcp: {\n projectId: wcpProjectId,\n // user: wcpUser?.email || \"N/A\",\n usingProjectEnvironmentApiKey: false // wcpUsingProject\n },\n host: {\n os: `${process.platform} (${process.arch})`,\n nodeJs: process.version,\n npm: npmVersion,\n npx: npxVersion,\n yarn: yarnVersion,\n isCI: isCI\n },\n pulumi: {\n \"@pulumi/pulumi\": pulumiVersion,\n \"@pulumi/aws\": pulumiAwsVersion,\n secretsProvider: process.env.PULUMI_SECRETS_PROVIDER || \"\",\n usingPassword: !!process.env.PULUMI_CONFIG_PASSPHRASE\n }\n } as IProjectInfoServiceResult;\n }\n}\n\nexport const projectInfoService = createImplementation({\n abstraction: ProjectInfoService,\n implementation: DefaultProjectInfoService,\n dependencies: [\n GetIsCiService,\n GetNpmVersionService,\n GetNpxVersionService,\n GetPulumiVersionService,\n GetYarnVersionService,\n GetProjectVersionService\n ]\n});\n"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,YAAY;AACjD,SACIC,kBAAkB,EAClBC,cAAc,EACdC,oBAAoB,EACpBC,oBAAoB,EACpBC,uBAAuB,EACvBC,qBAAqB,EACrBC,wBAAwB;AAI5B,OAAO,MAAMC,yBAAyB,CAAyC;EAC3EC,WAAWA,CACCC,OAAiC,EACjCC,aAA6C,EAC7CC,aAA6C,EAC7CC,gBAAmD,EACnDC,cAA+C,EAC/CC,iBAAqD,EAC/D;IAAA,KANUL,OAAiC,GAAjCA,OAAiC;IAAA,KACjCC,aAA6C,GAA7CA,aAA6C;IAAA,KAC7CC,aAA6C,GAA7CA,aAA6C;IAAA,KAC7CC,gBAAmD,GAAnDA,gBAAmD;IAAA,KACnDC,cAA+C,GAA/CA,cAA+C;IAAA,KAC/CC,iBAAqD,GAArDA,iBAAqD;EAC9D;EAEH,MAAMC,OAAOA,CAAA,EAAG;IACZ,MAAMC,YAAY,GAAGC,OAAO,CAACC,GAAG,CAACC,iBAAiB,IAAIF,OAAO,CAACC,GAAG,CAACE,cAAc,IAAI,EAAE;IACtF;IACA;IACA,MAAMC,gCAAgC,GAAGC,OAAO,CAC5CL,OAAO,CAACC,GAAG,CAACK,sBAAsB,IAC9BN,OAAO,CAACC,GAAG,CAACM,+BAA+B,IAC3CP,OAAO,CAACC,GAAG,CAACO,uBACpB,CAAC;IAED,MAAMC,IAAI,GAAG,IAAI,CAACjB,OAAO,CAACM,OAAO,CAAC,CAAC;IACnC,MAAMY,UAAU,GAAG,IAAI,CAACjB,aAAa,CAACK,OAAO,CAAC,CAAC;IAC/C,MAAMa,UAAU,GAAG,IAAI,CAACjB,aAAa,CAACI,OAAO,CAAC,CAAC;IAC/C,MAAMc,WAAW,GAAG,IAAI,CAAChB,cAAc,CAACE,OAAO,CAAC,CAAC;IACjD,MAAM,CAACe,aAAa,EAAEC,gBAAgB,CAAC,GAAG,IAAI,CAACnB,gBAAgB,CAACG,OAAO,CAAC,CAAC;IAEzE,OAAO;MACHiB,MAAM,EAAE;QACJC,OAAO,EAAE,IAAI,CAACnB,iBAAiB,CAACC,OAAO,CAAC,CAAC;QACzCmB,YAAY,EAAEjB,OAAO,CAACC,GAAG,CAACiB,KAAK,KAAK,MAAM;QAC1CC,YAAY,EAAEnB,OAAO,CAACC,GAAG,CAACmB,oBAAoB,IAAI,CAAC;MACvD,CAAC;MACDC,GAAG,EAAE;QACDC,SAAS,EAAEvB,YAAY;QACvB;QACAwB,6BAA6B,EAAE,KAAK,CAAC;MACzC,CAAC;MACDC,IAAI,EAAE;QACFC,EAAE,EAAE,GAAGzB,OAAO,CAAC0B,QAAQ,KAAK1B,OAAO,CAAC2B,IAAI,GAAG;QAC3CC,MAAM,EAAE5B,OAAO,CAACgB,OAAO;QACvBa,GAAG,EAAEnB,UAAU;QACfoB,GAAG,EAAEnB,UAAU;QACfoB,IAAI,EAAEnB,WAAW;QACjBH,IAAI,EAAEA;MACV,CAAC;MACDuB,MAAM,EAAE;QACJ,gBAAgB,EAAEnB,aAAa;QAC/B,aAAa,EAAEC,gBAAgB;QAC/BmB,eAAe,EAAEjC,OAAO,CAACC,GAAG,CAACiC,uBAAuB,IAAI,EAAE;QAC1DC,aAAa,EAAE,CAAC,CAACnC,OAAO,CAACC,GAAG,CAACmC;MACjC;IACJ,CAAC;EACL;AACJ;AAEA,OAAO,MAAMC,kBAAkB,GAAGvD,oBAAoB,CAAC;EACnDwD,WAAW,EAAEvD,kBAAkB;EAC/BwD,cAAc,EAAEjD,yBAAyB;EACzCkD,YAAY,EAAE,CACVxD,cAAc,EACdC,oBAAoB,EACpBC,oBAAoB,EACpBC,uBAAuB,EACvBC,qBAAqB,EACrBC,wBAAwB;AAEhC,CAAC,CAAC","ignoreList":[]}