-
Notifications
You must be signed in to change notification settings - Fork 24.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
build(aio): update to @angular/cli@6.0.0-rc.2 + project layout update (…
…#23234) project layout was updated using: yarn ng update @angular/cli --migrate-only --from=1.7.3 PR Close #23234
- Loading branch information
Showing
9 changed files
with
1,006 additions
and
704 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,230 @@ | ||
| { | ||
| "version": 1, | ||
| "newProjectRoot": "projects", | ||
| "projects": { | ||
| "site": { | ||
| "root": "", | ||
| "projectType": "application", | ||
| "architect": { | ||
| "build": { | ||
| "builder": "@angular-devkit/build-angular:browser", | ||
| "options": { | ||
| "outputPath": "dist", | ||
| "index": "src/index.html", | ||
| "main": "src/main.ts", | ||
| "tsConfig": "src/tsconfig.app.json", | ||
| "aot": true, | ||
| "optimization": true, | ||
| "buildOptimizer": true, | ||
| "outputHashing": "all", | ||
| "sourceMap": true, | ||
| "extractCss": true, | ||
| "extractLicenses": true, | ||
| "namedChunks": true, | ||
| "vendorChunk": false, | ||
| "polyfills": "src/polyfills.ts", | ||
| "assets": [ | ||
| { | ||
| "glob": "**/*", | ||
| "input": "src/assets", | ||
| "output": "/assets" | ||
| }, | ||
| { | ||
| "glob": "**/*", | ||
| "input": "src/generated", | ||
| "output": "/generated" | ||
| }, | ||
| { | ||
| "glob": "app/search/search-worker.js", | ||
| "input": "src", | ||
| "output": "/" | ||
| }, | ||
| { | ||
| "glob": "favicon.ico", | ||
| "input": "src", | ||
| "output": "/" | ||
| }, | ||
| { | ||
| "glob": "pwa-manifest.json", | ||
| "input": "src", | ||
| "output": "/" | ||
| }, | ||
| { | ||
| "glob": "google385281288605d160.html", | ||
| "input": "src", | ||
| "output": "/" | ||
| }, | ||
| { | ||
| "glob": "custom-elements.min.js", | ||
| "input": "node_modules/@webcomponents/custom-elements", | ||
| "output": "/assets/js" | ||
| }, | ||
| { | ||
| "glob": "native-shim.js", | ||
| "input": "node_modules/@webcomponents/custom-elements/src", | ||
| "output": "/assets/js" | ||
| } | ||
| ], | ||
| "styles": [ | ||
| { | ||
| "input": "src/styles.scss" | ||
| } | ||
| ], | ||
| "scripts": [], | ||
|
|
||
| }, | ||
| "configurations": { | ||
| "next": { | ||
| "fileReplacements": [ | ||
| { | ||
| "src": "src/environments/environment.ts", | ||
| "replaceWith": "src/environments/environment.next.ts" | ||
| } | ||
| ] | ||
| }, | ||
| "stable": { | ||
| "fileReplacements": [ | ||
| { | ||
| "src": "src/environments/environment.ts", | ||
| "replaceWith": "src/environments/environment.stable.ts" | ||
| } | ||
| ] | ||
| }, | ||
| "archive": { | ||
| "fileReplacements": [ | ||
| { | ||
| "src": "src/environments/environment.ts", | ||
| "replaceWith": "src/environments/environment.archive.ts" | ||
| } | ||
| ] | ||
| } | ||
| } | ||
| }, | ||
| "serve": { | ||
| "builder": "@angular-devkit/build-angular:dev-server", | ||
| "options": { | ||
| "browserTarget": "site:build" | ||
| }, | ||
| "configurations": { | ||
| "next": { | ||
| "browserTarget": "site:build:next" | ||
| }, | ||
| "stable": { | ||
| "browserTarget": "site:build:stable" | ||
| }, | ||
| "archive": { | ||
| "browserTarget": "site:build:archive" | ||
| } | ||
| } | ||
| }, | ||
| "extract-i18n": { | ||
| "builder": "@angular-devkit/build-angular:extract-i18n", | ||
| "options": { | ||
| "browserTarget": "site:build" | ||
| } | ||
| }, | ||
| "test": { | ||
| "builder": "@angular-devkit/build-angular:karma", | ||
| "options": { | ||
| "main": "src/test.ts", | ||
| "karmaConfig": "src/karma.conf.js", | ||
| "polyfills": "src/polyfills.ts", | ||
| "tsConfig": "src/tsconfig.spec.json", | ||
| "scripts": [], | ||
| "styles": [ | ||
| { | ||
| "input": "src/styles.scss" | ||
| } | ||
| ], | ||
| "assets": [ | ||
| { | ||
| "glob": "**/*", | ||
| "input": "src/assets", | ||
| "output": "/assets" | ||
| }, | ||
| { | ||
| "glob": "**/*", | ||
| "input": "src/generated", | ||
| "output": "/generated" | ||
| }, | ||
| { | ||
| "glob": "app/search/search-worker.js", | ||
| "input": "src", | ||
| "output": "/" | ||
| }, | ||
| { | ||
| "glob": "favicon.ico", | ||
| "input": "src", | ||
| "output": "/" | ||
| }, | ||
| { | ||
| "glob": "pwa-manifest.json", | ||
| "input": "src", | ||
| "output": "/" | ||
| }, | ||
| { | ||
| "glob": "google385281288605d160.html", | ||
| "input": "src", | ||
| "output": "/" | ||
| }, | ||
| { | ||
| "glob": "custom-elements.min.js", | ||
| "input": "node_modules/@webcomponents/custom-elements", | ||
| "output": "/assets/js" | ||
| }, | ||
| { | ||
| "glob": "native-shim.js", | ||
| "input": "node_modules/@webcomponents/custom-elements/src", | ||
| "output": "/assets/js" | ||
| } | ||
| ] | ||
| } | ||
| }, | ||
| "lint": { | ||
| "builder": "@angular-devkit/build-angular:tslint", | ||
| "options": { | ||
| "tsConfig": [ | ||
| "src/tsconfig.app.json", | ||
| "src/tsconfig.spec.json" | ||
| ], | ||
| "exclude": [] | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "site-e2e": { | ||
| "root": "", | ||
| "projectType": "application", | ||
| "cli": {}, | ||
| "schematics": {}, | ||
| "architect": { | ||
| "e2e": { | ||
| "builder": "@angular-devkit/build-angular:protractor", | ||
| "options": { | ||
| "protractorConfig": "tests/e2e/protractor.conf.js", | ||
| "devServerTarget": "site:serve" | ||
| } | ||
| }, | ||
| "lint": { | ||
| "builder": "@angular-devkit/build-angular:tslint", | ||
| "options": { | ||
| "tsConfig": [ | ||
| "tests/e2e/tsconfig.e2e.json" | ||
| ], | ||
| "exclude": [] | ||
| } | ||
| } | ||
| } | ||
| } | ||
| }, | ||
| "schematics": { | ||
| "@schematics/angular:component": { | ||
| "inlineStyle": true, | ||
| "prefix": "aio", | ||
| "styleext": "scss" | ||
| }, | ||
| "@schematics/angular:directive": { | ||
| "prefix": "aio" | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,9 @@ | ||
| const fs = require('fs'); | ||
| const sh = require('shelljs'); | ||
|
|
||
| const PATCH_LOCK = 'node_modules/@angular/cli/models/webpack-configs/.patched'; | ||
| const PATCH_LOCK = 'node_modules/@angular/cli/.patched'; | ||
|
|
||
| if (!fs.existsSync(PATCH_LOCK)) { | ||
| sh.exec('patch -p0 -i tools/cli-patches/webpack-no-global.patch'); | ||
| sh.touch(PATCH_LOCK); | ||
| } | ||
|
|
Oops, something went wrong.