Skip to content

Commit 2e2150f

Browse files
committed
Revert "test pnpm migration"
This reverts commit acda9ed.
1 parent 5d63c1e commit 2e2150f

File tree

15 files changed

+16292
-6645
lines changed

15 files changed

+16292
-6645
lines changed

.github/workflows/applications.yml

Lines changed: 14 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -42,27 +42,20 @@ jobs:
4242
- name: Get sources
4343
uses: actions/checkout@v4
4444

45-
- name: Set up Node.js
46-
uses: actions/setup-node@v4
47-
with:
48-
node-version: ${{ matrix.NODE }}
49-
cache: 'pnpm'
50-
cache-dependency-path: pnpm-lock.yaml
51-
52-
- name: Enable Corepack
53-
run: corepack enable
54-
55-
- name: Install dependencies
45+
- name: Run npm install
5646
env:
5747
PUPPETEER_SKIP_DOWNLOAD: true
58-
run: pnpm install --frozen-lockfile
48+
run: npm install --no-audit --no-fund
5949

6050
- uses: browser-actions/setup-chrome@v1
6151
id: setup-chrome
6252
- run: ${{ steps.setup-chrome.outputs.chrome-path }} --version
6353

54+
- name: Set Legacy-peer-deps=true
55+
run: npm config set legacy-peer-deps true
56+
6457
- name: Create ${{ matrix.APPROACH }} application
65-
run: pnpm run create-template -- -- -e ${{ matrix.APPROACH }} ${{ env.DEPS_VERSION_TAG_PARAM }}
58+
run: npm run create-template -- -- -e ${{ matrix.APPROACH }} ${{ env.DEPS_VERSION_TAG_PARAM }}
6659
timeout-minutes: 30
6760

6861
- name: Install Internal Packages
@@ -72,14 +65,14 @@ jobs:
7265

7366
- name: Lint created application
7467
if: ${{ matrix.OS != 'windows-latest' }}
75-
run: pnpm run lint-template -- -- -e ${{ matrix.APPROACH }} ${{ env.DEPS_VERSION_TAG_PARAM }}
68+
run: npm run lint-template -- -- -e ${{ matrix.APPROACH }} ${{ env.DEPS_VERSION_TAG_PARAM }}
7669

7770
- name: Run template tests
7871
if: ${{ matrix.OS != 'windows-latest' }}
7972
env:
8073
LAUNCH_BROWSER: true
8174
CHROME_PATH: ${{ steps.setup-chrome.outputs.chrome-path }}
82-
run: pnpm run test-template -- -- -e ${{ matrix.APPROACH }} ${{ env.DEPS_VERSION_TAG_PARAM }}
75+
run: npm run test-template -- -- -e ${{ matrix.APPROACH }} ${{ env.DEPS_VERSION_TAG_PARAM }}
8376
timeout-minutes: 40
8477

8578
- name: Archive artifacts
@@ -112,20 +105,17 @@ jobs:
112105
- name: Get sources
113106
uses: actions/checkout@v4
114107

115-
- name: Set up Node.js
108+
- name: Set up Node.js and restore cache
116109
uses: actions/setup-node@v4
117110
with:
118111
node-version: 20
119-
cache: 'pnpm'
120-
cache-dependency-path: pnpm-lock.yaml
121-
122-
- name: Enable Corepack
123-
run: corepack enable
112+
cache: 'npm'
113+
cache-dependency-path: '**/package-lock.json'
124114

125-
- name: Run pnpm install
115+
- name: Run npm install
126116
env:
127117
PUPPETEER_SKIP_DOWNLOAD: true
128-
run: pnpm install --frozen-lockfile
118+
run: npm install --no-package-lock --no-audit --no-fund
129119

130120
- name: Run schematics tests
131-
run: pnpm --filter devextreme-schematics test
121+
run: cd packages/devextreme-schematics && npm run test

.github/workflows/lint.yml

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,11 @@ jobs:
2020
uses: actions/setup-node@v4
2121
with:
2222
node-version: '20'
23-
cache: 'pnpm'
24-
cache-dependency-path: pnpm-lock.yaml
2523

26-
- name: Enable Corepack
27-
run: corepack enable
28-
29-
- name: Install dependencies
24+
- name: Run npm install
3025
env:
3126
PUPPETEER_SKIP_DOWNLOAD: true
32-
run: pnpm install --frozen-lockfile
27+
run: npm install --no-package-lock --no-audit --no-fund
3328

3429
- name: Run tests
35-
run: pnpm run lint
30+
run: npm run lint

.github/workflows/publish.yml

