Skip to content
This repository was archived by the owner on May 1, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/build.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function buildWorker(context: BuildContext) {
// load any 100% required files to ensure they exist
return validateRequiredFilesExist();
})
.then(([appEntryPointContents, tsConfigContents]) => {
.then(([_, tsConfigContents]) => {
return validateTsConfigSettings(tsConfigContents);
})
.then(() => {
Expand Down
2 changes: 1 addition & 1 deletion src/cleancss.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export function cleancssWorker(context: BuildContext, configFile: string): Promi
const config: CleanCssConfig = fillConfigDefaults(configFile, taskInfo.defaultConfigFile);
const srcFile = join(context.buildDir, config.sourceFileName);
const destFilePath = join(context.buildDir, config.destFileName);
Logger.debug(`[Clean CSS] cleancssWorker: reading source file ${srcFile}`)
Logger.debug(`[Clean CSS] cleancssWorker: reading source file ${srcFile}`);
return readFileAsync(srcFile).then(fileContent => {
return runCleanCss(config, fileContent);
}).then(minifiedContent => {
Expand Down
4 changes: 2 additions & 2 deletions src/deep-linking/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export function extractDeepLinkPathData(appNgModuleFileContent: string) {
function extractRegexContent(content: string, regex: RegExp) {
let match: RegExpExecArray = null;
const results: string[] = [];
while ((match = regex.exec(content))){
while ((match = regex.exec(content))) {
if (!match) {
break;
}
Expand Down Expand Up @@ -70,4 +70,4 @@ export function getDeepLinkData(appNgModuleFilePath: string, appNgModuleFileCont

const LINKS_REGEX = /links\s*?:\s*\[([\s|\S]*)\]/igm;
const LOAD_CHILDREN_REGEX = /loadChildren\s*?:\s*?['"`]\s*?(.*?)['"`]/igm;
const NAME_REGEX = /name\s*?:\s*?['"`]\s*?(.*?)['"`]/igm;
const NAME_REGEX = /name\s*?:\s*?['"`]\s*?(.*?)['"`]/igm;
2 changes: 1 addition & 1 deletion src/dev-server/lab.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ export let ApiCordovaProject = (req: any, res: any) => {
}, (config: CordovaProject) => {
res.json(config);
});
}
};
2 changes: 1 addition & 1 deletion src/serve.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ describe('test serve', () => {
expect(httpServer.createHttpServer).toHaveBeenCalledWith(configResults);
expect(open.default).toHaveBeenCalledWith('http://localhost:8100?ionicplatform=android', null);
});
})
});

it('all args should be set in the config object and should be passed on to server functions', () => {
config.setProcessArgs([]);
Expand Down
3 changes: 1 addition & 2 deletions src/uglifyjs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ import * as uglify from 'uglify-js';

import { Logger } from './logger/logger';
import { fillConfigDefaults, generateContext, getUserConfigFile } from './util/config';
import * as Constants from './util/constants';
import { BuildError } from './util/errors';
import { getBooleanPropertyValue, writeFileAsync } from './util/helpers';
import { writeFileAsync } from './util/helpers';
import { BuildContext, TaskInfo } from './util/interfaces';
import { runWorker } from './worker-client';

Expand Down
2 changes: 1 addition & 1 deletion src/util/typescript-utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -148,4 +148,4 @@ export function checkIfFunctionIsCalled(filePath: string, fileContent: string, f
const allCalls = findNodes(sourceFile, sourceFile, SyntaxKind.CallExpression, true) as CallExpression[];
const functionCallList = allCalls.filter(call => call.expression && call.expression.kind === SyntaxKind.Identifier && (call.expression as Identifier).text === functionName);
return functionCallList.length > 0;
}
}
4 changes: 1 addition & 3 deletions src/webpack/ionic-environment-plugin.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import { relative, sep } from 'path';
import { BuildContext, HydratedDeepLinkConfigEntry } from '../util/interfaces';
import { Logger } from '../logger/logger';
import { getInstance } from '../util/hybrid-file-system-factory';
import { WatchMemorySystem } from './watch-memory-system';
import { createResolveDependenciesFromContextMap } from './util';

export class IonicEnvironmentPlugin {
Expand Down Expand Up @@ -87,4 +85,4 @@ export function convertDeepLinkConfigToWebpackFormat(parsedDeepLinkConfigs: Hydr
dictionary[parsedDeepLinkConfig.modulePath] = parsedDeepLinkConfig.absolutePath;
});
return dictionary;
}
}