Skip to content

Commit bdea1b2

Browse files
domoritzdomoritz
committed
ARROW-15821: [JS] Fix paths to sourcemaps in directories
Closes apache#12539 from domoritz/dom/docs-import Authored-by: Dominik Moritz <domoritz@gmail.com> Signed-off-by: Dominik Moritz <domoritz@gmail.com>
1 parent 3434bf7 commit bdea1b2

12 files changed

Lines changed: 95 additions & 92 deletions

‎js/gulp/arrow-task.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,18 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
import { targetDir, observableFromStreams } from "./util.js";
18+
import { targetDir, observableFromStreams } from './util.js';
1919

20-
import del from "del";
21-
import gulp from "gulp";
22-
import mkdirp from "mkdirp";
23-
import gulpRename from "gulp-rename";
24-
import gulpReplace from "gulp-replace";
25-
import { memoizeTask } from "./memoize-task.js";
26-
import { ReplaySubject, forkJoin as ObservableForkJoin } from "rxjs";
27-
import { share } from "rxjs/operators";
28-
import util from "util";
29-
import stream from "stream";
20+
import del from 'del';
21+
import gulp from 'gulp';
22+
import mkdirp from 'mkdirp';
23+
import gulpRename from 'gulp-rename';
24+
import gulpReplace from 'gulp-replace';
25+
import { memoizeTask } from './memoize-task.js';
26+
import { ReplaySubject, forkJoin as ObservableForkJoin } from 'rxjs';
27+
import { share } from 'rxjs/operators';
28+
import util from 'util';
29+
import stream from 'stream';
3030
const pipeline = util.promisify(stream.pipeline);
3131

