@html-next/vertical-collection 1.0.0-beta.9 → 2.0.1

package/index.js

@@ -1,26 +1,11 @@
-/* eslint-env node */
 'use strict';
 
 const StripClassCallCheckPlugin = require('babel6-plugin-strip-class-callcheck');
 const Funnel = require('broccoli-funnel');
 const Rollup = require('broccoli-rollup');
-const merge   = require('broccoli-merge-trees');
+const merge = require('broccoli-merge-trees');
 const VersionChecker = require('ember-cli-version-checker');
 
-const path = require('path');
-
-const BlockScopingTransform = (function() {
-  let plugin = require('babel-plugin-transform-es2015-block-scoping');
-
-  // adding `baseDir` ensures that broccoli-babel-transpiler does not
-  // issue a warning and opt out of caching
-  let pluginPath = require.resolve('babel-plugin-transform-es2015-block-scoping/package');
-  let pluginBaseDir = path.dirname(pluginPath);
-  plugin.baseDir = () => pluginBaseDir;
-
-  return plugin;
-})();
-
 function isProductionEnv() {
   const isProd = /production/.test(process.env.EMBER_ENV);
   const isTest = process.env.EMBER_CLI_TEST_COMMAND;
@@ -29,7 +14,7 @@ function isProductionEnv() {
 }
 
 module.exports = {
-  name: 'vertical-collection',
+  name: require('./package').name,
 
   init() {
     this._super.init && this._super.init.apply(this, arguments);
@@ -37,9 +22,19 @@ module.exports = {
     this.options = this.options || {};
   },
 
+  getOutputDirForVersion() {
+    let VersionChecker = require('ember-cli-version-checker');
+    let checker = new VersionChecker(this);
+    let emberCli = checker.for('ember-cli', 'npm');
+
+    let requiresModulesDir = emberCli.satisfies('< 3.0.0');
+
+    return requiresModulesDir ? 'modules' : '';
+  },
+
   treeForAddon(tree) {
     let babel = this.addons.find((addon) => addon.name === 'ember-cli-babel');
-    let withPrivate    = new Funnel(tree, { include: ['-private/**'] });
+    let withPrivate = new Funnel(tree, { include: ['-private/**'] });
     let withoutPrivate = new Funnel(tree, {
       exclude: [
         '**/**.hbs',
@@ -47,7 +42,7 @@ module.exports = {
         isProductionEnv() ? '-debug' : false
       ].filter(Boolean),
 
-      destDir: 'vertical-collection'
+      destDir: '@html-next/vertical-collection'
     });
 
     let privateTree = babel.transpileTree(withPrivate, {
@@ -67,17 +62,23 @@ module.exports = {
 
     privateTree = new Rollup(privateTree, {
       rollup: {
-        entry: '-private/index.js',
-        targets: [
-          { dest: 'vertical-collection/-private.js', format: 'amd', moduleId: 'vertical-collection/-private' }
+        input: '-private/index.js',
+        output: [
+          {
+            file: '@html-next/vertical-collection/-private.js',
+            format: 'amd',
+            amd: {
+              id: '@html-next/vertical-collection/-private'
+            }
+          }
         ],
         external: ['ember', 'ember-raf-scheduler']
       }
     });
 
-    // the output of treeForAddon is required to be modules/<your files>
-    publicTree  = new Funnel(publicTree,  { destDir: 'modules' });
-    privateTree = new Funnel(privateTree, { destDir: 'modules' });
+    let destDir = this.getOutputDirForVersion();
+    publicTree = new Funnel(publicTree, { destDir });
+    privateTree = new Funnel(privateTree, { destDir });
 
     return merge([
       addonTemplateTree,
@@ -93,17 +94,9 @@ module.exports = {
     const opts = {
       loose: true,
       plugins,
-      postTransformPlugins: [StripClassCallCheckPlugin],
-      exclude: [
-        'transform-es2015-block-scoping',
-        'transform-es2015-typeof-symbol'
-      ]
+      postTransformPlugins: [StripClassCallCheckPlugin]
     };
 
-    opts.plugins.push(
-      [BlockScopingTransform, { 'throwIfClosureRequired': true }]
-    );
-
     return opts;
   },
   _setupBabelOptions() {
@@ -125,15 +118,15 @@ module.exports = {
     }
 
     if (typeof app.import !== 'function') {
-      throw new Error('vertical-collection is being used within another addon or engine ' +
-        'and is having trouble registering itself to the parent application.');
+      throw new Error('vertical-collection is being used within another addon or engine '
+        + 'and is having trouble registering itself to the parent application.');
     }
 
     this._env = app.env;
     this._setupBabelOptions(app.env);
 
     if (!/production/.test(app.env) && !/test/.test(app.env)) {
-      app.import('vendor/debug.css');
+      findImporter(this).import('vendor/debug.css');
     }
   },
 
@@ -146,10 +139,21 @@ module.exports = {
       exclude.push('initializers/debug.js');
     }
 
-    if (this.checker.forEmber().isAbove('1.13.0')) {
-      exclude.push('initializers/vertical-collection-legacy-compat.js');
-    }
-
     return new Funnel(tree, { exclude });
   }
 };
+
+function findImporter(addon) {
+  if (typeof addon.import === 'function') {
+    // If addon.import() is present (CLI 2.7+) use that
+    return addon;
+  } else {
+    // Otherwise, reuse the _findHost implementation that would power addon.import()
+    let current = addon;
+    let app;
+    do {
+      app = current.app || app;
+    } while (current.parent.parent && (current = current.parent));
+    return app;
+  }
+}

package/package.json

@@ -1,19 +1,24 @@
 {
   "name": "@html-next/vertical-collection",
-  "version": "1.0.0-beta.9",
+  "version": "2.0.1",
   "description": "infinite-scroll, done right. done.",
-  "directories": {
-    "doc": "doc",
-    "test": "tests"
-  },
-  "scripts": {
-    "build": "ember build",
-    "start": "ember server",
-    "test": "ember try:each"
-  },
-  "repository": "https://github.com/html-next/vertical-collection.git",
+  "keywords": [
+    "occlusion",
+    "infinite",
+    "infinite-scroll",
+    "collection",
+    "grid",
+    "list-view",
+    "recycling",
+    "cloaking",
+    "performance",
+    "lists",
+    "ember-addon"
+  ],
   "homepage": "https://github.com/html-next/vertical-collection",
   "bugs": "https://github.com/html-next/vertical-collection/issues",
+  "repository": "https://github.com/html-next/vertical-collection.git",
+  "license": "MIT",
   "author": {
     "name": "Chris Thoburn (@runspired)",
     "url": "https://runspired.com"
@@ -23,68 +28,95 @@
       "name": "Chris Garrett (@pzuraq)",
       "email": "me@pzuraq.com",
       "url": "https://github.com/pzuraq"
+    },
+    {
+      "name": "Robert Wagner (@rwwagner90)",
+      "email": "rwwagner90@gmail.com",
+      "url": "https://github.com/rwwagner90"
     }
   ],
-  "license": "MIT",
-  "devDependencies": {
-    "broccoli-asset-rev": "^2.4.5",
-    "ember-cli": "^2.12.2",
-    "ember-cli-app-version": "^1.0.0",
-    "ember-cli-changelog": "0.3.4",
-    "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-eslint": "3.0.0",
-    "ember-cli-github-pages": "^0.1.2",
-    "ember-cli-htmlbars-inline-precompile": "^0.4.0-beta.2",
-    "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^3.1.0",
-    "ember-cli-release": "^0.2.9",
-    "ember-cli-shims": "^1.0.2",
-    "ember-cli-sri": "^2.1.0",
-    "ember-cli-uglify": "^1.2.0",
-    "ember-cli-version-checker": "^1.2.0",
-    "ember-code-snippet": "^1.1.0",
-    "ember-data": "^2.12.2",
-    "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-disable-proxy-controllers": "^1.0.1",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.6.0",
-    "ember-maybe-import-regenerator": "^0.1.6",
-    "ember-native-dom-helpers": "^0.5.2",
-    "ember-perf-timeline": "^1.2.1",
-    "ember-resolver": "^2.0.3",
-    "ember-source": "^2.15.0",
-    "eslint-plugin-ember-suave": "^1.0.0",
-    "fastboot": "^1.0.0-rc.6",
-    "loader.js": "^4.2.3"
+  "directories": {
+    "doc": "doc",
+    "test": "tests"
+  },
+  "scripts": {
+    "build": "ember build",
+    "lint": "npm-run-all --aggregate-output --continue-on-error --parallel lint:*",
+    "lint:hbs": "ember-template-lint .",
+    "lint:js": "eslint .",
+    "start": "ember serve",
+    "test": "npm-run-all lint:* test:*",
+    "test:ember": "ember test",
+    "test:ember-compatibility": "ember try:each"
   },
   "dependencies": {
-    "babel-plugin-transform-es2015-block-scoping": "^6.24.1",
     "babel6-plugin-strip-class-callcheck": "^6.0.0",
-    "broccoli-funnel": "^1.2.0",
-    "broccoli-merge-trees": "^2.0.0",
-    "broccoli-rollup": "^1.2.0",
-    "ember-cli-babel": "^6.0.0-beta.10",
-    "ember-cli-htmlbars": "^1.1.1",
-    "ember-compatibility-helpers": "^0.1.2",
-    "ember-raf-scheduler": "0.1.0"
+    "broccoli-funnel": "^2.0.2",
+    "broccoli-merge-trees": "^3.0.1",
+    "broccoli-rollup": "^4.1.1",
+    "ember-cli-babel": "^7.12.0",
+    "ember-cli-htmlbars": "^3.0.1",
+    "ember-cli-version-checker": "^3.1.3",
+    "ember-compatibility-helpers": "^1.2.1",
+    "ember-raf-scheduler": "0.2.0"
+  },
+  "devDependencies": {
+    "@ember/optional-features": "^0.7.0",
+    "bootstrap": "~3.3.5",
+    "broccoli-asset-rev": "^3.0.0",
+    "ember-cli": "~3.12.0",
+    "ember-cli-app-version": "^3.2.0",
+    "ember-cli-dependency-checker": "^3.1.0",
+    "ember-cli-eslint": "^5.1.0",
+    "ember-cli-fastboot": "^2.1.3",
+    "ember-cli-github-pages": "^0.2.2",
+    "ember-cli-htmlbars-inline-precompile": "^2.1.0",
+    "ember-cli-inject-live-reload": "^2.0.1",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-template-lint": "^1.0.0-beta.1",
+    "ember-cli-uglify": "^3.0.0",
+    "ember-code-snippet": "^2.4.1",
+    "ember-data": "3.11.5",
+    "ember-disable-prototype-extensions": "^1.1.3",
+    "ember-export-application-global": "^2.0.0",
+    "ember-load-initializers": "^2.0.0",
+    "ember-native-dom-helpers": "^0.7.0",
+    "ember-perf-timeline": "^1.2.1",
+    "ember-qunit": "^4.5.1",
+    "ember-resolver": "^5.0.1",
+    "ember-source": "~3.12.0",
+    "ember-source-channel-url": "^2.0.1",
+    "ember-try": "^1.2.1",
+    "eslint-plugin-ember": "^6.7.1",
+    "eslint-plugin-node": "^9.1.0",
+    "loader.js": "^4.7.0",
+    "npm-run-all": "^4.1.5",
+    "qunit-dom": "^0.9.0",
+    "release-it": "^14.2.1",
+    "release-it-lerna-changelog": "^3.1.0"
   },
   "engines": {
-    "node": ">= 4"
+    "node": ">= 10.*"
+  },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"
   },
-  "keywords": [
-    "occlusion",
-    "infinite",
-    "infinite-scroll",
-    "collection",
-    "grid",
-    "list-view",
-    "recycling",
-    "cloaking",
-    "performance",
-    "lists",
-    "ember-addon"
-  ]
+  "release-it": {
+    "plugins": {
+      "release-it-lerna-changelog": {
+        "infile": "CHANGELOG.md",
+        "launchEditor": true
+      }
+    },
+    "git": {
+      "tagName": "v${version}"
+    },
+    "github": {
+      "release": true,
+      "tokenRef": "GITHUB_AUTH"
+    }
+  }
 }

package/.npmignore

@@ -1,16 +0,0 @@
-/bower_components
-/config/ember-try.js
-/dist
-/tests
-/tmp
-**/.gitkeep
-.bowerrc
-.editorconfig
-.ember-cli
-.gitignore
-.eslintrc.js
-.watchmanconfig
-.travis.yml
-bower.json
-ember-cli-build.js
-testem.js

package/app/initializers/vertical-collection-legacy-compat.js

@@ -1,14 +0,0 @@
-import Ember from 'ember';
-import VerticalCollection from 'vertical-collection/components/vertical-collection/component';
-
-Ember.HTMLBars._registerHelper('vertical-collection', (params, hash, options, env) => {
-  hash.items = params.pop();
-
-  return env.helpers.view.helperFunction.call(this, [VerticalCollection], hash, options, env);
-});
-
-export default {
-  name: 'vertical-collection-legacy-compat',
-
-  initialize() {}
-};

package/config/changelog.js

@@ -1,23 +0,0 @@
-/* eslint-env node */
-
-// For details on each option run `ember help release`
-module.exports = {
-
-  // angular style guide: https://github.com/angular/angular.js/blob/v1.4.8/CONTRIBUTING.md#commit
-  // jquery style guide: https://contribute.jquery.org/commits-and-pull-requests/#commit-guidelines
-  // ember style guide: https://github.com/emberjs/ember.js/blob/master/CONTRIBUTING.md#commit-tagging
-  style: 'angular', // 'ember' 'jquery'
-
-  head: 'develop',
-  base: '-last', // a branch or tag name, `-last` defaults to the version in package.json
-
-  hooks: {
-    /*
-     parser: function(commit) { return commit; }
-     filter: function(commit) { return true; },
-     groupSort: function(commits) { return { commits: commits }; },
-     format: function(commit) { return commit.title; },
-     */
-  }
-
-};

package/config/release.js

@@ -1,19 +0,0 @@
-/* eslint-env node */
-// var RSVP = require('rsvp');
-var generateChangelog = require('ember-cli-changelog/lib/tasks/release-with-changelog');
-
-// For details on each option run `ember help release`
-module.exports = {
-  // local: true,
-  // remote: 'some_remote',
-  // annotation: "Release %@",
-  // message: "Bumped version to %@",
-  // manifest: [ 'package.json', 'bower.json', 'someconfig.json' ],
-  // publish: true,
-  // strategy: 'date',
-  // format: 'YYYY-MM-DD',
-  // timezone: 'America/Los_Angeles',
-
-  beforeCommit: generateChangelog
-
-};