frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Merge pull request #4020 from node-red/rename-package-var

Browse Source 
Rename package var to avoid strict mode error
This commit is contained in:
Nick O'Leary 2023-01-23 20:44:29 +00:00 committed by GitHub
commit ae92ea9476
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
packages/node_modules/@node-red/registry/lib/localfilesystem.js vendored
View File

@ -106,8 +106,8 @@ function getLocalNodeFiles(dir, skipValidNodeRedModules) {
// when loading local files, if the path is a valid node-red module // when loading local files, if the path is a valid node-red module
// dont include it (will be picked up in scanTreeForNodesModules) // dont include it (will be picked up in scanTreeForNodesModules)
if(skipValidNodeRedModules && files.indexOf("package.json") >= 0) { if(skipValidNodeRedModules && files.indexOf("package.json") >= 0) {
const package = getPackageDetails(dir) const packageDetails = getPackageDetails(dir)
if(package.isNodeRedModule) { if(packageDetails.isNodeRedModule) {
return {files: [], icons: []}; return {files: [], icons: []};
} }
} }
@ -135,17 +135,17 @@ function getLocalNodeFiles(dir, skipValidNodeRedModules) {
return {files: result, icons: icons} return {files: result, icons: icons}
} }
function scanDirForNodesModules(dir,moduleName,package) { function scanDirForNodesModules(dir,moduleName,packageDetails) {
let results = []; let results = [];
let scopeName; let scopeName;
let files let files
try { try {
let isNodeRedModule = false let isNodeRedModule = false
if(package) { if(packageDetails) {
dir = path.join(package.moduleDir,'..') dir = path.join(packageDetails.moduleDir,'..')
files = [path.basename(package.moduleDir)] files = [path.basename(packageDetails.moduleDir)]
moduleName = (package.package ? package.package.name : null) || moduleName moduleName = (packageDetails.package ? packageDetails.package.name : null) || moduleName
isNodeRedModule = package.isNodeRedModule isNodeRedModule = packageDetails.isNodeRedModule
} else { } else {
files = fs.readdirSync(dir); files = fs.readdirSync(dir);
if (moduleName) { if (moduleName) {
@ -159,8 +159,8 @@ function scanDirForNodesModules(dir,moduleName,package) {
// if we have found a package.json, this IS a node_module, lets see if it is a node-red node // if we have found a package.json, this IS a node_module, lets see if it is a node-red node
if (!isNodeRedModule && files.indexOf('package.json') > -1) { if (!isNodeRedModule && files.indexOf('package.json') > -1) {
package = getPackageDetails(dir) // get package details packageDetails = getPackageDetails(dir) // get package details
if(package && package.isNodeRedModule) { if(packageDetails && packageDetails.isNodeRedModule) {
isNodeRedModule = true isNodeRedModule = true
files = ['package.json'] // shortcut the file scan files = ['package.json'] // shortcut the file scan
} }
@ -179,8 +179,8 @@ function scanDirForNodesModules(dir,moduleName,package) {
} else { } else {
if ((isNodeRedModule || (!moduleName || fn == moduleName)) && (isIncluded(fn) && !isExcluded(fn))) { if ((isNodeRedModule || (!moduleName || fn == moduleName)) && (isIncluded(fn) && !isExcluded(fn))) {
try { try {
const moduleDir = isNodeRedModule ? package.moduleDir : path.join(dir,fn); const moduleDir = isNodeRedModule ? packageDetails.moduleDir : path.join(dir,fn);
const pkg = package || getPackageDetails(moduleDir) const pkg = packageDetails || getPackageDetails(moduleDir)
if(pkg.error) { if(pkg.error) {
throw pkg.error throw pkg.error
} }

8
packages/node_modules/@node-red/runtime/lib/storage/localfilesystem/projects/defaultFileSet.js vendored
View File

@ -18,7 +18,7 @@ var i18n = require("@node-red/util").i18n;
module.exports = { module.exports = {
"package.json": function(project) { "package.json": function(project) {
var package = { var packageDetails = {
"name": project.name, "name": project.name,
"description": project.summary||i18n._("storage.localfilesystem.projects.summary"), "description": project.summary||i18n._("storage.localfilesystem.projects.summary"),
"version": "0.0.1", "version": "0.0.1",
@ -30,11 +30,11 @@ module.exports = {
}; };
if (project.files) { if (project.files) {
if (project.files.flow) { if (project.files.flow) {
package['node-red'].settings.flowFile = project.files.flow; packageDetails['node-red'].settings.flowFile = project.files.flow;
package['node-red'].settings.credentialsFile = project.files.credentials; packageDetails['node-red'].settings.credentialsFile = project.files.credentials;
} }
} }
return JSON.stringify(package,"",4); return JSON.stringify(packageDetails,"",4);
}, },
"README.md": function(project) { "README.md": function(project) {
var content = project.name+"\n"+("=".repeat(project.name.length))+"\n\n"; var content = project.name+"\n"+("=".repeat(project.name.length))+"\n\n";