IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Remove support for legacy plugin JS compilation pipeline (#18293)

Browse Source 
This became the default in b1755137
This commit is contained in:
David Taylor
2022-09-21 12:38:02 +01:00
committed by GitHub
parent ae3a5f6bf0
commit e06b9d4a52
13 changed files with 52 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/assets/javascripts/admin-plugins.js.erb
View File

@@ -1,11 +0,0 @@
<%
DiscoursePluginRegistry.admin_javascripts.each { |js| require_asset(js) }
DiscoursePluginRegistry.each_globbed_asset(admin: true) do |f|
if File.directory?(f)
depend_on(f)
else
require_asset(f)
end
end
%>

12
app/assets/javascripts/discourse/ember-cli-build.js
View File

@@ -145,15 +145,9 @@ module.exports = function (defaults) {
"/app/assets/javascripts/discourse/public/assets/scripts/module-shims.js"
);
let discoursePluginsTree;
if (process.env.EMBER_CLI_PLUGIN_ASSETS !== "0") {
discoursePluginsTree = app.project
.findAddonByName("discourse-plugins")
.generatePluginsTree();
} else {
// Empty tree - no-op
discoursePluginsTree = mergeTrees([]);
}
const discoursePluginsTree = app.project
.findAddonByName("discourse-plugins")
.generatePluginsTree();
const terserPlugin = app.project.findAddonByName("ember-cli-terser");
const applyTerser = (tree) => terserPlugin.postprocessTree("all", tree);

86
app/assets/javascripts/discourse/lib/bootstrap-json/index.js
View File

@@ -381,44 +381,36 @@ module.exports = {
if (shouldLoadPluginTestJs() && type === "test-plugin-js") {
const scripts = [];
if (process.env.EMBER_CLI_PLUGIN_ASSETS !== "0") {
const pluginInfos = this.app.project
.findAddonByName("discourse-plugins")
.pluginInfos();
const pluginInfos = this.app.project
.findAddonByName("discourse-plugins")
.pluginInfos();
for (const {
pluginName,
directoryName,
hasJs,
hasAdminJs,
} of pluginInfos) {
if (hasJs) {
scripts.push({
src: `plugins/${directoryName}.js`,
name: pluginName,
});
}
if (fs.existsSync(`../plugins/${directoryName}_extras.js.erb`)) {
scripts.push({
src: `plugins/${directoryName}_extras.js`,
name: pluginName,
});
}
if (hasAdminJs) {
scripts.push({
src: `plugins/${directoryName}_admin.js`,
name: pluginName,
});
}
for (const {
pluginName,
directoryName,
hasJs,
hasAdminJs,
} of pluginInfos) {
if (hasJs) {
scripts.push({
src: `plugins/${directoryName}.js`,
name: pluginName,
});
}
if (fs.existsSync(`../plugins/${directoryName}_extras.js.erb`)) {
scripts.push({
src: `plugins/${directoryName}_extras.js`,
name: pluginName,
});
}
if (hasAdminJs) {
scripts.push({
src: `plugins/${directoryName}_admin.js`,
name: pluginName,
});
}
} else {
scripts.push({
src: "discourse/tests/active-plugins.js",
name: "_all",
});
scripts.push({ src: "admin-plugins.js", name: "_admin" });
}
return scripts
@@ -428,19 +420,15 @@ module.exports = {
)
.join("\n");
} else if (shouldLoadPluginTestJs() && type === "test-plugin-tests-js") {
if (process.env.EMBER_CLI_PLUGIN_ASSETS !== "0") {
return this.app.project
.findAddonByName("discourse-plugins")
.pluginInfos()
.filter(({ hasTests }) => hasTests)
.map(
({ directoryName, pluginName }) =>
`<script src="${config.rootURL}assets/plugins/test/${directoryName}_tests.js" data-discourse-plugin="${pluginName}"></script>`
)
.join("\n");
} else {
return `<script id="plugin-test-script" src="${config.rootURL}assets/discourse/tests/plugin-tests.js" data-discourse-plugin="_all"></script>`;
}
return this.app.project
.findAddonByName("discourse-plugins")
.pluginInfos()
.filter(({ hasTests }) => hasTests)
.map(
({ directoryName, pluginName }) =>
`<script src="${config.rootURL}assets/plugins/test/${directoryName}_tests.js" data-discourse-plugin="${pluginName}"></script>`
)
.join("\n");
}
},

9
app/assets/javascripts/discourse/testem.js
View File

@@ -98,15 +98,6 @@ if (process.argv.includes("-t")) {
"/assets/plugins/*_extra.js": {
target,
},
"/assets/discourse/tests/active-plugins.js": {
target,
},
"/assets/admin-plugins.js": {
target,
},
"/assets/discourse/tests/plugin-tests.js": {
target,
},
"/plugins/": {
target,
},

11
app/assets/javascripts/discourse/tests/active-plugins.js.erb
View File

@@ -1,11 +0,0 @@
<%
DiscoursePluginRegistry.javascripts.each { |js| require_asset(js) }
DiscoursePluginRegistry.handlebars.each { |hb| require_asset(hb) }
DiscoursePluginRegistry.each_globbed_asset do |f|
if File.directory?(f)
depend_on(f)
else
require_asset(f)
end
end
%>

3
app/assets/javascripts/discourse/tests/core-tests.js
View File

@@ -1,3 +0,0 @@
//= require_tree ./acceptance
//= require_tree ./integration
//= require_tree ./unit

10
app/assets/javascripts/discourse/tests/plugin-tests.js.erb
View File

@@ -1,10 +0,0 @@
<%
Discourse.plugins.each do |p|
root_path = "#{File.dirname(p.path)}/test/javascripts"
to_glob = [root_path + '/**/**.es6']
to_glob << (root_path + '/**/**.js')
Dir.glob(to_glob) { |f| require_asset(f) }
end
%>