Skip to content

Commit 13e6de7

Browse files
committed
Drop support for ECM plugins
1 parent 56b2c99 commit 13e6de7

File tree

7 files changed

+22
-253
lines changed

7 files changed

+22
-253
lines changed

docs/PLUGINS.md

Lines changed: 0 additions & 89 deletions
This file was deleted.

packages/ember-css-modules/index.js

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const debug = require('debug')('ember-css-modules:addon');
77
const { localClassRegistryPlugin } = require('glimmer-local-class-transform');
88
const ModulesPreprocessor = require('./lib/modules-preprocessor');
99
const OutputStylesPreprocessor = require('./lib/output-styles-preprocessor');
10-
const PluginRegistry = require('./lib/plugin/registry');
10+
const normalizePostcssPlugins = require('./lib/utils/normalize-postcss-plugins');
1111

1212
module.exports = {
1313
name: require('./package.json').name,
@@ -18,7 +18,6 @@ module.exports = {
1818
this.outputStylesPreprocessor = new OutputStylesPreprocessor({
1919
owner: this,
2020
});
21-
this.plugins = new PluginRegistry(this.parent);
2221
},
2322

2423
included(includer) {
@@ -31,9 +30,11 @@ module.exports = {
3130

3231
this._super.included.apply(this, arguments);
3332

34-
this.cssModulesOptions = this.plugins.computeOptions(
35-
includer.options && includer.options.cssModules
33+
this.cssModulesOptions = includer.options?.cssModules ?? {};
34+
this.cssModulesOptions.plugins = normalizePostcssPlugins(
35+
this.cssModulesOptions.plugins
3636
);
37+
3738
this.setupTemplateTransform();
3839
},
3940

@@ -94,10 +95,6 @@ module.exports = {
9495
}
9596
},
9697

97-
notifyPlugins(event) {
98-
this.plugins.notify(event);
99-
},
100-
10198
getParentName() {
10299
return this.app ? this.app.name : this.parent.name;
103100
},

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,6 @@ module.exports = class ModulesPreprocessor {
7575
generateScopedName: this.scopedNameGenerator(),
7676
resolvePath: this.resolveAndRecordPath.bind(this),
7777
getJSFilePath: (cssPath) => this.getJSFilePath(cssPath, modulesSources),
78-
onBuildStart: () => this.owner.notifyPlugins('buildStart'),
79-
onBuildEnd: () => this.owner.notifyPlugins('buildEnd'),
80-
onBuildSuccess: () => this.owner.notifyPlugins('buildSuccess'),
81-
onBuildError: () => this.owner.notifyPlugins('buildError'),
8278
onProcessFile: this.resetFileDependencies.bind(this),
8379
onModuleResolutionFailure: this.onModuleResolutionFailure.bind(this),
8480
onImportResolutionFailure: this.onImportResolutionFailure.bind(this),

packages/ember-css-modules/lib/plugin/index.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

packages/ember-css-modules/lib/plugin/registry.js

Lines changed: 0 additions & 100 deletions
This file was deleted.

test-packages/plugin-addon/package.json

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,31 +31,22 @@
3131
"broccoli-file-creator": "^2.1.1",
3232
"broccoli-merge-trees": "^3.0.2",
3333
"ember-cli-babel": "^7.26.6",
34-
"ember-cli-htmlbars": "^5.7.1",
34+
"ember-cli-htmlbars": "^6.3.0",
3535
"ember-css-modules": "link:../../packages/ember-css-modules"
3636
},
3737
"devDependencies": {
3838
"@ember/optional-features": "^2.0.0",
39-
"@ember/test-helpers": "^2.4.2",
40-
"@embroider/test-setup": "^0.43.5",
39+
"@ember/test-helpers": "^5.2.1",
4140
"@glimmer/component": "^1.0.4",
4241
"@glimmer/tracking": "^1.0.4",
43-
"babel-eslint": "^10.1.0",
44-
"broccoli-asset-rev": "^3.0.0",
45-
"ember-auto-import": "^1.11.3",
46-
"ember-cli": "~3.28.4",
47-
"ember-cli-dependency-checker": "^3.2.0",
42+
"ember-auto-import": "^2.10.0",
43+
"ember-cli": "~5.12.0",
4844
"ember-cli-inject-live-reload": "^2.1.0",
49-
"ember-cli-sri": "^2.1.1",
50-
"ember-cli-terser": "^4.0.2",
5145
"ember-disable-prototype-extensions": "^1.1.3",
52-
"ember-export-application-global": "^2.0.1",
53-
"ember-load-initializers": "^2.1.2",
54-
"ember-maybe-import-regenerator": "^0.1.6",
55-
"ember-page-title": "^6.2.2",
56-
"ember-qunit": "^5.1.4",
57-
"ember-resolver": "^8.0.2",
58-
"ember-source": "~3.28.0",
46+
"ember-load-initializers": "^3.0.1",
47+
"ember-qunit": "^9.0.2",
48+
"ember-resolver": "^13.1.0",
49+
"ember-source": "~5.12.0",
5950
"ember-source-channel-url": "^3.0.0",
6051
"ember-template-lint": "^3.6.0",
6152
"ember-try": "^1.4.0",
@@ -68,16 +59,16 @@
6859
"loader.js": "^4.7.0",
6960
"npm-run-all": "^4.1.5",
7061
"prettier": "^2.3.2",
71-
"qunit": "^2.16.0",
72-
"qunit-dom": "^1.6.0"
73-
},
74-
"engines": {
75-
"node": "12.* || 14.* || >= 16"
62+
"qunit": "^2.24.1",
63+
"qunit-dom": "^3.4.0"
7664
},
7765
"ember": {
7866
"edition": "octane"
7967
},
8068
"ember-addon": {
8169
"configPath": "tests/dummy/config"
70+
},
71+
"volta": {
72+
"extends": "../../package.json"
8273
}
8374
}

test-packages/plugin-addon/tests/test-helper.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,13 @@ import config from 'dummy/config/environment';
33
import * as QUnit from 'qunit';
44
import { setApplication } from '@ember/test-helpers';
55
import { setup } from 'qunit-dom';
6-
import { start } from 'ember-qunit';
6+
import { loadTests } from 'ember-qunit/test-loader';
7+
import { start, setupEmberOnerrorValidation } from 'ember-qunit';
78

89
setApplication(Application.create(config.APP));
910

1011
setup(QUnit.assert);
12+
setupEmberOnerrorValidation();
1113

14+
loadTests();
1215
start();

0 commit comments

Comments
 (0)