Skip to content

Commit 6ff18e9

Browse files
committed
ship es2015 commonJS in main package to avoid confusion
1 parent 74e828a commit 6ff18e9

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

js/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ The base `apache-arrow` package includes all the compilation targets for conveni
178178
The targets are also published under the `@apache-arrow` namespace:
179179

180180
```sh
181-
npm install apache-arrow # <-- combined es5/CommonJS + UMD, es2015/ESModules + UMD, and TypeScript package
181+
npm install apache-arrow # <-- combined es5/UMD, es2015/CommonJS/ESModules/UMD, and TypeScript package
182182
npm install @apache-arrow/ts # standalone TypeScript package
183183
npm install @apache-arrow/es5-cjs # standalone es5/CommonJS package
184184
npm install @apache-arrow/es5-esm # standalone es5/ESModules package

js/gulp/arrow-task.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ const { Observable, ReplaySubject } = require('rxjs');
2828

2929
const arrowTask = ((cache) => memoizeTask(cache, function copyMain(target, format) {
3030
const out = targetDir(target);
31-
const srcGlob = `src/**/*.ts`;
32-
const es5Glob = `${targetDir(`es5`, `cjs`)}/**/*.js`;
31+
const dtsGlob = `${targetDir(`es2015`, `cjs`)}/**/*.ts`;
32+
const cjsGlob = `${targetDir(`es2015`, `cjs`)}/**/*.js`;
3333
const esmGlob = `${targetDir(`es2015`, `esm`)}/**/*.js`;
3434
const es5UmdGlob = `${targetDir(`es5`, `umd`)}/**/*.js`;
3535
const es5UmdMaps = `${targetDir(`es5`, `umd`)}/**/*.map`;
@@ -38,8 +38,8 @@ const arrowTask = ((cache) => memoizeTask(cache, function copyMain(target, forma
3838
const ch_ext = (ext) => gulpRename((p) => { p.extname = ext; });
3939
const append = (ap) => gulpRename((p) => { p.basename += ap; });
4040
return Observable.forkJoin(
41-
observableFromStreams(gulp.src(srcGlob), gulp.dest(out)), // copy src ts files
42-
observableFromStreams(gulp.src(es5Glob), gulp.dest(out)), // copy es5 cjs files
41+
observableFromStreams(gulp.src(dtsGlob), gulp.dest(out)), // copy d.ts files
42+
observableFromStreams(gulp.src(cjsGlob), gulp.dest(out)), // copy es2015 cjs files
4343
observableFromStreams(gulp.src(esmGlob), ch_ext(`.mjs`), gulp.dest(out)), // copy es2015 esm files and rename to `.mjs`
4444
observableFromStreams(gulp.src(es5UmdGlob), append(`.es5.min`), gulp.dest(out)), // copy es5 umd files and add `.min`
4545
observableFromStreams(gulp.src(es5UmdMaps), gulp.dest(out)), // copy es5 umd sourcemap files, but don't rename

js/gulp/package-task.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ const createMainPackageJson = (target, format) => (orig) => ({
4646
name: npmPkgName,
4747
main: mainExport,
4848
module: `${mainExport}.mjs`,
49-
browser: `${mainExport}.es5.min.js`,
50-
[`browser:es2015`]: `${mainExport}.es2015.min.js`,
49+
dist: `${mainExport}.es5.min.js`,
50+
[`dist:es2015`]: `${mainExport}.es2015.min.js`,
5151
[`@std/esm`]: { esm: `mjs` }
5252
});
5353

@@ -67,7 +67,7 @@ const createScopedPackageJSON = (target, format) => (({ name, ...orig }) =>
6767
(xs, key) => ({ ...xs, [key]: xs[key] || orig[key] }),
6868
{ name: `${npmOrgName}/${packageName(target, format)}`,
6969
version: undefined, main: `${mainExport}.js`, types: `${mainExport}.d.ts`,
70-
browser: undefined, [`browser:es2015`]: undefined, module: undefined, [`@std/esm`]: undefined }
70+
dist: undefined, [`dist:es2015`]: undefined, module: undefined, [`@std/esm`]: undefined }
7171
)
7272
)
7373
);

js/gulp/test-task.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ argv.update && jestArgv.push(`-u`);
3434
argv.verbose && jestArgv.push(`--verbose`);
3535
argv.coverage && jestArgv.push(`--coverage`);
3636

37-
const debugArgv = [`--runInBand`, `--env`, `jest-environment-node-debug`];
37+
const debugArgv = [`--runInBand`, `--env`, `node-debug`];
3838
const jest = require.resolve(path.join(`..`, `node_modules`, `.bin`, `jest`));
3939
const testOptions = {
4040
env: { ...process.env },

0 commit comments

Comments
 (0)