From dd2f672e0b72f8dd307a2615ada7ba688f1454cd Mon Sep 17 00:00:00 2001 From: DmitriVanGuard Date: Tue, 12 Apr 2022 10:17:52 +0300 Subject: [PATCH] Webkit updated --- package-lock.json | 10 +++++----- package.json | 4 ++-- webpack.config.js | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index 92aa24cc..cc7e2c6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3947,9 +3947,9 @@ } }, "fecha": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz", - "integrity": "sha512-MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q==" + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/fecha/-/fecha-4.2.2.tgz", + "integrity": "sha512-5rOQWkBVz3FnYWTi/ELZmq4CoK1Pb+xKNZWuJRsOwo0+8DrP43CrWJtyLVvb5U7z7ggE5llahfDbLjaVNzXVJQ==" }, "figgy-pudding": { "version": "3.5.2", @@ -7536,8 +7536,8 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "san-webkit": { - "version": "git+https://github.com/santiment/san-webkit.git#a8a8cb0206b1adf47dc0905d901bfd8f9e2b7aa5", - "from": "git+https://github.com/santiment/san-webkit.git#a8a8cb0", + "version": "git+https://github.com/santiment/san-webkit.git#4f80a168f0261a6102bf28189e289eb9000a0150", + "from": "git+https://github.com/santiment/san-webkit.git#4f80a16", "requires": { "@types/gtag.js": "0.0.4", "@types/jest": "^26.0.23", diff --git a/package.json b/package.json index 7ca9d0f2..5a9b515e 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ ] }, "scripts": { - "dev": "BACKEND_URL=https://api.santiment.net sapper dev", + "dev": "BACKEND_URL=https://api-stage.santiment.net sapper dev", "build": "npm run webkit && NODE_ENV=production sapper build", "webkit": "node scripts/webkit", "postinstall": "patch-package && npm run webkit", @@ -26,7 +26,7 @@ "mobile-detect": "^1.4.5", "node-fetch": "^2.6.1", "polka": "next", - "san-webkit": "https://github.com/santiment/san-webkit#a8a8cb0", + "san-webkit": "https://github.com/santiment/san-webkit#4f80a16", "sirv": "^1.0.0", "turndown": "^7.1.1", "medium-editor": "^5.23.3", diff --git a/webpack.config.js b/webpack.config.js index 4379d8de..16e7ee17 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -52,6 +52,8 @@ const ENVS = { 'process.env.MEDIA_PATH': JSON.stringify('webkit'), 'process.env.ICONS_PATH': JSON.stringify('webkit/icons'), + + 'process.env.API_FETCH_ORIGIN': JSON.stringify(process.env.API_FETCH_ORIGIN), } const URL_LOADER = { @@ -140,7 +142,6 @@ module.exports = { 'process.browser': false, ...ENVS, - // 'process.env.API_FETCH_ORIGIN': JSON.stringify(process.env.API_FETCH_ORIGIN), 'process.env.GQL_SERVER_URL': JSON.stringify( process.env.GQL_SERVER_URL || GQL_SERVER_FALLBACK, ),