3232
export const arrowTask = ((cache) => memoizeTask(cache, function copyMain(target) {

‎js/gulp/bundle-task.js‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,28 +15,28 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
import gulp from "gulp";
19-
import size from "gulp-vinyl-size";
20-
import gulpRename from "gulp-rename";
21-
import terser from "gulp-terser";
22-
import source from "vinyl-source-stream";
23-
import buffer from "vinyl-buffer";
24-
import { observableFromStreams } from "./util.js";
25-
import { forkJoin as ObservableForkJoin } from "rxjs";
26-
import { resolve, join } from "path";
27-
import { readdirSync } from "fs";
18+
import gulp from 'gulp';
19+
import size from 'gulp-vinyl-size';
20+
import gulpRename from 'gulp-rename';
21+
import terser from 'gulp-terser';
22+
import source from 'vinyl-source-stream';
23+
import buffer from 'vinyl-buffer';
24+
import { observableFromStreams } from './util.js';
25+
import { forkJoin as ObservableForkJoin } from 'rxjs';
26+
import { resolve, join } from 'path';
27+
import { readdirSync } from 'fs';
2828
import { execSync } from 'child_process';
2929

30-
import gulpEsbuild from "gulp-esbuild";
31-
import esbuildAlias from "esbuild-plugin-alias";
30+
import gulpEsbuild from 'gulp-esbuild';
31+
import esbuildAlias from 'esbuild-plugin-alias';
3232

33-
import rollupStream from "@rollup/stream";
34-
import { default as nodeResolve } from "@rollup/plugin-node-resolve";
35-
import rollupAlias from "@rollup/plugin-alias";
33+
import rollupStream from '@rollup/stream';
34+
import { default as nodeResolve } from '@rollup/plugin-node-resolve';
35+
import rollupAlias from '@rollup/plugin-alias';
3636

37-
import { BundleAnalyzerPlugin } from "webpack-bundle-analyzer";
38-
import webpack from "webpack-stream";
39-
import named from "vinyl-named";
37+
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
38+
import webpack from 'webpack-stream';
39+
import named from 'vinyl-named';
4040

4141
import { fileURLToPath } from 'url';
4242
import { dirname } from 'path';

‎js/gulp/clean-task.js‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
import del from "del";
19-
import { targetDir } from "./util.js";
20-
import memoizeTask from "./memoize-task.js";
21-
import { catchError } from "rxjs/operators";
22-
import { from as ObservableFrom, EMPTY as ObservableEmpty } from "rxjs";
18+
import del from 'del';
19+
import { targetDir } from './util.js';
20+
import memoizeTask from './memoize-task.js';
21+
import { catchError } from 'rxjs/operators';
22+
import { from as ObservableFrom, EMPTY as ObservableEmpty } from 'rxjs';
2323

2424
export const cleanTask = ((cache) => memoizeTask(cache, function clean(target, format) {
2525
const dir = targetDir(target, format);

‎js/gulp/closure-task.js‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717

1818
import { targetDir, mainExport, esmRequire, gCCLanguageNames, publicModulePaths, observableFromStreams, shouldRunInChildProcess, spawnGulpCommandInChildProcess } from "./util.js";
1919

20-
import fs from "fs";
21-
import gulp from "gulp";
22-
import path from "path";
23-
import mkdirp from "mkdirp";
24-
import sourcemaps from "gulp-sourcemaps";
25-
import { memoizeTask } from "./memoize-task.js";
26-
import { compileBinFiles } from "./typescript-task.js";
20+
import fs from 'fs';
21+
import gulp from 'gulp';
22+
import path from 'path';
23+
import mkdirp from 'mkdirp';
24+
import sourcemaps from 'gulp-sourcemaps';
25+
import { memoizeTask } from './memoize-task.js';
26+
import { compileBinFiles } from './typescript-task.js';
2727

2828
import closureCompiler from 'google-closure-compiler';
2929
const compiler = closureCompiler.gulp();

‎js/gulp/compile-task.js‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
import { Observable } from "rxjs";
19-
import { npmPkgName } from "./util.js";
20-
import { memoizeTask } from "./memoize-task.js";
18+
import { Observable } from 'rxjs';
19+
import { npmPkgName } from './util.js';
20+
import { memoizeTask } from './memoize-task.js';
2121

22-
import closureTask from "./closure-task.js";
23-
import typescriptTask from "./typescript-task.js";
24-
import { arrowTask, arrowTSTask } from "./arrow-task.js";
22+
import closureTask from './closure-task.js';
23+
import typescriptTask from './typescript-task.js';
24+
import { arrowTask, arrowTSTask } from './arrow-task.js';
2525

2626
const compileTask = ((cache) => memoizeTask(cache, function compile(target, format, ...args) {
2727
return target === `src` ? Observable.empty()

‎js/gulp/esm-require.cjs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
const esm = require("esm");
18+
const esm = require('esm');
1919

2020
const esmRequire = esm(module, {
2121
mode: `auto`,

‎js/gulp/memoize-task.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
import { taskName } from "./util.js";
18+
import { taskName } from './util.js';
1919

2020
export const createTask = ((taskFn) => ((target, format, ...args) => {
2121
// Give the memoized fn a displayName so gulp's output is easier to follow.

‎js/gulp/package-task.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
import { metadataFiles, packageJSONFields, mainExport, npmPkgName, npmOrgName, targetDir, packageName, observableFromStreams } from "./util.js";
18+
import { metadataFiles, packageJSONFields, mainExport, npmPkgName, npmOrgName, targetDir, packageName, observableFromStreams } from './util.js';
1919

20-
import gulp from "gulp";
21-
import { memoizeTask } from "./memoize-task.js";
22-
import { ReplaySubject, EMPTY as ObservableEmpty, forkJoin as ObservableForkJoin } from "rxjs";
23-
import { share } from "rxjs/operators";
24-
import gulpJsonTransform from "gulp-json-transform";
20+
import gulp from 'gulp';
21+
import { memoizeTask } from './memoize-task.js';
22+
import { ReplaySubject, EMPTY as ObservableEmpty, forkJoin as ObservableForkJoin } from 'rxjs';
23+
import { share } from 'rxjs/operators';
24+
import gulpJsonTransform from 'gulp-json-transform';
2525

2626
export const packageTask = ((cache) => memoizeTask(cache, function bundle(target, format) {
2727
if (target === `src`) return ObservableEmpty();
@@ -50,15 +50,15 @@ const createMainPackageJson = (target, format) => (orig) => ({
5050
[`./${mainExport}.node.mjs`]: `./${mainExport}.dom.mjs`
5151
},
5252
exports: {
53-
".": {
53+
'.': {
5454
node: {
5555
import: `./${mainExport}.node.mjs`,
5656
require: `./${mainExport}.node.js`,
5757
},
5858
import: `./${mainExport}.dom.mjs`,
5959
require: `./${mainExport}.dom.js`,
6060
},
61-
"./*": {
61+
'./*': {
6262
import: `./*.mjs`,
6363
require: `./*.js`
6464
}
@@ -77,7 +77,7 @@ const createTypeScriptPackageJson = (target, format) => (orig) => ({
7777
module: `${mainExport}.node.ts`,
7878
types: `${mainExport}.node.ts`,
7979
browser: `${mainExport}.dom.ts`,
80-
type: "module",
80+
type: 'module',
8181
sideEffects: false,
8282
esm: { mode: `auto`, sourceMap: true },
8383
dependencies: {

‎js/gulp/test-task.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,23 +15,23 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
import del from "del";
19-
import path from "path";
20-
import mkdirp from "mkdirp";
21-
import { argv } from "./argv.js";
22-
import { promisify } from "util";
23-
import globSync from "glob";
18+
import del from 'del';
19+
import path from 'path';
20+
import mkdirp from 'mkdirp';
21+
import { argv } from './argv.js';
22+
import { promisify } from 'util';
23+
import globSync from 'glob';
2424
const glob = promisify(globSync);
25-
import child_process from "child_process";
26-
import { memoizeTask } from "./memoize-task.js";
27-
import fs from "fs";
25+
import child_process from 'child_process';
26+
import { memoizeTask } from './memoize-task.js';
27+
import fs from 'fs';
2828
const readFile = promisify(fs.readFile);
29-
import asyncDoneSync from "async-done";
29+
import asyncDoneSync from 'async-done';
3030
const asyncDone = promisify(asyncDoneSync);
3131
const exec = promisify(child_process.exec);
32-
import xml2js from "xml2js";
32+
import xml2js from 'xml2js';
3333
const parseXML = promisify(xml2js.parseString);
34-
import { targetAndModuleCombinations, npmPkgName } from "./util.js";
34+
import { targetAndModuleCombinations, npmPkgName } from './util.js';
3535
import { createRequire } from 'module';
3636

3737
const require = createRequire(import.meta.url);

‎js/gulp/typescript-task.js‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,16 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18-
import { targetDir, tsconfigName, observableFromStreams, shouldRunInChildProcess, spawnGulpCommandInChildProcess } from "./util.js";
18+
import { targetDir, tsconfigName, observableFromStreams, shouldRunInChildProcess, spawnGulpCommandInChildProcess } from './util.js';
1919

20-
import gulp from "gulp";
21-
import path from "path";
22-
import ts from "gulp-typescript";
23-
import tsc from "typescript";
24-
import sourcemaps from "gulp-sourcemaps";
25-
import { memoizeTask } from "./memoize-task.js";
26-
import { ReplaySubject, forkJoin as ObservableForkJoin } from "rxjs";
27-
import { mergeWith, takeLast, share } from "rxjs/operators";
20+
import gulp from 'gulp';
21+
import path from 'path';
22+
import ts from 'gulp-typescript';
23+
import tsc from 'typescript';
24+
import sourcemaps from 'gulp-sourcemaps';
25+
import { memoizeTask } from './memoize-task.js';
26+
import { ReplaySubject, forkJoin as ObservableForkJoin } from 'rxjs';
27+
import { mergeWith, takeLast, share } from 'rxjs/operators';
2828

2929
export const typescriptTask = ((cache) => memoizeTask(cache, function typescript(target, format) {
3030
if (shouldRunInChildProcess(target, format)) {
@@ -54,9 +54,9 @@ function compileTypescript(out, tsconfigPath, tsconfigOverrides) {
5454
tsProject(ts.reporter.defaultReporter())
5555
);
5656
const writeSources = observableFromStreams(tsProject.src(), gulp.dest(path.join(out, 'src')));
57-
const writeDTypes = observableFromStreams(dts, sourcemaps.write('./', { includeContent: false, sourceRoot: 'src' }), gulp.dest(out));
57+
const writeDTypes = observableFromStreams(dts, sourcemaps.write('./', { includeContent: false, sourceRoot: './src' }), gulp.dest(out));
5858
const mapFile = tsProject.options.module === tsc.ModuleKind.ES2015 ? esmMapFile : cjsMapFile;
59-
const writeJS = observableFromStreams(js, sourcemaps.write('./', { mapFile, includeContent: false, sourceRoot: 'src' }), gulp.dest(out));
59+
const writeJS = observableFromStreams(js, sourcemaps.write('./', { mapFile, includeContent: false, sourceRoot: './src' }), gulp.dest(out));
6060
return ObservableForkJoin([writeSources, writeDTypes, writeJS]);
6161
}
6262

0 commit comments

Comments
 (0)