kjuulh/dagger
Archived
1
0
Fork 0
Code Issues 1 Pull Requests 1 Projects Releases Wiki Activity

Merge pull request #1148 from slumbering/fix/amplitude-dynamic-import

Browse Source 
Use common import instead of dynamic for Amplitude-js
This commit is contained in:
Andrea Luzzardi 2021-11-18 09:21:23 -08:00 committed by GitHub
commit 86821325b5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.github/workflows/ci.yml vendored
View File

@ -183,6 +183,7 @@ jobs:
REACT_APP_AMPLITUDE_ID: 123 REACT_APP_AMPLITUDE_ID: 123
with: with:
config: chromeWebSecurity=false config: chromeWebSecurity=false
install-command: yarn install --silent
start: | start: |
yarn start yarn start
yarn start:withAuth yarn start:withAuth

2
website/package.json
View File

@ -49,7 +49,7 @@
}, },
"devDependencies": { "devDependencies": {
"concurrently": "^6.4.0", "concurrently": "^6.4.0",
"cypress": "^9.0.0", "cypress": "8.5.0",
"cypress-localstorage-commands": "^1.6.1", "cypress-localstorage-commands": "^1.6.1",
"start-server-and-test": "^1.13.1" "start-server-and-test": "^1.13.1"
} }

3
website/src/theme/DocPage/index.js
View File

@ -19,6 +19,7 @@ import clsx from 'clsx';
import styles from './styles.module.css'; import styles from './styles.module.css';
import {ThemeClassNames, docVersionSearchTag} from '@docusaurus/theme-common'; import {ThemeClassNames, docVersionSearchTag} from '@docusaurus/theme-common';
import DocPageCustom from "../../components/DocPageCustom" import DocPageCustom from "../../components/DocPageCustom"
import amplitude from 'amplitude-js';
function DocPageContent({currentDocRoute, versionMetadata, children}) { function DocPageContent({currentDocRoute, versionMetadata, children}) {
const {pluginId, version} = versionMetadata; const {pluginId, version} = versionMetadata;
@ -138,7 +139,6 @@ function DocPage(props) {
); );
useEffect(() => { useEffect(() => {
import('amplitude-js').then(amplitude => {
if (userAccessStatus?.login) { if (userAccessStatus?.login) {
var amplitudeInstance = amplitude.getInstance().init(process.env.REACT_APP_AMPLITUDE_ID, userAccessStatus?.login.toLowerCase(), { var amplitudeInstance = amplitude.getInstance().init(process.env.REACT_APP_AMPLITUDE_ID, userAccessStatus?.login.toLowerCase(), {
apiEndpoint: `${window.location.hostname}/t` apiEndpoint: `${window.location.hostname}/t`
@ -149,7 +149,6 @@ function DocPage(props) {
window.hj("identify", userAccessStatus?.login.toLowerCase(), {}); window.hj("identify", userAccessStatus?.login.toLowerCase(), {});
} }
} }
})
}, [location.pathname, userAccessStatus]) }, [location.pathname, userAccessStatus])
if (process.env.OAUTH_ENABLE == 'true' && userAccessStatus?.permission !== true) { if (process.env.OAUTH_ENABLE == 'true' && userAccessStatus?.permission !== true) {