Skip to content

Commit

Permalink
Get rid of vue 2 (#25498)
Browse files Browse the repository at this point in the history
Co-authored-by: Alexander Bulychev <[email protected]>
  • Loading branch information
dxvladislavvolkov and Alexander Bulychev authored Sep 6, 2023
1 parent 4fa9b2b commit 2deea22
Show file tree
Hide file tree
Showing 141 changed files with 342 additions and 57,427 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/devextreme_vue_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
shell: bash
run: |
git add . -N
changes=$(git diff --name-status HEAD -- packages/devextreme-vue/src packages/vue2-strategy/src)
changes=$(git diff --name-status HEAD -- packages/devextreme-vue/src)
if [ -n "$changes" ]; then
echo "Generated code is outdated. The following files have uncommitted changes:"
echo "$changes";
Expand All @@ -73,5 +73,5 @@ jobs:
run: npm run test

- name: Check packing
run: npx nx run-many -t pack -p devextreme-vue devextreme-vue2-strategy
run: npx nx run-many -t pack -p devextreme-vue

3,741 changes: 336 additions & 3,405 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions packages/devextreme-vue/build.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ module.exports = {
ignoredGlobs: ['!./src/**/*.test.ts', '!./src/**/__mocks__/*'],
npm: {
dist: './npm/',
strategySrc: '../vue2-strategy/npm/*',
strategyDist: './npm/core/strategy/vue2',
package: 'package.json',
license: './LICENSE',
readme: './README.md'
Expand Down
15 changes: 2 additions & 13 deletions packages/devextreme-vue/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@ const config = require('./build.config');
const GENERATE = 'generate';
const CLEAN = 'clean';
const OUTPUTDIR_CLEAN = 'output-dir.clean';
const GENERATE_STRATEGY = 'generate.strategy';
const COPY_STRATEGY = 'copy.strategy';
const NPM_CLEAN = 'npm.clean';
const NPM_PACKAGE = 'npm.package';
const NPM_LICENSE = 'npm.license';
Expand All @@ -30,10 +28,7 @@ gulp.task(NPM_CLEAN, (c) =>

gulp.task(CLEAN, gulp.parallel(OUTPUTDIR_CLEAN, NPM_CLEAN));

gulp.task(GENERATE_STRATEGY, shell.task(['npm run generate -w devextreme-vue2-strategy']));

gulp.task(GENERATE, gulp.parallel(
GENERATE_STRATEGY,
gulp.task(GENERATE,
(done) => {
const generateSync = require('devextreme-vue-generator').default;
generateSync(
Expand All @@ -51,7 +46,7 @@ gulp.task(GENERATE, gulp.parallel(

done();
}
));
);

gulp.task(NPM_PACKAGE,
() => gulp.src(config.npm.package).pipe(gulp.dest(config.npm.dist))
Expand Down Expand Up @@ -107,15 +102,9 @@ gulp.task(ADD_HEADERS, function () {
.pipe(gulp.dest(config.npm.dist));
});

gulp.task(COPY_STRATEGY, function () {
return gulp.src(`${config.npm.strategySrc}`)
.pipe(gulp.dest(config.npm.strategyDist));
});

gulp.task(NPM_PACK, gulp.series(
NPM_CLEAN,
NPM_BUILD,
COPY_STRATEGY,
ADD_HEADERS,
shell.task(['npm pack'], {cwd: config.npm.dist})
));
6 changes: 2 additions & 4 deletions packages/devextreme-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,14 @@
"license": "MIT",
"peerDependencies": {
"devextreme": "23.2.0",
"vue": "^2.5.16 || ^3.0.0"
"vue": "^3.0.0"
},
"devDependencies": {
"@types/jest": "^26.0.24",
"@vue/compiler-sfc": "^3.0.0",
"@vue/test-utils": "2.0.0-beta.7",
"del": "^3.0.0",
"devextreme-vue-generator": "https://gitpkg.now.sh/DevExpress/devextreme-vue/packages/devextreme-vue-generator?master",
"devextreme-vue2-strategy": "~23.2.0",
"gulp": "^4.0.2",
"gulp-header": "^2.0.9",
"gulp-shell": "^0.6.5",
Expand All @@ -41,7 +40,6 @@
"ts-jest": "^26.5.6",
"typescript": "^4.7.4",
"vue": "3.2.47",
"vue-router": "^4.0.16",
"vue-template-compiler": "^2.6.3"
"vue-router": "^4.0.16"
}
}
1 change: 0 additions & 1 deletion packages/vue2-strategy/.gitignore

This file was deleted.

21 changes: 0 additions & 21 deletions packages/vue2-strategy/LICENSE

This file was deleted.

16 changes: 0 additions & 16 deletions packages/vue2-strategy/build.config.js

This file was deleted.

54 changes: 0 additions & 54 deletions packages/vue2-strategy/gulpfile.js

This file was deleted.

17 changes: 0 additions & 17 deletions packages/vue2-strategy/jest.config.js

This file was deleted.

41 changes: 0 additions & 41 deletions packages/vue2-strategy/package.json

This file was deleted.

73 changes: 0 additions & 73 deletions packages/vue2-strategy/sandbox/app.vue

This file was deleted.

This file was deleted.

Loading

0 comments on commit 2deea22

Please sign in to comment.