Skip to content

Commit d321f27

Browse files
authored
Move devextreme-dist workspace to packages/ (#33150)
1 parent 7c2371c commit d321f27

File tree

7 files changed

+26
-12
lines changed

7 files changed

+26
-12
lines changed

packages/devextreme/artifacts/npm/devextreme-dist/package.json renamed to packages/devextreme-dist/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,17 @@
4242
"Responsive-ui",
4343
"Javascript",
4444
"Typescript",
45-
"shadowdom"
45+
"shadowdom"
4646
],
4747
"homepage": "https://js.devexpress.com/",
4848
"bugs": "https://www.devexpress.com/support/",
4949
"author": "Developer Express Inc.",
5050
"repository": {
5151
"type": "git",
5252
"url": "https://github.com/DevExpress/DevExtreme.git"
53+
},
54+
"publishConfig": {
55+
"directory": "../devextreme/artifacts/npm/devextreme-dist",
56+
"linkDirectory": true
5357
}
5458
}

packages/devextreme/.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
node_modules
22
/artifacts
3-
!/artifacts/npm/devextreme-dist/package.json
43
/testing/testcafe/artifacts
54
/testing/LastSuiteTime.txt
65
/dotnet_packages

packages/devextreme/build/gulp/npm.js

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,10 @@ const ctx = require('./context.js');
1717
const env = require('./env-variables.js');
1818
const dataUri = require('./gulp-data-uri').gulpPipe;
1919
const headerPipes = require('./header-pipes.js');
20-
const { packageDir, packageDistDir, isEsmPackage, stringSrc, devextremeDistDir } = require('./utils');
20+
const { packageDir, packageDistDir, isEsmPackage, stringSrc } = require('./utils');
2121

2222
const resultPath = ctx.RESULT_NPM_PATH;
23+
const devextremeDistWorkspacePackageJsonPath = '../devextreme-dist/package.json';
2324

2425
const srcGlobsPattern = (path, exclude) => [
2526
`${path}/**/*.js`,
@@ -153,9 +154,20 @@ const distPath = `${resultPath}/${packageDistDir}`;
153154
gulp.task('npm-sources', gulp.series(
154155
'ts-sources',
155156
() => gulp
156-
.src(`${resultPath}/${devextremeDistDir}/package.json`)
157-
.pipe(overwriteInternalPackageName())
158-
.pipe(gulpIf(env.BUILD_INTERNAL_PACKAGE, gulp.dest(distPath))),
157+
.src(devextremeDistWorkspacePackageJsonPath)
158+
.pipe(
159+
through.obj((file, enc, callback) => {
160+
const pkg = JSON.parse(file.contents.toString(enc));
161+
162+
pkg.version = ctx.version;
163+
delete pkg.publishConfig;
164+
165+
file.contents = Buffer.from(JSON.stringify(pkg, null, 2));
166+
callback(null, file);
167+
})
168+
)
169+
.pipe(gulpIf(env.BUILD_INTERNAL_PACKAGE, overwriteInternalPackageName()))
170+
.pipe(gulp.dest(distPath)),
159171
sources(srcGlobs, packagePath, distGlobs))
160172
);
161173

packages/devextreme/gulpfile.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ gulp.task('clean', function(callback) {
2222
'!artifacts/npm/devextreme',
2323
'!artifacts/npm/devextreme/*.json',
2424
'!artifacts/npm/devextreme-dist',
25-
'!artifacts/npm/devextreme-dist/*.json',
2625
]);
2726
cache.clearAll();
2827
callback();

packages/devextreme/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
"targetDirectory": "./artifacts",
1414
"excludePatterns": [
1515
"./artifacts/css",
16-
"./artifacts/npm/devextreme/package.json",
17-
"./artifacts/npm/devextreme-dist/package.json"
16+
"./artifacts/npm/devextreme/package.json"
1817
]
1918
}
2019
},
@@ -761,6 +760,7 @@
761760
{
762761
"env": "BUILD_TEST_INTERNAL_PACKAGE"
763762
},
763+
"{workspaceRoot}/packages/devextreme-dist/package.json",
764764
"{projectRoot}/artifacts/transpiled/**/*",
765765
"{projectRoot}/artifacts/transpiled-esm-npm/**/*"
766766
],

pnpm-lock.yaml

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pnpm-workspace.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ packages:
22
- 'apps/*'
33
- 'e2e/*'
44
- 'packages/*'
5-
- 'packages/devextreme/artifacts/npm/devextreme-dist'
65
- '!packages/sbom'
76

87
catalog:

0 commit comments

Comments
 (0)