Clean up compat shims in the build for old CLI

Author: dfreeman

packages/ember-css-modules/index.js

@@ -3,7 +3,6 @@
 const path = require('path');
 const fs = require('fs');
 const debug = require('debug')('ember-css-modules:addon');
-const VersionChecker = require('ember-cli-version-checker');
 
 const HtmlbarsPlugin = require('./lib/htmlbars-plugin');
 const ModulesPreprocessor = require('./lib/modules-preprocessor');
@@ -19,7 +18,6 @@ module.exports = {
     this.outputStylesPreprocessor = new OutputStylesPreprocessor({
       owner: this,
     });
-    this.checker = new VersionChecker(this.project);
     this.plugins = new PluginRegistry(this.parent);
   },
 
@@ -166,15 +164,6 @@ module.exports = {
     return this.cssModulesOptions.postcssOptions;
   },
 
-  getAddonModulesRoot() {
-    // CLI 2.12 stopped exposing addon stuff nested under `modules/`
-    if (this.checker.for('ember-cli', 'npm').satisfies('< 2.12')) {
-      return 'modules/';
-    } else {
-      return '';
-    }
-  },
-
   getParentAddonTree() {
     return path.join(this.parentAddon.root, this.parentAddon.treePaths.addon);
   },

packages/ember-css-modules/lib/modules-preprocessor.js

@@ -50,15 +50,6 @@ module.exports = class ModulesPreprocessor {
       let inputRoot = this.owner.belongsToAddon()
         ? this.owner.getParentAddonTree()
         : this.owner.app.trees.app;
-      let outputRoot = this.owner.belongsToAddon()
-        ? this.owner.getAddonModulesRoot()
-        : '';
-
-      if (outputRoot) {
-        inputRoot = new Funnel(inputRoot, {
-          destDir: outputRoot,
-        });
-      }
 
       // If moduleName is defined, that should override the parent's name.
       // Otherwise, the template and generated module will disagree as to what the path should be.
@@ -71,17 +62,14 @@ module.exports = class ModulesPreprocessor {
 
       let modulesSources = new ModuleSourceFunnel(inputRoot, modulesInput, {
         include: ['**/*.' + this.owner.getFileExtension()],
-        outputRoot,
         parentName: ownerName,
       });
 
       let modulesTree = new (require('broccoli-css-modules'))(modulesSources, {
         extension: this.owner.getFileExtension(),
         plugins: this.getPostcssPlugins(),
         enableSourceMaps: this.owner.enableSourceMaps(),
-        sourceMapBaseDir: this.owner.belongsToAddon()
-          ? this.owner.getAddonModulesRoot()
-          : '',
+        sourceMapBaseDir: '',
         postcssOptions: this.owner.getPostcssOptions(),
         virtualModules: this.owner.getVirtualModules(),
         generateScopedName: this.scopedNameGenerator(),
@@ -217,7 +205,6 @@ module.exports = class ModulesPreprocessor {
       defaultExtension: this.owner.getFileExtension(),
       ownerName: this._ownerName,
       parentName: this._parentName,
-      addonModulesRoot: this.owner.getAddonModulesRoot(),
       root: ensurePosixPath(this._modulesTree.inputPaths[0]),
       parent: this.owner.getParent(),
       ui: this.owner.ui,
@@ -236,7 +223,6 @@ class ModuleSourceFunnel extends Funnel {
   constructor(input, stylesTree, options) {
     super([input, stylesTree], options);
     this.parentName = options.parentName;
-    this.destDir = options.outputRoot;
     this.inputHasParentName = null;
   }
 

packages/ember-css-modules/lib/resolve-path.js

@@ -103,7 +103,7 @@ function resolveExternalPath(importPath, originalPath, fromFile, options) {
   let absolutePath = ensurePosixPath(
     path.resolve(addonTreePath, pathWithinAddon)
   );
-  let keyPath = options.addonModulesRoot + addonName + '/' + pathWithinAddon;
+  let keyPath = addonName + '/' + pathWithinAddon;
   return new DependencyPath('external', absolutePath, keyPath);
 }
 

packages/ember-css-modules/package.json

@@ -81,7 +81,6 @@
     "debug": "^4.3.2",
     "ember-cli-babel": "^7.26.6",
     "ember-cli-htmlbars": "^6.0.0",
-    "ember-cli-version-checker": "^5.1.2",
     "ensure-posix-path": "^1.0.2",
     "hash-string": "^1.0.0",
     "lodash.merge": "^4.6.1",