Different way of bundling APM/PPM

This commit is contained in:
Maurício Szabo 2022-09-07 14:25:14 -03:00
parent cd14561780
commit 883afb32a2
10 changed files with 7 additions and 16183 deletions

3
.gitmodules vendored Normal file
View File

@ -0,0 +1,3 @@
[submodule "ppm"]
path = ppm
url = git@github.com:pulsar-edit/ppm

View File

@ -1,5 +0,0 @@
target=v12.18.3
node-version=12.18.3
package-lock=true
prefer-frozen-lockfile=true
strict-peer-dependencies=false

View File

@ -1,2 +0,0 @@
This folder is where [apm](https://github.com/atom/apm) is installed to so that
it is bundled with Atom.

12084
apm/package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +0,0 @@
{
"name": "pulsar-bundled-apm",
"description": "Pulsar's bundled apm",
"repository": {
"type": "git",
"url": "https://github.com/pulsar-edit/pulsar.git"
},
"dependencies": {
"ppm": "https://github.com/pulsar-edit/ppm.git#53d3a8f"
}
}

File diff suppressed because it is too large Load Diff

View File

@ -280,7 +280,7 @@
"preinstall": "node -e 'process.exit(0)'", "preinstall": "node -e 'process.exit(0)'",
"test": "node script/test", "test": "node script/test",
"build": "electron-rebuild", "build": "electron-rebuild",
"build:apm": "cd apm && yarn install && ./node_modules/ppm/bin/npm rebuild && cd ./node_modules/git-utils && npm run prepare && npm install", "build:apm": "cd ppm && yarn install",
"start": "electron --enable-logging . -f", "start": "electron --enable-logging . -f",
"dist": "node script/electron-builder.js" "dist": "node script/electron-builder.js"
}, },

1
ppm Submodule

@ -0,0 +1 @@
Subproject commit 46d8338fb258d5265ab2248f3218b01f750d802f

View File

@ -7,7 +7,7 @@ const path = require('path');
const spawnSync = require('./lib/spawn-sync'); const spawnSync = require('./lib/spawn-sync');
const repositoryRootPath = path.resolve(__dirname, '..'); const repositoryRootPath = path.resolve(__dirname, '..');
const apmRootPath = path.join(repositoryRootPath, 'apm'); const apmRootPath = path.join(repositoryRootPath, 'ppm');
const scriptRootPath = path.join(repositoryRootPath, 'script'); const scriptRootPath = path.join(repositoryRootPath, 'script');
const scriptRunnerRootPath = path.join(scriptRootPath, 'script-runner'); const scriptRunnerRootPath = path.join(scriptRootPath, 'script-runner');
const scriptRunnerModulesPath = path.join(scriptRunnerRootPath, 'node_modules'); const scriptRunnerModulesPath = path.join(scriptRunnerRootPath, 'node_modules');

View File

@ -48,7 +48,7 @@ let options = {
"publish": null, "publish": null,
"extraResources": [ "extraResources": [
{ {
"from": "apm", "from": "ppm",
"to": "app/apm" "to": "app/apm"
}, { }, {
"from": pngIcon, "from": pngIcon,