@@ -42,3 +42,3 @@ /* eslint-env node, browser */ | ||
* The version (from package.json) of the bundle which this NodeCG API instance is for. | ||
* @name NodeCG#bundleName | ||
* @name NodeCG#bundleVersion | ||
*/ | ||
@@ -45,0 +45,0 @@ this.bundleVersion = bundle.version; |
@@ -105,3 +105,3 @@ 'use strict'; | ||
if (err.code === 'ENOENT') { | ||
return res.sendStatus(404); | ||
return next(); | ||
} | ||
@@ -174,10 +174,2 @@ | ||
if (defaultWorkspaceHasPanels || !otherWorkspacesHavePanels) { | ||
workspaces.unshift({ | ||
name: 'default', | ||
label: otherWorkspacesHavePanels ? 'Main Workspace' : 'Workspace', | ||
route: '' | ||
}); | ||
} | ||
workspaceNames.forEach(name => { | ||
@@ -195,3 +187,11 @@ workspaces.push({ | ||
if (defaultWorkspaceHasPanels || !otherWorkspacesHavePanels) { | ||
workspaces.unshift({ | ||
name: 'default', | ||
label: otherWorkspacesHavePanels ? 'Main Workspace' : 'Workspace', | ||
route: '' | ||
}); | ||
} | ||
return workspaces; | ||
} |
@@ -71,3 +71,3 @@ 'use strict'; | ||
if (err.code === 'ENOENT') { | ||
return res.sendStatus(404); | ||
return next(); | ||
} | ||
@@ -74,0 +74,0 @@ |
@@ -23,3 +23,3 @@ 'use strict'; | ||
if (err.code === 'ENOENT') { | ||
return res.sendStatus(404); | ||
return next(); | ||
} | ||
@@ -26,0 +26,0 @@ |
@@ -29,2 +29,11 @@ // Packages | ||
dereferencedData = referenceFile.data; | ||
// If this file reference also has a local reference appended to it, | ||
// we need to resolve that local reference within the file we just dereferenced. | ||
// Example: schemaRefTargetWithDef.json#/definitions/exampleDef | ||
const hashIndex = obj.$ref.indexOf('#'); | ||
if (hashIndex >= 0) { | ||
const hashPath = obj.$ref.slice(hashIndex); | ||
dereferencedData = resolvePointerReference(dereferencedData, hashPath); | ||
} | ||
} else if (isPointerReference(obj)) { | ||
@@ -31,0 +40,0 @@ referenceFile = currentFile; |
@@ -135,3 +135,5 @@ 'use strict'; | ||
const opts = { | ||
rootDir: process.env.NODECG_ROOT, | ||
rootDir: global.isZeitPkg ? | ||
path.resolve(__dirname, '../../') : | ||
process.env.NODECG_ROOT, | ||
modulesUrl: `/bundles/${bundle.name}/node_modules` | ||
@@ -138,0 +140,0 @@ }; |
@@ -32,3 +32,3 @@ // Native | ||
if (err.code === 'ENOENT') { | ||
return res.sendStatus(404); | ||
return next(); | ||
} | ||
@@ -35,0 +35,0 @@ |
@@ -161,3 +161,4 @@ 'use strict'; | ||
// Inject the scripts required for singleInstance behavior, if requested. | ||
if (resourceType === 'graphic') { | ||
if (resourceType === 'graphic' && | ||
!(pathOrHtml.endsWith('busy.html') || pathOrHtml.endsWith('killed.html'))) { | ||
scripts.push('<script src="/instance/client_registration.js"></script>'); | ||
@@ -177,11 +178,10 @@ } | ||
// Inject the needed stylesheets, if any. | ||
// If there are <script> tags in the head, inject before them. | ||
// Otherwise, add at the end of the <head>. | ||
// Prepend our styles before the first one. | ||
// If there are no styles, put our styles at the end of <head>. | ||
if (styles.length > 0) { | ||
styles = styles.join('\n'); | ||
const headScripts = $('head').find('script'); | ||
if (headScripts.length > 0) { | ||
headScripts.first().before(styles); | ||
const headStyles = $('head').find('style, link[rel="stylesheet"]'); | ||
if (headStyles.length > 0) { | ||
headStyles.first().before(styles); | ||
} else { | ||
@@ -188,0 +188,0 @@ $('head').append(styles); |
@@ -5,4 +5,3 @@ { | ||
"main": "index.js", | ||
"bin": "index.js", | ||
"version": "1.3.0", | ||
"version": "1.3.1-master.55f4c36", | ||
"repository": { | ||
@@ -128,3 +127,4 @@ "type": "git", | ||
"bundles/**/*", | ||
"schemas/**/*" | ||
"schemas/**/*", | ||
"node_modules/babel-plugin-bare-import-rewrite/**" | ||
] | ||
@@ -141,3 +141,3 @@ }, | ||
"brfs": "^2.0.0", | ||
"browserify": "^14.5.0", | ||
"browserify": "^16.2.3", | ||
"del": "^3.0.0", | ||
@@ -161,7 +161,7 @@ "eslint": "^4.10.0", | ||
"merge-stream": "^1.0.1", | ||
"minami": "github:nodecg/minami#a674ded7782ed7c60e8d5c1638aace339cbdbb4c", | ||
"minami": "github:nodecg/minami#fbe470b796dd26f2b3d04584e5fc90451bea3ab8", | ||
"nyc": "^13.0.0", | ||
"p-retry": "^2.0.0", | ||
"polymer-build": "^3.0.4", | ||
"puppeteer": "^1.9.0", | ||
"puppeteer": "^1.12.1", | ||
"remark": "^8.0.0", | ||
@@ -168,0 +168,0 @@ "remark-toc": "^5.0.0", |
@@ -0,0 +0,0 @@ import {NodeCGStaticBrowser} from './lib/nodecg-static'; |
@@ -0,0 +0,0 @@ import {LoggerOptions} from './logger'; |
@@ -0,0 +0,0 @@ export class Logger { |
@@ -0,0 +0,0 @@ /// <reference lib="dom" /> |
@@ -0,0 +0,0 @@ import { |
@@ -0,0 +0,0 @@ /** |
@@ -0,0 +0,0 @@ import {EventEmitter} from 'events'; |
@@ -0,0 +0,0 @@ export {NodeCGServer as NodeCG} from './lib/nodecg-instance'; |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is too big to display
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
No v1
QualityPackage is not semver >=1. This means it is not stable and does not support ^ ranges.
Found 1 instance in 1 package
Major refactor
Supply chain riskPackage has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.
Found 1 instance in 1 package
33142
0.01%7
-12.5%1837944
-37.15%188
-42.33%2
100%