Merge branch 'develop' into fix-pnpm

.dockerignore

@@ -13,7 +13,8 @@
 **/*.tsbuildinfo
 **/build
 **/node_modules
-**/.pnpm-debug.log*
+**/npm-debug.log*
+**/.pnpm-debug.log
 **/server*.log
 **/yarn-error.log
 Dockerfile

.eslintignore

@@ -19,6 +19,7 @@ node_modules
 .DS_Store
 
 .idea
+npm-debug.log.*
 .pnpm-debug.log*
 *.css.d.ts
 *.sass.d.ts

.github/PULL_REQUEST_TEMPLATE.md

@@ -25,12 +25,10 @@
 
 #### Checklist
 <!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
-
 - [ ] My pull request is properly named
-- [ ] The changes respect the code style of the project (`pnpm prepare-code`)
-- [ ] `pnpm test` passes
+- [ ] The changes respect the code style of the project (`npm run prepare-code`)
+- [ ] `npm test` passes
 - [ ] I tested/previewed my changes locally
 
 #### Release Notes
-
 <!-- Please add a one-line description for users of Ferdium to read in the release notes, or 'none' if no notes relevant to such users. Examples and help on special cases: https://github.com/electron/clerk/blob/master/README.md#examples -->

.github/config.yml

@@ -5,7 +5,7 @@ newPRWelcomeComment: |
   Things that will help get your PR across the finish line:
 
   - Follow the JavaScript [coding style](https://github.com/electron/electron/blob/master/docs/development/coding-style.md) as recommended by the Electron project.
-  - Run `pnpm lint` locally to catch formatting errors earlier.
+  - Run `npm run lint` locally to catch formatting errors earlier.
   - Document any user-facing changes you've made by including screenshots and animated GIFs whenever possible.
 
   We get a lot of pull requests on this repo, so please be patient and we will get back to you as soon as we can.

.husky/commit-msg

@@ -2,7 +2,7 @@
 
 FILE_NAME="$(dirname "$0")/_/husky.sh"
 
-# Conditionally invoke so as to avoid running pnpm commands if this is a clean checkout (ie before installing node modules)
+# Conditionally invoke so as to avoid running npm commands if this is a clean checkout (ie before installing node modules)
 if [ -f $FILE_NAME ]; then
   . $FILE_NAME
 

.husky/pre-commit

@@ -2,9 +2,8 @@
 
 FILE_NAME="$(dirname "$0")/_/husky.sh"
 
-# Conditionally invoke so as to avoid running pnpm commands if this is a clean checkout (ie before installing node modules)
+# Conditionally invoke so as to avoid running npm commands if this is a clean checkout (ie before installing node modules)
 if [ -f $FILE_NAME ]; then
   . $FILE_NAME
-  pnpm prepare-code
-  pnpm test
+  npm run prepare-code
 fi

.npmrc

@@ -1,5 +1,6 @@
 save-exact = true
 engine-strict = true
 unsafe-perm = true
-legacy-peer-deps = true
 frozen-lockfile = false
+legacy-peer-deps = true
+shamefully-hoist = true

.vscode/tasks.json

@@ -2,17 +2,17 @@
     "version": "2.0.0",
     "tasks": [
         {
-            "type": "pnpm",
+            "type": "npm",
             "script": "dev",
             "group": {
                 "kind": "build",
                 "isDefault": true
             }
         },
         {
-            "type": "pnpm",
+            "type": "npm",
             "script": "lint",
             "group": "test"
         }
     ]
-}
+}

CONTRIBUTING.md

@@ -13,7 +13,7 @@
   - [How can I contribute?](#how-can-i-contribute)
   - [Setting up your development machine](#setting-up-your-development-machine)
     - [Install system-level dependencies](#install-system-level-dependencies)
-      - [Node.js, pnpm](#nodejs-pnpm)
+      - [Node.js, npm, pnpm](#nodejs-npm-pnpm)
       - [Git](#git)
       - [On Debian/Ubuntu](#on-debianubuntu)
       - [On Fedora](#on-fedora)
@@ -52,7 +52,7 @@ If so, engage in the already existing discussion.
 
 _Note:_ This list can likely get outdated. If so, please refer to the specific version of the [electronuserland builder](https://hub.docker.com/r/electronuserland/builder) that we use in our [Dockerfile](./Dockerfile).
 
-#### Node.js, pnpm
+#### Node.js, npm, pnpm
 
 Please make sure you are conforming to the `engines` requirements used by the developers/contributors as specified in the [`package.json`](./package.json#engines) and [`recipes/package.json`](./recipes/package.json#engine) files.
 
@@ -63,11 +63,12 @@ Currently, these are the combinations of system dependencies that work for MacOS
 $ jq --null-input '[inputs.engines] | add' < ./package.json < ./recipes/package.json
 {
   "node": "16.18.0",
+  "npm": "8.19.2",
   "pnpm": "7.14.0"
 }
 ```
 
-_Note:_ You can choose any version manager to manage multiple versions of `node` and `pnpm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf).
+_Note:_ You can choose any version manager to manage multiple versions of `node` and `npm`. For eg, [nvm](https://github.com/nvm-sh/nvm) or [asdf](https://github.com/asdf-vm/asdf).
 
 #### Git
 
@@ -89,7 +90,7 @@ dnf install libX11-devel libXext-devel libXScrnSaver-devel libxkbfile-devel rpm
 
 Please make sure you have the following installed:
 
-- Microsoft Visual Studio Build Tools (2017, 2019 or 2022 - with Windows 10 SDK selected).
+- Microsoft Visual Studio Build Tools (2019 or higher - with Windows 10 SDK selected).
 
 ### Clone repository with submodule
 
@@ -146,7 +147,7 @@ mv /ferdium/latest-linux.yml /ferdium-out/latest-linux-$GIT_SHA.yml
 Run this command on the terminal:
 
 ```bash
-pnpm debug
+npm run debug
 ```
 
 Note: please prefer [`debug()`](https://github.com/visionmedia/debug) over `console.log()`.

gulpfile.babel.ts

@@ -4,7 +4,6 @@ import babel from 'gulp-babel';
 import dartSass from 'sass';
 import gulpSass from 'gulp-sass';
 import csso from 'gulp-csso';
-import rename from 'gulp-rename';
 import terser from 'gulp-terser';
 import htmlMin from 'gulp-htmlmin';
 import connect from 'gulp-connect';
@@ -102,13 +101,6 @@ function mvSrc() {
     .pipe(gulp.dest(paths.dest));
 }
 
-function mvElectronNpmrc() {
-  return gulp
-    .src(['electron-builder.npmrc'])
-    .pipe(rename('.npmrc'))
-    .pipe(gulp.dest(paths.dest));
-}
-
 function mvPackageJson() {
   return gulp.src(['./package.json']).pipe(gulp.dest(paths.dest));
 }
@@ -227,7 +219,7 @@ function recipeInfo() {
 
 export const build = gulp.series(
   clean,
-  gulp.parallel(mvElectronNpmrc, mvSrc, mvPackageJson, BuildInfo),
+  gulp.parallel(mvSrc, mvPackageJson, BuildInfo),
   gulp.parallel(
     html,
     processJavascript,