Skip to content

Commit

Permalink
fix(dependencies): reduce the dependencies further. (#3488)
Browse files Browse the repository at this point in the history
Added a script that tells you if you are missing dependencies and if any dependencies are not needed.
  • Loading branch information
hansl authored Dec 9, 2016
1 parent 2fb2d13 commit 901a64f
Show file tree
Hide file tree
Showing 18 changed files with 197 additions and 339 deletions.
16 changes: 5 additions & 11 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
"build": "node ./scripts/publish/build.js",
"build:patch": "node ./scripts/patch.js",
"build:packages": "for PKG in packages/*; do echo Building $PKG...; tsc -p $PKG; done",
"test": "npm-run-all -c test:packages test:cli",
"test": "npm-run-all -c test:packages test:cli test:deps",
"e2e": "npm run test:e2e",
"e2e:nightly": "node tests/e2e_runner.js --nightly",
"mobile_test": "mocha tests/e2e/e2e_workflow.spec.js",
"test:e2e": "node tests/e2e_runner.js",
"test:cli": "node tests/runner",
"test:deps": "node scripts/publish/validate_dependencies.js",
"test:inspect": "node --inspect --debug-brk tests/runner",
"test:packages": "node scripts/run-packages-spec.js",
"build-config-interface": "dtsgen packages/angular-cli/lib/config/schema.json --out packages/angular-cli/lib/config/schema.d.ts",
Expand Down Expand Up @@ -51,7 +52,6 @@
"chalk": "^1.1.3",
"common-tags": "^1.3.1",
"configstore": "^2.0.0",
"core-js": "^2.4.0",
"css-loader": "^0.23.1",
"debug": "^2.1.3",
"denodeify": "^1.2.1",
Expand All @@ -73,31 +73,28 @@
"inquirer": "^0.12.0",
"is-git-url": "^0.2.0",
"isbinaryfile": "^2.0.3",
"istanbul-instrumenter-loader": "^0.2.0",
"json-loader": "^0.5.4",
"karma-sourcemap-loader": "^0.3.7",
"karma-webpack": "^1.8.0",
"leek": "0.0.21",
"less": "^2.7.1",
"less-loader": "^2.2.3",
"loader-utils": "^0.2.16",
"lodash": "^4.11.1",
"magic-string": "^0.16.0",
"markdown-it": "4.3.0",
"markdown-it-terminal": "0.0.3",
"minimatch": "^3.0.0",
"mkdirp": "^0.5.1",
"node-modules-path": "^1.0.0",
"node-sass": "^3.10.1",
"nopt": "^3.0.1",
"npm-run-all": "^3.0.0",
"offline-plugin": "^3.4.1",
"opn": "4.0.1",
"ora": "^0.2.0",
"parse5": "^2.1.5",
"portfinder": "1.0.9",
"postcss-discard-comments": "^2.0.4",
"postcss-loader": "^0.9.1",
"protractor": "^3.3.0",
"quick-temp": "0.1.5",
"raw-loader": "^0.5.1",
"readline2": "0.1.1",
Expand All @@ -106,21 +103,18 @@
"resolve": "^1.1.7",
"rimraf": "^2.5.3",
"rsvp": "^3.0.17",
"rxjs": "5.0.0-beta.12",
"sass-loader": "^3.2.0",
"script-loader": "^0.7.0",
"semver": "^5.1.0",
"silent-error": "^1.0.0",
"source-map": "^0.5.6",
"source-map-loader": "^0.1.5",
"sourcemap-istanbul-instrumenter-loader": "^0.2.0",
"string-replace-loader": "^1.0.5",
"style-loader": "^0.13.1",
"stylus": "^0.54.5",
"stylus-loader": "^2.1.0",
"temp": "0.8.3",
"through": "^2.3.6",
"ts-loader": "^0.8.2",
"tslint": "^3.15.1",
"tslint-loader": "^3.3.0",
"typescript": "~2.0.3",
Expand All @@ -131,8 +125,8 @@
"webpack-dev-server": "2.1.0-beta.9",
"webpack-md5-hash": "0.0.5",
"webpack-merge": "^0.14.0",
"yam": "0.0.18",
"zone.js": "^0.6.23"
"webpack-sources": "^0.1.3",
"yam": "0.0.18"
},
"ember-addon": {
"paths": [
Expand Down
10 changes: 7 additions & 3 deletions packages/@ngtools/webpack/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,18 @@
"npm": ">= 3.0.0"
},
"dependencies": {
"@angular-cli/ast-tools": "^1.0.0",
"enhanced-resolve": "^2.3.0",
"loader-utils": "^0.2.16",
"magic-string": "^0.16.0",
"source-map": "^0.5.6"
},
"peerDependencies": {
"typescript": "^2.0.2",
"@angular/compiler": "2.2.3",
"@angular/compiler-cli": "2.2.3",
"@angular/core": "2.2.3",
"reflect-metadata": "^0.1.8"
"@angular/tsc-wrapped": "0.4.0",
"typescript": "^2.0.2",
"reflect-metadata": "^0.1.8",
"webpack": "^2.1.0-beta.25"
}
}
1 change: 0 additions & 1 deletion packages/@ngtools/webpack/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"sourceRoot": "/",
"baseUrl": "./",
"paths": {
"@angular-cli/ast-tools": [ "../../../dist/ast-tools/src" ]
},
"typeRoots": [
"../../node_modules/@types"
Expand Down
9 changes: 1 addition & 8 deletions packages/angular-cli/blueprints/ng2/files/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,7 @@
"ts-helpers": "^1.1.1",
"zone.js": "^0.6.23"
},
"devDependencies": {<% if(isMobile) { %>
"@angular/platform-server": "2.2.3",
"@angular/service-worker": "0.2.0",
"@angular/app-shell": "0.0.0",
"angular2-universal":"0.104.5",
"angular2-universal-polyfills": "0.4.1",
"preboot": "2.1.2",
"parse5": "1.5.1",<% } %>
"devDependencies": {
"@angular/compiler-cli": "2.2.3",
"@types/jasmine": "2.5.38",
"@types/node": "^6.0.42",
Expand Down
6 changes: 0 additions & 6 deletions packages/angular-cli/ember-cli/lib/cli/cli.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

var lookupCommand = require('./lookup-command');
var Promise = require('../ext/promise');
var UpdateChecker = require('../models/update-checker');
var getOptionArgs = require('../utilities/get-option-args');
var debug = require('debug')('ember-cli:cli');
var debugTesting = require('debug')('ember-cli:testing');
Expand Down Expand Up @@ -66,11 +65,6 @@ CLI.prototype.run = function(environment) {

debug('command: %s', commandName);

if (commandName !== 'update' && !this.testing) {
var a = new UpdateChecker(this.ui, environment.settings);
update = a.checkForUpdates();
}

if (!this.testing) {
process.chdir(environment.project.root);
var skipInstallationCheck = commandArgs.indexOf('--skip-installation-check') !== -1;
Expand Down
6 changes: 0 additions & 6 deletions packages/angular-cli/ember-cli/lib/models/addon.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ var AddonsFactory = require('../models/addons-factory');
var CoreObject = require('../ext/core-object');
var Project = require('./project');

// var upstreamMergeTrees = require('broccoli-merge-trees');
// var Funnel = require('broccoli-funnel');
var walkSync = require('walk-sync');


Expand Down Expand Up @@ -111,7 +109,6 @@ Addon.prototype._requireBuildPackages = function() {
}

this.transpileModules = deprecatedAddonFilters(this, 'this.transpileModules', 'broccoli-es6modules', function(tree, options) {
return new (require('broccoli-es6modules'))(tree, options);
});

this.pickFiles = deprecatedAddonFilters(this, 'this.pickFiles', 'broccoli-funnel', function(tree, options) {
Expand All @@ -123,7 +120,6 @@ Addon.prototype._requireBuildPackages = function() {
return new Funnel(tree, options);
});

// this.mergeTrees = deprecatedAddonFilters(this, 'this.mergeTrees', 'broccoli-merge-trees', mergeTrees);
this.walkSync = deprecatedAddonFilters(this, 'this.walkSync', 'node-walk-sync', walkSync);
};

Expand Down Expand Up @@ -152,8 +148,6 @@ function deprecatedAddonFilters(addon, name, insteadUse, fn) {
@return {tree} Modified tree
*/
Addon.prototype.concatFiles = function(tree, options) {
options.sourceMapConfig = this.app.options.sourcemaps;
return require('broccoli-concat')(tree, options);
};

/**
Expand Down
104 changes: 0 additions & 104 deletions packages/angular-cli/ember-cli/lib/models/update-checker.js

This file was deleted.

11 changes: 3 additions & 8 deletions packages/angular-cli/ember-cli/lib/models/watcher.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ var Watcher = Task.extend({
var options = this.buildOptions();

debug('initialize %o', options);

this.watcher = this.watcher || new (require('broccoli-sane-watcher'))(this.builder, options);

this.watcher.on('error', this.didError.bind(this));
this.watcher.on('change', this.didChange.bind(this));
},

didError: function(error) {
Expand All @@ -30,7 +25,7 @@ var Watcher = Task.extend({
},

then: function() {
return this.watcher.then.apply(this.watcher, arguments);
// return this.watcher.then.apply(this.watcher, arguments);
},

didChange: function(results) {
Expand All @@ -54,11 +49,11 @@ var Watcher = Task.extend({
},

on: function() {
this.watcher.on.apply(this.watcher, arguments);
// this.watcher.on.apply(this.watcher, arguments);
},

off: function() {
this.watcher.off.apply(this.watcher, arguments);
// this.watcher.off.apply(this.watcher, arguments);
},
buildOptions: function() {
var watcher = this.options && this.options.watcher;
Expand Down
1 change: 0 additions & 1 deletion packages/angular-cli/ember-cli/lib/tasks.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,4 @@ module.exports = {
NpmInstall: require('./tasks/npm-install'),
NpmTask: require('./tasks/npm-task'),
NpmUninstall: require('./tasks/npm-uninstall'),
Update: require('./tasks/update')
};
Loading

0 comments on commit 901a64f

Please sign in to comment.