Merge remote-tracking branch 'upstream/master'

Author: aegyed91

.gitignore

@@ -1,6 +1,7 @@
 dist/
 node_modules/
 npm-debug.log*
+yarn.lock
 
 # IDEs
 .idea/

README.md

@@ -328,8 +328,8 @@ To use these preprocessors simply add the file to your component's `styleUrls`:
 ```javascript
 @Component({
   selector: 'app-root',
-  templateUrl: 'app.component.html',
-  styleUrls: ['app.component.scss']
+  templateUrl: './app.component.html',
+  styleUrls: ['./app.component.scss']
 })
 export class AppComponent {
   title = 'app works!';

packages/@ngtools/webpack/src/loader.ts

@@ -108,6 +108,16 @@ function _removeModuleId(refactor: TypeScriptFileRefactor) {
     });
 }
 
+function _getResourceRequest(element: ts.Expression, sourceFile: ts.SourceFile) {
+  if (element.kind == ts.SyntaxKind.StringLiteral) {
+    // if string, assume relative path unless it start with /
+    return `'${loaderUtils.urlToRequest((element as ts.StringLiteral).text, '')}'`;
+  } else {
+    // if not string, just use expression directly
+    return element.getFullText(sourceFile);
+  }
+}
+
 function _replaceResources(refactor: TypeScriptFileRefactor): void {
   const sourceFile = refactor.sourceFile;
 
@@ -132,7 +142,7 @@ function _replaceResources(refactor: TypeScriptFileRefactor): void {
 
       if (key == 'templateUrl') {
         refactor.replaceNode(node,
-          `template: require(${node.initializer.getFullText(sourceFile)})`);
+          `template: require(${_getResourceRequest(node.initializer, sourceFile)})`);
       } else if (key == 'styleUrls') {
         const arr = <ts.ArrayLiteralExpression[]>(
           refactor.findAstNodes(node, ts.SyntaxKind.ArrayLiteralExpression, false));
@@ -141,7 +151,7 @@ function _replaceResources(refactor: TypeScriptFileRefactor): void {
         }
 
         const initializer = arr[0].elements.map((element: ts.Expression) => {
-          return element.getFullText(sourceFile);
+          return _getResourceRequest(element, sourceFile);
         });
         refactor.replaceNode(node, `styles: [require(${initializer.join('), require(')})]`);
       }

packages/angular-cli/blueprints/ng2/files/tslint.json

@@ -46,7 +46,6 @@
     "no-empty-interface": true,
     "no-eval": true,
     "no-inferrable-types": true,
-    "no-inferred-empty-object-type": true,
     "no-shadowed-variable": true,
     "no-string-literal": false,
     "no-string-throw": true,

packages/angular-cli/lib/config/schema.json

@@ -59,7 +59,8 @@
             "type": "string"
           },
           "tsconfig": {
-            "type": "string"
+            "type": "string",
+            "default": "tsconfig.json"
           },
           "prefix": {
             "type": "string"

packages/angular-cli/models/json-schema/schema-tree.ts

@@ -134,9 +134,11 @@ export abstract class NonLeafSchemaTreeNode<T> extends SchemaTreeNode<T> {
     if (!schema['oneOf']) {
       type = schema['type'];
     } else {
+      let testValue = value || schema['default'];
+      // Match existing value to one of the schema types
       for (let testSchema of schema['oneOf']) {
-        if ((testSchema['type'] === 'array' && Array.isArray(value))
-            || typeof value === testSchema['type']) {
+        if ((testSchema['type'] === 'array' && Array.isArray(testValue))
+            || typeof testValue === testSchema['type']) {
           type = testSchema['type'];
           schema = testSchema;
           break;

packages/angular-cli/models/webpack-build-common.ts

@@ -46,12 +46,8 @@ export function getWebpackCommonConfig(
     main: [appMain]
   };
 
-  if (!(environment in appConfig.environments)) {
-    throw new SilentError(`Environment "${environment}" does not exist.`);
-  }
-
   // process global scripts
-  if (appConfig.scripts.length > 0) {
+  if (appConfig.scripts && appConfig.scripts.length > 0) {
     const globalScripts = extraEntryParser(appConfig.scripts, appRoot, 'scripts');
 
     // add entry points and lazy chunks
@@ -67,7 +63,7 @@ export function getWebpackCommonConfig(
   }
 
   // process global styles
-  if (appConfig.styles.length === 0) {
+  if (!appConfig.styles || appConfig.styles.length === 0) {
     // create css loaders for component css
     extraRules.push(...makeCssLoaders());
   } else {
@@ -104,6 +100,33 @@ export function getWebpackCommonConfig(
     }));
   }
 
+  // process environment file replacement
+  if (appConfig.environments) {
+    if (!('source' in appConfig.environments)) {
+      throw new SilentError(`Environment configuration does not contain "source" entry.`);
+    }
+    if (!(environment in appConfig.environments)) {
+      throw new SilentError(`Environment "${environment}" does not exist.`);
+    }
+
+    extraPlugins.push(new webpack.NormalModuleReplacementPlugin(
+      // This plugin is responsible for swapping the environment files.
+      // Since it takes a RegExp as first parameter, we need to escape the path.
+      // See https://webpack.github.io/docs/list-of-plugins.html#normalmodulereplacementplugin
+      new RegExp(path.resolve(appRoot, appConfig.environments['source'])
+        .replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&')),
+      path.resolve(appRoot, appConfig.environments[environment])
+    ));
+  }
+
+  // process asset entries
+  if (appConfig.assets) {
+    extraPlugins.push(new GlobCopyWebpackPlugin({
+      patterns: appConfig.assets,
+      globOptions: { cwd: appRoot, dot: true, ignore: '**/.gitkeep' }
+    }));
+  }
+
   if (progress) { extraPlugins.push(new ProgressPlugin({ profile: verbose, colors: true })); }
 
   return {
@@ -145,22 +168,10 @@ export function getWebpackCommonConfig(
       new BaseHrefWebpackPlugin({
         baseHref: baseHref
       }),
-      new webpack.NormalModuleReplacementPlugin(
-        // This plugin is responsible for swapping the environment files.
-        // Since it takes a RegExp as first parameter, we need to escape the path.
-        // See https://webpack.github.io/docs/list-of-plugins.html#normalmodulereplacementplugin
-        new RegExp(path.resolve(appRoot, appConfig.environments['source'])
-          .replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, '\\$&')),
-        path.resolve(appRoot, appConfig.environments[environment])
-      ),
       new webpack.optimize.CommonsChunkPlugin({
         minChunks: Infinity,
         name: 'inline'
       }),
-      new GlobCopyWebpackPlugin({
-        patterns: appConfig.assets,
-        globOptions: { cwd: appRoot, dot: true, ignore: '**/.gitkeep' }
-      }),
       new webpack.LoaderOptionsPlugin({
         test: /\.(css|scss|sass|less|styl)$/,
         options: {

packages/angular-cli/models/webpack-build-typescript.ts

@@ -9,6 +9,8 @@ const webpackLoader: string = g['angularCliIsLocal']
 
 
 export const getWebpackNonAotConfigPartial = function(projectRoot: string, appConfig: any) {
+  let exclude = [ '**/*.spec.ts' ];
+  if (appConfig.test) { exclude.push(path.join(projectRoot, appConfig.root, appConfig.test)); };
   return {
     module: {
       rules: [
@@ -23,10 +25,7 @@ export const getWebpackNonAotConfigPartial = function(projectRoot: string, appCo
       new AotPlugin({
         tsConfigPath: path.resolve(projectRoot, appConfig.root, appConfig.tsconfig),
         mainPath: path.join(projectRoot, appConfig.root, appConfig.main),
-        exclude: [
-          path.join(projectRoot, appConfig.root, appConfig.test),
-          '**/*.spec.ts'
-        ],
+        exclude: exclude,
         skipCodeGeneration: true
       }),
     ]
@@ -35,6 +34,8 @@ export const getWebpackNonAotConfigPartial = function(projectRoot: string, appCo
 
 export const getWebpackAotConfigPartial = function(projectRoot: string, appConfig: any,
   i18nFile: string, i18nFormat: string, locale: string) {
+  let exclude = [ '**/*.spec.ts' ];
+  if (appConfig.test) { exclude.push(path.join(projectRoot, appConfig.root, appConfig.test)); };
   return {
     module: {
       rules: [
@@ -52,10 +53,7 @@ export const getWebpackAotConfigPartial = function(projectRoot: string, appConfi
         i18nFile: i18nFile,
         i18nFormat: i18nFormat,
         locale: locale,
-        exclude: [
-          path.join(projectRoot, appConfig.root, appConfig.test),
-          '**/*.spec.ts'
-        ]
+        exclude: exclude
       })
     ]
   };

packages/angular-cli/tasks/serve-webpack.ts

@@ -98,7 +98,8 @@ export default Task.extend({
       proxy: proxyConfig,
       compress: serveTaskOptions.target === 'production',
       watchOptions: {
-        poll: CliConfig.fromProject().config.defaults.poll
+        poll: CliConfig.fromProject().config.defaults &&
+          CliConfig.fromProject().config.defaults.poll
       },
       https: serveTaskOptions.ssl
     };

tests/e2e/tests/misc/minimal-config.ts

@@ -0,0 +1,14 @@
+import { writeFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+
+
+export default function () {
+  return Promise.resolve()
+    .then(() => writeFile('angular-cli.json', JSON.stringify({
+      apps: [{
+        root: 'src',
+        main: 'main.ts'
+      }]
+    })))
+    .then(() => ng('build'));
+}

tests/e2e/tests/packages/webpack/test.ts

@@ -1,7 +1,7 @@
 import {normalize} from 'path';
 import {createProjectFromAsset} from '../../../utils/assets';
 import {exec} from '../../../utils/process';
-import {expectFileSizeToBeUnder} from '../../../utils/fs';
+import {expectFileSizeToBeUnder, replaceInFile} from '../../../utils/fs';
 
 
 export default function(skipCleaning: () => void) {
@@ -10,5 +10,11 @@ export default function(skipCleaning: () => void) {
     .then(() => exec(normalize('node_modules/.bin/webpack'), '-p'))
     .then(() => expectFileSizeToBeUnder('dist/app.main.js', 420000))
     .then(() => expectFileSizeToBeUnder('dist/0.app.main.js', 40000))
+    // test resource urls without ./
+    .then(() => replaceInFile('app/app.component.ts',
+      './app.component.html', 'app.component.html'))
+    .then(() => replaceInFile('app/app.component.ts',
+      './app.component.scss', 'app.component.scss'))
+    .then(() => exec(normalize('node_modules/.bin/webpack'), '-p'))
     .then(() => skipCleaning());
 }