Skip to content

Commit

Permalink
[CHORE] rename and restructure packages to clarify unpublished/privat…
Browse files Browse the repository at this point in the history
…e status

move unpublished packages into directories marked private

move published but private into better naming convention

move unpublished into better naming convention

change -build-infra imports to private-build-infra

larger re-org
  • Loading branch information
runspired committed Oct 25, 2019
1 parent 9a67f6a commit a640679
Show file tree
Hide file tree
Showing 305 changed files with 56 additions and 59 deletions.
6 changes: 3 additions & 3 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ module.exports = {
'.eslintrc.js',
'.prettierrc.js',
'bin/*',
'packages/-build-infra/src/**/*.js',
'packages/-test-infra/src/**/*.js',
'packages/private-build-infra/src/**/*.js',
'packages/unpublished-test-infra/src/**/*.js',
'packages/*/.ember-cli.js',
'packages/*/.eslintrc.js',
'packages/*/.template-lintrc.js',
Expand Down Expand Up @@ -91,7 +91,7 @@ module.exports = {

// node tests
{
files: ['packages/*/node-tests/**', 'packages/-test-infra/src/node-test-helpers/**/*'],
files: ['packages/*/node-tests/**', 'packages/unpublished-test-infra/src/node-test-helpers/**/*'],
env: {
mocha: true,
},
Expand Down
5 changes: 1 addition & 4 deletions bin/lint-features
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@
const fs = require('fs');
const path = require('path');

const configPath = path.join(
__dirname,
'../packages/-build-infra/config/in-progress-features.json'
);
const configPath = path.join(__dirname, '../packages/private-build-infra/config/in-progress-features.json');
const beginsWithDS = /^ds-/;
const violations = [];

Expand Down
4 changes: 2 additions & 2 deletions bin/packages-for-commit.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
project without publishing the commit to a registry.
The tarballs produced will reference each other appropriately. For instance
if `@ember-data/store` has a dependency on `@ember-data/-build-infra` the
if `@ember-data/store` has a dependency on `@ember-data/private-build-infra` the
tarball for `@ember-data/store` will have a package.json file whose version
of `@ember-data/-build-infra` is the tarball for the commit for that package.
of `@ember-data/private-build-infra` is the tarball for the commit for that package.
*/

'use strict';
Expand Down
2 changes: 1 addition & 1 deletion packages/-ember-data/ember-cli-build.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ module.exports = function(defaults) {
babel: {
// this ensures that the same `@ember-data/canary-features` processing that the various
// ember-data addons do is done in the dummy app
plugins: [...require('@ember-data/-build-infra/src/debug-macros')()],
plugins: [...require('@ember-data/private-build-infra/src/debug-macros')()],
},
'ember-cli-babel': {
throwUnlessParallelizable: true,
Expand Down
4 changes: 2 additions & 2 deletions packages/-ember-data/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
'use strict';

const addonBuildConfigForDataPackage = require('@ember-data/-build-infra/src/addon-build-config-for-data-package');
const addonBuildConfigForDataPackage = require('@ember-data/private-build-infra/src/addon-build-config-for-data-package');
const addonBaseConfig = addonBuildConfigForDataPackage('ember-data');
const version = require('@ember-data/-build-infra/src/create-version-module');
const version = require('@ember-data/private-build-infra/src/create-version-module');
const merge = require('broccoli-merge-trees');

module.exports = Object.assign({}, addonBaseConfig, {
Expand Down
2 changes: 1 addition & 1 deletion packages/-ember-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"author": "",
"license": "MIT",
"dependencies": {
"@ember-data/-build-infra": "3.15.0-alpha.1",
"@ember-data/private-build-infra": "3.15.0-alpha.1",
"@ember-data/adapter": "3.15.0-alpha.1",
"@ember-data/debug": "3.15.0-alpha.1",
"@ember-data/model": "3.15.0-alpha.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter/blueprints/adapter-test/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const testInfo = require('ember-cli-test-info');
const useTestFrameworkDetector = require('@ember-data/-build-infra/src/utilities/test-framework-detector');
const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
const path = require('path');

module.exports = useTestFrameworkDetector({
Expand Down
4 changes: 2 additions & 2 deletions packages/adapter/blueprints/adapter/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const extendFromApplicationEntity = require('@ember-data/-build-infra/src/utilities/extend-from-application-entity');
const useEditionDetector = require('@ember-data/-build-infra/src/utilities/edition-detector');
const extendFromApplicationEntity = require('@ember-data/private-build-infra/src/utilities/extend-from-application-entity');
const useEditionDetector = require('@ember-data/private-build-infra/src/utilities/edition-detector');

module.exports = useEditionDetector({
description: 'Generates an ember-data adapter.',
Expand Down
2 changes: 1 addition & 1 deletion packages/adapter/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const name = require('./package').name;
const addonBuildConfigForDataPackage = require('@ember-data/-build-infra/src/addon-build-config-for-data-package');
const addonBuildConfigForDataPackage = require('@ember-data/private-build-infra/src/addon-build-config-for-data-package');
const addonBaseConfig = addonBuildConfigForDataPackage(name);

module.exports = Object.assign({}, addonBaseConfig, {
Expand Down
6 changes: 3 additions & 3 deletions packages/adapter/node-tests/blueprints/adapter-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ const expect = chai.expect;

const SilentError = require('silent-error');

const generateFakePackageManifest = require('@ember-data/-test-infra/src/node-test-helpers/generate-fake-package-manifest');
const fixture = require('@ember-data/-test-infra/src/node-test-helpers/fixture');
const generateFakePackageManifest = require('@ember-data/unpublished-test-infra/src/node-test-helpers/generate-fake-package-manifest');
const fixture = require('@ember-data/unpublished-test-infra/src/node-test-helpers/fixture');

const setupTestEnvironment = require('@ember-data/-test-infra/src/node-test-helpers/setup-test-environment');
const setupTestEnvironment = require('@ember-data/unpublished-test-infra/src/node-test-helpers/setup-test-environment');
const enableOctane = setupTestEnvironment.enableOctane;

describe('Acceptance: generate and destroy adapter blueprints', function() {
Expand Down
4 changes: 2 additions & 2 deletions packages/adapter/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
"test:node": "mocha"
},
"dependencies": {
"@ember-data/-build-infra": "3.15.0-alpha.1",
"@ember-data/private-build-infra": "3.15.0-alpha.1",
"@ember-data/store": "3.15.0-alpha.1",
"@ember/edition-utils": "^1.1.1",
"ember-cli-babel": "^7.12.0",
"ember-cli-test-info": "^1.0.0",
"ember-cli-typescript": "^3.0.0"
},
"devDependencies": {
"@ember-data/-test-infra": "3.15.0-alpha.1",
"@ember-data/unpublished-test-infra": "3.15.0-alpha.1",
"@ember/optional-features": "^1.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.13.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/canary-features/README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @ember-data/-build-infra
# @ember-data/private-build-infra

!! This is an internal package for use by `@ember-data` only. !!

Expand Down
2 changes: 1 addition & 1 deletion packages/canary-features/addon/default-features.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
*/

/*
This list of features is used both at build time (by `@ember-data/-build-infra`)
This list of features is used both at build time (by `@ember-data/private-build-infra`)
and at runtime (by `@ember-data/canary-features`).
The valid values are:
Expand Down
2 changes: 1 addition & 1 deletion packages/debug/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const name = require('./package').name;
const addonBuildConfigForDataPackage = require('@ember-data/-build-infra/src/addon-build-config-for-data-package');
const addonBuildConfigForDataPackage = require('@ember-data/private-build-infra/src/addon-build-config-for-data-package');
const addonBaseConfig = addonBuildConfigForDataPackage(name);

module.exports = Object.assign({}, addonBaseConfig, {
Expand Down
4 changes: 2 additions & 2 deletions packages/debug/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
"test:all": "ember try:each"
},
"dependencies": {
"@ember-data/-build-infra": "3.15.0-alpha.1",
"@ember-data/private-build-infra": "3.15.0-alpha.1",
"@ember/edition-utils": "^1.1.1",
"ember-cli-babel": "^7.12.0",
"ember-cli-test-info": "^1.0.0",
"ember-cli-typescript": "^3.0.0"
},
"devDependencies": {
"@ember-data/-test-infra": "3.15.0-alpha.1",
"@ember-data/unpublished-test-infra": "3.15.0-alpha.1",
"@ember/optional-features": "^1.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.13.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/model/blueprints/model-test/index.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const ModelBlueprint = require('../model');
const testInfo = require('ember-cli-test-info');
const useTestFrameworkDetector = require('@ember-data/-build-infra/src/utilities/test-framework-detector');
const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
const path = require('path');

module.exports = useTestFrameworkDetector({
Expand Down
2 changes: 1 addition & 1 deletion packages/model/blueprints/model/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const inflection = require('inflection');
const stringUtils = require('ember-cli-string-utils');
const EOL = require('os').EOL;
const useEditionDetector = require('@ember-data/-build-infra/src/utilities/edition-detector');
const useEditionDetector = require('@ember-data/private-build-infra/src/utilities/edition-detector');
const { has } = require('@ember/edition-utils');

module.exports = useEditionDetector({
Expand Down
2 changes: 1 addition & 1 deletion packages/model/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const name = require('./package').name;
const addonBuildConfigForDataPackage = require('@ember-data/-build-infra/src/addon-build-config-for-data-package');
const addonBuildConfigForDataPackage = require('@ember-data/private-build-infra/src/addon-build-config-for-data-package');
const addonBaseConfig = addonBuildConfigForDataPackage(name);

module.exports = Object.assign({}, addonBaseConfig, {
Expand Down
6 changes: 3 additions & 3 deletions packages/model/node-tests/blueprints/model-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ const modifyPackages = blueprintHelpers.modifyPackages;
const chai = require('ember-cli-blueprint-test-helpers/chai');
const expect = chai.expect;

const generateFakePackageManifest = require('@ember-data/-test-infra/src/node-test-helpers/generate-fake-package-manifest');
const fixture = require('@ember-data/-test-infra/src/node-test-helpers/fixture');
const generateFakePackageManifest = require('@ember-data/unpublished-test-infra/src/node-test-helpers/generate-fake-package-manifest');
const fixture = require('@ember-data/unpublished-test-infra/src/node-test-helpers/fixture');

const setupTestEnvironment = require('@ember-data/-test-infra/src/node-test-helpers/setup-test-environment');
const setupTestEnvironment = require('@ember-data/unpublished-test-infra/src/node-test-helpers/setup-test-environment');
const enableOctane = setupTestEnvironment.enableOctane;

describe('Acceptance: generate and destroy model blueprints', function() {
Expand Down
4 changes: 2 additions & 2 deletions packages/model/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"test:node": "mocha"
},
"dependencies": {
"@ember-data/-build-infra": "3.15.0-alpha.1",
"@ember-data/private-build-infra": "3.15.0-alpha.1",
"@ember-data/canary-features": "3.15.0-alpha.1",
"@ember-data/store": "3.15.0-alpha.1",
"@ember/edition-utils": "^1.1.1",
Expand All @@ -33,7 +33,7 @@
"inflection": "1.12.0"
},
"devDependencies": {
"@ember-data/-test-infra": "3.15.0-alpha.1",
"@ember-data/unpublished-test-infra": "3.15.0-alpha.1",
"@ember/optional-features": "^1.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.13.1",
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# @ember-data/-build-infra
# @ember-data/private-build-infra

!! This is an internal package for use by `@ember-data` only. !!

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "@ember-data/-build-infra",
"name": "@ember-data/private-build-infra",
"version": "3.15.0-alpha.1",
"description": "The default blueprint for ember-data private packages.",
"keywords": [],
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/record-data/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const name = require('./package').name;
const addonBuildConfigForDataPackage = require('@ember-data/-build-infra/src/addon-build-config-for-data-package');
const addonBuildConfigForDataPackage = require('@ember-data/private-build-infra/src/addon-build-config-for-data-package');
const addonBaseConfig = addonBuildConfigForDataPackage(name);

module.exports = Object.assign({}, addonBaseConfig, {
Expand Down
4 changes: 2 additions & 2 deletions packages/record-data/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"test:all": "ember try:each"
},
"dependencies": {
"@ember-data/-build-infra": "3.15.0-alpha.1",
"@ember-data/private-build-infra": "3.15.0-alpha.1",
"@ember-data/canary-features": "3.15.0-alpha.1",
"@ember-data/store": "3.15.0-alpha.1",
"@ember/edition-utils": "^1.1.1",
Expand All @@ -29,7 +29,7 @@
"ember-cli-typescript": "^3.0.0"
},
"devDependencies": {
"@ember-data/-test-infra": "3.15.0-alpha.1",
"@ember-data/unpublished-test-infra": "3.15.0-alpha.1",
"@ember/optional-features": "^1.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.13.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/serializer/blueprints/serializer-test/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const testInfo = require('ember-cli-test-info');
const useTestFrameworkDetector = require('@ember-data/-build-infra/src/utilities/test-framework-detector');
const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
const path = require('path');

module.exports = useTestFrameworkDetector({
Expand Down
4 changes: 2 additions & 2 deletions packages/serializer/blueprints/serializer/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const extendFromApplicationEntity = require('@ember-data/-build-infra/src/utilities/extend-from-application-entity');
const useEditionDetector = require('@ember-data/-build-infra/src/utilities/edition-detector');
const extendFromApplicationEntity = require('@ember-data/private-build-infra/src/utilities/extend-from-application-entity');
const useEditionDetector = require('@ember-data/private-build-infra/src/utilities/edition-detector');

module.exports = useEditionDetector({
description: 'Generates an ember-data serializer.',
Expand Down
2 changes: 1 addition & 1 deletion packages/serializer/blueprints/transform-test/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const testInfo = require('ember-cli-test-info');
const useTestFrameworkDetector = require('@ember-data/-build-infra/src/utilities/test-framework-detector');
const useTestFrameworkDetector = require('@ember-data/private-build-infra/src/utilities/test-framework-detector');
const path = require('path');

module.exports = useTestFrameworkDetector({
Expand Down
2 changes: 1 addition & 1 deletion packages/serializer/blueprints/transform/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const useEditionDetector = require('@ember-data/-build-infra/src/utilities/edition-detector');
const useEditionDetector = require('@ember-data/private-build-infra/src/utilities/edition-detector');

module.exports = useEditionDetector({
description: 'Generates an ember-data value transform.',
Expand Down
2 changes: 1 addition & 1 deletion packages/serializer/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const name = require('./package').name;
const addonBuildConfigForDataPackage = require('@ember-data/-build-infra/src/addon-build-config-for-data-package');
const addonBuildConfigForDataPackage = require('@ember-data/private-build-infra/src/addon-build-config-for-data-package');
const addonBaseConfig = addonBuildConfigForDataPackage(name);

module.exports = Object.assign({}, addonBaseConfig, {
Expand Down
6 changes: 3 additions & 3 deletions packages/serializer/node-tests/blueprints/serializer-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ const expect = chai.expect;

const SilentError = require('silent-error');

const generateFakePackageManifest = require('@ember-data/-test-infra/src/node-test-helpers/generate-fake-package-manifest');
const fixture = require('@ember-data/-test-infra/src/node-test-helpers/fixture');
const generateFakePackageManifest = require('@ember-data/unpublished-test-infra/src/node-test-helpers/generate-fake-package-manifest');
const fixture = require('@ember-data/unpublished-test-infra/src/node-test-helpers/fixture');

const setupTestEnvironment = require('@ember-data/-test-infra/src/node-test-helpers/setup-test-environment');
const setupTestEnvironment = require('@ember-data/unpublished-test-infra/src/node-test-helpers/setup-test-environment');
const enableOctane = setupTestEnvironment.enableOctane;

describe('Acceptance: generate and destroy serializer blueprints', function() {
Expand Down
6 changes: 3 additions & 3 deletions packages/serializer/node-tests/blueprints/transform-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ const modifyPackages = blueprintHelpers.modifyPackages;
const chai = require('ember-cli-blueprint-test-helpers/chai');
const expect = chai.expect;

const generateFakePackageManifest = require('@ember-data/-test-infra/src/node-test-helpers/generate-fake-package-manifest');
const fixture = require('@ember-data/-test-infra/src/node-test-helpers/fixture');
const generateFakePackageManifest = require('@ember-data/unpublished-test-infra/src/node-test-helpers/generate-fake-package-manifest');
const fixture = require('@ember-data/unpublished-test-infra/src/node-test-helpers/fixture');

const setupTestEnvironment = require('@ember-data/-test-infra/src/node-test-helpers/setup-test-environment');
const setupTestEnvironment = require('@ember-data/unpublished-test-infra/src/node-test-helpers/setup-test-environment');
const enableOctane = setupTestEnvironment.enableOctane;

describe('Acceptance: generate and destroy transform blueprints', function() {
Expand Down
4 changes: 2 additions & 2 deletions packages/serializer/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@
"test:node": "mocha"
},
"dependencies": {
"@ember-data/-build-infra": "3.15.0-alpha.1",
"@ember-data/private-build-infra": "3.15.0-alpha.1",
"@ember-data/store": "3.15.0-alpha.1",
"ember-cli-babel": "^7.12.0",
"ember-cli-test-info": "^1.0.0",
"ember-cli-typescript": "^3.0.0"
},
"devDependencies": {
"@ember-data/-test-infra": "3.15.0-alpha.1",
"@ember-data/unpublished-test-infra": "3.15.0-alpha.1",
"@ember/optional-features": "^1.1.0",
"broccoli-asset-rev": "^3.0.0",
"ember-cli": "~3.13.1",
Expand Down
2 changes: 1 addition & 1 deletion packages/store/index.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict';

const name = require('./package').name;
const addonBuildConfigForDataPackage = require('@ember-data/-build-infra/src/addon-build-config-for-data-package');
const addonBuildConfigForDataPackage = require('@ember-data/private-build-infra/src/addon-build-config-for-data-package');
const addonBaseConfig = addonBuildConfigForDataPackage(name);

module.exports = Object.assign({}, addonBaseConfig, {
Expand Down
4 changes: 2 additions & 2 deletions packages/store/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@
"test:all": "ember try:each"
},
"dependencies": {
"@ember-data/-build-infra": "3.15.0-alpha.1",
"@ember-data/private-build-infra": "3.15.0-alpha.1",
"@ember-data/canary-features": "3.15.0-alpha.1",
"ember-cli-babel": "^7.12.0",
"ember-cli-path-utils": "^1.0.0",
"ember-cli-typescript": "^3.0.0",
"heimdalljs": "^0.3.0"
},
"devDependencies": {
"@ember-data/-test-infra": "3.15.0-alpha.1",
"@ember-data/unpublished-test-infra": "3.15.0-alpha.1",
"@ember/optional-features": "^1.1.0",
"@types/ember": "^3.1.1",
"@types/rsvp": "^4.0.3",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit a640679

Please sign in to comment.