refactor(package): re-target from dist/cjs to dist/packages as the ne…

…w npm published dir

.markdown-doctest-setup.js

@@ -45,7 +45,7 @@ module.exports = {
 
   regexRequire: {
     'rxjs/(.*)': function (_, moduleName) {
-      return require(__dirname + '/dist/cjs/' + moduleName);
+      return require(__dirname + '/dist/package/' + moduleName);
     }
   },
 

index.js

@@ -1 +1 @@
-module.exports = require('./dist/cjs/Rx');
+module.exports = require('./dist/package/Rx');

package.json

@@ -211,7 +211,7 @@
   "engines": {
     "npm": ">=2.0.0"
   },
-  "typings": "./dist/cjs/Rx.d.ts",
+  "typings": "./dist/package/typings/Rx.d.ts",
   "dependencies": {
     "symbol-observable": "^1.0.1"
   }

perf/micro/immediate-scheduler/operators/distinct-keyselector.js

@@ -1,5 +1,5 @@
 var RxOld = require('rx');
-var RxNew = require('../../../../dist/cjs/Rx');
+var RxNew = require('../../../../dist/package/Rx');
 
 module.exports = function (suite) {
   var source = Array.from({ length: 25 }, function (_, i) { return { value: i % 3 }; });

perf/micro/immediate-scheduler/operators/distinct.js

@@ -1,5 +1,5 @@
 var RxOld = require('rx');
-var RxNew = require('../../../../dist/cjs/Rx');
+var RxNew = require('../../../../dist/package/Rx');
 
 module.exports = function (suite) {
   var source = Array.from({ length: 25 }, function (_, i) { return i % 3; });

spec/Notification-spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../dist/cjs/Rx';
+import * as Rx from '../dist/package/Rx';
 
 declare const expectObservable;
 const Notification = Rx.Notification;

spec/Observable-spec.ts

@@ -1,9 +1,9 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../dist/cjs/Rx';
-import {TeardownLogic} from '../dist/cjs/Subscription';
+import * as Rx from '../dist/package/Rx';
+import {TeardownLogic} from '../dist/package/Subscription';
 import marbleTestingSignature = require('./helpers/marble-testing'); // tslint:disable-line:no-require-imports
-import { map } from '../dist/cjs/operators';
+import { map } from '../dist/package/operators';
 
 declare const { asDiagram, rxTestScheduler };
 declare const cold: typeof marbleTestingSignature.cold;

spec/Scheduler-spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../dist/cjs/Rx';
+import * as Rx from '../dist/package/Rx';
 
 const Scheduler = Rx.Scheduler;
 

spec/Subject-spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../dist/cjs/Rx';
+import * as Rx from '../dist/package/Rx';
 import marbleTestingSignature = require('./helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { time };

spec/Subscriber-spec.ts

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../dist/cjs/Rx';
+import * as Rx from '../dist/package/Rx';
 
 const Subscriber = Rx.Subscriber;
 

spec/Subscription-spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../dist/cjs/Rx';
+import * as Rx from '../dist/package/Rx';
 
 const Observable = Rx.Observable;
 const Subscription = Rx.Subscription;

spec/exports-spec.ts

@@ -1,29 +1,29 @@
 import { expect } from 'chai';
-import { bindCallback } from '../dist/cjs/observable/bindCallback';
-import { bindNodeCallback } from '../dist/cjs/observable/bindNodeCallback';
-import { combineLatest } from '../dist/cjs/observable/combineLatest';
-import { concat } from '../dist/cjs/observable/concat';
-import { defer } from '../dist/cjs/observable/defer';
-import { empty } from '../dist/cjs/observable/empty';
-import { forkJoin } from '../dist/cjs/observable/forkJoin';
-import { from } from '../dist/cjs/observable/from';
-import { fromEvent } from '../dist/cjs/observable/fromEvent';
-import { fromEventPattern } from '../dist/cjs/observable/fromEventPattern';
-import { fromPromise } from '../dist/cjs/observable/fromPromise';
-import { _if } from '../dist/cjs/observable/if';
-import { interval } from '../dist/cjs/observable/interval';
-import { merge } from '../dist/cjs/observable/merge';
-import { never } from '../dist/cjs/observable/never';
-import { of } from '../dist/cjs/observable/of';
-import { onErrorResumeNext } from '../dist/cjs/observable/onErrorResumeNext';
-import { pairs } from '../dist/cjs/observable/pairs';
-import { race } from '../dist/cjs/observable/race';
-import { range } from '../dist/cjs/observable/range';
-import { _throw } from '../dist/cjs/observable/throw';
-import { timer } from '../dist/cjs/observable/timer';
-import { using } from '../dist/cjs/observable/using';
-import { zip } from '../dist/cjs/observable/zip';
-import * as Rx from '../dist/cjs/Rx';
+import { bindCallback } from '../dist/package/observable/bindCallback';
+import { bindNodeCallback } from '../dist/package/observable/bindNodeCallback';
+import { combineLatest } from '../dist/package/observable/combineLatest';
+import { concat } from '../dist/package/observable/concat';
+import { defer } from '../dist/package/observable/defer';
+import { empty } from '../dist/package/observable/empty';
+import { forkJoin } from '../dist/package/observable/forkJoin';
+import { from } from '../dist/package/observable/from';
+import { fromEvent } from '../dist/package/observable/fromEvent';
+import { fromEventPattern } from '../dist/package/observable/fromEventPattern';
+import { fromPromise } from '../dist/package/observable/fromPromise';
+import { _if } from '../dist/package/observable/if';
+import { interval } from '../dist/package/observable/interval';
+import { merge } from '../dist/package/observable/merge';
+import { never } from '../dist/package/observable/never';
+import { of } from '../dist/package/observable/of';
+import { onErrorResumeNext } from '../dist/package/observable/onErrorResumeNext';
+import { pairs } from '../dist/package/observable/pairs';
+import { race } from '../dist/package/observable/race';
+import { range } from '../dist/package/observable/range';
+import { _throw } from '../dist/package/observable/throw';
+import { timer } from '../dist/package/observable/timer';
+import { using } from '../dist/package/observable/using';
+import { zip } from '../dist/package/observable/zip';
+import * as Rx from '../dist/package/Rx';
 
 describe('exports', () => {
   it('should have rxjs/observable/bindCallback', () => {

spec/helpers/marble-testing.ts

@@ -1,9 +1,9 @@
 ///<reference path='../../typings/index.d.ts'/>
-import {Observable} from '../../dist/cjs/Observable';
-import {SubscriptionLog} from '../../dist/cjs/testing/SubscriptionLog';
-import {ColdObservable} from '../../dist/cjs/testing/ColdObservable';
-import {HotObservable} from '../../dist/cjs/testing/HotObservable';
-import {TestScheduler, observableToBeFn, subscriptionLogsToBeFn} from '../../dist/cjs/testing/TestScheduler';
+import {Observable} from '../../dist/package/Observable';
+import {SubscriptionLog} from '../../dist/package/testing/SubscriptionLog';
+import {ColdObservable} from '../../dist/package/testing/ColdObservable';
+import {HotObservable} from '../../dist/package/testing/HotObservable';
+import {TestScheduler, observableToBeFn, subscriptionLogsToBeFn} from '../../dist/package/testing/TestScheduler';
 
 declare const global: any;
 

spec/helpers/test-helper.ts

@@ -1,10 +1,10 @@
 ///<reference path='../../typings/index.d.ts'/>
 declare const global: any;
 
-import * as Rx from '../../dist/cjs/Rx';
-import {ObservableInput} from '../../dist/cjs/Observable';
-import {root} from '../../dist/cjs/util/root';
-import {$$iterator} from '../../dist/cjs/symbol/iterator';
+import * as Rx from '../../dist/package/Rx';
+import {ObservableInput} from '../../dist/package/Observable';
+import {root} from '../../dist/package/util/root';
+import {$$iterator} from '../../dist/package/symbol/iterator';
 import $$symbolObservable from 'symbol-observable';
 
 export function lowerCaseO<T>(...args): Rx.Observable<T> {

spec/helpers/testScheduler-ui.ts

@@ -7,7 +7,7 @@ import * as escapeRe from 'escape-string-regexp';
 import * as chai from 'chai';
 import * as sinonChai from 'sinon-chai';
 
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import * as marble from './marble-testing';
 
 //setup sinon-chai

spec/helpers/tests2png/diagram-test-runner.js

@@ -1,5 +1,5 @@
-var root = require('../../../dist/cjs/util/root').root;
-var Rx = require('../../../dist/cjs/Rx');
+var root = require('../../../dist/package/util/root').root;
+var Rx = require('../../../dist/package/Rx');
 var painter = require('./painter');
 
 function getInputStreams(rxTestScheduler) {

spec/observables/IteratorObservable-spec.ts

@@ -1,7 +1,7 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
-import {queue} from '../../dist/cjs/scheduler/queue';
-import {IteratorObservable} from '../../dist/cjs/observable/IteratorObservable';
+import * as Rx from '../../dist/package/Rx';
+import {queue} from '../../dist/package/scheduler/queue';
+import {IteratorObservable} from '../../dist/package/observable/IteratorObservable';
 
 declare const expectObservable;
 declare const rxTestScheduler: Rx.TestScheduler;

spec/observables/ScalarObservable-spec.ts

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
-import {ScalarObservable} from '../../dist/cjs/observable/ScalarObservable';
+import * as Rx from '../../dist/package/Rx';
+import {ScalarObservable} from '../../dist/package/observable/ScalarObservable';
 
 declare const rxTestScheduler: Rx.TestScheduler;
 

spec/observables/SubscribeOnObservable-spec.ts

@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
-import {SubscribeOnObservable} from '../../dist/cjs/observable/SubscribeOnObservable';
+import * as Rx from '../../dist/package/Rx';
+import {SubscribeOnObservable} from '../../dist/package/observable/SubscribeOnObservable';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const hot: typeof marbleTestingSignature.hot;

spec/observables/bindCallback-spec.ts

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 declare const rxTestScheduler: Rx.TestScheduler;
 const Observable = Rx.Observable;

spec/observables/bindNodeCallback-spec.ts

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 declare const rxTestScheduler: Rx.TestScheduler;
 const Observable = Rx.Observable;

spec/observables/combineLatest-spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { type };

spec/observables/concat-spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import {lowerCaseO} from '../helpers/test-helper';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 

spec/observables/defer-spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };

spec/observables/dom/ajax-spec.ts

@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../../dist/cjs/Rx';
-import {root} from '../../../dist/cjs/util/root';
+import * as Rx from '../../../dist/package/Rx';
+import {root} from '../../../dist/package/util/root';
 
 declare const global: any;
 

spec/observables/dom/webSocket-spec.ts

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../../dist/cjs/Rx';
+import * as Rx from '../../../dist/package/Rx';
 
 declare const __root__: any;
 

spec/observables/empty-spec.ts

@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };

spec/observables/forkJoin-spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import {lowerCaseO} from '../helpers/test-helper';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 

spec/observables/from-promise-spec.ts

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 declare const process: any;
 const Observable = Rx.Observable;

spec/observables/from-spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 
 declare const {asDiagram, expectObservable, Symbol, type};
 declare const rxTestScheduler: Rx.TestScheduler;

spec/observables/fromEvent-spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };

spec/observables/fromEventPattern-spec.ts

@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
-import {noop} from '../../dist/cjs/util/noop';
+import * as Rx from '../../dist/package/Rx';
+import {noop} from '../../dist/package/util/noop';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };

spec/observables/generate-spec.ts

@@ -1,6 +1,6 @@
-import * as Rx from '../../dist/cjs/Rx';
-import '../../dist/cjs/add/observable/generate';
-import {TestScheduler} from '../../dist/cjs/testing/TestScheduler';
+import * as Rx from '../../dist/package/Rx';
+import '../../dist/package/add/observable/generate';
+import {TestScheduler} from '../../dist/package/testing/TestScheduler';
 import {expect} from 'chai';
 declare const {asDiagram, expectObservable};
 declare const rxTestScheduler: TestScheduler;

spec/observables/if-spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const expectObservable: typeof marbleTestingSignature.expectObservable;

spec/observables/interval-spec.ts

@@ -1,6 +1,6 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };

spec/observables/merge-spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import {lowerCaseO} from '../helpers/test-helper';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 

spec/observables/never-spec.ts

@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };

spec/observables/of-spec.ts

@@ -1,8 +1,8 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
-import {ArrayObservable} from '../../dist/cjs/observable/ArrayObservable';
-import {ScalarObservable} from '../../dist/cjs/observable/ScalarObservable';
-import {EmptyObservable} from '../../dist/cjs/observable/EmptyObservable';
+import * as Rx from '../../dist/package/Rx';
+import {ArrayObservable} from '../../dist/package/observable/ArrayObservable';
+import {ScalarObservable} from '../../dist/package/observable/ScalarObservable';
+import {EmptyObservable} from '../../dist/package/observable/EmptyObservable';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };

spec/observables/onErrorResumeNext-spec.ts

@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const hot: typeof marbleTestingSignature.hot;

spec/observables/pairs-spec.ts

@@ -1,5 +1,5 @@
 import {expect} from 'chai';
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };

spec/observables/race-spec.ts

@@ -1,4 +1,4 @@
-import * as Rx from '../../dist/cjs/Rx';
+import * as Rx from '../../dist/package/Rx';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const hot: typeof marbleTestingSignature.hot;

spec/observables/range-spec.ts

@@ -1,7 +1,7 @@
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import * as Rx from '../../dist/cjs/Rx';
-import {RangeObservable} from '../../dist/cjs/observable/RangeObservable';
+import * as Rx from '../../dist/package/Rx';
+import {RangeObservable} from '../../dist/package/observable/RangeObservable';
 import marbleTestingSignature = require('../helpers/marble-testing'); // tslint:disable-line:no-require-imports
 
 declare const { asDiagram };