Merge pull request #3907 from fivetanley/addonize

Addonize
emberjs · Nov 12, 2015 · 1d5dfa1 · 1d5dfa1
2 parents 309d481 + 0ee2cc7
commit 1d5dfa1
Show file tree

Hide file tree

Showing 218 changed files with 5,803 additions and 5,244 deletions.
diff --git a/.bowerrc b/.bowerrc
@@ -1,3 +1,4 @@
 {
-  "directory": "bower_components"
+  "directory": "bower_components",
+  "interactive": false
 }
diff --git a/.travis.yml b/.travis.yml
@@ -1,19 +1,18 @@
 ---
 language: node_js
-sudo: false
+sudo: required
+dist: trusty
 node_js:
   - "0.10"
 before_install:
   - "npm config set spin false"
   - "npm install -g npm@^2"
 install:
   - npm install --no-optional
+  - ./node_modules/.bin/bower install
 script:
   - ./bin/lint-features
   - npm run-script test
-  - npm run-script test:beta
-  - npm run-script test:canary
-  - npm run-script test:optional-features
 after_success:
   - npm run-script publish-build:prebuilt
   - "./bin/bower-ember-data-build"

diff --git a/Brocfile.js b/Brocfile.js
diff --git a/addon/.gitkeep b/addon/.gitkeep
diff --git a/packages/ember-data/lib/adapters.js → addon/adapters.js b/packages/ember-data/lib/adapters.js → addon/adapters.js
diff --git a/...mber-data/lib/adapters/build-url-mixin.js → addon/adapters/build-url-mixin.js b/...mber-data/lib/adapters/build-url-mixin.js → addon/adapters/build-url-mixin.js
diff --git a/packages/ember-data/lib/adapters/errors.js → addon/adapters/errors.js b/packages/ember-data/lib/adapters/errors.js → addon/adapters/errors.js
@@ -1,3 +1,4 @@
+import {assert} from 'ember-data/debug';
 const EmberError = Ember.Error;
 
 const SOURCE_POINTER_REGEXP = /^\/?data\/(attributes|relationships)\/(.*)/;
@@ -80,7 +81,7 @@ AdapterError.prototype = Object.create(EmberError.prototype);
   @namespace DS
 */
 export function InvalidError(errors) {
-  Ember.assert('`InvalidError` expects json-api formatted errors array.', Ember.isArray(errors || []));
+  assert('`InvalidError` expects json-api formatted errors array.', Ember.isArray(errors || []));
   AdapterError.call(this, errors, 'The adapter rejected the commit because it was invalid');
 }
 

diff --git a/...ber-data/lib/adapters/json-api-adapter.js → addon/adapters/json-api-adapter.js b/...ber-data/lib/adapters/json-api-adapter.js → addon/adapters/json-api-adapter.js
diff --git a/...s/ember-data/lib/adapters/rest-adapter.js → addon/adapters/rest-adapter.js b/...s/ember-data/lib/adapters/rest-adapter.js → addon/adapters/rest-adapter.js
diff --git a/packages/ember-data/lib/core.js → addon/core.js b/packages/ember-data/lib/core.js → addon/core.js
@@ -1,3 +1,6 @@
+import Ember from 'ember';
+import VERSION from 'ember-data/version';
+
 /**
   @module ember-data
 */
@@ -12,20 +15,19 @@
 /**
   @property VERSION
   @type String
-  @default 'VERSION_STRING_PLACEHOLDER'
   @static
 */
 /*jshint -W079 */
 var DS = Ember.Namespace.create({
-  VERSION: 'VERSION_STRING_PLACEHOLDER'
+  VERSION: VERSION
 });
 
 if (Ember.libraries) {
   Ember.libraries.registerCoreLibrary('Ember Data', DS.VERSION);
 }
 
-var EMBER_DATA_FEATURES = EMBER_DATA_FEATURES_PLACEHOLDER; //jshint ignore: line
+// var EMBER_DATA_FEATURES = EMBER_DATA_FEATURES_PLACEHOLDER; //jshint ignore: line
 
