Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ packages/*/*/index.ts
packages/**/bad.js
tmpl
packages/api/core/helper/dynamic-import.js
packages/api/core/spec/fixture/api-tester/
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ jobs:
run: |
mkdir -p ./reports/out
yarn test:slow --reporter=default --reporter=junit --outputFile="./reports/out/test_output.xml"
yarn test:verdaccio --reporter=default --reporter=junit --outputFile="./reports/out/test_output_verdaccio.xml"

required-ci:
needs:
Expand Down
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ packages/**/.swc
packages/api/core/spec/fixture/app-with-scoped-name/out/make
packages/plugin/webpack/spec/fixtures/apps/native-modules/package-lock.json
packages/plugin/fuses/spec/fixture/app
!packages/plugin/fuses/spec/fixture/app/package.json.tmpl
.links
reports
packages/**/typedoc.json
Expand All @@ -42,3 +43,6 @@ packages/**/typedoc.json
.nx/workspace-data
.cursor/rules/nx-rules.mdc
.github/instructions/nx.instructions.md

tools/verdaccio/storage
tools/verdaccio/htpasswd
1 change: 1 addition & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ packages/*/*/index.ts
packages/*/*/README.md
packages/*/*/tsconfig.json
packages/*/*/typedoc.json
packages/api/core/spec/fixture/api-tester/package.json
packages/api/core/spec/fixture/bad_external_forge_config/bad.js
packages/plugin/webpack/spec/**/.webpack
.links
Expand Down
10 changes: 9 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,10 @@
"lint": "npm run lint:js && npm run lint:markdown && npm run lint:markdown-js && npm run lint:markdown-links",
"lint:fix": "prettier --write . --experimental-cli && eslint --fix . --cache",
"prepack": "yarn build",
"test": "xvfb-maybe vitest run --project fast --project slow",
"test": "xvfb-maybe vitest run --project fast --project slow --project slow-verdaccio",
"test:fast": "xvfb-maybe vitest run --project fast",
"test:slow": "xvfb-maybe vitest run --project slow",
"test:verdaccio": "ts-node tools/verdaccio/spawn-verdaccio.ts xvfb-maybe vitest run --project slow-verdaccio",
"test:clear": "ts-node tools/test-clear",
"update:lockfile-fixtures": "ts-node tools/regenerate-lockfile-fixtures.ts",
"postinstall": "husky install && node -e \"try { fs.rmSync('node_modules/.bin/*.ps1', { recursive: true, force: true }) } catch (e) {}\" && ts-node ./tools/gen-tsconfigs.ts && ts-node ./tools/gen-ts-glue.ts"
Expand Down Expand Up @@ -101,6 +102,8 @@
"@types/which": "^2.0.0",
"@typescript-eslint/eslint-plugin": "^8.0.0",
"@typescript-eslint/parser": "^8.0.0",
"@yarnpkg/types": "^4.0.1",
"electron": "^39.2.6",
"electron-installer-common": "^0.10.2",
"eslint": "^8.56.0",
"eslint-config-prettier": "^10.0.1",
Expand All @@ -116,10 +119,12 @@
"minimist": "^1.2.6",
"msw": "^2.7.0",
"prettier": "^3.6.2",
"ref-napi": "^3.0.3",
"syncpack": "^11.2.1",
"ts-node": "^10.0.0",
"typedoc": "0.25.13",
"typescript": "~5.4.5",
"verdaccio": "^6.2.4",
"vitest": "^3.1.3",
"xvfb-maybe": "^0.2.1",
"yaml-hook": "^1.0.0"
Expand Down Expand Up @@ -154,6 +159,9 @@
"@bitdisaster/exe-icon-extractor": {
"built": true
},
"electron": {
"built": true
},
"electron-winstaller": {
"built": true
},
Expand Down
18 changes: 18 additions & 0 deletions packages/api/core/spec/fixture/api-tester/forge.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
module.exports = {
packagerConfig: {
asar: true,
},
rebuildConfig: {},
makers: [
{
name: '@electron-forge/maker-zip',
platforms: ['darwin', 'linux', 'win32'],
},
],
plugins: [
{
name: '@electron-forge/plugin-auto-unpack-natives',
config: {},
},
],
};
42 changes: 42 additions & 0 deletions packages/api/core/spec/fixture/api-tester/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"name": "api-tester",
"productName": "api-tester",
"version": "1.0.0",
"description": "Test Electron application for Forge API tests",
"main": "src/index.js",
"scripts": {
"start": "electron-forge start",
"package": "electron-forge package",
"make": "electron-forge make"
},
"keywords": [],
"author": "Test Author",
"license": "MIT",
"homepage": "http://www.electronjs.org/",
"devDependencies": {
"@electron-forge/cli": "file:../../../../../api/cli",
"@electron-forge/core": "file:../../../../../api/core",
"@electron-forge/core-utils": "file:../../../../../utils/core-utils",
"@electron-forge/maker-appx": "file:../../../../../maker/appx",
"@electron-forge/maker-base": "file:../../../../../maker/base",
"@electron-forge/maker-deb": "file:../../../../../maker/deb",
"@electron-forge/maker-dmg": "file:../../../../../maker/dmg",
"@electron-forge/maker-flatpak": "file:../../../../../maker/flatpak",
"@electron-forge/maker-msix": "file:../../../../../maker/msix",
"@electron-forge/maker-pkg": "file:../../../../../maker/pkg",
"@electron-forge/maker-rpm": "file:../../../../../maker/rpm",
"@electron-forge/maker-snap": "file:../../../../../maker/snap",
"@electron-forge/maker-squirrel": "file:../../../../../maker/squirrel",
"@electron-forge/maker-wix": "file:../../../../../maker/wix",
"@electron-forge/maker-zip": "file:../../../../../maker/zip",
"@electron-forge/plugin-auto-unpack-natives": "file:../../../../../plugin/auto-unpack-natives",
"@electron-forge/plugin-base": "file:../../../../../plugin/base",
"@electron-forge/plugin-fuses": "file:../../../../../plugin/fuses",
"@electron-forge/shared-types": "file:../../../../../utils/types",
"@electron/fuses": "file:../../../../../../node_modules/@electron/fuses",
"electron": "file:../../../../../../node_modules/electron"
},
"config": {
"forge": "./forge.config.js"
}
}
24 changes: 24 additions & 0 deletions packages/api/core/spec/fixture/api-tester/src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
const { app, BrowserWindow } = require('electron');

const createWindow = () => {
const mainWindow = new BrowserWindow();

// and load the index.html of the app.
mainWindow.loadURL('https://electronjs.org');
};

app.whenReady().then(() => {
createWindow();

app.on('activate', () => {
if (BrowserWindow.getAllWindows().length === 0) {
createWindow();
}
});
});

app.on('window-all-closed', () => {
if (process.platform !== 'darwin') {
app.quit();
}
});
4 changes: 2 additions & 2 deletions packages/api/core/spec/fixture/custom_init/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ const fs = require('fs-extra');

module.exports = {
requiredForgeVersion: '>= 6.0.0-beta.1',
dependencies: [...baseTemplate.dependencies, 'debug'],
devDependencies: [...baseTemplate.devDependencies, 'lodash'],
dependencies: [...baseTemplate.dependencies, 'semver@7.7.3'],
devDependencies: [...baseTemplate.devDependencies, '@types/semver@7.7.1'],
initializeTemplate: async (directory) => {
const tasks = await baseTemplate.initializeTemplate(directory, {});
return [
Expand Down
Loading
Loading