From fd5dced9c036e3e69d230be6fcbfa4ad4b0501c7 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Thu, 8 Dec 2016 22:28:57 -0600 Subject: [PATCH] chore(worker): remove inline worker task --- scripts/gulp/declarations.d.ts | 1 - scripts/gulp/tasks/build.ts | 2 +- scripts/gulp/util.ts | 40 ---------------------------------- 3 files changed, 1 insertion(+), 42 deletions(-) diff --git a/scripts/gulp/declarations.d.ts b/scripts/gulp/declarations.d.ts index 32ab9ceca7..d73cc38eff 100644 --- a/scripts/gulp/declarations.d.ts +++ b/scripts/gulp/declarations.d.ts @@ -22,7 +22,6 @@ declare module 'rollup-plugin-node-resolve'; declare module 'rollup-plugin-uglify'; declare module 'through2'; declare module 'semver'; -declare module 'uglify-js'; declare module 'vinyl'; declare module 'yargs'; declare module 'strip-function'; \ No newline at end of file diff --git a/scripts/gulp/tasks/build.ts b/scripts/gulp/tasks/build.ts index af42e5efa5..6f4d5b7ba8 100644 --- a/scripts/gulp/tasks/build.ts +++ b/scripts/gulp/tasks/build.ts @@ -1,6 +1,6 @@ import { task } from 'gulp'; import { DIST_BUILD_ROOT, DIST_BUILD_ES2015_ROOT, DIST_BUILD_UMD_ROOT, ES5, ES_2015, UMD_MODULE } from '../constants'; -import { copySourceToDest, copySwiperToPath, createTempTsConfig, deleteFiles, runNgc} from '../util'; +import { copySourceToDest, copySwiperToPath, createTempTsConfig, deleteFiles, runNgc } from '../util'; export function buildIonicAngularUmd(excludeSpec: boolean, stripDebug: boolean, done: Function) { diff --git a/scripts/gulp/util.ts b/scripts/gulp/util.ts index 378eafe3bb..c52df9c1eb 100644 --- a/scripts/gulp/util.ts +++ b/scripts/gulp/util.ts @@ -8,7 +8,6 @@ import * as commonjs from 'rollup-plugin-commonjs'; import * as multiEntry from 'rollup-plugin-multi-entry'; import * as nodeResolve from 'rollup-plugin-node-resolve'; import * as through from 'through2'; -import * as uglifyJS from 'uglify-js'; import * as uglifyPlugin from 'rollup-plugin-uglify'; export function mergeObjects(obj1: any, obj2: any ) { @@ -63,43 +62,6 @@ function removeDebugStatements() { }); } -function minifyInlineStrings() { - // used to manually minify the inline web workers - // which are strings of code and not actual code - - const start = '/** minify-start **/'; - const end = '/** minify-end **/'; - - return through.obj(function (file, encoding, callback) { - let content: string = file.contents.toString(); - - const startIndex = content.indexOf(start); - const endIndex = content.indexOf(end); - - if (startIndex > -1 && endIndex > startIndex) { - let startContent = content.substring(0, startIndex); - let minifyContent = content.substring(startIndex, endIndex + end.length); - let endContent = content.substring(endIndex + end.length); - - minifyContent = uglifyJS.minify(minifyContent, { - fromString: true, - compress: { - dead_code: true, - global_defs: { - DEBUG: false - } - } - }).code; - - content = startContent + minifyContent + endContent; - - file.contents = new Buffer(content, 'utf8'); - } - - callback(null, file); - }); -} - export function copySourceToDest(destinationPath: string, excludeSpecs: boolean, excludeE2e: boolean, stripDebug: boolean) { let glob = [`${SRC_ROOT}/**/*.ts`]; if (excludeSpecs) { @@ -115,8 +77,6 @@ export function copySourceToDest(destinationPath: string, excludeSpecs: boolean, console.log('Removing debug statements:', destinationPath); stream = stream.pipe(removeDebugStatements()); } - console.log('Minifying inline web-worker strings:', destinationPath); - stream = stream.pipe(minifyInlineStrings()); return stream.pipe(dest(destinationPath)); }