Skip to content

Commit 1a57e4f

Browse files
GoodDayForSurfGoodDayForSurf
authored
Merge branch '26_1' into issue-4222_26_1
2 parents 547cf5b + 3e3aa56 commit 1a57e4f

193 files changed

Lines changed: 9010 additions & 5724 deletions

File tree

Some content is hidden

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

‎.github/copilot-instructions.md‎

Lines changed: 67 additions & 464 deletions
Large diffs are not rendered by default.

‎apps/demos/Demos/DataGrid/AIAssistant/jQuery/index.html‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@
99
<script src="../../../../node_modules/jquery/dist/jquery.min.js"></script>
1010
<script src="../../../../node_modules/devextreme-dist/js/dx.all.js"></script>
1111
<script src="../../../../node_modules/devextreme-dist/js/dx.ai-integration.js"></script>
12-
<script type="module">
13-
import { AzureOpenAI } from "https://esm.sh/openai@4.73.1";
14-
15-
window.AzureOpenAI = AzureOpenAI;
16-
</script>
1712
<script src="data.js"></script>
18-
<script src="index.js"></script>
13+
<script type="module" src="index.js"></script>
1914
</head>
2015
<body class="dx-viewport">
2116
<div class="demo-container">

‎apps/demos/Demos/DataGrid/AIAssistant/jQuery/index.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// eslint-disable-next-line import/no-unresolved
2+
import { AzureOpenAI } from 'https://esm.sh/openai@4.73.1';
3+
4+
window.AzureOpenAI = AzureOpenAI;
5+
16
$(() => {
27
const deployment = 'gpt-4o-mini';
38
const apiVersion = '2024-02-01';

‎apps/demos/Demos/DataGrid/AIColumns/jQuery/index.html‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@
99
<script src="../../../../node_modules/jquery/dist/jquery.min.js"></script>
1010
<script src="../../../../node_modules/devextreme-dist/js/dx.all.js"></script>
1111
<script src="../../../../node_modules/devextreme-dist/js/dx.ai-integration.js"></script>
12-
<script type="module">
13-
import { AzureOpenAI } from "https://esm.sh/openai@4.73.1";
14-
15-
window.AzureOpenAI = AzureOpenAI;
16-
</script>
1712
<script src="data.js"></script>
18-
<script src="index.js"></script>
13+
<script type="module" src="index.js"></script>
1914
<link rel="stylesheet" type="text/css" href="styles.css" />
2015
</head>
2116
<body class="dx-viewport">

‎apps/demos/Demos/DataGrid/AIColumns/jQuery/index.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// eslint-disable-next-line import/no-unresolved
2+
import { AzureOpenAI } from 'https://esm.sh/openai@4.73.1';
3+
4+
window.AzureOpenAI = AzureOpenAI;
5+
16
$(() => {
27
const deployment = 'gpt-4o-mini';
38
const apiVersion = '2024-02-01';

‎apps/demos/Demos/TreeList/AIColumns/jQuery/index.html‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,8 @@
99
<script src="../../../../node_modules/jquery/dist/jquery.min.js"></script>
1010
<script src="../../../../node_modules/devextreme-dist/js/dx.all.js"></script>
1111
<script src="../../../../node_modules/devextreme-dist/js/dx.ai-integration.js"></script>
12-
<script type="module">
13-
import { AzureOpenAI } from "https://esm.sh/openai@4.73.1";
14-
15-
window.AzureOpenAI = AzureOpenAI;
16-
</script>
1712
<script src="data.js"></script>
18-
<script src="index.js"></script>
13+
<script type="module" src="index.js"></script>
1914
<link rel="stylesheet" type="text/css" href="styles.css" />
2015
</head>
2116
<body class="dx-viewport">

‎apps/demos/Demos/TreeList/AIColumns/jQuery/index.js‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
// eslint-disable-next-line import/no-unresolved
2+
import { AzureOpenAI } from 'https://esm.sh/openai@4.73.1';
3+
4+
window.AzureOpenAI = AzureOpenAI;
5+
16
$(() => {
27
const deployment = 'gpt-4o-mini';
38
const apiVersion = '2024-02-01';

‎apps/demos/utils/server/csp-server.js‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ const CSP_DEMO_ALLOWLIST = {
6868
'DataGrid/Cell': {
6969
'img-src': ['data:'],
7070
},
71-
// AI demo: inline <script type="module"> to import OpenAI SDK from esm.sh
7271
'DataGrid/AIColumns': {
73-
'script-src': ["'unsafe-inline'"],
7472
'connect-src': ['https://public-api.devexpress.com'],
7573
},
7674
'DataGrid/ExcelJSExportImages': {
@@ -145,10 +143,8 @@ const CSP_DEMO_ALLOWLIST = {
145143
'TagBox/Grouping': {
146144
'font-src': ['https://maxcdn.bootstrapcdn.com'],
147145
},
148-
// AI demos use inline <script type="module"> to import OpenAI SDK from esm.sh
149146
'TreeList/AIColumns': {
150147
'connect-src': ['https://public-api.devexpress.com'],
151-
'script-src': ["'unsafe-inline'"],
152148
},
153149
'TreeList/BatchEditing': {
154150
'img-src': ['data:'],

‎packages/devextreme-angular/project.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@
7070
"packageJsonPath": "./package.json",
7171
"includePatterns": [
7272
"**/*.ts"
73-
]
73+
],
74+
"mode": "mit"
7475
}
7576
},
7677
"build:ngc": {
@@ -117,9 +118,6 @@
117118
},
118119
"npm:pack-npm-dist": {
119120
"executor": "devextreme-nx-infra-plugin:pack-npm",
120-
"options": {
121-
"workingDirectory": "./npm/dist"
122-
},
123121
"outputs": [
124122
"{projectRoot}/npm/dist/*.tgz"
125123
],

‎packages/devextreme-react/project.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@
4848
"executor": "devextreme-nx-infra-plugin:add-license-headers",
4949
"options": {
5050
"targetDirectory": "./npm",
51-
"packageJsonPath": "./package.json"
51+
"packageJsonPath": "./package.json",
52+
"mode": "mit"
5253
}
5354
},
5455
"npm:prepare-modules": {
@@ -75,9 +76,6 @@
7576
},
7677
"npm:pack": {
7778
"executor": "devextreme-nx-infra-plugin:pack-npm",
78-
"options": {
79-
"workingDirectory": "./npm"
80-
},
8179
"outputs": ["{projectRoot}/npm/*.tgz"],
8280
"inputs": ["default"]
8381
},

0 commit comments

Comments
 (0)