From ba3f37646177be069b2f55fa230065c223caa2f8 Mon Sep 17 00:00:00 2001 From: Rory Mulligan Date: Fri, 10 Nov 2017 09:14:37 -0500 Subject: [PATCH 1/3] Updating to use tslib from shim and downlevel iteration --- tsconfig.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tsconfig.json b/tsconfig.json index 3b17043d..d6a02db2 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,6 +8,8 @@ "sourceMap": true, "strict": true, "target": "es2016", + "noEmitHelpers": true, + "downlevelIteration": true, "types": [ "intern", "sinon-as-promised" ] }, "include": [ From b86e8179242c9b6ae062602e75d9041be758eace Mon Sep 17 00:00:00 2001 From: Rory Mulligan Date: Fri, 10 Nov 2017 09:17:11 -0500 Subject: [PATCH 2/3] Adding main shim import --- src/index.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/index.ts b/src/index.ts index 64bec35d..b021fda9 100755 --- a/src/index.ts +++ b/src/index.ts @@ -1,3 +1,5 @@ +import '@dojo/shim/main'; + import * as yargs from 'yargs'; import updateNotifier from './updateNotifier'; import registerCommands from './registerCommands'; From ab69638342dc609f846862f4438249e403573246 Mon Sep 17 00:00:00 2001 From: Rory Mulligan Date: Wed, 15 Nov 2017 08:07:12 -0500 Subject: [PATCH 3/3] Using importHelpers and removing downlevelIteration --- intern.json | 4 ++++ package.json | 4 ++-- tsconfig.json | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/intern.json b/intern.json index 28c8cb64..657bc2a2 100644 --- a/intern.json +++ b/intern.json @@ -3,6 +3,10 @@ { "browserName": "node" } ], + "browser": { + "loader": "./node_modules/grunt-dojo2/lib/intern/internLoader.js" + }, + "suites": [ "./_build/tests/unit/all.js" ], diff --git a/package.json b/package.json index 1c41bff4..3f686136 100644 --- a/package.json +++ b/package.json @@ -32,9 +32,9 @@ ], "dependencies": { "@dojo/cli-create-app": "~0.1.0", - "@dojo/core": "~0.1.0", + "@dojo/core": "~0.2.1", "@dojo/has": "~0.1.0", - "@dojo/shim": "~0.1.0", + "@dojo/shim": "~0.2.2", "chalk": "^1.1.3", "cliui": "^3.2.0", "cross-spawn": "^4.0.0", diff --git a/tsconfig.json b/tsconfig.json index d6a02db2..93b60ed5 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,8 +8,7 @@ "sourceMap": true, "strict": true, "target": "es2016", - "noEmitHelpers": true, - "downlevelIteration": true, + "importHelpers": true, "types": [ "intern", "sinon-as-promised" ] }, "include": [