Skip to content

Commit

Permalink
Merge pull request #1402 from dhis2/libs-741-fix-dq-playground
Browse files Browse the repository at this point in the history
chore: fix data-query playground build (LIBS-741)
  • Loading branch information
KaiVandivier authored Jan 22, 2025
2 parents 6708dba + 34bc1ca commit 2d41dc3
Show file tree
Hide file tree
Showing 12 changed files with 4,335 additions and 9,504 deletions.
2 changes: 1 addition & 1 deletion examples/query-playground/d2.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const config = {
minDHIS2Version: '2.32',

entryPoints: {
app: './src/App',
app: './src/App.jsx',
},
}

Expand Down
8 changes: 3 additions & 5 deletions examples/query-playground/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "query-playground",
"version": "1.1.1",
"version": "1.1.2",
"description": "",
"license": "BSD-3-Clause",
"private": true,
Expand All @@ -11,19 +11,17 @@
"test": "d2-app-scripts test"
},
"devDependencies": {
"@dhis2/cli-app-scripts": "<7.6.0"
"@dhis2/cli-app-scripts": "^12.0.0"
},
"dependencies": {
"@codemirror/lang-json": "^6.0.1",
"@dhis2/app-runtime": "*",
"@dhis2/ui": "^6.25.3",
"@dhis2/ui": "^10.1.10",
"@uiw/codemirror-theme-github": "^4.21.25",
"@uiw/codemirror-theme-monokai": "^4.21.25",
"@uiw/react-codemirror": "^4.21.25",
"classnames": "^2.2.6",
"prop-types": "^15.7.2",
"react": "^16.9.0",
"react-dom": "^16.9.0",
"styled-jsx": "^4"
},
"resolutions": {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { CssVariables } from '@dhis2/ui'
import React from 'react'
import { QueryRepl } from './QueryRepl'
import { QueryRepl } from './QueryRepl.jsx'

export default function App() {
return (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import cx from 'classnames'
import React from 'react'
import { GlobalLoading } from './components/GlobalLoading'
import { QueryTab } from './components/QueryTab'
import { ServerDetails } from './components/ServerDetails'
import { TabControls } from './components/TabControls'
import { GlobalLoading } from './components/GlobalLoading.jsx'
import { QueryTab } from './components/QueryTab.jsx'
import { ServerDetails } from './components/ServerDetails.jsx'
import { TabControls } from './components/TabControls.jsx'
import { useExecuteQuery } from './hooks/useExecuteQuery'
import { useTabs } from './hooks/useTabs'
import styles from './QueryRepl.module.css'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import i18n from '@dhis2/d2-i18n'
import { Button, Radio } from '@dhis2/ui'
import PropTypes from 'prop-types'
import React, { useState } from 'react'
import { Editor } from './Editor'
import { Editor } from './Editor.jsx'
import styles from './QueryEditor.module.css'

const defaultQuery = {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import i18n from '@dhis2/d2-i18n'
import PropTypes from 'prop-types'
import React from 'react'
import { Editor } from './Editor'
import { Editor } from './Editor.jsx'
import styles from './QueryResults.module.css'

export const QueryResults = ({ result }) => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import PropTypes from 'prop-types'
import React from 'react'
import { QueryEditor } from './QueryEditor'
import { QueryResults } from './QueryResults'
import { QueryEditor } from './QueryEditor.jsx'
import { QueryResults } from './QueryResults.jsx'
import styles from './QueryTab.module.css'

export const QueryTab = ({
Expand Down
13,811 changes: 4,322 additions & 9,489 deletions examples/query-playground/yarn.lock

Large diffs are not rendered by default.

0 comments on commit 2d41dc3

Please sign in to comment.