Skip to content

Commit fa7c17a

Browse files
committed
passing all tests except es5 umd mangler ones
1 parent d18d915 commit fa7c17a

34 files changed

+3025
-732
lines changed

js/gulp/package-task.js

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,11 @@ const createMainPackageJson = (target, format) => (orig) => ({
4545
...createTypeScriptPackageJson(target, format)(orig),
4646
name: npmPkgName,
4747
main: mainExport,
48+
types: `${mainExport}.d.ts`,
4849
module: `${mainExport}.mjs`,
4950
dist: `${mainExport}.es5.min.js`,
5051
[`dist:es2015`]: `${mainExport}.es2015.min.js`,
51-
[`@std/esm`]: { esm: `mjs` }
52+
[`@std/esm`]: { esm: `mjs`, warnings: false, sourceMap: true }
5253
});
5354

5455
const createTypeScriptPackageJson = (target, format) => (orig) => ({
@@ -63,18 +64,20 @@ const createTypeScriptPackageJson = (target, format) => (orig) => ({
6364

6465
const createScopedPackageJSON = (target, format) => (({ name, ...orig }) =>
6566
conditionallyAddStandardESMEntry(target, format)(
66-
packageJSONFields.reduce(
67-
(xs, key) => ({ ...xs, [key]: xs[key] || orig[key] }),
68-
{ name: `${npmOrgName}/${packageName(target, format)}`,
69-
version: undefined, main: `${mainExport}.js`, types: `${mainExport}.d.ts`,
70-
dist: undefined, [`dist:es2015`]: undefined, module: undefined, [`@std/esm`]: undefined }
71-
)
67+
packageJSONFields.reduce(
68+
(xs, key) => ({ ...xs, [key]: xs[key] || orig[key] }),
69+
{
70+
name: `${npmOrgName}/${packageName(target, format)}`,
71+
version: undefined, main: `${mainExport}.js`, types: `${mainExport}.d.ts`,
72+
dist: undefined, [`dist:es2015`]: undefined, module: undefined, [`@std/esm`]: undefined
73+
}
74+
)
7275
)
7376
);
7477

7578
const conditionallyAddStandardESMEntry = (target, format) => (packageJSON) => (
76-
format !== `esm`
77-
? packageJSON
78-
: { ...packageJSON, [`@std/esm`]: { esm: `js` } }
79+
format !== `esm` && format !== `cls`
80+
? packageJSON
81+
: { ...packageJSON, [`@std/esm`]: { esm: `js`, warnings: false, sourceMap: true } }
7982
);
8083

js/gulp/typescript-task.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ const typescriptTask = ((cache) => memoizeTask(cache, function typescript(target
3434
const tsProject = ts.createProject(path.join(`tsconfig`, tsconfigFile), { typescript: require(`typescript`) });
3535
const { stream: { js, dts } } = observableFromStreams(
3636
tsProject.src(), sourcemaps.init(),
37-
tsProject(ts.reporter.fullReporter(true))
37+
tsProject(ts.reporter.defaultReporter())
3838
);
3939
const writeDTypes = observableFromStreams(dts, gulp.dest(out));
4040
const writeJS = observableFromStreams(js, sourcemaps.write(), gulp.dest(out));
@@ -52,12 +52,12 @@ function maybeCopyRawJSArrowFormatFiles(target, format) {
5252
return Observable.empty();
5353
}
5454
return Observable.defer(async () => {
55-
const outFormatDir = path.join(targetDir(target, format), `format`, `fb`);
55+
const outFormatDir = path.join(targetDir(target, format), `fb`);
5656
await del(path.join(outFormatDir, '*.js'));
5757
await observableFromStreams(
58-
gulp.src(path.join(`src`, `format`, `fb`, `*_generated.js`)),
58+
gulp.src(path.join(`src`, `fb`, `*_generated.js`)),
5959
gulpRename((p) => { p.basename = p.basename.replace(`_generated`, ``); }),
6060
gulp.dest(outFormatDir)
6161
).toPromise();
6262
});
63-
}
63+
}

js/gulp/uglify-task.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const webpack = require(`webpack`);
2929
const { memoizeTask } = require('./memoize-task');
3030
const { Observable, ReplaySubject } = require('rxjs');
3131
const UglifyJSPlugin = require(`uglifyjs-webpack-plugin`);
32-
const esmRequire = require(`@std/esm`)(module, { cjs: true, esm: `js` });
32+
const esmRequire = require(`@std/esm`)(module, { cjs: true, esm: `js`, warnings: false });
3333

3434
const uglifyTask = ((cache, commonConfig) => memoizeTask(cache, function uglifyJS(target, format) {
3535

js/gulp/util.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,13 @@ function targetDir(target, format) {
108108

109109
function logAndDie(e) {
110110
if (e) {
111-
console.error(e);
112111
process.exit(1);
113112
}
114113
}
115114

116115
function observableFromStreams(...streams) {
117-
const pumped = streams.length <= 1 ? streams[0]
118-
: pump(...streams, logAndDie);
116+
if (streams.length <= 0) { return Observable.empty(); }
117+
const pumped = streams.length <= 1 ? streams[0] : pump(...streams, logAndDie);
119118
const fromEvent = Observable.fromEvent.bind(null, pumped);
120119
const streamObs = fromEvent(`data`)
121120
.merge(fromEvent(`error`).flatMap((e) => Observable.throw(e)))

js/package.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,16 @@
5151
],
5252
"dependencies": {
5353
"@types/text-encoding-utf-8": "1.0.1",
54-
"command-line-args": "4.0.7",
55-
"command-line-usage": "4.0.2",
54+
"command-line-args": "5.0.0",
55+
"command-line-usage": "4.1.0",
5656
"flatbuffers": "trxcllnt/flatbuffers-esm",
5757
"json-bignum": "0.0.3",
5858
"text-encoding-utf-8": "^1.0.2",
59+
"ts-node": "4.1.0",
5960
"tslib": "1.8.1"
6061
},
6162
"devDependencies": {
62-
"@std/esm": "0.19.1",
63+
"@std/esm": "0.19.6",
6364
"@types/flatbuffers": "1.6.5",
6465
"@types/glob": "5.0.34",
6566
"@types/jest": "22.0.1",
@@ -79,10 +80,10 @@
7980
"gulp-transform-js-ast": "1.0.2",
8081
"gulp-typescript": "3.2.3",
8182
"ix": "2.3.4",
82-
"jest": "22.0.5",
83+
"jest": "22.1.2",
8384
"jest-environment-node-debug": "2.0.0",
8485
"json": "9.0.6",
85-
"lerna": "2.6.0",
86+
"lerna": "2.7.1",
8687
"lint-staged": "6.0.0",
8788
"merge2": "1.2.1",
8889
"mkdirp": "0.5.1",
@@ -100,6 +101,9 @@
100101
"webpack": "3.10.0",
101102
"xml2js": "0.4.19"
102103
},
104+
"@std/esm": {
105+
"warnings": false
106+
},
103107
"lint-staged": {
104108
"*.@(ts)": [
105109
"tslint --fix",
@@ -135,7 +139,8 @@
135139
".(js|jsx)": "./node_modules/babel-jest/build/index.js"
136140
},
137141
"transformIgnorePatterns": [
138-
"/node_modules/", "/(es2015|esnext)\/umd/"
142+
"/node_modules/",
143+
"/(es2015|esnext)/umd/"
139144
],
140145
"testRegex": "(.*(-|\\.)(test|spec)s?)\\.(ts|tsx|js)$"
141146
}

0 commit comments

Comments
 (0)