Skip to content

Commit 78855de

Browse files
Update package versions (#903)
* Update ng version to 17 * Remove a variable to check ng 17 * Use 18 node to run cli * Add standalone flag to ts module of new view * Update devextreme version to beta * Update path to builded app
1 parent 370999e commit 78855de

File tree

17 files changed

+127
-903
lines changed

17 files changed

+127
-903
lines changed

.github/workflows/applications.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ jobs:
2222
- react
2323
- react-ts
2424
NODE:
25-
- 16
2625
- 18
2726
OS:
2827
- ubuntu-latest
@@ -90,7 +89,7 @@ jobs:
9089
- name: Set up Node.js and restore cache
9190
uses: actions/setup-node@v3
9291
with:
93-
node-version: 16
92+
node-version: 18
9493
cache: 'npm'
9594
cache-dependency-path: '**/package-lock.json'
9695

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ jobs:
1717
uses: actions/checkout@v2
1818

1919
- name: Use Node.js
20-
uses: actions/setup-node@v2
20+
uses: actions/setup-node@v3
2121
with:
22-
node-version: '14'
22+
node-version: '18'
2323

2424
- name: Run npm install
2525
run: npm install --no-package-lock --no-audit --no-fund

.github/workflows/themebuilder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
strategy:
88
fail-fast: false
99
matrix:
10-
NODE: [ 16, 18 ]
10+
NODE: [ 18 ]
1111

1212
runs-on: ubuntu-latest
1313
name: ThemeBuilder

packages/devextreme-cli/src/applications/application.angular.js

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ const latestVersions = require('../utility/latest-versions');
1010
const { extractToolingVersion, toolingVersionOptionName } = require('../utility/extract-tooling-version');
1111
const schematicsVersion = latestVersions['devextreme-schematics'] || 'latest';
1212

13-
const minNgCliVersion = new semver('16.0.0');
14-
const ngCliWithStandalone = new semver('17.0.0');
13+
const minNgCliVersion = new semver('17.0.0');
1514

1615
async function runSchematicCommand(schematicCommand, options, evaluatingOptions) {
1716
const collectionName = 'devextreme-schematics';
@@ -77,21 +76,18 @@ const install = async(options) => {
7776

7877
const create = async(appName, options) => {
7978
const layout = await getLayoutInfo(options.layout);
80-
const currentNgVersion = ngVersion.getNgCliVersion().version;
8179

8280
const commandArguments = [
8381
'new',
8482
appName,
8583
'--style=scss',
8684
'--routing=false',
8785
'--skip-tests=true',
88-
'--skip-install=true'
86+
'--skip-install=true',
87+
'--standalone=false',
88+
'--ssr=false'
8989
];
9090

91-
if(ngCliWithStandalone.compare(currentNgVersion) <= 0) {
92-
commandArguments.push('--standalone=false', '--ssr=false');
93-
}
94-
9591
await runNgCommand(commandArguments, options);
9692

9793
const appPath = path.join(process.cwd(), appName);
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
const packageJson = require('../../package.json');
22
module.exports = {
3-
'devextreme': '24.1.7',
4-
'devextreme-react': '24.1.7',
5-
'devextreme-vue': '24.1.7',
3+
'devextreme': '24.2.2-beta',
4+
'devextreme-react': '24.2.2-beta',
5+
'devextreme-vue': '24.2.2-beta',
66
'devextreme-cli': packageJson.version,
77
'devextreme-schematics': 'latest'
88
};

packages/devextreme-cli/testing/env.angular.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ async function prepareSchematics() {
2626

2727
exports.engine = 'angular';
2828
exports.appPath = appPath;
29-
exports.deployPath = path.join(appPath, 'dist', 'my-app');
29+
exports.deployPath = path.join(appPath, 'dist', 'my-app', 'browser');
3030
// disable optimization due to https://github.com/angular/angular-cli/issues/20760
3131
exports.npmArgs = ['run', 'build', '--', '--configuration', 'development'];
3232
exports.fileExtention = 'ts';

0 commit comments

Comments
 (0)