Lines changed: 16 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -23,62 +23,31 @@ jobs:
2323
- name: Get sources
2424
uses: actions/checkout@v4
2525

26-
- name: Set up Node.js
27-
uses: actions/setup-node@v4
28-
with:
29-
node-version: 20
30-
cache: 'pnpm'
31-
cache-dependency-path: pnpm-lock.yaml
26+
- name: Run npm install - root
27+
run: npm install --no-audit --no-fund
3228

33-
- name: Enable Corepack
34-
run: corepack enable
35-
36-
- name: Install dependencies
37-
env:
38-
PUPPETEER_SKIP_DOWNLOAD: true
39-
run: pnpm install --frozen-lockfile
29+
- name: Run npm install - devextreme-schematics
30+
working-directory: packages/devextreme-schematics
31+
run: npm install --no-audit --no-fund
4032

4133
- name: Test devextreme-schematics
42-
run: pnpm --filter devextreme-schematics test
34+
working-directory: packages/devextreme-schematics
35+
run: npm run test
4336

4437
- name: Build devextreme-schematics
45-
run: pnpm --filter devextreme-schematics build
38+
working-directory: packages/devextreme-schematics
39+
run: npm run build
4640

4741
- uses: fregante/setup-git-user@v2
4842

49-
- name: Bump package versions
50-
run: node ./scripts/bump-version.mjs ${{ github.event.inputs.version }}
51-
52-
- name: Refresh lockfile
53-
run: pnpm install --lockfile-only
54-
55-
- name: Capture release versions
56-
id: versions
57-
run: |
58-
echo "cli=$(node -p \"require('./packages/devextreme-cli/package.json').version\")" >> $GITHUB_OUTPUT
59-
echo "schematics=$(node -p \"require('./packages/devextreme-schematics/package.json').version\")" >> $GITHUB_OUTPUT
60-
61-
- name: Commit version update
62-
run: |
63-
git add packages/devextreme-cli/package.json packages/devextreme-schematics/package.json pnpm-lock.yaml
64-
git commit -m "chore: release devextreme-cli v${{ steps.versions.outputs.cli }}" --no-verify
65-
66-
- name: Tag release
67-
run: |
68-
git tag devextreme-cli@${{ steps.versions.outputs.cli }}
69-
git tag devextreme-schematics@${{ steps.versions.outputs.schematics }}
43+
- name: Update NPM config
44+
run: npm set "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}"
7045

71-
- name: Configure npm auth
72-
run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" >> ~/.npmrc
73-
74-
- name: Push changes
46+
- name: Publish package
7547
env:
7648
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
77-
run: git push --follow-tags origin master
78-
79-
- name: Publish packages
80-
env:
81-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
49+
NODE_AUTH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
8250
run: |
83-
pnpm --filter devextreme-cli publish --access public --no-git-checks
84-
pnpm --filter devextreme-schematics publish --access public --no-git-checks
51+
npx lerna version ${{ github.event.inputs.version }} -y --no-push
52+
git push -f --follow-tags --no-verify --atomic origin master
53+
npx lerna publish from-git -y

.github/workflows/themebuilder.yml

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,20 @@ jobs:
2222
uses: actions/setup-node@v4
2323
with:
2424
node-version: ${{ matrix.NODE }}
25-
cache: 'pnpm'
26-
cache-dependency-path: pnpm-lock.yaml
2725

28-
- name: Enable Corepack
29-
run: corepack enable
26+
- name: Restore npm cache
27+
uses: actions/cache@v4
28+
with:
29+
path: ~/.npm
30+
key: themebuilder-${{ runner.os }}-node-${{ matrix.NODE }}-${{ hashFiles('**/package-lock.json') }}
31+
restore-keys: |
32+
themebuilder-${{ runner.os }}-node-${{ matrix.NODE }}
33+
themebuilder-${{ runner.os }}-node-
3034
31-
- name: Install dependencies
35+
- name: Run npm install
3236
env:
3337
PUPPETEER_SKIP_DOWNLOAD: true
34-
run: pnpm install --frozen-lockfile
38+
run: npm install --no-package-lock --no-audit --no-fund
3539

3640
- name: Run tests
37-
run: pnpm run test-themebuilder
41+
run: npm run test-themebuilder

.npmrc

Lines changed: 0 additions & 2 deletions
This file was deleted.

