Bump v18.0.0-beta.1

Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>

ELECTRON_VERSION

@@ -1 +1 @@
-18.0.0-alpha.6
+18.0.0-beta.1

docs/tutorial/quick-start.md

@@ -463,46 +463,46 @@ The fastest way to distribute your newly created app is using
 1. Add Electron Forge as a development dependency of your app, and use its `import` command to set up
 Forge's scaffolding:
 
-```sh npm2yarn
-npm install --save-dev @electron-forge/cli
-npx electron-forge import
+   ```sh npm2yarn
+   npm install --save-dev @electron-forge/cli
+   npx electron-forge import
 
-✔ Checking your system
-✔ Initializing Git Repository
-✔ Writing modified package.json file
-✔ Installing dependencies
-✔ Writing modified package.json file
-✔ Fixing .gitignore
+   ✔ Checking your system
+   ✔ Initializing Git Repository
+   ✔ Writing modified package.json file
+   ✔ Installing dependencies
+   ✔ Writing modified package.json file
+   ✔ Fixing .gitignore
 
-We have ATTEMPTED to convert your app to be in a format that electron-forge understands.
+   We have ATTEMPTED to convert your app to be in a format that electron-forge understands.
 
-Thanks for using "electron-forge"!!!
-```
+   Thanks for using "electron-forge"!!!
+   ```
 
-1. Create a distributable using Forge's `make` command:
+2. Create a distributable using Forge's `make` command:
 
-```sh npm2yarn
-npm run make
+   ```sh npm2yarn
+   npm run make
 
-> my-electron-app@1.0.0 make /my-electron-app
-> electron-forge make
+   > my-electron-app@1.0.0 make /my-electron-app
+   > electron-forge make
 
-✔ Checking your system
-✔ Resolving Forge Config
-We need to package your application before we can make it
-✔ Preparing to Package Application for arch: x64
-✔ Preparing native dependencies
-✔ Packaging Application
-Making for the following targets: zip
-✔ Making for target: zip - On platform: darwin - For arch: x64
-```
+   ✔ Checking your system
+   ✔ Resolving Forge Config
+   We need to package your application before we can make it
+   ✔ Preparing to Package Application for arch: x64
+   ✔ Preparing native dependencies
+   ✔ Packaging Application
+   Making for the following targets: zip
+   ✔ Making for target: zip - On platform: darwin - For arch: x64
+   ```
 
-Electron Forge creates the `out` folder where your package will be located:
+   Electron Forge creates the `out` folder where your package will be located:
 
-```plain
-// Example for macOS
-out/
-├── out/make/zip/darwin/x64/my-electron-app-darwin-x64-1.0.0.zip
-├── ...
-└── out/my-electron-app-darwin-x64/my-electron-app.app/Contents/MacOS/my-electron-app
-```
+   ```plain
+   // Example for macOS
+   out/
+   ├── out/make/zip/darwin/x64/my-electron-app-darwin-x64-1.0.0.zip
+   ├── ...
+   └── out/my-electron-app-darwin-x64/my-electron-app.app/Contents/MacOS/my-electron-app
+   ```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "electron",
-  "version": "18.0.0-alpha.6",
+  "version": "18.0.0-beta.1",
   "repository": "https://github.com/electron/electron",
   "description": "Build cross platform desktop apps with JavaScript, HTML, and CSS",
   "devDependencies": {

script/release/release.js

@@ -111,9 +111,11 @@ function assetsForVersion (version, validatingRelease) {
     `chromedriver-${version}-win32-x64.zip`,
     `chromedriver-${version}-win32-arm64.zip`,
     `electron-${version}-darwin-x64-dsym.zip`,
+    `electron-${version}-darwin-x64-dsym-snapshot.zip`,
     `electron-${version}-darwin-x64-symbols.zip`,
     `electron-${version}-darwin-x64.zip`,
     `electron-${version}-darwin-arm64-dsym.zip`,
+    `electron-${version}-darwin-arm64-dsym-snapshot.zip`,
     `electron-${version}-darwin-arm64-symbols.zip`,
     `electron-${version}-darwin-arm64.zip`,
     `electron-${version}-linux-arm64-symbols.zip`,
@@ -126,9 +128,11 @@ function assetsForVersion (version, validatingRelease) {
     `electron-${version}-linux-x64-symbols.zip`,
     `electron-${version}-linux-x64.zip`,
     `electron-${version}-mas-x64-dsym.zip`,
+    `electron-${version}-mas-x64-dsym-snapshot.zip`,
     `electron-${version}-mas-x64-symbols.zip`,
     `electron-${version}-mas-x64.zip`,
     `electron-${version}-mas-arm64-dsym.zip`,
+    `electron-${version}-mas-arm64-dsym-snapshot.zip`,
     `electron-${version}-mas-arm64-symbols.zip`,
     `electron-${version}-mas-arm64.zip`,
     `electron-${version}-win32-ia32-pdb.zip`,

script/release/uploaders/upload.py

@@ -33,6 +33,8 @@ OUT_DIR = get_out_dir()
 DIST_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION)
 SYMBOLS_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'symbols')
 DSYM_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'dsym')
