Skip to content
This repository has been archived by the owner on Jul 24, 2023. It is now read-only.

Commit

Permalink
Merge branch 'hotfix'
Browse files Browse the repository at this point in the history
  • Loading branch information
zifahm committed Jul 22, 2023
2 parents bfc3c80 + fc1e1af commit 51c6cbd
Show file tree
Hide file tree
Showing 9 changed files with 54 additions and 15 deletions.
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.2.14](https://github.com/bespoke-surf/bespoke/compare/v0.2.13...v0.2.14) (2023-07-22)


### Bug Fixes

* failing CDN, temp fix ([f692d7f](https://github.com/bespoke-surf/bespoke/commit/f692d7f375d9ac426ca7b850ef1d2ba291999937))





## [0.2.13](https://github.com/bespoke-surf/bespoke/compare/v0.2.12...v0.2.13) (2023-07-07)

**Note:** Version bump only for package bespoke
Expand Down
11 changes: 11 additions & 0 deletions apps/web/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.2.14](https://github.com/bespoke-surf/bespoke/compare/v0.2.13...v0.2.14) (2023-07-22)


### Bug Fixes

* failing CDN, temp fix ([f692d7f](https://github.com/bespoke-surf/bespoke/commit/f692d7f375d9ac426ca7b850ef1d2ba291999937))





## [0.2.13](https://github.com/bespoke-surf/bespoke/compare/v0.2.12...v0.2.13) (2023-07-07)

**Note:** Version bump only for package @bespoke/web
Expand Down
6 changes: 3 additions & 3 deletions apps/web/package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "@bespoke/web",
"version": "0.2.13",
"version": "0.2.14",
"private": true,
"sideEffects": false,
"scripts": {
"build": "remix build --sourcemap && yarn gen:scripts && yarn sentry-upload && yarn upload-assets",
"build": "remix build --sourcemap && yarn gen:scripts && yarn sentry-upload",
"sentry-upload": "is-ci && yarn sentry-upload-sourcemaps --release $npm_package_version && yarn clean-sourcemap",
"clean-sourcemap": "node ./deleteSourcemaps.js",
"upload-assets": "node ./uploadToS3.js",
Expand All @@ -18,7 +18,7 @@
},
"dependencies": {
"@aws-sdk/client-s3": "^3.367.0",
"@bespoke/common": "^0.2.13",
"@bespoke/common": "^0.2.14",
"@clayui/css": "^3.99.0",
"@clayui/slider": "^3.96.0",
"@lexical/code": "^0.11.1",
Expand Down
17 changes: 9 additions & 8 deletions apps/web/remix.config.js
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
const { flatRoutes } = require("remix-flat-routes");
const invariant = require("tiny-invariant");
// const invariant = require("tiny-invariant");

// using dotenv-cli for process.env

function getPublicPath() {
let defaultCDN = process.env.CLOUDFRONT;
let isCI = process.env.CI ?? false; // only configure this when building on CI
if (!isCI) return "/build/";
if (isCI) {
invariant(process.env.CLOUDFRONT, "CLOUDTFRONT is missing");
}
return `${defaultCDN}/build/`;
return "/build/";
// let defaultCDN = process.env.CLOUDFRONT;
// let isCI = process.env.CI ?? false; // only configure this when building on CI
// if (!isCI) return "/build/";
// if (isCI) {
// invariant(process.env.CLOUDFRONT, "CLOUDTFRONT is missing");
// }
// return `${defaultCDN}/build/`;
}

/** @type {import('@remix-run/dev').AppConfig} */
Expand Down
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"apps": [
"*"
],
"version": "0.2.13",
"version": "0.2.14",
"npmClient": "yarn",
"useWorkspaces": true
}
8 changes: 8 additions & 0 deletions packages/common/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.2.14](https://github.com/bespoke-surf/bespoke/compare/v0.2.13...v0.2.14) (2023-07-22)

**Note:** Version bump only for package @bespoke/common





## [0.2.13](https://github.com/bespoke-surf/bespoke/compare/v0.2.12...v0.2.13) (2023-07-07)

**Note:** Version bump only for package @bespoke/common
Expand Down
2 changes: 1 addition & 1 deletion packages/common/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bespoke/common",
"version": "0.2.13",
"version": "0.2.14",
"main": "./dist/index.js",
"module": "./dist/index.mjs",
"types": "./dist/index.d.ts",
Expand Down
8 changes: 8 additions & 0 deletions packages/server/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,14 @@
All notable changes to this project will be documented in this file.
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.

## [0.2.14](https://github.com/bespoke-surf/bespoke/compare/v0.2.13...v0.2.14) (2023-07-22)

**Note:** Version bump only for package @bespoke/server





## [0.2.13](https://github.com/bespoke-surf/bespoke/compare/v0.2.12...v0.2.13) (2023-07-07)

**Note:** Version bump only for package @bespoke/server
Expand Down
4 changes: 2 additions & 2 deletions packages/server/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@bespoke/server",
"version": "0.2.13",
"version": "0.2.14",
"private": true,
"scripts": {
"prebuild": "rimraf dist",
Expand Down Expand Up @@ -28,7 +28,7 @@
"@apollo/utils.keyvadapter": "^3.0.0",
"@aws-sdk/client-ses": "^3.363.0",
"@aws-sdk/credential-provider-node": "^3.363.0",
"@bespoke/common": "^0.2.13",
"@bespoke/common": "^0.2.14",
"@bull-board/api": "^5.6.0",
"@bull-board/express": "^5.6.0",
"@casl/ability": "^6.5.0",
Expand Down

0 comments on commit 51c6cbd

Please sign in to comment.