Skip to content

Commit 703ba9c

Browse files
committed
chore(install): move ember cli in our repo and remove everything unnecessary
1 parent f815228 commit 703ba9c

File tree

139 files changed

+8786
-132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+8786
-132
lines changed

.eslintignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,6 @@ typings/
66

77
# Ignore all blueprint files. We e2e tests those later on.
88
packages/angular-cli/blueprints/*/files/
9+
10+
# Ignore ember cli.
11+
packages/ember-cli/

lib/bootstrap-local.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,13 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
6161
const newRequest = path.relative(dir, path.join(__dirname, '../packages', request));
6262
return oldLoad.call(this, newRequest, parent);
6363
} else {
64-
return oldLoad.apply(this, arguments);
64+
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+
}
6571
}
6672
};
6773
}

lib/packages.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ const packages = fs.readdirSync(packageRoot)
1717
dist: path.join(__dirname, '../dist', pkg.name),
1818
packageJson: path.join(pkg.root, 'package.json'),
1919
root: pkg.root,
20+
relative: path.relative(path.dirname(__dirname), pkg.root),
2021
main: path.resolve(pkg.root, 'src/index.ts')
2122
};
2223
return packages;

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
"fs-extra": "^0.30.0",
7272
"fs.realpath": "^1.0.0",
7373
"glob": "^7.0.3",
74-
"handlebars": "^4.0.5",
7574
"html-webpack-plugin": "^2.19.0",
7675
"istanbul-instrumenter-loader": "^0.2.0",
7776
"json-loader": "^0.5.4",

packages/angular-cli/blueprints/class/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const stringUtils = require('ember-cli-string-utils');
22
const dynamicPathParser = require('../../utilities/dynamic-path-parser');
3-
const Blueprint = require('ember-cli/lib/models/blueprint');
3+
const Blueprint = require('@angular-cli/ember-cli/lib/models/blueprint');
44
const getFiles = Blueprint.prototype.files;
55

66
module.exports = {

packages/angular-cli/blueprints/component/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
const path = require('path');
22
const chalk = require('chalk');
3-
const Blueprint = require('ember-cli/lib/models/blueprint');
3+
const Blueprint = require('@angular-cli/ember-cli/lib/models/blueprint');
44
const dynamicPathParser = require('../../utilities/dynamic-path-parser');
55
const findParentModule = require('../../utilities/find-parent-module').default;
66
const getFiles = Blueprint.prototype.files;

packages/angular-cli/blueprints/directive/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const stringUtils = require('ember-cli-string-utils');
44
const astUtils = require('../../utilities/ast-utils');
55
const findParentModule = require('../../utilities/find-parent-module').default;
66
const NodeHost = require('@angular-cli/ast-tools').NodeHost;
7-
const Blueprint = require('ember-cli/lib/models/blueprint');
7+
const Blueprint = require('@angular-cli/ember-cli/lib/models/blueprint');
88
const getFiles = Blueprint.prototype.files;
99

1010
module.exports = {

packages/angular-cli/blueprints/module/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
const path = require('path');
2-
const Blueprint = require('ember-cli/lib/models/blueprint');
2+
const Blueprint = require('@angular-cli/ember-cli/lib/models/blueprint');
33
const dynamicPathParser = require('../../utilities/dynamic-path-parser');
44
const getFiles = Blueprint.prototype.files;
55

packages/angular-cli/blueprints/ng2/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
const Blueprint = require('ember-cli/lib/models/blueprint');
1+
const Blueprint = require('@angular-cli/ember-cli/lib/models/blueprint');
22
const path = require('path');
33
const stringUtils = require('ember-cli-string-utils');
44
const getFiles = Blueprint.prototype.files;

packages/angular-cli/blueprints/pipe/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const stringUtils = require('ember-cli-string-utils');
44
const astUtils = require('../../utilities/ast-utils');
55
const findParentModule = require('../../utilities/find-parent-module').default;
66
const NodeHost = require('@angular-cli/ast-tools').NodeHost;
7-
const Blueprint = require('ember-cli/lib/models/blueprint');
7+
const Blueprint = require('@angular-cli/ember-cli/lib/models/blueprint');
88
const getFiles = Blueprint.prototype.files;
99

1010
module.exports = {

0 commit comments

Comments
 (0)