Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI - remove devextreme-main #27773

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/default_workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ jobs:
devextreme-react
devextreme-vue
devextreme-react-storybook
devextreme-main
devextreme-angular-playground
devextreme-testcafe-tests
devextreme-demos
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/demos_visual_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
pnpm install

- name: DevExtreme - Build
run: pnpx nx build devextreme-main
run: pnpx nx build devextreme

testcafe:
needs:
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
pnpm install

- name: DevExtreme - Build
run: pnpx nx build devextreme-main
run: pnpx nx build devextreme

- name: Run Web Server
run: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/renovation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ jobs:
run: pnpx gulp localization

- name: Jest tests
run: pnpx nx test-jest devextreme-main
run: pnpx nx test-jest devextreme

notify:
runs-on: devextreme-shr2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testcafe_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
pnpm install

- name: Build
run: pnpx nx build devextreme-main
run: pnpx nx build devextreme

- name: Zip artifacts
working-directory: ./packages/devextreme
Expand Down
18 changes: 9 additions & 9 deletions apps/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,49 +8,49 @@ To run a playground, clone this repository and follow the instructions below.

Before you run a playground, install modules and build the devextreme package. Run the following scripts from the root directory of this repository:
```
npm install
npm run build -w=devextreme-main
pnpm install
pnpm run build -w=devextreme
```

## Angular playground
> **_NOTE:_** Requires Node v17+
1. Prepare the devextreme-angular package:
```
npm run pack -w=devextreme-angular
pnpm run pack -w=devextreme-angular
```
2. Run the launch script:
```
cd apps/angular
npm run start
pnpm run start
```

## React playground
1. Prepare the devextreme-react package:
```
npm run pack -w=devextreme-react
pnpm run pack -w=devextreme-react
```
2. Run the launch script:
```
cd apps/react
npm run start
pnpm run start
```

## Vue playground
1. Prepare the devextreme-vue package:
```
npm run pack -w=devextreme-vue
pnpm run pack -w=devextreme-vue
```
2. Run the launch script:
```
cd apps/vue
npm run start
pnpm run start
```

## Update DevExtreme code

