Skip to content

Commit aa9b271

Browse files
committed
Get rid of (p)npx, enforce frozen lockfile
1 parent 030f251 commit aa9b271

File tree

5 files changed

+11
-19
lines changed

5 files changed

+11
-19
lines changed

.github/workflows/demos_visual_tests.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
${{ runner.os }}-pnpm-store
6767
6868
- name: Install dependencies
69-
run: pnpm install
69+
run: pnpm install --frozen-lockfile
7070

7171
- name: DevExtreme - Build
7272
shell: bash
@@ -125,7 +125,7 @@ jobs:
125125
${{ runner.os }}-pnpm-store
126126
127127
- name: Install dependencies
128-
run: pnpm install
128+
run: pnpm install --frozen-lockfile
129129

130130
- name: DevExtreme - Build
131131
run: pnpm exec nx build devextreme

.github/workflows/demos_visual_tests_frameworks.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,12 +142,6 @@ jobs:
142142
working-directory: apps/demos
143143
run: pnpm add ../../devextreme-installer.tgz ../../devextreme-dist-installer.tgz ../../devextreme-react-installer.tgz ../../devextreme-vue-installer.tgz ../../devextreme-angular-installer.tgz
144144

145-
# - name: Build wrappers
146-
# run: pnpm exec nx run-many -t pack -p devextreme-angular devextreme-react devetreme-vue
147-
148-
# - name: Link wrappers packages
149-
# run: pnpm install
150-
151145
- name: Prepare bundles
152146
working-directory: apps/demos
153147
run: pnpm exec nx prepare-bundles

.github/workflows/wrapper_tests.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
${{ runner.os }}-pnpm-store
5858
5959
- name: Install dependencies
60-
run: pnpm install
60+
run: pnpm install --frozen-lockfile
6161

6262
- name: Build devextreme package
6363
env:

tools/scripts/build-all.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,18 @@ if (!devMode) {
5454
}
5555

5656
if (devMode) {
57-
sh.exec('pnpx nx build devextreme');
57+
sh.exec('pnpm exec nx build devextreme');
5858
} else {
59-
sh.exec('pnpx nx build devextreme-scss');
60-
sh.exec('pnpx nx build-dist devextreme --skipNxCache', {
59+
sh.exec('pnpm exec nx build devextreme-scss');
60+
sh.exec('pnpm exec nx build-dist devextreme --skipNxCache', {
6161
env: {
6262
...sh.env,
6363
BUILD_INTERNAL_PACKAGE: 'false'
6464
}
6565
});
6666
}
6767

68-
sh.exec(`pnpx nx build devextreme-themebuilder${devMode ? '' : ' --skipNxCache'}`);
68+
sh.exec(`pnpm exec nx build devextreme-themebuilder${devMode ? '' : ' --skipNxCache'}`);
6969

7070
// Copy artifacts for DXBuild (Installation)
7171
sh.pushd(path.join(ROOT_DIR, 'packages/devextreme/artifacts'));
@@ -79,9 +79,9 @@ sh.cp([path.join(BOOTSTRAP_DIR, 'css', 'bootstrap.css'), path.join(BOOTSTRAP_DIR
7979

8080
sh.exec('pnpm run all:pack-and-copy');
8181

82-
sh.exec('pnpx nx pack devextreme-react', { silent: true });
83-
sh.exec('pnpx nx pack devextreme-vue', { silent: true });
84-
sh.exec(`pnpx nx pack devextreme-angular${devMode ? '' : ' --with-descriptions'}`, { silent: true });
82+
sh.exec('pnpm exec nx pack devextreme-react', { silent: true });
83+
sh.exec('pnpm exec nx pack devextreme-vue', { silent: true });
84+
sh.exec(`pnpm exec nx pack devextreme-angular${devMode ? '' : ' --with-descriptions'}`, { silent: true });
8585

8686
sh.pushd(path.join(DEVEXTREME_NPM_DIR, 'devextreme'));
8787
packAndCopy(NPM_DIR);
@@ -101,7 +101,7 @@ sh.cp(path.join(ROOT_DIR, 'packages', 'devextreme-react', 'npm', '*.tgz'), NPM_D
101101
sh.cp(path.join(ROOT_DIR, 'packages', 'devextreme-vue', 'npm', '*.tgz'), NPM_DIR);
102102

103103
if (sh.env.BUILD_INTERNAL_PACKAGE === 'true') {
104-
sh.exec('pnpx nx build-dist devextreme');
104+
sh.exec('pnpm exec nx build-dist devextreme');
105105

106106
sh.pushd(path.join(DEVEXTREME_NPM_DIR, 'devextreme-internal'));
107107
sh.exec(`pnpm pkg set version="${devextremeNpmVersion}"`);

tools/scripts/common/version.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ export function updateVersion(version: string | undefined): void {
1818
.concat([rootWorkspacePath]);
1919

2020
sh.sed('-i', /"version": ".*"/, `"version": "${version}"`, workspacesPaths);
21-
22-
sh.exec('pnpm install --no-frozen-lockfile');
2321
}
2422

2523
export function updateVersionJs(version: string | undefined, build?: string | undefined): void {

0 commit comments

Comments
 (0)