summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package.json2
-rw-r--r--rollup.config.js23
-rw-r--r--tests/error_004_missing_module.ts.out4
-rw-r--r--tests/error_005_missing_dynamic_import.ts.out4
-rw-r--r--tests/error_006_import_ext_failure.ts.out4
m---------third_party0
6 files changed, 22 insertions, 15 deletions
diff --git a/package.json b/package.json
index 56b32ceca..6f2fafb3a 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
"flatbuffers": "^1.9.0",
"magic-string": "^0.22.5",
"prettier": "^1.14.0",
- "rollup": "^0.63.2",
+ "rollup": "0.67.0",
"rollup-plugin-alias": "^1.4.0",
"rollup-plugin-analyzer": "^2.1.0",
"rollup-plugin-commonjs": "^9.1.3",
diff --git a/rollup.config.js b/rollup.config.js
index a648c6470..1996d2b3e 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -1,5 +1,5 @@
// Copyright 2018 the Deno authors. All rights reserved. MIT license.
-import assert from "assert";
+// @ts-check
import * as fs from "fs";
import path from "path";
import alias from "rollup-plugin-alias";
@@ -30,10 +30,14 @@ const tsconfigOverride = {
}
};
-// this is a rollup plugin which will look for imports ending with `!string` and resolve
-// them with a module that will inline the contents of the file as a string. Needed to
-// support `js/assets.ts`.
-function strings({ include, exclude } = {}) {
+/** this is a rollup plugin which will look for imports ending with `!string` and resolve
+ * them with a module that will inline the contents of the file as a string. Needed to
+ * support `js/assets.ts`.
+ * @param {any} param0
+ */
+function strings(
+ { include, exclude } = { include: undefined, exclude: undefined }
+) {
if (!include) {
throw new Error("include option must be passed");
}
@@ -85,7 +89,9 @@ const osNodeToDeno = {
linux: "linux"
};
-// Inject deno.platform.arch and deno.platform.os
+/** Inject deno.platform.arch and deno.platform.os
+ * @param {any} param0
+ */
function platform({ include, exclude } = {}) {
if (!include) {
throw new Error("include option must be passed");
@@ -132,7 +138,7 @@ function resolveGenerated() {
}
function generateDepFile({ outputFile, sourceFiles = [], configFiles = [] }) {
- let timestamp = Date.now();
+ let timestamp = new Date();
// Save the depfile just before the node process exits.
process.once("beforeExit", () =>
@@ -209,7 +215,8 @@ export default function makeConfig(commandOptions) {
output: {
format: "iife",
name: "denoMain",
- sourcemap: true
+ sourcemap: true,
+ sourcemapExcludeSources: true
},
plugins: [
diff --git a/tests/error_004_missing_module.ts.out b/tests/error_004_missing_module.ts.out
index 64932ddd0..22207250d 100644
--- a/tests/error_004_missing_module.ts.out
+++ b/tests/error_004_missing_module.ts.out
@@ -7,5 +7,5 @@ NotFound: Cannot resolve module "bad-module.ts" from "[WILDCARD]/tests/error_004
at moduleNames.map.name ([WILDCARD]/js/compiler.ts:[WILDCARD])
at Array.map (<anonymous>)
at DenoCompiler.resolveModuleNames ([WILDCARD]/js/compiler.ts:[WILDCARD])
- at Object.compilerHost.resolveModuleNames ([WILDCARD]/third_party/node_modules/typescript/lib/typescript.js:[WILDCARD])
- at resolveModuleNamesWorker ([WILDCARD]/third_party/node_modules/typescript/lib/typescript.js:[WILDCARD])
+ at Object.compilerHost.resolveModuleNames (<anonymous>)
+ at resolveModuleNamesWorker (<anonymous>)
diff --git a/tests/error_005_missing_dynamic_import.ts.out b/tests/error_005_missing_dynamic_import.ts.out
index eb991de9d..a0f17cf81 100644
--- a/tests/error_005_missing_dynamic_import.ts.out
+++ b/tests/error_005_missing_dynamic_import.ts.out
@@ -7,5 +7,5 @@ NotFound: Cannot resolve module "bad-module.ts" from "[WILDCARD]/tests/error_005
at moduleNames.map.name ([WILDCARD]/js/compiler.ts:[WILDCARD])
at Array.map (<anonymous>)
at DenoCompiler.resolveModuleNames ([WILDCARD]/js/compiler.ts:[WILDCARD])
- at Object.compilerHost.resolveModuleNames ([WILDCARD]/third_party/node_modules/typescript/lib/typescript.js:[WILDCARD])
- at resolveModuleNamesWorker ([WILDCARD]/third_party/node_modules/typescript/lib/typescript.js:[WILDCARD])
+ at Object.compilerHost.resolveModuleNames (<anonymous>)
+ at resolveModuleNamesWorker (<anonymous>)
diff --git a/tests/error_006_import_ext_failure.ts.out b/tests/error_006_import_ext_failure.ts.out
index f2b6aa599..f5f76af0f 100644
--- a/tests/error_006_import_ext_failure.ts.out
+++ b/tests/error_006_import_ext_failure.ts.out
@@ -7,5 +7,5 @@ NotFound: Cannot resolve module "./non-existent" from "[WILDCARD]/tests/error_00
at moduleNames.map.name ([WILDCARD]/js/compiler.ts:[WILDCARD])
at Array.map (<anonymous>)
at DenoCompiler.resolveModuleNames ([WILDCARD]/js/compiler.ts:[WILDCARD])
- at Object.compilerHost.resolveModuleNames ([WILDCARD]/third_party/node_modules/typescript/lib/typescript.js:[WILDCARD])
- at resolveModuleNamesWorker ([WILDCARD]/third_party/node_modules/typescript/lib/typescript.js:[WILDCARD])
+ at Object.compilerHost.resolveModuleNames (<anonymous>)
+ at resolveModuleNamesWorker (<anonymous>)
diff --git a/third_party b/third_party
-Subproject d1447e6375ebddf590f1cd87219dadeca51cfec
+Subproject d2dc0456c23c771781d77c40f8e2c21ba9f5abe