diff --git a/.gitignore b/.gitignore
index a60a4dbce..9b3a09fc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,7 @@ debug.log
src/**/*.js
!src/systemjs.config.extras.js
!src/systemjs.config.js
+!src/systemjs-angular-loader.js
*.js.map
e2e/**/*.js
e2e/**/*.js.map
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 66044b5d2..4c991b119 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ Upgraders: for a fresh start, consider running these commands
* `git clean -xdf`
* `npm install`
+
+# 0.4.1 (2017-03-24)
+* Replace systemjs-angular-loader with version that works for IE
+
+
+# 0.4.0 (2017-03-24)
+* Update to Angular 4.0.0
+
+
+# 0.3.0 (2017-03-22)
+* Remove moduleId with a systemjs loader.
+
# 0.2.22 (2017-01-05)
* Add `non-essential-files.txt` and instructions to use it to README
diff --git a/README.md b/README.md
index afbee0226..aeccb7d76 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,14 @@
# Angular QuickStart Source
[![Build Status][travis-badge]][travis-badge-url]
+**This repository is now deprecated. The Angular Quickstart project was a nice starting point for creating Angular applications. Now we recommend using the [Angular CLI](https://github.com/angular/angular-cli) to create new Angular projects.**
+
+**Starting from 1 November 2017, all the Angular documentation, at [angular.io](https://angular.io), is based on the Angular CLI.**
+
+**Let's [get started](https://angular.io/guide/quickstart)**
+
+---
+
This repository holds the TypeScript source code of the [angular.io quickstart](https://angular.io/docs/ts/latest/quickstart.html),
the foundation for most of the documentation samples and potentially a good starting point for your application.
@@ -14,7 +22,7 @@ Please keep that in mind before posting issues and PRs.
## Updating to a newer version of the Quickstart Repo
-From time to time the QuickStart will add be enhanced with support for new features or to reflect
+From time to time the QuickStart will be enhanced with support for new features or to reflect
changes to the [official Style Guide](https://angular.io/docs/ts/latest/guide/style-guide.html).
You can update your existing project to an up-to-date QuickStart by following these instructions:
diff --git a/package.json b/package.json
index 7353243df..25513978a 100644
--- a/package.json
+++ b/package.json
@@ -24,25 +24,25 @@
"author": "",
"license": "MIT",
"dependencies": {
- "@angular/common": "~2.4.0",
- "@angular/compiler": "~2.4.0",
- "@angular/core": "~2.4.0",
- "@angular/forms": "~2.4.0",
- "@angular/http": "~2.4.0",
- "@angular/platform-browser": "~2.4.0",
- "@angular/platform-browser-dynamic": "~2.4.0",
- "@angular/router": "~3.4.0",
+ "@angular/common": "~4.3.4",
+ "@angular/compiler": "~4.3.4",
+ "@angular/core": "~4.3.4",
+ "@angular/forms": "~4.3.4",
+ "@angular/http": "~4.3.4",
+ "@angular/platform-browser": "~4.3.4",
+ "@angular/platform-browser-dynamic": "~4.3.4",
+ "@angular/router": "~4.3.4",
- "angular-in-memory-web-api": "~0.2.4",
+ "angular-in-memory-web-api": "~0.3.0",
"systemjs": "0.19.40",
"core-js": "^2.4.1",
"rxjs": "5.0.1",
- "zone.js": "^0.7.4"
+ "zone.js": "^0.8.4"
},
"devDependencies": {
"concurrently": "^3.2.0",
"lite-server": "^2.2.2",
- "typescript": "~2.0.10",
+ "typescript": "~2.1.0",
"canonical-path": "0.0.2",
"tslint": "^3.15.1",
diff --git a/src/index.html b/src/index.html
index 6d6e22326..832743558 100644
--- a/src/index.html
+++ b/src/index.html
@@ -2,9 +2,9 @@
Angular QuickStart
+
-
diff --git a/src/systemjs-angular-loader.js b/src/systemjs-angular-loader.js
new file mode 100644
index 000000000..8b1005444
--- /dev/null
+++ b/src/systemjs-angular-loader.js
@@ -0,0 +1,49 @@
+var templateUrlRegex = /templateUrl\s*:(\s*['"`](.*?)['"`]\s*)/gm;
+var stylesRegex = /styleUrls *:(\s*\[[^\]]*?\])/g;
+var stringRegex = /(['`"])((?:[^\\]\\\1|.)*?)\1/g;
+
+module.exports.translate = function(load){
+ if (load.source.indexOf('moduleId') != -1) return load;
+
+ var url = document.createElement('a');
+ url.href = load.address;
+
+ var basePathParts = url.pathname.split('/');
+
+ basePathParts.pop();
+ var basePath = basePathParts.join('/');
+
+ var baseHref = document.createElement('a');
+ baseHref.href = this.baseURL;
+ baseHref = baseHref.pathname;
+
+ if (!baseHref.startsWith('/base/')) { // it is not karma
+ basePath = basePath.replace(baseHref, '');
+ }
+
+ load.source = load.source
+ .replace(templateUrlRegex, function(match, quote, url){
+ var resolvedUrl = url;
+
+ if (url.startsWith('.')) {
+ resolvedUrl = basePath + url.substr(1);
+ }
+
+ return 'templateUrl: "' + resolvedUrl + '"';
+ })
+ .replace(stylesRegex, function(match, relativeUrls) {
+ var urls = [];
+
+ while ((match = stringRegex.exec(relativeUrls)) !== null) {
+ if (match[2].startsWith('.')) {
+ urls.push('"' + basePath + match[2].substr(1) + '"');
+ } else {
+ urls.push('"' + match[2] + '"');
+ }
+ }
+
+ return "styleUrls: [" + urls.join(', ') + "]";
+ });
+
+ return load;
+};
diff --git a/src/systemjs.config.js b/src/systemjs.config.js
index e91ba9b3c..129704a37 100644
--- a/src/systemjs.config.js
+++ b/src/systemjs.config.js
@@ -11,7 +11,7 @@
// map tells the System loader where to look for things
map: {
// our app is within the app folder
- app: 'app',
+ 'app': 'app',
// angular bundles
'@angular/core': 'npm:@angular/core/bundles/core.umd.js',
@@ -30,7 +30,12 @@
// packages tells the System loader how to load when no filename and/or no extension
packages: {
app: {
- defaultExtension: 'js'
+ defaultExtension: 'js',
+ meta: {
+ './*.js': {
+ loader: 'systemjs-angular-loader.js'
+ }
+ }
},
rxjs: {
defaultExtension: 'js'