Skip to content

Commit

Permalink
passing all tests except es5 umd mangler ones
Browse files Browse the repository at this point in the history
  • Loading branch information
trxcllnt committed Jan 18, 2018
1 parent d18d915 commit fa7c17a
Show file tree
Hide file tree
Showing 34 changed files with 3,025 additions and 732 deletions.
23 changes: 13 additions & 10 deletions js/gulp/package-task.js
Expand Up @@ -45,10 +45,11 @@ const createMainPackageJson = (target, format) => (orig) => ({
...createTypeScriptPackageJson(target, format)(orig),
name: npmPkgName,
main: mainExport,
types: `${mainExport}.d.ts`,
module: `${mainExport}.mjs`,
dist: `${mainExport}.es5.min.js`,
[`dist:es2015`]: `${mainExport}.es2015.min.js`,
[`@std/esm`]: { esm: `mjs` }
[`@std/esm`]: { esm: `mjs`, warnings: false, sourceMap: true }
});

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

const createScopedPackageJSON = (target, format) => (({ name, ...orig }) =>
conditionallyAddStandardESMEntry(target, format)(
packageJSONFields.reduce(
(xs, key) => ({ ...xs, [key]: xs[key] || orig[key] }),
{ name: `${npmOrgName}/${packageName(target, format)}`,
version: undefined, main: `${mainExport}.js`, types: `${mainExport}.d.ts`,
dist: undefined, [`dist:es2015`]: undefined, module: undefined, [`@std/esm`]: undefined }
)
packageJSONFields.reduce(
(xs, key) => ({ ...xs, [key]: xs[key] || orig[key] }),
{
name: `${npmOrgName}/${packageName(target, format)}`,
version: undefined, main: `${mainExport}.js`, types: `${mainExport}.d.ts`,
dist: undefined, [`dist:es2015`]: undefined, module: undefined, [`@std/esm`]: undefined
}
)
)
);

const conditionallyAddStandardESMEntry = (target, format) => (packageJSON) => (
format !== `esm`
? packageJSON
: { ...packageJSON, [`@std/esm`]: { esm: `js` } }
format !== `esm` && format !== `cls`
? packageJSON
: { ...packageJSON, [`@std/esm`]: { esm: `js`, warnings: false, sourceMap: true } }
);

8 changes: 4 additions & 4 deletions js/gulp/typescript-task.js
Expand Up @@ -34,7 +34,7 @@ const typescriptTask = ((cache) => memoizeTask(cache, function typescript(target
const tsProject = ts.createProject(path.join(`tsconfig`, tsconfigFile), { typescript: require(`typescript`) });
const { stream: { js, dts } } = observableFromStreams(
tsProject.src(), sourcemaps.init(),
tsProject(ts.reporter.fullReporter(true))
tsProject(ts.reporter.defaultReporter())
);
const writeDTypes = observableFromStreams(dts, gulp.dest(out));
const writeJS = observableFromStreams(js, sourcemaps.write(), gulp.dest(out));
Expand All @@ -52,12 +52,12 @@ function maybeCopyRawJSArrowFormatFiles(target, format) {
return Observable.empty();
}
return Observable.defer(async () => {
const outFormatDir = path.join(targetDir(target, format), `format`, `fb`);
const outFormatDir = path.join(targetDir(target, format), `fb`);
await del(path.join(outFormatDir, '*.js'));
await observableFromStreams(
gulp.src(path.join(`src`, `format`, `fb`, `*_generated.js`)),
gulp.src(path.join(`src`, `fb`, `*_generated.js`)),
gulpRename((p) => { p.basename = p.basename.replace(`_generated`, ``); }),
gulp.dest(outFormatDir)
).toPromise();
});
}
}
2 changes: 1 addition & 1 deletion js/gulp/uglify-task.js
Expand Up @@ -29,7 +29,7 @@ const webpack = require(`webpack`);
const { memoizeTask } = require('./memoize-task');
const { Observable, ReplaySubject } = require('rxjs');
const UglifyJSPlugin = require(`uglifyjs-webpack-plugin`);
const esmRequire = require(`@std/esm`)(module, { cjs: true, esm: `js` });
const esmRequire = require(`@std/esm`)(module, { cjs: true, esm: `js`, warnings: false });

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

Expand Down
5 changes: 2 additions & 3 deletions js/gulp/util.js
Expand Up @@ -108,14 +108,13 @@ function targetDir(target, format) {

function logAndDie(e) {
if (e) {
console.error(e);
process.exit(1);
}
}

function observableFromStreams(...streams) {
const pumped = streams.length <= 1 ? streams[0]
: pump(...streams, logAndDie);
if (streams.length <= 0) { return Observable.empty(); }
const pumped = streams.length <= 1 ? streams[0] : pump(...streams, logAndDie);
const fromEvent = Observable.fromEvent.bind(null, pumped);
const streamObs = fromEvent(`data`)
.merge(fromEvent(`error`).flatMap((e) => Observable.throw(e)))
Expand Down
17 changes: 11 additions & 6 deletions js/package.json
Expand Up @@ -51,15 +51,16 @@
],
"dependencies": {
"@types/text-encoding-utf-8": "1.0.1",
"command-line-args": "4.0.7",
"command-line-usage": "4.0.2",
"command-line-args": "5.0.0",
"command-line-usage": "4.1.0",
"flatbuffers": "trxcllnt/flatbuffers-esm",
"json-bignum": "0.0.3",
"text-encoding-utf-8": "^1.0.2",
"ts-node": "4.1.0",
"tslib": "1.8.1"
},
"devDependencies": {
"@std/esm": "0.19.1",
"@std/esm": "0.19.6",
"@types/flatbuffers": "1.6.5",
"@types/glob": "5.0.34",
"@types/jest": "22.0.1",
Expand All @@ -79,10 +80,10 @@
"gulp-transform-js-ast": "1.0.2",
"gulp-typescript": "3.2.3",
"ix": "2.3.4",
"jest": "22.0.5",
"jest": "22.1.2",
"jest-environment-node-debug": "2.0.0",
"json": "9.0.6",
"lerna": "2.6.0",
"lerna": "2.7.1",
"lint-staged": "6.0.0",
"merge2": "1.2.1",
"mkdirp": "0.5.1",
Expand All @@ -100,6 +101,9 @@
"webpack": "3.10.0",
"xml2js": "0.4.19"
},
"@std/esm": {
"warnings": false
},
"lint-staged": {
"*.@(ts)": [
"tslint --fix",
Expand Down Expand Up @@ -135,7 +139,8 @@
".(js|jsx)": "./node_modules/babel-jest/build/index.js"
},
"transformIgnorePatterns": [
"/node_modules/", "/(es2015|esnext)\/umd/"
"/node_modules/",
"/(es2015|esnext)/umd/"
],
"testRegex": "(.*(-|\\.)(test|spec)s?)\\.(ts|tsx|js)$"
}
Expand Down

0 comments on commit fa7c17a

Please sign in to comment.