Adding polyfills, issue #106

dojo · Sep 11, 2017 · 3e72e05 · 3e72e05
1 parent 499e736
commit 3e72e05
Show file tree

Hide file tree

Showing 12 changed files with 98 additions and 38 deletions.
diff --git a/package.json b/package.json
@@ -36,6 +36,7 @@
     "typescript": "~2.4.1"
   },
   "dependencies": {
+    "pepjs": "^0.4.2",
     "tslib": "^1.7.1"
   }
 }
diff --git a/src/main.ts b/src/main.ts
@@ -9,6 +9,18 @@ import * as string from './string';
 import Symbol from './Symbol';
 import WeakMap from './WeakMap';
 
+`!has('es6-promise')`;
+import './Promise';
+
+`!has('es6-symbol')`;
+import './Symbol';
+import has from '@dojo/has/has';
+
+if (has('host-browser')) {
+	require('pepjs');
+	require('intersection-observer');
+}
+
 export {
 	array,
 	iterator,

diff --git a/src/util/amd.ts b/src/util/amd.ts
@@ -0,0 +1,39 @@
+function addIfNotPresent(packages: any[], newPackage: any) {
+	if (packages.some((pack) => pack.name === newPackage.name)) {
+		return;
+	}
+
+	packages.push(newPackage);
+}
+
+// tslint:disable-next-line
+function shimAmdDependencies(config: any) {
+	let packages = config.packages || [];
+
+	addIfNotPresent(packages, {
+		name: 'tslib',
+		location: 'node_modules/tslib',
+		main: 'tslib'
+	});
+
+	addIfNotPresent(packages, {
+		name: 'pepjs',
+		location: 'node_modules/pepjs/dist',
+		main: 'pep'
+	});
+
+	addIfNotPresent(packages, {
+		name: 'intersection-observer',
+		location: 'node_modules/intersection-observer',
+		main: 'intersection-observer'
+	});
+
+	addIfNotPresent(packages, {
+		name: '@dojo',
+		location: 'node_modules/@dojo'
+	});
+
+	config.packages = packages;
+
+	return config;
+}
diff --git a/tests/functional/asyncAwait.html b/tests/functional/asyncAwait.html
@@ -6,16 +6,16 @@
 </head>
 
 <body>
+<script src="../../src/util/amd.js"></script>
 <script src="../../../node_modules/@dojo/loader/loader.js"></script>
 <script>
-	require.config({
-		packages: [
-			{ name: '@dojo', location: '../../../node_modules/@dojo' }
-		]
-	});
+	require.config(shimAmdDependencies({
+		baseUrl: '../../../'
+	}));
 	require([
-		'./dojoPromise'
-	], function(main) {
+		'_build/src/main',
+		'_build/tests/functional/dojoPromise'
+	], function(unused, main) {
 		main.default(function(value) {
 			window.callbackValue = value;
 		});

diff --git a/tests/functional/asyncAwait.ts b/tests/functional/asyncAwait.ts
@@ -5,7 +5,7 @@ import pollUntil from '@theintern/leadfoot/helpers/pollUntil';
 registerSuite('asyncAwait', {
 	'Async/Await with Bluebird'() {
 		return this.remote
-			.get((<any> require).toUrl('./bluebird.html'))
+			.get('/_build/tests/functional/bluebird.html')
 			.then(pollUntil(function () {
 				return (<any> window).callbackValue;
 			}, undefined, 5000), undefined)
@@ -16,7 +16,7 @@ registerSuite('asyncAwait', {
 
 	'Async/Await with Dojo'() {
 		return this.remote
-			.get((<any> require).toUrl('./asyncAwait.html'))
+			.get('/_build/tests/functional/asyncAwait.html')
 			.then(pollUntil(function () {
 				return (<any> window).callbackValue;
 			}, undefined, 5000), undefined)
@@ -27,7 +27,7 @@ registerSuite('asyncAwait', {
 
 	'Async/Await with Bluebird and Dojo'() {
 		return this.remote
-			.get((<any> require).toUrl('./bluebirdAndDojo.html'))
+			.get('/_build/tests/functional/bluebirdAndDojo.html')
 			.then(pollUntil(function () {
 				return (<any> window).callbackValue;
 			}, undefined, 5000), undefined)

diff --git a/tests/functional/bluebird.html b/tests/functional/bluebird.html
@@ -6,12 +6,17 @@
 </head>
 
 <body>
+<script src="../../src/util/amd.js"></script>
 <script src="https://cdn.jsdelivr.net/bluebird/latest/bluebird.core.min.js"></script>
 <script src="../../../node_modules/@dojo/loader/loader.js"></script>
 <script>
+	require.config(shimAmdDependencies({
+		baseUrl: '../../../'
+	}));
 	require([
-		'./nativePromise'
-	], function(main) {
+		'_build/src/main',
+		'_build/tests/functional/nativePromise'
+	], function(unused, main) {
 		main.default(function(value) {
 			window.callbackValue = value;
 		});

diff --git a/tests/functional/bluebirdAndDojo.html b/tests/functional/bluebirdAndDojo.html
@@ -6,17 +6,17 @@
 </head>
 
 <body>
+<script src="../../src/util/amd.js"></script>
 <script src="https://cdn.jsdelivr.net/bluebird/latest/bluebird.core.min.js"></script>
 <script src="../../../node_modules/@dojo/loader/loader.js"></script>
 <script>
-	require.config({
-		packages: [
-			{ name: '@dojo', location: '../../../node_modules/@dojo' }
-		]
-	});
+	require.config(shimAmdDependencies({
+		baseUrl: '../../../'
+	}));
 	require([
-		'./dojoPromise'
-	], function(main) {
+		'_build/src/main',
+		'_build/tests/functional/dojoPromise'
+	], function(unused, main) {
 		main.default(function(value) {
 			window.callbackValue = value;
 		});

diff --git a/tests/intern.ts b/tests/intern.ts
@@ -14,27 +14,15 @@ export const capabilities = {
 // Maximum number of simultaneous integration tests that should be executed on the remote WebDriver service
 export const maxConcurrency = 5;
 
-// Configuration options for the module loader; any AMD configuration options supported by the specified AMD loader
-// can be used here
-export const loader = {
-	script: 'dojo2',
-	options: {
-		// Packages that should be registered with the loader in each testing environment
-		packages: [
-			{ name: 'src', location: '_build/src' },
-			{ name: 'tests', location: '_build/tests' },
-			{ name: 'dojo', location: 'node_modules/intern/node_modules/dojo' },
-			{ name: 'grunt-dojo2', location: 'node_modules/grunt-dojo2'},
-			{ name: '@dojo', location: 'node_modules/@dojo' }
-		]
-	}
+export const browser = {
+	loader: './_build/tests/loader.js'
 };
 
 // Non-functional test suite(s) to run in each browser
-export const suites = 'tests/unit/all';
+export const suites = ['_build/src/main.js', '_build/tests/unit/all.js'];
 
 // Functional test suite(s) to run in each browser once non-functional tests are completed
-export const functionalSuites = 'tests/functional/all';
+export const functionalSuites = '_build/tests/functional/all';
 
 // A regular expression matching URLs to files that should not be included in code coverage analysis
 export const coverage = [

diff --git a/tests/loader.ts b/tests/loader.ts
@@ -0,0 +1,16 @@
+intern.registerLoader((options) => {
+	return intern.loadScript('node_modules/@dojo/loader/loader.js')
+		.then(() => intern.loadScript('./_build/src/util/amd.js'))
+		.then(() => {
+			(<any> require).config(shimAmdDependencies({
+				baseUrl: options.baseUrl || intern.config.basePath,
+				packages: []
+			}));
+
+			return (modules: string[]) => {
+				return new Promise<void>((resolve, reject) => {
+					(<any> require)(modules, () => resolve());
+				});
+			};
+		});
+});
diff --git a/tests/unit/array.ts b/tests/unit/array.ts
@@ -1,7 +1,7 @@
 import * as array from '../../src/array';
 import has, { add as hasAdd } from '../../src/support/has';
 import { Iterable, ShimIterator } from '../../src/iterator';
-import 'src/Symbol';
+import '../../src/Symbol';
 
 const { registerSuite } = intern.getInterface('object');
 const { assert } = intern.getPlugin('chai');

diff --git a/tests/unit/object.ts b/tests/unit/object.ts
@@ -1,6 +1,6 @@
 import * as object from '../../src/object';
 import { assign } from '../../src/object';
-import 'src/Symbol';
+import '../../src/Symbol';
 
 const { registerSuite } = intern.getInterface('object');
 const { assert } = intern.getPlugin('chai');

diff --git a/tsconfig.json b/tsconfig.json
@@ -21,7 +21,6 @@
 		"moduleResolution": "node",
 		"strictNullChecks": true,
 		"noImplicitThis": true,
-		"importHelpers": true,
 		"types": [ "intern" ],
 		"typeRoots": [
 			"./node_modules/@types",