README.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,12 +17,3 @@ Familiarize yourself with the [DevExtreme License](https://js.devexpress.com/Lic
1717
## Support & Feedback ##
1818

1919
If you want to report a bug, request a feature, or ask a question, contact us at the [DevExpress Support Center](https://www.devexpress.com/Support/Center).
20-
21-
## Development
22-
23-
This repository is managed with [pnpm workspaces](https://pnpm.io/workspaces). Enable Corepack and install dependencies before running the developer scripts described in `README_DEVELOPERS.md`:
24-
25-
```sh
26-
corepack enable
27-
pnpm install
28-
```

README_DEVELOPERS.md

Lines changed: 27 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,21 @@
1-
# Setup
2-
3-
Use [Corepack](https://nodejs.org/api/corepack.html) (bundled with Node.js 20+) to activate pnpm and install workspace dependencies:
4-
5-
```sh
6-
corepack enable
7-
pnpm install
8-
```
9-
101
# Testing
112

123
## Build docker image
134
```sh
14-
pnpm --filter devextreme-cli docker:build
5+
$ lerna run docker:build
156
```
167

178
## Run docker image with browser
189
```sh
19-
pnpm --filter devextreme-cli docker:run
10+
$ lerna run docker:run
2011
```
2112

2213
## Run tests
2314

2415
To run tests for all target frameworks, use the following command:
2516

2617
```sh
27-
$ pnpm run test
18+
$ npm run test
2819
```
2920

3021
This script creates test applications in the `testing/sandbox` folder, starts a web server for each framework, and runs the snapshot tests.
@@ -38,61 +29,61 @@ You can find test results in the following folders:
3829
## Generate Applications
3930

4031
```sh
41-
pnpm run create-template
32+
npm run create-template
4233
```
4334

4435
## Generate Applications for an Individual Framework
4536

4637
```sh
47-
pnpm run create-template -- -- -e angular
48-
pnpm run create-template -- -- -e react
49-
pnpm run create-template -- -- -e react-ts
50-
pnpm run create-template -- -- -e vue-v3
38+
npm run create-template -- -- -e angular
39+
npm run create-template -- -- -e react
40+
npm run create-template -- -- -e react-ts
41+
npm run create-template -- -- -e vue-v3
5142
```
5243

5344
## Lint Applications
5445

5546
```sh
56-
pnpm run lint-template
47+
npm run lint-template
5748
```
5849

5950
## Lint Applications for an Individual Framework
6051

6152
```sh
62-
pnpm run lint-template -- -- -e angular
63-
pnpm run lint-template -- -- -e react
64-
pnpm run lint-template -- -- -e react-ts
65-
pnpm run lint-template -- -- -e vue-v3
53+
npm run lint-template -- -- -e angular
54+
npm run lint-template -- -- -e react
55+
npm run lint-template -- -- -e react-ts
56+
npm run lint-template -- -- -e vue-v3
6657
```
6758

6859
## Test Applications
6960

7061
```sh
71-
pnpm run test-template
62+
npm run test-template
7263
```
7364

7465
## Test Applications for an Individual Framework
7566

7667
```sh
77-
pnpm run test-template -- -- -e angular
78-
pnpm run test-template -- -- -e react
79-
pnpm run test-template -- -- -e react-ts
80-
pnpm run test-template -- -- -e vue-v3
68+
npm run test-template -- -- -e angular
69+
npm run test-template -- -- -e react
70+
npm run test-template -- -- -e react-ts
71+
npm run test-template -- -- -e vue-v3
8172
```
8273

8374
## Run Tests for Existing Test Applications
8475

8576
```sh
86-
pnpm run test-dev
77+
npm run test-dev
8778
```
8879

8980
## Run Tests for an Individual Framework
9081

9182
```sh
92-
pnpm run test -- -- -t angular
93-
pnpm run test -- -- -t react
94-
pnpm run test -- -- -t react-ts
95-
pnpm run test -- -- -t vue-v3
83+
npm run test -- -- -t angular
84+
npm run test -- -- -t react
85+
npm run test -- -- -t react-ts
86+
npm run test -- -- -t vue-v3
9687
```
9788

9889
## Replace etalon
@@ -108,13 +99,13 @@ Modifying an application template directly is not recommended. Instead, generate
10899
3. Run a script that updates templates for all frameworks:
109100

110101
```sh
111-
pnpm run update-template
102+
npm run update-template
112103
```
113104

114105
... or a script that updates the template for an individual framework:
115106

116107
```sh
117-
pnpm run update-template -- -p angular
118-
pnpm run update-template -- -p react-ts
119-
pnpm run update-template -- -p vue-v3
108+
npm run update-template -- -p angular
109+
npm run update-template -- -p react-ts
110+
npm run update-template -- -p vue-v3
120111
```

lerna.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"packages": [
3+
"packages/*"
4+
],
5+
"version": "1.12.1"
6+
}

0 commit comments

Comments
 (0)