works with libs compiled into it

This commit is contained in:
Henry Oswald 2017-12-13 14:19:19 +00:00
parent 88334959d7
commit 357617d952
2 changed files with 4 additions and 5 deletions

View file

@ -205,11 +205,10 @@ module.exports = (grunt) ->
modules: [
{
name: "main",
exclude: ["libs"]
}, {
name: "ide",
exclude: ["libs", "pdfjs-dist/build/pdf"]
}, {
exclude: ["pdfjs-dist/build/pdf"]
},{
name: "libs"
},{
name: "ace/mode-latex"

View file

@ -132,7 +132,7 @@ block requirejs
"pdfjs-dist/build/pdf.worker": "#{pdfWorkerPath}",
"ace": "#{lib('ace')}",
"fineuploader": "libs/#{lib('fineuploader')}",
"ide": "#{buildJsPath('ide.js', {hashedPath:true, fingerprint:false}).slice(0,-3)}",
"ide": "#{buildJsPath('ide.js', {hashedPath:true, fingerprint:false, removeExtension:true})}"
},
"urlArgs" : "fingerprint=#{fingerprint(jsPath + 'ide.js')}-#{fingerprint(jsPath + 'libs.js')}",
@ -163,7 +163,7 @@ block requirejs
window.uiConfig = JSON.parse('!{JSON.stringify(uiConfig).replace(/\//g, "\\/")}');
script(
data-main=buildJsPath("ide.js", {hashedPath:false}),
data-main=buildJsPath("ide.js", {hashedPath:false, fingerprint:false}),
baseurl=fullJsPath,
data-ace-base=buildJsPath(lib('ace'), {fingerprint:false}),
src=buildJsPath('libs/require.js', {hashedPath:true})