8000 chore(install): move ember cli in our repo and remove everything unne… · adamturco/angular-cli@28925dc · GitHub
[go: up one dir, main page]
Skip to content

Commit 28925dc

Browse files
hanslhansl
authored
chore(install): move ember cli in our repo and remove everything unnecessary (angular#3056)
* chore(install): move ember-cli to a directory in angular-cli * further remove files
1 parent 150b3b0 commit 28925dc

File tree

131 files changed

+8374
-135
lines changed
  • component
  • directive
  • module
  • ng2
  • pipe
  • service
  • commands
  • ember-cli
  • lib/cli
  • package.json
  • tasks
  • ast-tools/src
  • scripts/publish
  • tests

    • Some content is hidden

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

    131 files changed

    +8374
    -135
    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/angular-cli/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: 34 additions & 3 deletions
    Original file line numberDiff line numberDiff line change
    @@ -57,22 +57,36 @@
    5757
    "chalk": "^1.1.3",
    5858
    "common-tags": "^1.3.1",
    5959
    "compression-webpack-plugin": "^0.3.2",
    60+
    "configstore": "^2.0.0",
    6061
    "core-js": "^2.4.0",
    62+
    "core-object": "0.0.2",
    6163
    "css-loader": "^0.23.1",
    64+
    "debug": "^2.1.3",
    6265
    "denodeify": "^1.2.1",
    63-
    "ember-cli": "2.5.0",
    66+
    "diff": "^2.2.2",
    67+
    "ember-cli-normalize-entity-name": "^1.0.0",
    68+
    "ember-cli-preprocess-registry": "^2.0.0",
    6469
    "ember-cli-string-utils": "^1.0.0",
    6570
    "enhanced-resolve": "^2.2.2",
    71+
    "exists-sync": "0.0.3",
    6672
    "exit": "^0.1.2",
    6773
    "exports-loader": "^0.6.3",
    6874
    "expose-loader": "^0.7.1",
    6975
    "extract-text-webpack-plugin": "^2.0.0-beta.4",
    7076
    "file-loader": "^0.8.5",
    77+
    "findup": "0.1.5",
    78+
    "findup-sync": "^0.2.1",
    7179
    "fs-extra": "^0.30.0",
    80+
    "fs-monitor-stack": "^1.0.2",
    7281
    "fs.realpath": "^1.0.0",
    82+
    "get-caller-file": "^1.0.0",
    83+
    "git-repo-info": "^1.0.4",
    7384
    "glob": "^7.0.3",
    74-
    "handlebars": "^4.0.5",
    7585
    "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",
    7690
    "istanbul-instrumenter-loader": "^0.2.0",
    7791
    "json-loader": "^0.5.4",
    7892
    "karma-sourcemap-loader": "^0.3.7",
    @@ -81,22 +95,35 @@
    8195
    "less": "^2.7.1",
    8296
    "less-loader": "^2.2.3",
    8397
    "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",
    84103
    "node-sass": "^3.10.1",
    104+
    "node-uuid": "^1.4.3",
    105+
    "nopt": "^3.0.1",
    85106
    "npm-run-all": "^3.0.0",
    86107
    "offline-plugin": "^3.4.1",
    87108
    "opn": "4.0.1",
    109+
    "ora": "^0.2.0",
    88110
    "parse5": "^2.1.5",
    89111
    "portfinder": "1.0.9",
    90112
    "postcss-discard-comments": "^2.0.4",
    91113
    "postcss-loader": "^0.9.1",
    92114
    "protractor": "^3.3.0",
    115+
    "quick-temp": "0.1.5",
    93116
    "raw-loader": "^0.5.1",
    117+
    "readline2": "0.1.1",
    94118
    "remap-istanbul": "^0.6.4",
    95119
    "resolve": "^1.1.7",
    96120
    "rimraf": "^2.5.3",
    121+
    "rsvp": "^3.0.17",
    97122
    "rxjs": "5.0.0-beta.12",
    123+
    "sane": "^1.1.1",
    98124
    "sass-loader": "^3.2.0",
    99125
    "script-loader": "^0.7.0",
    126+
    "semver": "^5.1.0",
    100127
    "shelljs": "^0.7.0",
    101128
    "silent-error": "^1.0.0",
    102129
    "source-map-loader": "^0.1.5",
    @@ -105,16 +132,20 @@
    105132
    "style-loader": "^0.13.1",
    106133
    "stylus": "^0.54.5",
    107134
    "stylus-loader": "^2.1.0",
    108-
    "symlink-or-copy": "^1.0.3",
    135+
    "temp": "0.8.3",
    136+
    "through": "^2.3.6",
    137+
    "tree-sync": "^1.1.0",
    109138
    "ts-loader": "^0.8.2",
    110139
    "tslint": "^3.15.1",
    111140
    "tslint-loader": "^2.1.4",
    112141
    "typescript": "~2.0.3",
    113142
    "url-loader": "^0.5.7",
    143+
    "walk-sync": "^0.2.6",
    114144
    "webpack": "2.1.0-beta.25",
    115145
    "webpack-dev-server": "2.1.0-beta.9",
    116146
    "webpack-md5-hash": "0.0.5",
    117147
    "webpack-merge": "^0.14.0",
    148+
    "yam": "0.0.18",
    118149
    "zone.js": "^0.6.23"
    119150
    },
    120151
    "ember-addon": {

    ‎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('../../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('../../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('../../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('../../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('../../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('../../ember-cli/lib/models/blueprint');
    88
    const getFiles = Blueprint.prototype.files;
    99

    1010
    module.exports = {

    0 commit comments

    Comments
     (0)
    0