To observe the changes made to the DevExtreme code within playgrounds, rebuild the `devextreme` package.
```
npm run build -w=devextreme-main
pnpm run build -w=devextreme
```
If you need your changes to apply dynamically without reloading the playground, save them in the following directory:
```
Expand Down
2 changes: 1 addition & 1 deletion apps/demos/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
},
"dependsOn": [
// NOTE: uncomment me when the NX cache is fixed to work in GHA
// "devextreme-main:build"
// "devextreme:build"
],
"inputs": [
{ "env": "STRATEGY" },
Expand Down
1 change: 0 additions & 1 deletion e2e/bundlers/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
"vite": "2.9.18",
"webpack": "5.76.0",
"webpack-cli": "4.10.0",
"devextreme-main": "*",
"devextreme": "*"
},
"alias": {
Expand Down
1 change: 0 additions & 1 deletion e2e/compilation-cases/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
"devDependencies": {
"@angular/common": "^11.2.14",
"@types/jquery": "3.5.29",
"devextreme-main": "*",
"devextreme": "*",
"jquery": "3.7.1",
"typescript": "4.9.5"
Expand Down
3 changes: 0 additions & 3 deletions e2e/testcafe-devextreme/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "e2e/testcafe-devextreme",
"projectType": "application",
"implicitDependencies": [
"devextreme-main"
],
"targets": {
"lint": {
"executor": "nx:run-script",
Expand Down
3 changes: 0 additions & 3 deletions packages/devextreme-angular/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/devextreme-angular",
"projectType": "library",
"implicitDependencies": [
"devextreme-main"
],
"targets": {
"build": {
"executor": "nx:run-script",
Expand Down
3 changes: 0 additions & 3 deletions packages/devextreme-react/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/devextreme-react",
"projectType": "library",
"implicitDependencies": [
"devextreme-main"
],
"targets": {
"pack": {
"executor": "nx:run-script",
Expand Down
3 changes: 0 additions & 3 deletions packages/devextreme-vue/project.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,6 @@
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/devextreme-vue",
"projectType": "library",
"implicitDependencies": [
"devextreme-main"
],
"targets": {
"pack": {
"executor": "nx:run-script",
Expand Down
2 changes: 0 additions & 2 deletions packages/devextreme/.gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
node_modules
/artifacts
!/artifacts/npm/devextreme/package.json
!/artifacts/npm/devextreme/project.json
!/artifacts/npm/devextreme-dist/package.json
/testing/testcafe/artifacts
/testing/LastSuiteTime.txt
Expand Down
53 changes: 0 additions & 53 deletions packages/devextreme/artifacts/npm/devextreme/package.json

This file was deleted.

17 changes: 0 additions & 17 deletions packages/devextreme/artifacts/npm/devextreme/project.json

This file was deleted.

21 changes: 16 additions & 5 deletions packages/devextreme/build/gulp/npm.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const eol = require('gulp-eol');
const gulp = require('gulp');
const gulpIf = require('gulp-if');
const merge = require('merge-stream');
const through = require('through2');
const replace = require('gulp-replace');
const lazyPipe = require('lazypipe');
const gulpFilter = require('gulp-filter');
Expand All @@ -16,7 +17,7 @@ const ctx = require('./context.js');
const env = require('./env-variables.js');
const dataUri = require('./gulp-data-uri').gulpPipe;
const headerPipes = require('./header-pipes.js');
const { packageDir, packageDistDir, isEsmPackage, stringSrc, devextremeDir, devextremeDistDir } = require('./utils');
const { packageDir, packageDistDir, isEsmPackage, stringSrc, devextremeDistDir } = require('./utils');

const resultPath = ctx.RESULT_NPM_PATH;

Expand Down Expand Up @@ -115,7 +116,20 @@ const sources = (src, dist, distGlob) => (() => merge(
.pipe(gulp.dest(`${dist}/bin`)),

gulp
.src(`${dist}/package.json`)
.src('package.json')
.pipe(
through.obj((file, enc, callback) => {
const pkg = JSON.parse(file.contents.toString(enc));

pkg.name = 'devextreme';
pkg.version = ctx.version;
delete pkg.devDependencies;
delete pkg.publishConfig;

file.contents = Buffer.from(JSON.stringify(pkg, null, 2));
callback(null, file);
})
)
.pipe(gulpIf(env.BUILD_INTERNAL_PACKAGE, overwriteInternalPackageName()))
.pipe(gulp.dest(dist)),

Expand All @@ -136,9 +150,6 @@ const distPath = `${resultPath}/${packageDistDir}`;

gulp.task('npm-sources', gulp.series(
'ts-sources',
() => gulp
.src(`${resultPath}/${devextremeDir}/package.json`)
.pipe(gulpIf(env.BUILD_INTERNAL_PACKAGE, gulp.dest(packagePath))),
() => gulp
.src(`${resultPath}/${devextremeDistDir}/package.json`)
.pipe(overwriteInternalPackageName())
Expand Down
23 changes: 0 additions & 23 deletions packages/devextreme/build/preinstall.js

This file was deleted.

9 changes: 6 additions & 3 deletions packages/devextreme/package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "devextreme-main",
"name": "devextreme",
"version": "24.2.0",
"description": "HTML5 JavaScript Component Suite for Responsive Web Development",
"keywords": [
Expand Down Expand Up @@ -184,7 +184,6 @@
"yargs": "17.7.2"
},
"scripts": {
"preinstall": "node build/preinstall.js",
"clean": "gulp clean",
"lint": "npm-run-all -p -c lint-js lint-ts lint-renovation lint-dts lint-texts",
"lint-js": "eslint --quiet --ext .js .",
Expand Down Expand Up @@ -228,5 +227,9 @@
"ios > 9",
"> 1%",
"not dead"
]
],
"publishConfig": {
"directory": "artifacts/npm/devextreme",
"linkDirectory": true
}
}
2 changes: 1 addition & 1 deletion packages/devextreme/project.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "devextreme-main",
"name": "devextreme",
"$schema": "../../node_modules/nx/schemas/project-schema.json",
"sourceRoot": "packages/devextreme",
"projectType": "library",
Expand Down
Loading
Loading