From 044a0c6e5f21d59f51de1a6fc594e8c4944c38c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Rodr=C3=ADguez?= Date: Tue, 14 Feb 2017 00:32:38 +0100 Subject: [PATCH] chore: add systemjs.config.js back to plunkers (#3219) * chore: add systemjs.config.js back to plunkers * remove the non needed options from plnkr.json as well --- public/docs/_examples/setup/ts/quickstart-specs.plnkr.json | 3 +-- public/docs/_examples/testing/ts/1st-specs.plnkr.json | 3 +-- public/docs/_examples/testing/ts/app-specs.plnkr.json | 3 +-- public/docs/_examples/testing/ts/bag-specs.plnkr.json | 3 +-- .../_examples/testing/ts/banner-inline-specs.plnkr.json | 3 +-- public/docs/_examples/testing/ts/banner-specs.plnkr.json | 3 +-- tools/plunker-builder/builder.js | 6 ++---- tools/plunker-builder/indexHtmlTranslator.js | 7 ------- 8 files changed, 8 insertions(+), 23 deletions(-) diff --git a/public/docs/_examples/setup/ts/quickstart-specs.plnkr.json b/public/docs/_examples/setup/ts/quickstart-specs.plnkr.json index 40161e34a0..a7dfedb595 100644 --- a/public/docs/_examples/setup/ts/quickstart-specs.plnkr.json +++ b/public/docs/_examples/setup/ts/quickstart-specs.plnkr.json @@ -9,6 +9,5 @@ ], "main": "quickstart-specs.html", "open": "app/app.component.spec.ts", - "tags": ["quickstart", "setup", "testing"], - "includeSystemConfig": true + "tags": ["quickstart", "setup", "testing"] } diff --git a/public/docs/_examples/testing/ts/1st-specs.plnkr.json b/public/docs/_examples/testing/ts/1st-specs.plnkr.json index 6a21b1f761..9fe15ddef1 100644 --- a/public/docs/_examples/testing/ts/1st-specs.plnkr.json +++ b/public/docs/_examples/testing/ts/1st-specs.plnkr.json @@ -10,6 +10,5 @@ ], "main": "1st-specs.html", "open": "app/1st.spec.ts", - "tags": ["testing"], - "includeSystemConfig": true + "tags": ["testing"] } diff --git a/public/docs/_examples/testing/ts/app-specs.plnkr.json b/public/docs/_examples/testing/ts/app-specs.plnkr.json index 6efb603ce9..d97bf82c86 100644 --- a/public/docs/_examples/testing/ts/app-specs.plnkr.json +++ b/public/docs/_examples/testing/ts/app-specs.plnkr.json @@ -20,6 +20,5 @@ "app-specs.html" ], "main": "app-specs.html", - "tags": ["testing"], - "includeSystemConfig": true + "tags": ["testing"] } diff --git a/public/docs/_examples/testing/ts/bag-specs.plnkr.json b/public/docs/_examples/testing/ts/bag-specs.plnkr.json index 0e320b776c..cd22e10c28 100644 --- a/public/docs/_examples/testing/ts/bag-specs.plnkr.json +++ b/public/docs/_examples/testing/ts/bag-specs.plnkr.json @@ -17,6 +17,5 @@ "bag-specs.html" ], "main": "bag-specs.html", - "tags": ["testing"], - "includeSystemConfig": true + "tags": ["testing"] } diff --git a/public/docs/_examples/testing/ts/banner-inline-specs.plnkr.json b/public/docs/_examples/testing/ts/banner-inline-specs.plnkr.json index 5e1fa0e81f..77b8c212cf 100644 --- a/public/docs/_examples/testing/ts/banner-inline-specs.plnkr.json +++ b/public/docs/_examples/testing/ts/banner-inline-specs.plnkr.json @@ -11,6 +11,5 @@ ], "main": "banner-inline-specs.html", "open": "app/banner-inline.component.spec.ts", - "tags": ["testing"], - "includeSystemConfig": true + "tags": ["testing"] } diff --git a/public/docs/_examples/testing/ts/banner-specs.plnkr.json b/public/docs/_examples/testing/ts/banner-specs.plnkr.json index 10848fa218..6e5f20bccb 100644 --- a/public/docs/_examples/testing/ts/banner-specs.plnkr.json +++ b/public/docs/_examples/testing/ts/banner-specs.plnkr.json @@ -13,6 +13,5 @@ ], "main": "banner-specs.html", "open": "app/banner.component.spec.ts", - "tags": ["testing"], - "includeSystemConfig": true + "tags": ["testing"] } diff --git a/tools/plunker-builder/builder.js b/tools/plunker-builder/builder.js index d7b8b328af..033e6fee62 100644 --- a/tools/plunker-builder/builder.js +++ b/tools/plunker-builder/builder.js @@ -39,10 +39,8 @@ class PlunkerBuilder { _addPlunkerFiles(config, postData) { if (config.basePath.indexOf('/ts') > -1) { - if (config.includeSystemConfig) { - // uses systemjs.config.js so add plunker version - this.options.addField(postData, 'systemjs.config.js', this.systemjsConfig); - } + // uses systemjs.config.js so add plunker version + this.options.addField(postData, 'systemjs.config.js', this.systemjsConfig); } } diff --git a/tools/plunker-builder/indexHtmlTranslator.js b/tools/plunker-builder/indexHtmlTranslator.js index 3877ea1e54..254fdcc750 100644 --- a/tools/plunker-builder/indexHtmlTranslator.js +++ b/tools/plunker-builder/indexHtmlTranslator.js @@ -19,10 +19,6 @@ var _rxRules = { from: '//', to: '' }, - systemjs: { - from: /' - }, // Clear script like this: //