js and css files in html head are treated like resources (not touched…

… just copied to output dir).
bobril · Aug 29, 2019 · cbf20c4 · cbf20c4
1 parent f4b98d0
commit cbf20c4
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## [unreleased]
 
+### Fixed
+
+- js and css files in html head are treated like resources (not touched just copied to output dir).
+
 ## 0.91.3
 
 ### Fixed

diff --git a/Lib/TSCompiler/BuildModuleCtx.cs b/Lib/TSCompiler/BuildModuleCtx.cs
@@ -458,7 +458,7 @@ public string ExpandHtmlHead(string htmlHead)
                 (Match m) =>
                 {
                     var info = AutodetectAndAddDependency(
-                        PathUtils.Join(Owner.Owner.FullPath, m.Value.Substring(2, m.Length - 4)));
+                        PathUtils.Join(Owner.Owner.FullPath, m.Value.Substring(2, m.Length - 4)), true);
                     if (info == null)
                     {
                         Owner.Logger.Error("HtmlHead in package.json missing dependency " + m.Value.Substring(2, m.Length - 4));

diff --git a/TestProjects/Sandbox/piskoviste/package.json b/TestProjects/Sandbox/piskoviste/package.json
@@ -8,7 +8,10 @@
     },
     "author": "",
     "license": "ISC",
+    "bobril": {
+        "head": "<script src=\"<<../temp/jshead.js>>\"></script>"
+    },
     "dependencies": {
         "bobril": "*"
     }
-}
+}
diff --git a/TestProjects/Sandbox/piskoviste/tsconfig.json b/TestProjects/Sandbox/piskoviste/tsconfig.json
@@ -2,7 +2,7 @@
   "compilerOptions": {
     "allowJs": false,
     "checkJs": false,
-    "declaration": true,
+    "declaration": false,
     "experimentalDecorators": true,
     "jsx": "react",
     "lib": [
@@ -18,15 +18,12 @@
     "preserveConstEnums": false,
     "reactNamespace": "b",
     "removeComments": false,
-    "skipLibCheck": true,
+    "skipLibCheck": false,
     "skipDefaultLibCheck": true,
     "sourceMap": true,
     "target": "es5",
     "resolveJsonModule": true
   },
-  "files": [
-    "node_modules/bobril/jsx.d.ts"
-  ],
   "include": [
     "**/*"
   ]

diff --git a/TestProjects/Sandbox/temp/jshead.js b/TestProjects/Sandbox/temp/jshead.js
@@ -0,0 +1 @@
+console.log("From Asset");