-Ember.merge(Ember.FEATURES, EMBER_DATA_FEATURES);
+// Ember.merge(Ember.FEATURES, EMBER_DATA_FEATURES);
 
 export default DS;
diff --git a/addon/debug.js b/addon/debug.js
@@ -0,0 +1,30 @@
+import Ember from 'ember';
+
+export function assert() {
+  return Ember.assert(...arguments);
+}
+
+export function debug() {
+  return Ember.debug(...arguments);
+}
+
+export function deprecate() {
+  return Ember.deprecate(...arguments);
+}
+
+export function info() {
+  return Ember.info(...arguments);
+}
+
+export function runInDebug() {
+  return Ember.runInDebug(...arguments);
+}
+
+export function warn() {
+  return Ember.warn(...arguments);
+}
+
+export function debugSeal() {
+  return Ember.debugSeal(...arguments);
+}
+
diff --git a/packages/ember-data/lib/ember-initializer.js → addon/ember-initializer.js b/packages/ember-data/lib/ember-initializer.js → addon/ember-initializer.js
diff --git a/packages/ember-data/lib/ext/date.js → addon/ext/date.js b/packages/ember-data/lib/ext/date.js → addon/ext/date.js
diff --git a/packages/ember-data/lib/main.js → addon/index.js b/packages/ember-data/lib/main.js → addon/index.js
@@ -1,3 +1,4 @@
+import Ember from "ember";
 /**
   Ember Data
   @module ember-data

diff --git a/...ber-data/lib/initializers/data-adapter.js → addon/initializers/data-adapter.js b/...ber-data/lib/initializers/data-adapter.js → addon/initializers/data-adapter.js
diff --git a/...data/lib/initializers/store-injections.js → addon/initializers/store-injections.js b/...data/lib/initializers/store-injections.js → addon/initializers/store-injections.js
diff --git a/...ages/ember-data/lib/initializers/store.js → addon/initializers/store.js b/...ages/ember-data/lib/initializers/store.js → addon/initializers/store.js
diff --git a/...ember-data/lib/initializers/transforms.js → addon/initializers/transforms.js b/...ember-data/lib/initializers/transforms.js → addon/initializers/transforms.js
diff --git a/...-initializers/initialize-store-service.js → ...-initializers/initialize-store-service.js b/...-initializers/initialize-store-service.js → ...-initializers/initialize-store-service.js
diff --git a/packages/ember-data/lib/serializers.js → addon/serializers.js b/packages/ember-data/lib/serializers.js → addon/serializers.js
diff --git a/...lib/serializers/embedded-records-mixin.js → addon/serializers/embedded-records-mixin.js b/...lib/serializers/embedded-records-mixin.js → addon/serializers/embedded-records-mixin.js
diff --git a/...ta/lib/serializers/json-api-serializer.js → addon/serializers/json-api-serializer.js b/...ta/lib/serializers/json-api-serializer.js → addon/serializers/json-api-serializer.js
diff --git a/...r-data/lib/serializers/json-serializer.js → addon/serializers/json-serializer.js b/...r-data/lib/serializers/json-serializer.js → addon/serializers/json-serializer.js
diff --git a/...r-data/lib/serializers/rest-serializer.js → addon/serializers/rest-serializer.js b/...r-data/lib/serializers/rest-serializer.js → addon/serializers/rest-serializer.js
diff --git a/packages/ember-data/lib/setup-container.js → addon/setup-container.js b/packages/ember-data/lib/setup-container.js → addon/setup-container.js
diff --git a/packages/ember-data/lib/system/adapter.js → addon/system/adapter.js b/packages/ember-data/lib/system/adapter.js → addon/system/adapter.js
diff --git a/packages/ember-data/lib/system/clone-null.js → addon/system/clone-null.js b/packages/ember-data/lib/system/clone-null.js → addon/system/clone-null.js
diff --git a/packages/ember-data/lib/system/coerce-id.js → addon/system/coerce-id.js b/packages/ember-data/lib/system/coerce-id.js → addon/system/coerce-id.js
diff --git a/.../ember-data/lib/system/container-proxy.js → addon/system/container-proxy.js b/.../ember-data/lib/system/container-proxy.js → addon/system/container-proxy.js
diff --git a/packages/ember-data/lib/system/debug.js → addon/system/debug.js b/packages/ember-data/lib/system/debug.js → addon/system/debug.js
diff --git a/...er-data/lib/system/debug/debug-adapter.js → addon/system/debug/debug-adapter.js b/...er-data/lib/system/debug/debug-adapter.js → addon/system/debug/debug-adapter.js
diff --git a/...ember-data/lib/system/debug/debug-info.js → addon/system/debug/debug-info.js b/...ember-data/lib/system/debug/debug-info.js → addon/system/debug/debug-info.js
diff --git a/...ges/ember-data/lib/system/empty-object.js → addon/system/empty-object.js b/...ges/ember-data/lib/system/empty-object.js → addon/system/empty-object.js
diff --git a/...es/ember-data/lib/system/is-array-like.js → addon/system/is-array-like.js b/...es/ember-data/lib/system/is-array-like.js → addon/system/is-array-like.js
diff --git a/packages/ember-data/lib/system/many-array.js → addon/system/many-array.js b/packages/ember-data/lib/system/many-array.js → addon/system/many-array.js
diff --git a/packages/ember-data/lib/system/merge.js → addon/system/merge.js b/packages/ember-data/lib/system/merge.js → addon/system/merge.js
diff --git a/packages/ember-data/lib/system/model.js → addon/system/model.js b/packages/ember-data/lib/system/model.js → addon/system/model.js
diff --git a/...ember-data/lib/system/model/attributes.js → addon/system/model/attributes.js b/...ember-data/lib/system/model/attributes.js → addon/system/model/attributes.js
diff --git a/...ges/ember-data/lib/system/model/errors.js → addon/system/model/errors.js b/...ges/ember-data/lib/system/model/errors.js → addon/system/model/errors.js
diff --git a/...r-data/lib/system/model/errors/invalid.js → addon/system/model/errors/invalid.js b/...r-data/lib/system/model/errors/invalid.js → addon/system/model/errors/invalid.js
diff --git a/...r-data/lib/system/model/internal-model.js → addon/system/model/internal-model.js b/...r-data/lib/system/model/internal-model.js → addon/system/model/internal-model.js
diff --git a/...ages/ember-data/lib/system/model/model.js → addon/system/model/model.js b/...ages/ember-data/lib/system/model/model.js → addon/system/model/model.js
diff --git a/...ges/ember-data/lib/system/model/states.js → addon/system/model/states.js b/...ges/ember-data/lib/system/model/states.js → addon/system/model/states.js
diff --git a/...s/ember-data/lib/system/normalize-link.js → addon/system/normalize-link.js b/...s/ember-data/lib/system/normalize-link.js → addon/system/normalize-link.js
diff --git a/...r-data/lib/system/normalize-model-name.js → addon/system/normalize-model-name.js b/...r-data/lib/system/normalize-model-name.js → addon/system/normalize-model-name.js
diff --git a/...ages/ember-data/lib/system/ordered-set.js → addon/system/ordered-set.js b/...ages/ember-data/lib/system/ordered-set.js → addon/system/ordered-set.js
diff --git a/.../ember-data/lib/system/promise-proxies.js → addon/system/promise-proxies.js b/.../ember-data/lib/system/promise-proxies.js → addon/system/promise-proxies.js
diff --git a/...r-data/lib/system/record-array-manager.js → addon/system/record-array-manager.js b/...r-data/lib/system/record-array-manager.js → addon/system/record-array-manager.js
diff --git a/...es/ember-data/lib/system/record-arrays.js → addon/system/record-arrays.js b/...es/ember-data/lib/system/record-arrays.js → addon/system/record-arrays.js
diff --git a/...-arrays/adapter-populated-record-array.js → ...-arrays/adapter-populated-record-array.js b/...-arrays/adapter-populated-record-array.js → ...-arrays/adapter-populated-record-array.js
diff --git a/...em/record-arrays/filtered-record-array.js → ...em/record-arrays/filtered-record-array.js b/...em/record-arrays/filtered-record-array.js → ...em/record-arrays/filtered-record-array.js
diff --git a/.../lib/system/record-arrays/record-array.js → addon/system/record-arrays/record-array.js b/.../lib/system/record-arrays/record-array.js → addon/system/record-arrays/record-array.js
diff --git a/...mber-data/lib/system/relationship-meta.js → addon/system/relationship-meta.js b/...mber-data/lib/system/relationship-meta.js → addon/system/relationship-meta.js
diff --git a/...es/ember-data/lib/system/relationships.js → addon/system/relationships.js b/...es/ember-data/lib/system/relationships.js → addon/system/relationships.js
diff --git a/...ta/lib/system/relationships/belongs-to.js → addon/system/relationships/belongs-to.js b/...ta/lib/system/relationships/belongs-to.js → addon/system/relationships/belongs-to.js
diff --git a/...mber-data/lib/system/relationships/ext.js → addon/system/relationships/ext.js b/...mber-data/lib/system/relationships/ext.js → addon/system/relationships/ext.js
diff --git a/...data/lib/system/relationships/has-many.js → addon/system/relationships/has-many.js b/...data/lib/system/relationships/has-many.js → addon/system/relationships/has-many.js
diff --git a/.../system/relationships/state/belongs-to.js → .../system/relationships/state/belongs-to.js b/.../system/relationships/state/belongs-to.js → .../system/relationships/state/belongs-to.js
diff --git a/.../lib/system/relationships/state/create.js → addon/system/relationships/state/create.js b/.../lib/system/relationships/state/create.js → addon/system/relationships/state/create.js
diff --git a/...ib/system/relationships/state/has-many.js → addon/system/relationships/state/has-many.js b/...ib/system/relationships/state/has-many.js → addon/system/relationships/state/has-many.js
diff --git a/...ystem/relationships/state/relationship.js → ...ystem/relationships/state/relationship.js b/...ystem/relationships/state/relationship.js → ...ystem/relationships/state/relationship.js
diff --git a/packages/ember-data/lib/system/serializer.js → addon/system/serializer.js b/packages/ember-data/lib/system/serializer.js → addon/system/serializer.js
diff --git a/...-data/lib/system/snapshot-record-array.js → addon/system/snapshot-record-array.js b/...-data/lib/system/snapshot-record-array.js → addon/system/snapshot-record-array.js
diff --git a/packages/ember-data/lib/system/snapshot.js → addon/system/snapshot.js b/packages/ember-data/lib/system/snapshot.js → addon/system/snapshot.js
diff --git a/packages/ember-data/lib/system/store.js → addon/system/store.js b/packages/ember-data/lib/system/store.js → addon/system/store.js
diff --git a/...ges/ember-data/lib/system/store/common.js → addon/system/store/common.js b/...ges/ember-data/lib/system/store/common.js → addon/system/store/common.js
diff --git a/.../system/store/container-instance-cache.js → .../system/store/container-instance-cache.js b/.../system/store/container-instance-cache.js → .../system/store/container-instance-cache.js
diff --git a/...es/ember-data/lib/system/store/finders.js → addon/system/store/finders.js b/...es/ember-data/lib/system/store/finders.js → addon/system/store/finders.js
diff --git a/...a/lib/system/store/serializer-response.js → addon/system/store/serializer-response.js b/...a/lib/system/store/serializer-response.js → addon/system/store/serializer-response.js
diff --git a/...mber-data/lib/system/store/serializers.js → addon/system/store/serializers.js b/...mber-data/lib/system/store/serializers.js → addon/system/store/serializers.js
diff --git a/packages/ember-data/lib/transforms.js → addon/transforms.js b/packages/ember-data/lib/transforms.js → addon/transforms.js
diff --git a/packages/ember-data/lib/transforms/base.js → addon/transforms/base.js b/packages/ember-data/lib/transforms/base.js → addon/transforms/base.js
diff --git a/...ages/ember-data/lib/transforms/boolean.js → addon/transforms/boolean.js b/...ages/ember-data/lib/transforms/boolean.js → addon/transforms/boolean.js
diff --git a/packages/ember-data/lib/transforms/date.js → addon/transforms/date.js b/packages/ember-data/lib/transforms/date.js → addon/transforms/date.js
diff --git a/packages/ember-data/lib/transforms/number.js → addon/transforms/number.js b/packages/ember-data/lib/transforms/number.js → addon/transforms/number.js
diff --git a/packages/ember-data/lib/transforms/string.js → addon/transforms/string.js b/packages/ember-data/lib/transforms/string.js → addon/transforms/string.js
diff --git a/packages/ember-data/lib/utils.js → addon/utils.js b/packages/ember-data/lib/utils.js → addon/utils.js
diff --git a/appveyor.yml b/appveyor.yml
@@ -14,9 +14,8 @@ install:
   # Get the latest stable version of Node 0.STABLE.latest
   - ps: Install-Product node $env:nodejs_version
   # Install PhantomJS
-  - cinst PhantomJS -Version 1.9.8
-  - set path=%path%;C:\tools\PhantomJS\
-  - dir C:\tools\PhantomJS
+  - choco install phantomjs --version 2.0.0 -y
+  - set path=%path%;C:\ProgramData\chocolatey\lib\PhantomJS\tools\
   # Typical npm stuff.
   - md C:\nc
   - npm install -g npm@^2
@@ -25,16 +24,13 @@ install:
   - npm config set cache C:\nc
   - npm version
   - npm install --no-optional
-
+  - npm run bower
 # Post-install test scripts.
 test_script:
   # Output useful info for debugging.
   - npm version
   - npm run build
   - cmd: npm run test
-  - cmd: npm run test:beta
-  - cmd: npm run test:canary
-  - cmd: npm run test:optional-features
 
 # Don't actually build.
 build: off

diff --git a/bin/bower-ember-data-build b/bin/bower-ember-data-build
@@ -10,7 +10,7 @@ COMPONENTS_EMBER_REPO_SLUG="components/ember-data"
 USER="rwjblue"
 
 # This ensure that no directories within dist will be copied when script is run.
-INCLUDED_FILES=`find dist -maxdepth 1 -type f`
+INCLUDED_FILES=`find dist/globals -maxdepth 1 -type f`
 
 CURRENT_BRANCH=$TRAVIS_BRANCH
 

diff --git a/bower.json b/bower.json
@@ -1,13 +1,18 @@
 {
   "name": "ember-data",
-  "private": true,
   "dependencies": {
-    "ember": "^2.0.0"
+    "ember": "components/ember#release",
+    "ember-cli-shims": "ember-cli/ember-cli-shims#0.0.3",
+    "ember-cli-test-loader": "ember-cli-test-loader#0.1.3",
+    "ember-load-initializers": "ember-cli/ember-load-initializers#0.1.5",
+    "ember-qunit": "0.4.9",
+    "ember-qunit-notifications": "0.0.7",
+    "ember-resolver": "~0.1.18",
+    "jquery": "^1.11.3",
+    "loader.js": "3.3.0",
+    "qunit": "~1.18.0"
   },
-  "devDependencies": {
-    "qunit": "~1.17.0",
-    "jquery": "~1.10.x",
-    "loader.js": "~1.0.0",
-    "es5-shim": "~4.0.3"
+  "resolutions": {
+    "ember": "release"
   }
-}
+}
diff --git a/config/babel.js b/config/babel.js