Skip to content
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion js/DEVELOP.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ We use [yarn](https://yarnpkg.com/) to install dependencies and run scrips.

These scripts accept argument lists of targets × modules:

* Available `targets` are `es5`, `es2015`, `esnext`, and `all` (default: `all`)
* Available `targets` are `es5`, `es2015`, `esnext`, `ts`, and `all` (default: `all`)
* Available `modules` are `cjs`, `esm`, `umd`, and `all` (default: `all`)

Examples:
Expand Down
4 changes: 2 additions & 2 deletions js/gulp/arrow-task.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ const arrowTSTask = ((cache) => memoizeTask(cache, async function copyTS(target,
await pipeline(gulp.src(`src/**/*`), gulp.dest(out));
await del(`${out}/**/*.js`);
}))({});


module.exports = arrowTask;
module.exports.arrowTask = arrowTask;
module.exports.arrowTSTask = arrowTSTask;
8 changes: 4 additions & 4 deletions js/gulp/typescript-task.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ const { memoizeTask } = require('./memoize-task');
const { Observable, ReplaySubject } = require('rxjs');

const typescriptTask = ((cache) => memoizeTask(cache, function typescript(target, format) {

if (shouldRunInChildProcess(target, format)) {
return spawnGulpCommandInChildProcess('compile', target, format);
}
Expand All @@ -55,10 +54,11 @@ function compileTypescript(out, tsconfigPath, tsconfigOverrides) {
tsProject.src(), sourcemaps.init(),
tsProject(ts.reporter.defaultReporter())
);
const writeDTypes = observableFromStreams(dts, gulp.dest(out));
const writeSources = observableFromStreams(tsProject.src(), gulp.dest(out));
const writeDTypes = observableFromStreams(dts, sourcemaps.write('./', { includeContent: false }), gulp.dest(out));
const mapFile = tsProject.options.module === 5 ? esmMapFile : cjsMapFile;
const writeJS = observableFromStreams(js, sourcemaps.write('./', { mapFile }), gulp.dest(out));
return Observable.forkJoin(writeDTypes, writeJS);
const writeJS = observableFromStreams(js, sourcemaps.write('./', { mapFile, includeContent: false }), gulp.dest(out));
return Observable.forkJoin(writeSources, writeDTypes, writeJS);
}

function cjsMapFile(mapFilePath) { return mapFilePath; }
Expand Down
10 changes: 5 additions & 5 deletions js/gulp/util.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,12 @@ function* combinations(_targets, _modules) {
const targets = known(knownTargets, _targets || [`all`]);
const modules = known(knownModules, _modules || [`all`]);

if (_targets.indexOf(`src`) > -1) {
if (_targets.includes(`src`)) {
yield [`src`, ``];
return;
}

if (_targets.indexOf(`all`) > -1 && _modules.indexOf(`all`) > -1) {
if (_targets.includes(`all`) && _modules.includes(`all`)) {
yield [`ts`, ``];
yield [`src`, ``];
yield [npmPkgName, ``];
Expand All @@ -139,11 +139,11 @@ function* combinations(_targets, _modules) {
}

function known(known, values) {
return ~values.indexOf(`all`) ? known
: ~values.indexOf(`src`) ? [`src`]
return values.includes(`all`) ? known
: values.includes(`src`) ? [`src`]
: Object.keys(
values.reduce((map, arg) => ((
(known.indexOf(arg) !== -1) &&
(known.includes(arg)) &&
(map[arg.toLowerCase()] = true)
|| true) && map
), {})
Expand Down
4 changes: 2 additions & 2 deletions js/gulpfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,8 @@ function gulpConcurrent(tasks) {

function getTasks(name) {
const tasks = [];
if (targets.indexOf(`ts`) !== -1) tasks.push(`${name}:ts`);
if (targets.indexOf(npmPkgName) !== -1) tasks.push(`${name}:${npmPkgName}`);
if (targets.includes(`ts`)) tasks.push(`${name}:ts`);
if (targets.includes(npmPkgName)) tasks.push(`${name}:${npmPkgName}`);
for (const [target, format] of combinations(targets, modules)) {
if (tasksToSkipPerTargetOrFormat[target] && tasksToSkipPerTargetOrFormat[target][name]) continue;
if (tasksToSkipPerTargetOrFormat[format] && tasksToSkipPerTargetOrFormat[format][name]) continue;
Expand Down
3 changes: 2 additions & 1 deletion js/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,8 @@ module.exports = {
"^.+\\.tsx?$": "ts-jest"
},
"transformIgnorePatterns": [
"/node_modules/(?!web-stream-tools).+\\.js$"
"/node_modules/(?!web-stream-tools).+\\.js$",
".*/cjs/.*\\.js$"
Comment thread
domoritz marked this conversation as resolved.
Outdated
],
"testRegex": "(.*(-|\\.)(test|spec)s?)\\.(ts|tsx|js)$",
"preset": "ts-jest",
Expand Down
1 change: 1 addition & 0 deletions js/tsconfig/tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

/* Control what is emitted */
"declaration": true,
"declarationMap": true,
"noEmitOnError": true,
"removeComments": false,
"noErrorTruncation": true,
Expand Down
3 changes: 2 additions & 1 deletion js/tsconfig/tsconfig.bin.cjs.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"compilerOptions": {
"target": "esnext",
"module": "commonjs",
"declaration": false
"declaration": false,
"declarationMap": false
}
}
1 change: 1 addition & 0 deletions js/tsconfig/tsconfig.es2015.cls.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"target": "esnext",
"module": "es2015",
"declaration": false,
"declarationMap": false,
"noEmitHelpers": true,
"importHelpers": false
}
Expand Down
1 change: 1 addition & 0 deletions js/tsconfig/tsconfig.es5.cls.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"target": "esnext",
"module": "es2015",
"declaration": false,
"declarationMap": false,
"noEmitHelpers": true,
"importHelpers": false
}
Expand Down
1 change: 1 addition & 0 deletions js/tsconfig/tsconfig.esnext.cls.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
"target": "esnext",
"module": "es2015",
"declaration": false,
"declarationMap": false,
"noEmitHelpers": true,
"importHelpers": false
}
Expand Down