From b11cf9419f3a6f9c23d4c225a41e67079a47595a Mon Sep 17 00:00:00 2001 From: Tero Parviainen Date: Tue, 15 Dec 2015 18:56:21 +0200 Subject: [PATCH] chore(upgrade): rename package.json, tsconfig.json, and karma.conf.js Add *.1.* to filenames so that they are available for shredding. --- .../classes/{package.json => package.1.json} | 0 .../test/{karma.conf.js => karma.conf.1.js} | 0 .../classes/{tsconfig.json => tsconfig.1.json} | 0 .../{package.json => package.1.json} | 0 .../test/{karma.conf.js => karma.conf.1.js} | 0 .../{tsconfig.json => tsconfig.1.json} | 0 .../ng2_final/{package.json => package.1.json} | 0 .../test/{karma.conf.js => karma.conf.1.js} | 0 .../{tsconfig.json => tsconfig.1.json} | 0 .../{package.json => package.1.json} | 0 .../test/{karma.conf.js => karma.conf.1.js} | 0 .../{tsconfig.json => tsconfig.1.json} | 0 .../{package.json => package.1.json} | 0 .../test/{karma.conf.js => karma.conf.1.js} | 0 .../{tsconfig.json => tsconfig.1.json} | 0 public/docs/ts/latest/guide/upgrade.jade | 18 +++++++++--------- 16 files changed, 9 insertions(+), 9 deletions(-) rename public/docs/_examples/upgrade/ts/classes/{package.json => package.1.json} (100%) rename public/docs/_examples/upgrade/ts/classes/test/{karma.conf.js => karma.conf.1.js} (100%) rename public/docs/_examples/upgrade/ts/classes/{tsconfig.json => tsconfig.1.json} (100%) rename public/docs/_examples/upgrade/ts/ng2_components/{package.json => package.1.json} (100%) rename public/docs/_examples/upgrade/ts/ng2_components/test/{karma.conf.js => karma.conf.1.js} (100%) rename public/docs/_examples/upgrade/ts/ng2_components/{tsconfig.json => tsconfig.1.json} (100%) rename public/docs/_examples/upgrade/ts/ng2_final/{package.json => package.1.json} (100%) rename public/docs/_examples/upgrade/ts/ng2_final/test/{karma.conf.js => karma.conf.1.js} (100%) rename public/docs/_examples/upgrade/ts/ng2_final/{tsconfig.json => tsconfig.1.json} (100%) rename public/docs/_examples/upgrade/ts/ng2_initial/{package.json => package.1.json} (100%) rename public/docs/_examples/upgrade/ts/ng2_initial/test/{karma.conf.js => karma.conf.1.js} (100%) rename public/docs/_examples/upgrade/ts/ng2_initial/{tsconfig.json => tsconfig.1.json} (100%) rename public/docs/_examples/upgrade/ts/typescript-conversion/{package.json => package.1.json} (100%) rename public/docs/_examples/upgrade/ts/typescript-conversion/test/{karma.conf.js => karma.conf.1.js} (100%) rename public/docs/_examples/upgrade/ts/typescript-conversion/{tsconfig.json => tsconfig.1.json} (100%) diff --git a/public/docs/_examples/upgrade/ts/classes/package.json b/public/docs/_examples/upgrade/ts/classes/package.1.json similarity index 100% rename from public/docs/_examples/upgrade/ts/classes/package.json rename to public/docs/_examples/upgrade/ts/classes/package.1.json diff --git a/public/docs/_examples/upgrade/ts/classes/test/karma.conf.js b/public/docs/_examples/upgrade/ts/classes/test/karma.conf.1.js similarity index 100% rename from public/docs/_examples/upgrade/ts/classes/test/karma.conf.js rename to public/docs/_examples/upgrade/ts/classes/test/karma.conf.1.js diff --git a/public/docs/_examples/upgrade/ts/classes/tsconfig.json b/public/docs/_examples/upgrade/ts/classes/tsconfig.1.json similarity index 100% rename from public/docs/_examples/upgrade/ts/classes/tsconfig.json rename to public/docs/_examples/upgrade/ts/classes/tsconfig.1.json diff --git a/public/docs/_examples/upgrade/ts/ng2_components/package.json b/public/docs/_examples/upgrade/ts/ng2_components/package.1.json similarity index 100% rename from public/docs/_examples/upgrade/ts/ng2_components/package.json rename to public/docs/_examples/upgrade/ts/ng2_components/package.1.json diff --git a/public/docs/_examples/upgrade/ts/ng2_components/test/karma.conf.js b/public/docs/_examples/upgrade/ts/ng2_components/test/karma.conf.1.js similarity index 100% rename from public/docs/_examples/upgrade/ts/ng2_components/test/karma.conf.js rename to public/docs/_examples/upgrade/ts/ng2_components/test/karma.conf.1.js diff --git a/public/docs/_examples/upgrade/ts/ng2_components/tsconfig.json b/public/docs/_examples/upgrade/ts/ng2_components/tsconfig.1.json similarity index 100% rename from public/docs/_examples/upgrade/ts/ng2_components/tsconfig.json rename to public/docs/_examples/upgrade/ts/ng2_components/tsconfig.1.json diff --git a/public/docs/_examples/upgrade/ts/ng2_final/package.json b/public/docs/_examples/upgrade/ts/ng2_final/package.1.json similarity index 100% rename from public/docs/_examples/upgrade/ts/ng2_final/package.json rename to public/docs/_examples/upgrade/ts/ng2_final/package.1.json diff --git a/public/docs/_examples/upgrade/ts/ng2_final/test/karma.conf.js b/public/docs/_examples/upgrade/ts/ng2_final/test/karma.conf.1.js similarity index 100% rename from public/docs/_examples/upgrade/ts/ng2_final/test/karma.conf.js rename to public/docs/_examples/upgrade/ts/ng2_final/test/karma.conf.1.js diff --git a/public/docs/_examples/upgrade/ts/ng2_final/tsconfig.json b/public/docs/_examples/upgrade/ts/ng2_final/tsconfig.1.json similarity index 100% rename from public/docs/_examples/upgrade/ts/ng2_final/tsconfig.json rename to public/docs/_examples/upgrade/ts/ng2_final/tsconfig.1.json diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/package.json b/public/docs/_examples/upgrade/ts/ng2_initial/package.1.json similarity index 100% rename from public/docs/_examples/upgrade/ts/ng2_initial/package.json rename to public/docs/_examples/upgrade/ts/ng2_initial/package.1.json diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/test/karma.conf.js b/public/docs/_examples/upgrade/ts/ng2_initial/test/karma.conf.1.js similarity index 100% rename from public/docs/_examples/upgrade/ts/ng2_initial/test/karma.conf.js rename to public/docs/_examples/upgrade/ts/ng2_initial/test/karma.conf.1.js diff --git a/public/docs/_examples/upgrade/ts/ng2_initial/tsconfig.json b/public/docs/_examples/upgrade/ts/ng2_initial/tsconfig.1.json similarity index 100% rename from public/docs/_examples/upgrade/ts/ng2_initial/tsconfig.json rename to public/docs/_examples/upgrade/ts/ng2_initial/tsconfig.1.json diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/package.json b/public/docs/_examples/upgrade/ts/typescript-conversion/package.1.json similarity index 100% rename from public/docs/_examples/upgrade/ts/typescript-conversion/package.json rename to public/docs/_examples/upgrade/ts/typescript-conversion/package.1.json diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/test/karma.conf.js b/public/docs/_examples/upgrade/ts/typescript-conversion/test/karma.conf.1.js similarity index 100% rename from public/docs/_examples/upgrade/ts/typescript-conversion/test/karma.conf.js rename to public/docs/_examples/upgrade/ts/typescript-conversion/test/karma.conf.1.js diff --git a/public/docs/_examples/upgrade/ts/typescript-conversion/tsconfig.json b/public/docs/_examples/upgrade/ts/typescript-conversion/tsconfig.1.json similarity index 100% rename from public/docs/_examples/upgrade/ts/typescript-conversion/tsconfig.json rename to public/docs/_examples/upgrade/ts/typescript-conversion/tsconfig.1.json diff --git a/public/docs/ts/latest/guide/upgrade.jade b/public/docs/ts/latest/guide/upgrade.jade index 9b37be324d..fb5f09f64e 100644 --- a/public/docs/ts/latest/guide/upgrade.jade +++ b/public/docs/ts/latest/guide/upgrade.jade @@ -173,7 +173,7 @@ include ../../../../_includes/_util-fns in the [Quickstart](../quickstart.html). It instructs the TypeScript compiler how to interpret our source files. -+makeJson('upgrade/ts/typescript-conversion/tsconfig.json', null, 'tsconfig.json') ++makeJson('upgrade/ts/typescript-conversion/tsconfig.1.json', null, 'tsconfig.json') :marked We are telling the TypeScript compiler to turn our TypeScript files to ES5 code @@ -183,7 +183,7 @@ include ../../../../_includes/_util-fns Also add a `tsc` run script to `package.json`. We'll use it to start the TypeScript compiler: -+makeJson('upgrade/ts/typescript-conversion/package.json', {paths: 'scripts'}, 'package.json', {otl: /(\"tsc.*)/}) ++makeJson('upgrade/ts/typescript-conversion/package.1.json', {paths: 'scripts'}, 'package.json', {otl: /(\"tsc.*)/}) :marked We can now launch the TypeScript compiler from the command line. It will watch @@ -358,7 +358,7 @@ include ../../../../_includes/_util-fns We will *watch* them so that the test suite is triggered when changes occur, but we won't have Karma *include* them because that is now done by SystemJS and the shim. -+makeExample('upgrade/ts/typescript-conversion/test/karma.conf.js', 'files', 'test/karma.conf.js') ++makeExample('upgrade/ts/typescript-conversion/test/karma.conf.1.js', 'files', 'test/karma.conf.js') :marked Now we have the infrastructure in place and can convert the test files themselves. @@ -523,7 +523,7 @@ include ../../../../_includes/_util-fns While we're at it, let's also load the same files into unit tests by updating the Karma config: -+makeExample('upgrade/ts/ng2_initial/test/karma.conf.js', 'ng2', 'test/karma.conf.js', {otl: /(.*\.\.\/node\_modules\/angular2.*)/}) ++makeExample('upgrade/ts/ng2_initial/test/karma.conf.1.js', 'ng2', 'test/karma.conf.js', {otl: /(.*\.\.\/node\_modules\/angular2.*)/}) .alert.is-important :marked @@ -549,7 +549,7 @@ include ../../../../_includes/_util-fns compiler's `moduleResolution` option to `node`, so that it knows to look for these definitions from the `angular2` NPM package. -+makeJson('upgrade/ts/ng2_initial/tsconfig.json', null, 'tsconfig.json', {otl: /(\"moduleResolution.*)/}) ++makeJson('upgrade/ts/ng2_initial/tsconfig.1.json', null, 'tsconfig.json', {otl: /(\"moduleResolution.*)/}) :marked Angular 2 bundles the Jasmine type definitions we need in tests, which means @@ -631,7 +631,7 @@ include ../../../../_includes/_util-fns We'll also do the same in `karma.conf.js` so that `Http` will be available in unit tests: -+makeExample('upgrade/ts/ng2_initial/test/karma.conf.js', 'ng2-http') ++makeExample('upgrade/ts/ng2_initial/test/karma.conf.1.js', 'ng2-http') :marked Before the `Http` service is available for injection, we still need to register @@ -754,7 +754,7 @@ include ../../../../_includes/_util-fns the Angular 2 test support library in our unit test suite. We first need to add the angular `testing` bundle to list of files that Karma is loading: -+makeExample('upgrade/ts/ng2_initial/test/karma.conf.js', 'ng2-testing') ++makeExample('upgrade/ts/ng2_initial/test/karma.conf.1.js', 'ng2-testing') :marked Then we'll update the Karma test shim. It should load the Angular 2 @@ -959,7 +959,7 @@ include ../../../../_includes/_util-fns before when we were testing the controller in isolation, but our new test exercises the component as a whole, which includes the template. -+makeExample('upgrade/ts/ng2_components/test/karma.conf.js', 'html', 'test/karma.conf.js') ++makeExample('upgrade/ts/ng2_components/test/karma.conf.1.js', 'html', 'test/karma.conf.js') :marked Now we can start looking at our other controller, which is the one for @@ -1289,7 +1289,7 @@ table :marked And this is what `karma.conf.js` should look like: -+makeExample('upgrade/ts/ng2_final/test/karma.conf.js', null, 'test/karma.conf.js') ++makeExample('upgrade/ts/ng2_final/test/karma.conf.1.js', null, 'test/karma.conf.js') :marked That is the last we'll see of Angular 1! It has served us well but now