Merge remote-tracking branch 'origin/develop'
Julian Lam
8 years ago
commit
7e0d0e0eb5
File diff suppressed because one or more lines are too long
@ -0,0 +1,72 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
var path = require('path');
|
||||||
|
var fs = require('fs');
|
||||||
|
var cproc = require('child_process');
|
||||||
|
|
||||||
|
var packageFilePath = path.join(__dirname, '../../package.json');
|
||||||
|
var packageDefaultFilePath = path.join(__dirname, '../../package.default.json');
|
||||||
|
var modulesPath = path.join(__dirname, '../../node_modules');
|
||||||
|
|
||||||
|
function updatePackageFile() {
|
||||||
|
var oldPackageContents = {};
|
||||||
|
|
||||||
|
try {
|
||||||
|
oldPackageContents = JSON.parse(fs.readFileSync(packageFilePath, 'utf8'));
|
||||||
|
} catch (e) {
|
||||||
|
if (e.code !== 'ENOENT') {
|
||||||
|
throw e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var defaultPackageContents = JSON.parse(fs.readFileSync(packageDefaultFilePath, 'utf8'));
|
||||||
|
var packageContents = Object.assign({}, oldPackageContents, defaultPackageContents, {
|
||||||
|
dependencies: Object.assign({}, oldPackageContents.dependencies, defaultPackageContents.dependencies),
|
||||||
|
});
|
||||||
|
|
||||||
|
fs.writeFileSync(packageFilePath, JSON.stringify(packageContents, null, 2));
|
||||||
|
}
|
||||||
|
|
||||||
|
exports.updatePackageFile = updatePackageFile;
|
||||||
|
|
||||||
|
function npmInstallProduction() {
|
||||||
|
cproc.execSync('npm i --production', {
|
||||||
|
cwd: path.join(__dirname, '../../'),
|
||||||
|
stdio: [0, 1, 2],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
exports.npmInstallProduction = npmInstallProduction;
|
||||||
|
|
||||||
|
function preserveExtraneousPlugins() {
|
||||||
|
// Skip if `node_modules/` is not found or inaccessible
|
||||||
|
try {
|
||||||
|
fs.accessSync(modulesPath, fs.constants.R_OK);
|
||||||
|
} catch (e) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var isPackage = /^nodebb-(plugin|theme|widget|reward)-\w+/;
|
||||||
|
var packages = fs.readdirSync(modulesPath).filter(function (pkgName) {
|
||||||
|
return isPackage.test(pkgName);
|
||||||
|
});
|
||||||
|
var packageContents = JSON.parse(fs.readFileSync(packageFilePath, 'utf8'));
|
||||||
|
|
||||||
|
var extraneous = packages
|
||||||
|
// only extraneous plugins (ones not in package.json)
|
||||||
|
.filter(function (pkgName) {
|
||||||
|
return !packageContents.dependencies.hasOwnProperty(pkgName);
|
||||||
|
})
|
||||||
|
// reduce to a map of package names to package versions
|
||||||
|
.reduce(function (map, pkgName) {
|
||||||
|
var pkgConfig = JSON.parse(fs.readFileSync(path.join(modulesPath, pkgName, 'package.json')));
|
||||||
|
map[pkgName] = pkgConfig.version;
|
||||||
|
return map;
|
||||||
|
}, {});
|
||||||
|
|
||||||
|
// Add those packages to package.json
|
||||||
|
Object.assign(packageContents.dependencies, extraneous);
|
||||||
|
fs.writeFileSync(packageFilePath, JSON.stringify(packageContents, null, 2));
|
||||||
|
}
|
||||||
|
|
||||||
|
exports.preserveExtraneousPlugins = preserveExtraneousPlugins;
|
||||||
@ -0,0 +1,37 @@
|
|||||||
|
'use strict';
|
||||||
|
|
||||||
|
var meta = require('../../meta');
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
name: 'Generate customHTML block from old customJS setting',
|
||||||
|
timestamp: Date.UTC(2017, 9, 12),
|
||||||
|
method: function (callback) {
|
||||||
|
var newHTML = meta.config.customJS;
|
||||||
|
var newJS = [];
|
||||||
|
|
||||||
|
// Forgive me for parsing HTML with regex...
|
||||||
|
var scriptMatch = /^<script\s?(?!async|deferred)?>([\s\S]+?)<\/script>/m;
|
||||||
|
var match = scriptMatch.exec(newHTML);
|
||||||
|
|
||||||
|
while (match) {
|
||||||
|
if (match[1]) {
|
||||||
|
// Append to newJS array
|
||||||
|
newJS.push(match[1].trim());
|
||||||
|
|
||||||
|
// Remove the match from the existing value
|
||||||
|
newHTML = ((match.index > 0 ? newHTML.slice(0, match.index) : '') + newHTML.slice(match.index + match[0].length)).trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
match = scriptMatch.exec(newHTML);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Combine newJS array
|
||||||
|
newJS = newJS.join('\n\n');
|
||||||
|
|
||||||
|
// Write both values to config
|
||||||
|
meta.configs.setMultiple({
|
||||||
|
customHTML: newHTML,
|
||||||
|
customJS: newJS,
|
||||||
|
}, callback);
|
||||||
|
},
|
||||||
|
};
|
||||||
Loading…
Reference in New Issue