Skip to content

chore: remove angular-cli from node modules of new projects #731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
hansl wants to merge 1 commit into from
Closed

chore: remove angular-cli from node modules of new projects #731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

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: 0 additions & 2 deletions addon/ng2/blueprints/ng2/files/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
"name": "<%= htmlComponentName %>",
"version": "0.0.0",
"license": "MIT",
"angular-cli": {},
"scripts": {
"start": "ng server",
"postinstall": "typings install",
Expand All @@ -28,7 +27,6 @@
"zone.js": "^0.6.12"
},
"devDependencies": {
"angular-cli": "^<%= version %>",
"clang-format": "^1.0.35",
"codelyzer": "0.0.14",
"ember-cli-inject-live-reload": "^1.4.0",
Expand Down
12 changes: 12 additions & 0 deletions bin/ng
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,24 @@ process.title = 'angular-cli';
const resolve = require('resolve');
const exit = require('exit');
const packageJson = require('../package.json');
const path = require('path');
const Leek = require('leek');

resolve('angular-cli', { basedir: process.cwd() },
function (error, projectLocalCli) {
var cli;
if (error) {
const nodeModulePath = path.join(__dirname, '../..');
// Add the global ourselves to the NODE_PATH.
if (!process.env['NODE_PATH'] || process.env['NODE_PATH'].split(path.delimiter).indexOf(nodeModulePath) == -1) {
process.env['NODE_PATH'] = (process.env['NODE_PATH'] ? process.env['NODE_PATH'].split(path.delimiter) : [])
.concat([nodeModulePath])
.join(path.delimiter);

require('shelljs').exec(process.argv.join(' '));
return;
}

// If there is an error, resolve could not find the ember-cli
// library from a package.json. Instead, include it from a relative
// path to this script file (which is likely a globally installed
Expand Down
2 changes: 1 addition & 1 deletion lib/broccoli/angular2-app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const BroccoliSource = require('broccoli-source');
const UnwatchedDir = BroccoliSource.UnwatchedDir;
const Project = require('ember-cli/lib/models/project');
const HandlebarReplace = require('./broccoli-handlebars');
const config = require('../../addon/ng2/models/config');
const config = require(path.join(__dirname, '../../addon/ng2/models/config'));
const loadEnvironment = require('./environment');

class Angular2App extends BroccoliPlugin {
Expand Down