We read every piece of feedback, and take your input very seriously.
1 parent 150b3b0 commit 28925dcCopy full SHA for 28925dc
.eslintignore
@@ -6,3 +6,6 @@ typings/
6
7
# Ignore all blueprint files. We e2e tests those later on.
8
packages/angular-cli/blueprints/*/files/
9
+
10
+# Ignore ember cli.
11
+packages/angular-cli/ember-cli/
lib/bootstrap-local.js
@@ -61,7 +61,13 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
61
const newRequest = path.relative(dir, path.join(__dirname, '../packages', request));
62
return oldLoad.call(this, newRequest, parent);
63
} else {
64
- return oldLoad.apply(this, arguments);
+ let match = Object.keys(packages).find(pkgName => request.startsWith(pkgName + '/'));
65
+ if (match) {
66
+ const p = path.join(packages[match].root, request.substr(match.length));
67
+ return oldLoad.call(this, p, parent);
68
+ } else {
69
+ return oldLoad.apply(this, arguments);
70
+ }
71
}
72
};
73
lib/packages.js
@@ -17,6 +17,7 @@ const packages = fs.readdirSync(packageRoot)
17
dist: path.join(__dirname, '../dist', pkg.name),
18
packageJson: path.join(pkg.root, 'package.json'),
19
root: pkg.root,
20
+ relative: path.relative(path.dirname(__dirname), pkg.root),
21
main: path.resolve(pkg.root, 'src/index.ts')
22
23
return packages;
package.json
@@ -57,22 +57,36 @@
57
"chalk": "^1.1.3",
58
"common-tags": "^1.3.1",
59
"compression-webpack-plugin": "^0.3.2",
60
+ "configstore": "^2.0.0",
"core-js": "^2.4.0",
+ "core-object": "0.0.2",
"css-loader": "^0.23.1",
+ "debug": "^2.1.3",
"denodeify": "^1.2.1",
- "ember-cli": "2.5.0",
+ "diff": "^2.2.2",
+ "ember-cli-normalize-entity-name": "^1.0.0",
+ "ember-cli-preprocess-registry": "^2.0.0",
"ember-cli-string-utils": "^1.0.0",
"enhanced-resolve": "^2.2.2",
+ "exists-sync": "0.0.3",
"exit": "^0.1.2",
"exports-loader": "^0.6.3",
74
"expose-loader": "^0.7.1",
75
"extract-text-webpack-plugin": "^2.0.0-beta.4",
76
"file-loader": "^0.8.5",
77
+ "findup": "0.1.5",
78
+ "findup-sync": "^0.2.1",
79
"fs-extra": "^0.30.0",
80
+ "fs-monitor-stack": "^1.0.2",
81
"fs.realpath": "^1.0.0",
82
+ "get-caller-file": "^1.0.0",
83
+ "git-repo-info": "^1.0.4",
84
"glob": "^7.0.3",
- "handlebars": "^4.0.5",
85
"html-webpack-plugin": "^2.19.0",
86
+ "inflection": "^1.7.0",
87
+ "inquirer": "^0.12.0",
88
+ "is-git-url": "^0.2.0",
89
+ "isbinaryfile": "^2.0.3",
90
"istanbul-instrumenter-loader": "^0.2.0",
91
"json-loader": "^0.5.4",
92
"karma-sourcemap-loader": "^0.3.7",
@@ -81,22 +95,35 @@
95
"less": "^2.7.1",
96
"less-loader": "^2.2.3",
97
"lodash": "^4.11.1",
98
+ "markdown-it": "4.3.0",
99
+ "markdown-it-terminal": "0.0.3",
100
+ "minimatch": "^3.0.0",
101
+ "mkdirp": "^0.5.1",
102
+ "node-modules-path": "^1.0.0",
103
"node-sass": "^3.10.1",
104
+ "node-uuid": "^1.4.3",
105
+ "nopt": "^3.0.1",
106
"npm-run-all": "^3.0.0",
107
"offline-plugin": "^3.4.1",
108
"opn": "4.0.1",
109
+ "ora": "^0.2.0",
110
"parse5": "^2.1.5",
111
"portfinder": "1.0.9",
112
"postcss-discard-comments": "^2.0.4",
113
"postcss-loader": "^0.9.1",
114
"protractor": "^3.3.0",
115
+ "quick-temp": "0.1.5",
93
116
"raw-loader": "^0.5.1",
117
+ "readline2": "0.1.1",
94
118
"remap-istanbul": "^0.6.4",
119
"resolve": "^1.1.7",
120
"rimraf": "^2.5.3",
121
+ "rsvp": "^3.0.17",
122
"rxjs": "5.0.0-beta.12",
123
+ "sane": "^1.1.1",
124
"sass-loader": "^3.2.0",
125
"script-loader": "^0.7.0",
126
+ "semver": "^5.1.0",
127
"shelljs": "^0.7.0",
128
"silent-error": "^1.0.0",
129
"source-map-loader": "^0.1.5",
@@ -105,16 +132,20 @@
132
"style-loader": "^0.13.1",
133
"stylus": "^0.54.5",
134
"stylus-loader": "^2.1.0",
- "symlink-or-copy": "^1.0.3",
135
+ "temp": "0.8.3",
136
+ "through": "^2.3.6",
137
+ "tree-sync": "^1.1.0",
138
"ts-loader": "^0.8.2",
139
"tslint": "^3.15.1",
140
"tslint-loader": "^2.1.4",
141
"typescript": "~2.0.3",
142
"url-loader": "^0.5.7",
143
+ "walk-sync": "^0.2.6",
144
"webpack": "2.1.0-beta.25",
145
"webpack-dev-server": "2.1.0-beta.9",
146
"webpack-md5-hash": "0.0.5",
147
"webpack-merge": "^0.14.0",
148
+ "yam": "0.0.18",
149
"zone.js": "^0.6.23"
150
},
151
"ember-addon": {
packages/angular-cli/blueprints/class/index.js
@@ -1,6 +1,6 @@
1
const stringUtils = require('ember-cli-string-utils');
2
const dynamicPathParser = require('../../utilities/dynamic-path-parser');
3
-const Blueprint = require('ember-cli/lib/models/blueprint');
+const Blueprint = require('../../ember-cli/lib/models/blueprint');
4
const getFiles = Blueprint.prototype.files;
5
module.exports = {
packages/angular-cli/blueprints/component/index.js
const path = require('path');
const chalk = require('chalk');
const findParentModule = require('../../utilities/find-parent-module').default;
packages/angular-cli/blueprints/directive/index.js
@@ -4,7 +4,7 @@ const stringUtils = require('ember-cli-string-utils');
const astUtils = require('../../utilities/ast-utils');
const NodeHost = require('@angular-cli/ast-tools').NodeHost;
packages/angular-cli/blueprints/module/index.js
@@ -1,5 +1,5 @@
packages/angular-cli/blueprints/ng2/index.js
@@ -1,4 +1,4 @@
packages/angular-cli/blueprints/pipe/index.js