+DSYM_SNAPSHOT_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION,
+                                  'dsym-snapshot')
 PDB_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'pdb')
 DEBUG_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION, 'debug')
 TOOLCHAIN_PROFILE_NAME = get_zip_name(PROJECT_NAME, ELECTRON_VERSION,
@@ -88,6 +90,10 @@ def main():
     dsym_zip = os.path.join(OUT_DIR, DSYM_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'dsym.zip'), dsym_zip)
     upload_electron(release, dsym_zip, args)
+
+    dsym_snaphot_zip = os.path.join(OUT_DIR, DSYM_SNAPSHOT_NAME)
+    shutil.copy2(os.path.join(OUT_DIR, 'dsym-snapshot.zip'), dsym_snaphot_zip)
+    upload_electron(release, dsym_snaphot_zip, args)    
   elif PLATFORM == 'win32':
     pdb_zip = os.path.join(OUT_DIR, PDB_NAME)
     shutil.copy2(os.path.join(OUT_DIR, 'pdb.zip'), pdb_zip)
@@ -154,7 +160,6 @@ def main():
         'toolchain_profile.json')
     upload_electron(release, toolchain_profile_zip, args)
 
-
 def parse_args():
   parser = argparse.ArgumentParser(description='upload distribution file')
   parser.add_argument('-v', '--version', help='Specify the version',

script/zip-symbols.py

@@ -33,9 +33,17 @@ def main():
     dsym_name = 'dsym.zip'
     with scoped_cwd(args.build_dir):
       dsyms = glob.glob('*.dSYM')
+      snapshot_dsyms = ['v8_context_snapshot_generator.dSYM']
+      for dsym in snapshot_dsyms:
+        if (dsym in dsyms):
+          dsyms.remove(dsym)
       dsym_zip_file = os.path.join(args.build_dir, dsym_name)
       print('Making dsym zip: ' + dsym_zip_file)
       make_zip(dsym_zip_file, licenses, dsyms)
+      dsym_snapshot_name = 'dsym-snapshot.zip'
+      dsym_snapshot_zip_file = os.path.join(args.build_dir, dsym_snapshot_name)
+      print('Making dsym snapshot zip: ' + dsym_snapshot_zip_file)
+      make_zip(dsym_snapshot_zip_file, licenses, snapshot_dsyms)
       if len(dsyms) > 0 and 'DELETE_DSYMS_AFTER_ZIP' in os.environ:
         execute(['rm', '-rf'] + dsyms)
   elif PLATFORM == 'win32':

shell/browser/resources/win/electron.rc

@@ -50,8 +50,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,0,0,6
- PRODUCTVERSION 18,0,0,6
+ FILEVERSION 18,0,0,1
+ PRODUCTVERSION 18,0,0,1
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L