Skip to content

Commit b34177a

Browse files
refactor and optimization
1 parent 4f58e30 commit b34177a

4 files changed

Lines changed: 14 additions & 12 deletions

File tree

.github/workflows/themebuilder_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252

5353
- name: Build etalon bundles
5454
working-directory: ./packages/devextreme-scss
55-
run: pnpm --workspace-root nx build:ci devextreme-scss
55+
run: pnpm nx build:ci devextreme-scss
5656

5757
- name: Build
5858
working-directory: ./packages/devextreme-themebuilder

packages/devextreme-scss/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
"ts-jest": "29.1.2"
1111
},
1212
"scripts": {
13-
"build": "pnpm --workspace-root nx build devextreme-scss",
13+
"build": "pnpm nx build devextreme-scss",
1414
"lint": "stylelint scss/widgets",
1515
"test": "jest --no-coverage --runInBand --config=./tests/jest.config.json",
16-
"watch": "pnpm --workspace-root nx run devextreme-scss --target=watch"
16+
"watch": "pnpm nx run devextreme-scss --target=watch"
1717
},
1818
"version": "26.1.2"
1919
}

packages/devextreme-scss/project.json

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"executor": "nx:run-commands",
2121
"options": {
2222
"commands": [
23-
"pnpm --workspace-root nx clean:artifacts devextreme-scss",
24-
"pnpm --workspace-root nx clean:bundles devextreme-scss"
23+
"pnpm nx clean:artifacts devextreme-scss",
24+
"pnpm nx clean:bundles devextreme-scss"
2525
],
2626
"parallel": false
2727
}
@@ -52,6 +52,8 @@
5252
},
5353
"inputs": [
5454
"{projectRoot}/build/**/*",
55+
"{projectRoot}/fonts/**/*",
56+
"{projectRoot}/icons/**/*",
5557
"{projectRoot}/images/**/*",
5658
"{projectRoot}/scss/**/*"
5759
],
@@ -68,6 +70,8 @@
6870
},
6971
"inputs": [
7072
"{projectRoot}/build/**/*",
73+
"{projectRoot}/fonts/**/*",
74+
"{projectRoot}/icons/**/*",
7175
"{projectRoot}/images/**/*",
7276
"{projectRoot}/scss/**/*"
7377
],
@@ -81,9 +85,8 @@
8185
"executor": "nx:run-commands",
8286
"options": {
8387
"commands": [
84-
"pnpm --workspace-root nx clean devextreme-scss",
85-
"pnpm --workspace-root nx build:themes devextreme-scss",
86-
"pnpm --workspace-root nx copy:assets devextreme-scss"
88+
"pnpm nx clean devextreme-scss",
89+
"pnpm nx run-many --targets=build:themes,copy:assets --projects=devextreme-scss --parallel"
8790
],
8891
"parallel": false
8992
},
@@ -106,9 +109,8 @@
106109
"executor": "nx:run-commands",
107110
"options": {
108111
"commands": [
109-
"pnpm --workspace-root nx clean devextreme-scss",
110-
"pnpm --workspace-root nx build:themes-dev devextreme-scss",
111-
"pnpm --workspace-root nx copy:assets devextreme-scss"
112+
"pnpm nx clean devextreme-scss",
113+
"pnpm nx run-many --targets=build:themes-dev,copy:assets --projects=devextreme-scss --parallel"
112114
],
113115
"parallel": false
114116
},

packages/devextreme/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@
231231
"build:testcafe": "cross-env DEVEXTREME_TEST_CI=TRUE BUILD_ESM_PACKAGE=true BUILD_TESTCAFE=TRUE gulp default",
232232
"build-npm-devextreme": "cross-env BUILD_ESM_PACKAGE=true gulp default",
233233
"build-dist": "cross-env BUILD_ESM_PACKAGE=true gulp default --uglify",
234-
"build-themes": "pnpm --workspace-root nx build:themes devextreme-scss && pnpm --workspace-root nx copy:assets devextreme-scss",
234+
"build-themes": "pnpm nx build:themes devextreme-scss && pnpm nx copy:assets devextreme-scss",
235235
"build:react": "gulp generate-react",
236236
"build:react:watch": "gulp generate-react-watch",
237237
"build:react:typescript": "gulp generate-react-typescript",

0 commit comments

Comments
 (0)