Skip to content

Commit 7e4d611

Browse files
committedMay 8, 2021
Merge branch 'v2-mst-aptd-gcms-lcz-sty' into next-v10.2
2 parents 69652f3 + ac38db0 commit 7e4d611

File tree

89 files changed

+380
-354
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+380
-354
lines changed
 

‎next.config.js

-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ module.exports = withBundleAnalyzer(withSourceMaps({
8282
NEXT_PUBLIC_APP_BUILD_TIMESTAMP: +date,
8383
NEXT_PUBLIC_APP_NAME: packageJson.name,
8484
NEXT_PUBLIC_APP_NAME_VERSION: `${packageJson.name}-${APP_RELEASE_TAG}`,
85-
UNLY_SIMPLE_LOGGER_ENV: process.env.NEXT_PUBLIC_APP_STAGE, // Used by @unly/utils-simple-logger - Fix missing staging logs because otherwise it believes we're in production
8685
GIT_COMMIT_SHA_SHORT,
8786
GIT_COMMIT_SHA: process.env.GIT_COMMIT_SHA, // Resolve commit hash from ENV first (set through CI), fallbacks to reading git (when used locally, through "/scripts/populate-git-env.sh")
8887
GIT_COMMIT_REF: process.env.GIT_COMMIT_REF, // Resolve commit ref (branch/tag) from ENV first (set through CI), fallbacks to reading git (when used locally, through "/scripts/populate-git-env.sh")

‎package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -118,13 +118,14 @@
118118
"@sentry/browser": "6.2.4",
119119
"@sentry/node": "6.2.4",
120120
"@types/lodash.isequal": "4.5.5",
121+
"@unly/simple-logger": "1.0.0",
121122
"@unly/universal-language-detector": "2.0.3",
122123
"@unly/utils": "1.0.3",
123-
"@unly/utils-simple-logger": "1.4.0",
124124
"amplitude-js": "8.1.0",
125125
"animate.css": "4.1.1",
126126
"append-query": "2.1.0",
127127
"bootstrap": "4.6.0",
128+
"chalk": "4.1.1",
128129
"classnames": "2.2.6",
129130
"cookieconsent": "3.1.1",
130131
"cookies": "0.8.0",
@@ -173,8 +174,7 @@
173174
"tinycolor2": "1.4.2",
174175
"type-fest": "1.0.1",
175176
"uuid": "8.3.2",
176-
"webfontloader": "1.6.28",
177-
"winston": "3.3.3"
177+
"webfontloader": "1.6.28"
178178
},
179179
"devDependencies": {
180180
"@cypress/react": "4.16.4",

0 commit comments

Comments
 (0)