diff --git a/packages/devextreme/artifacts/npm/devextreme-dist/package.json b/packages/devextreme-dist/package.json similarity index 88% rename from packages/devextreme/artifacts/npm/devextreme-dist/package.json rename to packages/devextreme-dist/package.json index 93931f134eb4..e9c7e77e02b2 100644 --- a/packages/devextreme/artifacts/npm/devextreme-dist/package.json +++ b/packages/devextreme-dist/package.json @@ -42,7 +42,7 @@ "Responsive-ui", "Javascript", "Typescript", - "shadowdom" + "shadowdom" ], "homepage": "https://js.devexpress.com/", "bugs": "https://www.devexpress.com/support/", @@ -50,5 +50,9 @@ "repository": { "type": "git", "url": "https://github.com/DevExpress/DevExtreme.git" + }, + "publishConfig": { + "directory": "../devextreme/artifacts/npm/devextreme-dist", + "linkDirectory": true } } diff --git a/packages/devextreme/.gitignore b/packages/devextreme/.gitignore index fb121254cc17..92951c37eb48 100644 --- a/packages/devextreme/.gitignore +++ b/packages/devextreme/.gitignore @@ -1,6 +1,5 @@ node_modules /artifacts -!/artifacts/npm/devextreme-dist/package.json /testing/testcafe/artifacts /testing/LastSuiteTime.txt /dotnet_packages diff --git a/packages/devextreme/build/gulp/npm.js b/packages/devextreme/build/gulp/npm.js index 9f7f9d5e67bd..f256edc83ed5 100644 --- a/packages/devextreme/build/gulp/npm.js +++ b/packages/devextreme/build/gulp/npm.js @@ -17,9 +17,10 @@ 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, devextremeDistDir } = require('./utils'); +const { packageDir, packageDistDir, isEsmPackage, stringSrc } = require('./utils'); const resultPath = ctx.RESULT_NPM_PATH; +const devextremeDistWorkspacePackageJsonPath = '../devextreme-dist/package.json'; const srcGlobsPattern = (path, exclude) => [ `${path}/**/*.js`, @@ -153,9 +154,20 @@ const distPath = `${resultPath}/${packageDistDir}`; gulp.task('npm-sources', gulp.series( 'ts-sources', () => gulp - .src(`${resultPath}/${devextremeDistDir}/package.json`) - .pipe(overwriteInternalPackageName()) - .pipe(gulpIf(env.BUILD_INTERNAL_PACKAGE, gulp.dest(distPath))), + .src(devextremeDistWorkspacePackageJsonPath) + .pipe( + through.obj((file, enc, callback) => { + const pkg = JSON.parse(file.contents.toString(enc)); + + pkg.version = ctx.version; + 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(distPath)), sources(srcGlobs, packagePath, distGlobs)) ); diff --git a/packages/devextreme/gulpfile.js b/packages/devextreme/gulpfile.js index cba8da120490..5b5d061c2d8c 100644 --- a/packages/devextreme/gulpfile.js +++ b/packages/devextreme/gulpfile.js @@ -22,7 +22,6 @@ gulp.task('clean', function(callback) { '!artifacts/npm/devextreme', '!artifacts/npm/devextreme/*.json', '!artifacts/npm/devextreme-dist', - '!artifacts/npm/devextreme-dist/*.json', ]); cache.clearAll(); callback(); diff --git a/packages/devextreme/project.json b/packages/devextreme/project.json index 172e5940c22a..650eb214b8f2 100644 --- a/packages/devextreme/project.json +++ b/packages/devextreme/project.json @@ -13,8 +13,7 @@ "targetDirectory": "./artifacts", "excludePatterns": [ "./artifacts/css", - "./artifacts/npm/devextreme/package.json", - "./artifacts/npm/devextreme-dist/package.json" + "./artifacts/npm/devextreme/package.json" ] } }, @@ -761,6 +760,7 @@ { "env": "BUILD_TEST_INTERNAL_PACKAGE" }, + "{workspaceRoot}/packages/devextreme-dist/package.json", "{projectRoot}/artifacts/transpiled/**/*", "{projectRoot}/artifacts/transpiled-esm-npm/**/*" ], diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7b84e9de5630..9f7e689b49a2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1968,6 +1968,9 @@ importers: version: 0.15.1 publishDirectory: npm/dist + packages/devextreme-dist: + publishDirectory: ../devextreme/artifacts/npm/devextreme-dist + packages/devextreme-metadata: devDependencies: '@types/node': @@ -2267,8 +2270,6 @@ importers: version: 4.2.5(vue@3.2.47) publishDirectory: npm - packages/devextreme/artifacts/npm/devextreme-dist: {} - packages/eslint-migration-utils: devDependencies: '@eslint-stylistic/metadata': diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml index b928ebca0572..5f6c8312a3ab 100644 --- a/pnpm-workspace.yaml +++ b/pnpm-workspace.yaml @@ -2,7 +2,6 @@ packages: - 'apps/*' - 'e2e/*' - 'packages/*' - - 'packages/devextreme/artifacts/npm/devextreme-dist' - '!packages/sbom' catalog: