From c8d8c041ecd1585624c3ed6a56c767383c9ab448 Mon Sep 17 00:00:00 2001 From: Robert Jackson Date: Thu, 11 Jul 2019 00:10:10 -0400 Subject: [PATCH 1/2] [BUGFIX release] Add blueprints to ember-data package. In 3.11 ember-data migrated its blueprints to belong to the specific packages that they operate on. Unfortunately, ember-cli (at least as of 3.12) only supports discovering blueprints from addons that are direct dependencies or devDependencies of the project. This adds re-exports for each of the blueprints from the top level `ember-data` package in order to make `ember g model` (and friends) work properly when the project depends on `ember-data` and not the individual `@ember-data/*` packages themselves. --- packages/-ember-data/blueprints/adapter-test/index.js | 4 ++++ packages/-ember-data/blueprints/adapter/index.js | 4 ++++ packages/-ember-data/blueprints/model-test/index.js | 4 ++++ packages/-ember-data/blueprints/model/index.js | 4 ++++ packages/-ember-data/blueprints/serializer-test/index.js | 4 ++++ packages/-ember-data/blueprints/serializer/index.js | 4 ++++ packages/-ember-data/blueprints/transform-test/index.js | 4 ++++ packages/-ember-data/blueprints/transform/index.js | 4 ++++ 8 files changed, 32 insertions(+) create mode 100644 packages/-ember-data/blueprints/adapter-test/index.js create mode 100644 packages/-ember-data/blueprints/adapter/index.js create mode 100644 packages/-ember-data/blueprints/model-test/index.js create mode 100644 packages/-ember-data/blueprints/model/index.js create mode 100644 packages/-ember-data/blueprints/serializer-test/index.js create mode 100644 packages/-ember-data/blueprints/serializer/index.js create mode 100644 packages/-ember-data/blueprints/transform-test/index.js create mode 100644 packages/-ember-data/blueprints/transform/index.js diff --git a/packages/-ember-data/blueprints/adapter-test/index.js b/packages/-ember-data/blueprints/adapter-test/index.js new file mode 100644 index 00000000000..0285c42143b --- /dev/null +++ b/packages/-ember-data/blueprints/adapter-test/index.js @@ -0,0 +1,4 @@ +// Re-exporting the blueprints from the top level `ember-data` package +// because blueprint discovery in ember-cli (as of 3.12) is only done +// for top level packages. +module.exports = require('@ember-data/adapter/blueprints/adapter-test'); diff --git a/packages/-ember-data/blueprints/adapter/index.js b/packages/-ember-data/blueprints/adapter/index.js new file mode 100644 index 00000000000..da0a6c102c1 --- /dev/null +++ b/packages/-ember-data/blueprints/adapter/index.js @@ -0,0 +1,4 @@ +// Re-exporting the blueprints from the top level `ember-data` package +// because blueprint discovery in ember-cli (as of 3.12) is only done +// for top level packages. +module.exports = require('@ember-data/adapter/blueprints/adapter'); diff --git a/packages/-ember-data/blueprints/model-test/index.js b/packages/-ember-data/blueprints/model-test/index.js new file mode 100644 index 00000000000..3b54452d580 --- /dev/null +++ b/packages/-ember-data/blueprints/model-test/index.js @@ -0,0 +1,4 @@ +// Re-exporting the blueprints from the top level `ember-data` package +// because blueprint discovery in ember-cli (as of 3.12) is only done +// for top level packages. +module.exports = require('@ember-data/model/blueprints/model-test'); diff --git a/packages/-ember-data/blueprints/model/index.js b/packages/-ember-data/blueprints/model/index.js new file mode 100644 index 00000000000..02f9819b4f7 --- /dev/null +++ b/packages/-ember-data/blueprints/model/index.js @@ -0,0 +1,4 @@ +// Re-exporting the blueprints from the top level `ember-data` package +// because blueprint discovery in ember-cli (as of 3.12) is only done +// for top level packages. +module.exports = require('@ember-data/model/blueprints/model'); diff --git a/packages/-ember-data/blueprints/serializer-test/index.js b/packages/-ember-data/blueprints/serializer-test/index.js new file mode 100644 index 00000000000..928704fce18 --- /dev/null +++ b/packages/-ember-data/blueprints/serializer-test/index.js @@ -0,0 +1,4 @@ +// Re-exporting the blueprints from the top level `ember-data` package +// because blueprint discovery in ember-cli (as of 3.12) is only done +// for top level packages. +module.exports = require('@ember-data/serializer/blueprints/serializer-test'); diff --git a/packages/-ember-data/blueprints/serializer/index.js b/packages/-ember-data/blueprints/serializer/index.js new file mode 100644 index 00000000000..b610a185d1d --- /dev/null +++ b/packages/-ember-data/blueprints/serializer/index.js @@ -0,0 +1,4 @@ +// Re-exporting the blueprints from the top level `ember-data` package +// because blueprint discovery in ember-cli (as of 3.12) is only done +// for top level packages. +module.exports = require('@ember-data/serializer/blueprints/serializer'); diff --git a/packages/-ember-data/blueprints/transform-test/index.js b/packages/-ember-data/blueprints/transform-test/index.js new file mode 100644 index 00000000000..8347ca35e74 --- /dev/null +++ b/packages/-ember-data/blueprints/transform-test/index.js @@ -0,0 +1,4 @@ +// Re-exporting the blueprints from the top level `ember-data` package +// because blueprint discovery in ember-cli (as of 3.12) is only done +// for top level packages. +module.exports = require('@ember-data/serializer/blueprints/transform-test'); diff --git a/packages/-ember-data/blueprints/transform/index.js b/packages/-ember-data/blueprints/transform/index.js new file mode 100644 index 00000000000..4c8fe435099 --- /dev/null +++ b/packages/-ember-data/blueprints/transform/index.js @@ -0,0 +1,4 @@ +// Re-exporting the blueprints from the top level `ember-data` package +// because blueprint discovery in ember-cli (as of 3.12) is only done +// for top level packages. +module.exports = require('@ember-data/serializer/blueprints/transform'); From d617c8e86a18aa34cc686537f98985b8f3a4b169 Mon Sep 17 00:00:00 2001 From: Chris Thoburn Date: Thu, 18 Jul 2019 18:58:30 -0700 Subject: [PATCH 2/2] skip node tests --- .travis.yml | 7 ++++--- azure-pipelines.yml | 7 ++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 93f45a5419f..5b3b84728c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -65,9 +65,10 @@ jobs: env: TARGET_IE11=true script: yarn test - - name: 'Node Tests' - install: yarn install - script: yarn test:node + # See https://github.com/emberjs/data/pull/6241 + # - name: 'Node Tests' + # install: yarn install + # script: yarn test:node # runs tests against each supported Ember version - stage: ember version tests diff --git a/azure-pipelines.yml b/azure-pipelines.yml index a4d13cfe135..909fc8129aa 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -84,9 +84,10 @@ jobs: TARGET_IE11=true yarn test displayName: 'Max transpilation Tests' - - script: | - yarn test:node - displayName: 'Node Tests' + # See https://github.com/emberjs/data/pull/6241 + # - script: | + # yarn test:node + # displayName: 'Node Tests' - script: | yarn test:try-one with-ember-fetch