Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update many dependencies #133

Merged
merged 14 commits into from
Aug 8, 2024
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
8 changes: 7 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
"test": "npm run check-version && node ./script/local-jasmine.js --captureExceptions spec"
},
"dependencies": {
"@atom/plist": "0.4.4",
"asar-require": "0.3.0",
"async": "^3.2.0",
"colors": "~1.4.0",
Expand All @@ -34,6 +33,7 @@
"ncp": "~2.0.0",
"npm": "https://github.com/pulsar-edit/npm-cli/releases/download/v6.14.19-pulsar1-1/npm-6.14.19-pulsar1-1.tgz",
"open": "7.3.0",
"plist": "3",
"read": "~1.0.7",
"request": "^2.88.2",
"season": "^6.0.2",
Expand All @@ -54,5 +54,11 @@
"jasmine-focused": ">=1.0.7 <2.0",
"node-gyp": "https://github.com/nodejs/node-gyp/archive/d3615c66f7e7a65de48ce9860b1fe13710d20988.tar.gz",
"shx": "^0.3.3"
},
"resolutions": {
"make-fetch-happen/**/ip": "^1.1.9",
"npm/**/got": "^11.8.6",
"npm/**/http-cache-semantics": "^4.1.1",
"npm/**/tar": "^6.1.2"
}
}
6 changes: 3 additions & 3 deletions src/package-converter.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const zlib = require('zlib');

const _ = require('underscore-plus');
const CSON = require('season');
const plist = require('@atom/plist');
const plist = require('plist');
const {ScopeSelector, ready} = require('second-mate');
const tar = require('tar');
const temp = require('temp');
Expand Down Expand Up @@ -113,7 +113,7 @@ class PackageConverter {

readFileSync(filePath) {
if (_.contains(this.plistExtensions, path.extname(filePath))) {
return plist.parseFileSync(filePath);
return plist.parse(fs.readFileSync(filePath, 'utf8'));
} else if (_.contains(['.json', '.cson'], path.extname(filePath))) {
return CSON.readFileSync(filePath);
}
Expand All @@ -135,7 +135,7 @@ class PackageConverter {

let contents;
if (_.contains(this.plistExtensions, path.extname(sourcePath))) {
contents = plist.parseFileSync(sourcePath);
contents = plist.parse(fs.readFileSync(sourcePath, 'utf8'));
} else if (_.contains(['.json', '.cson'], path.extname(sourcePath))) {
contents = CSON.readFileSync(sourcePath);
}
Expand Down
4 changes: 2 additions & 2 deletions src/text-mate-theme.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

const _ = require('underscore-plus');
const plist = require('@atom/plist');
const plist = require('plist');
const {ScopeSelector, ready} = require('second-mate');

module.exports =
Expand All @@ -18,7 +18,7 @@ class TextMateTheme {

async buildRulesets() {
let variableSettings;
let { settings } = plist.parseStringSync(this.contents) ?? {};
let { settings } = plist.parse(this.contents) ?? {};
settings ??= [];

for (let setting of settings) {
Expand Down
Loading
Loading