Skip to content

Commit ea30033

Browse files
committed
Testing yarn2npm
1 parent a58d7e8 commit ea30033

8 files changed

Lines changed: 85 additions & 8493 deletions

File tree

.github/workflows/build.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,15 @@ jobs:
5757
uses: actions/cache@v4
5858
with:
5959
path: node_modules/
60-
key: node_modules-${{ runner.os }}-${{ hashFiles('yarn.lock') }}
60+
key: node_modules-${{ runner.os }}-${{ hashFiles('package-lock.json') }}
6161

6262
- name: Install node.js
6363
uses: actions/setup-node@v5
6464
with:
6565
node-version-file: '.nvmrc'
6666

67-
- run: npm install yarn -g
68-
- run: yarn install
69-
- run: yarn build
67+
- run: npm ci
68+
- run: npm run build
7069

7170
- name: Generate Capacitor Config
7271
run: node capacitor.config.generator.mjs

.github/workflows/tauri-nightly.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,8 @@ jobs:
252252
with:
253253
node-version-file: .nvmrc
254254

255-
- run: npm install yarn -g
256-
- run: yarn install
257-
- run: yarn build
255+
- run: npm ci
256+
- run: npm run build
258257
- run: node capacitor.config.generator.mjs
259258
- run: npx cap sync android
260259

.github/workflows/test.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ jobs:
2222
uses: actions/setup-node@v5
2323
with:
2424
node-version-file: '.nvmrc'
25-
cache: yarn
25+
cache: npm
2626

27-
- run: npm install yarn -g
28-
- run: yarn install --frozen-lockfile
27+
- run: npm ci
2928
- run: npm run lint
3029
- run: npm run test

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
node_modules/
44
npm-debug.log*
5-
yarn-debug.log*
6-
yarn-error.log*
75

86
# App Build process
97
cache/

README.md

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -110,29 +110,28 @@ If you prefer to have the application in English or any other language, you can
110110

111111
### Technical details
112112

113-
The next versions of the App will be a modern tool that based on PWA (Progressive Web Application) and uses principally Node, Yarn, Vite and Vue for development and building. For Android we use Capacitor as wrapper over the PWA. To build and develop over it, follow the instructions below.
113+
The next versions of the App will be a modern tool that based on PWA (Progressive Web Application) and uses principally Node, npm, Vite and Vue for development and building. For Android we use Capacitor as wrapper over the PWA. To build and develop over it, follow the instructions below.
114114

115115
### Prepare your environment
116116

117117
1. Install [node.js](https://nodejs.org/) (refer to [.nvmrc](./.nvmrc) for minimum required version)
118-
2. Install yarn: `npm install yarn -g`
119118

120119
### PWA version
121120

122121
#### Run development version
123122

124-
1. Change to project folder and run `yarn install`.
125-
2. Run `yarn dev`.
123+
1. Change to project folder and run `npm install`.
124+
2. Run `npm run dev`.
126125

127126
The web app will be available at http://localhost:8000 with full HMR.
128127

129128
#### Run production version
130129

131-
1. Change to project folder and run `yarn install`.
132-
2. Run `yarn build`.
133-
3. Run `yarn preview` after build has finished.
130+
1. Change to project folder and run `npm install`.
131+
2. Run `npm run build`.
132+
3. Run `npm run preview` after build has finished.
134133

135-
Alternatively you can run `yarn review` to build and preview in one step.
134+
Alternatively you can run `npm run review` to build and preview in one step.
136135

137136
The web app should behave directly as in production, available at http://localhost:8080.
138137

@@ -146,25 +145,25 @@ You need to install [Android Studio](https://developer.android.com/studio) as Ca
146145

147146
#### Run development version
148147

149-
1. Change to project folder and run `yarn install`.
150-
2. Run `yarn android:run`.
148+
1. Change to project folder and run `npm install`.
149+
2. Run `npm run android:run`.
151150

152151
The command will ask for the device to run the app. You need to have some Android virtual machine created or some Android phone [connected using ADB](https://developer.android.com/tools/adb).
153152

154-
As alternative to the step 2, you can execute a `yarn android:open` to open de project into Android Studio and run or debug the app from there.
153+
As alternative to the step 2, you can execute a `npm run android:open` to open de project into Android Studio and run or debug the app from there.
155154

156155
#### Run development version with live reload
157156

158-
1. Change to project folder and run `yarn install`.
159-
2. Run `yarn dev --host`. It will start the vite server and will show you the IP address where the server is listening.
160-
3. Run `yarn android:dev`
157+
1. Change to project folder and run `npm install`.
158+
2. Run `npm run dev --host`. It will start the vite server and will show you the IP address where the server is listening.
159+
3. Run `npm run android:dev`
161160

162161
This will ask for the IP where the server is running (if there are more than one network interfaces). You need to have some Android virtual machine created or some Android phone [connected using ADB](https://developer.android.com/tools/adb).
163162
Any change make in the code will reload the app in the Android device.
164163

165164
### Running tests
166165

167-
`yarn test`
166+
`npm test`
168167

169168
## Support and Developers Channel
170169

package-lock.json

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

package.json

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
"@rollup/plugin-commonjs": "^28.0.2",
8585
"@rollup/plugin-node-resolve": "^16.0.0",
8686
"@rollup/plugin-replace": "^6.0.2",
87-
"@storybook/addon-actions": "^8.6.3",
88-
"@storybook/addon-essentials": "^8.6.3",
87+
"@storybook/addon-actions": "^9.0.8",
88+
"@storybook/addon-essentials": "^8.6.14",
8989
"@storybook/addon-links": "^8.6.3",
9090
"@storybook/vue3": "^8.6.3",
9191
"@tauri-apps/cli": "~2.10.0",
@@ -111,12 +111,6 @@
111111
"run-script-os": "^1.1.6",
112112
"vite": "^7.3.2",
113113
"vite-plugin-mkcert": "^1.17.9",
114-
"vitest": "^3.2.4",
115-
"yarn": "^1.22.22"
116-
},
117-
"resolutions": {
118-
"string-width": "4.2.3",
119-
"strip-ansi": "6.0.1",
120-
"wrap-ansi": "7.0.0"
114+
"vitest": "^3.2.4"
121115
}
122116
}

0 commit comments

Comments
 (0)