diff --git a/.gitattributes b/.gitattributes index 63ca2fc710..85a9c64aa9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -39,4 +39,4 @@ # Yarn # https://yarnpkg.com/getting-started/qa#which-files-should-be-gitignored -/war/.yarn/plugins/** binary +/.yarn/plugins/** binary diff --git a/.prettierignore b/.prettierignore index 66cf7311b1..72610f04b4 100644 --- a/.prettierignore +++ b/.prettierignore @@ -8,10 +8,10 @@ node/ .git # libraries / external deps / generated files -war/src/main/js/plugin-setup-wizard/bootstrap-detached.js +src/main/js/plugin-setup-wizard/bootstrap-detached.js war/src/main/webapp/scripts/yui war/src/main/webapp/jsbundles/ -war/src/main/scss/_bootstrap.scss +src/main/scss/_bootstrap.scss # test files that we don't need formatted test/src/test/resources diff --git a/.stylelintrc.js b/.stylelintrc.js index 711c7c77f8..cfea225e30 100644 --- a/.stylelintrc.js +++ b/.stylelintrc.js @@ -1,7 +1,7 @@ module.exports = { extends: "stylelint-config-standard", customSyntax: "postcss-scss", - ignoreFiles: ["war/src/main/scss/_bootstrap.scss"], + ignoreFiles: ["src/main/scss/_bootstrap.scss"], rules: { "no-descending-specificity": null, "selector-class-pattern": "[a-z]", diff --git a/eslint.config.cjs b/eslint.config.cjs index f6c1c6181e..0362bf627a 100644 --- a/eslint.config.cjs +++ b/eslint.config.cjs @@ -18,7 +18,7 @@ module.exports = [ // External scripts ".pnp.cjs", ".pnp.loader.mjs", - "war/src/main/js/plugin-setup-wizard/bootstrap-detached.js", + "src/main/js/plugin-setup-wizard/bootstrap-detached.js", "war/src/main/webapp/scripts/yui/*", ], }, @@ -91,8 +91,8 @@ module.exports = [ { files: [ "eslint.config.cjs", - "war/postcss.config.js", - "war/webpack.config.js", + "postcss.config.js", + "webpack.config.js", ".stylelintrc.js", ], languageOptions: { diff --git a/package.json b/package.json index bee799d33b..1e9ae7d916 100644 --- a/package.json +++ b/package.json @@ -10,16 +10,16 @@ }, "private": true, "scripts": { - "dev": "webpack --config war/webpack.config.js", - "prod": "webpack --config war/webpack.config.js --mode=production", + "dev": "webpack --config webpack.config.js", + "prod": "webpack --config webpack.config.js --mode=production", "build": "yarn prod", "start": "yarn dev --watch", "lint:js": "eslint . && prettier --check .", "lint:js-ci": "eslint . -f checkstyle -o target/eslint-warnings.xml && prettier --check .", - "lint:css": "stylelint war/src/main/scss", - "lint:css-ci": "stylelint war/src/main/scss --custom-formatter stylelint-checkstyle-reporter -o target/stylelint-warnings.xml", + "lint:css": "stylelint src/main/scss", + "lint:css-ci": "stylelint src/main/scss --custom-formatter stylelint-checkstyle-reporter -o target/stylelint-warnings.xml", "lint:ci": "yarn lint:js-ci && yarn lint:css-ci", - "lint:fix": "eslint --fix . && prettier --write . && stylelint war/src/main/scss --fix", + "lint:fix": "eslint --fix . && prettier --write . && stylelint src/main/scss --fix", "lint": "yarn lint:js && yarn lint:css" }, "devDependencies": { diff --git a/war/postcss.config.js b/postcss.config.js similarity index 100% rename from war/postcss.config.js rename to postcss.config.js diff --git a/war/src/main/js/add-item.js b/src/main/js/add-item.js similarity index 100% rename from war/src/main/js/add-item.js rename to src/main/js/add-item.js diff --git a/war/src/main/js/add-item.scss b/src/main/js/add-item.scss similarity index 100% rename from war/src/main/js/add-item.scss rename to src/main/js/add-item.scss diff --git a/war/src/main/js/api/pluginManager.js b/src/main/js/api/pluginManager.js similarity index 100% rename from war/src/main/js/api/pluginManager.js rename to src/main/js/api/pluginManager.js diff --git a/war/src/main/js/api/securityConfig.js b/src/main/js/api/securityConfig.js similarity index 100% rename from war/src/main/js/api/securityConfig.js rename to src/main/js/api/securityConfig.js diff --git a/war/src/main/js/app.js b/src/main/js/app.js similarity index 100% rename from war/src/main/js/app.js rename to src/main/js/app.js diff --git a/war/src/main/js/components/autocomplete/index.js b/src/main/js/components/autocomplete/index.js similarity index 100% rename from war/src/main/js/components/autocomplete/index.js rename to src/main/js/components/autocomplete/index.js diff --git a/war/src/main/js/components/confirmation-link/index.js b/src/main/js/components/confirmation-link/index.js similarity index 100% rename from war/src/main/js/components/confirmation-link/index.js rename to src/main/js/components/confirmation-link/index.js diff --git a/war/src/main/js/components/dialogs/index.js b/src/main/js/components/dialogs/index.js similarity index 100% rename from war/src/main/js/components/dialogs/index.js rename to src/main/js/components/dialogs/index.js diff --git a/war/src/main/js/components/dropdowns/hetero-list.js b/src/main/js/components/dropdowns/hetero-list.js similarity index 100% rename from war/src/main/js/components/dropdowns/hetero-list.js rename to src/main/js/components/dropdowns/hetero-list.js diff --git a/war/src/main/js/components/dropdowns/index.js b/src/main/js/components/dropdowns/index.js similarity index 100% rename from war/src/main/js/components/dropdowns/index.js rename to src/main/js/components/dropdowns/index.js diff --git a/war/src/main/js/components/dropdowns/inpage-jumplist.js b/src/main/js/components/dropdowns/inpage-jumplist.js similarity index 100% rename from war/src/main/js/components/dropdowns/inpage-jumplist.js rename to src/main/js/components/dropdowns/inpage-jumplist.js diff --git a/war/src/main/js/components/dropdowns/jumplists.js b/src/main/js/components/dropdowns/jumplists.js similarity index 100% rename from war/src/main/js/components/dropdowns/jumplists.js rename to src/main/js/components/dropdowns/jumplists.js diff --git a/war/src/main/js/components/dropdowns/overflow-button.js b/src/main/js/components/dropdowns/overflow-button.js similarity index 100% rename from war/src/main/js/components/dropdowns/overflow-button.js rename to src/main/js/components/dropdowns/overflow-button.js diff --git a/war/src/main/js/components/dropdowns/templates.js b/src/main/js/components/dropdowns/templates.js similarity index 100% rename from war/src/main/js/components/dropdowns/templates.js rename to src/main/js/components/dropdowns/templates.js diff --git a/war/src/main/js/components/dropdowns/utils.js b/src/main/js/components/dropdowns/utils.js similarity index 100% rename from war/src/main/js/components/dropdowns/utils.js rename to src/main/js/components/dropdowns/utils.js diff --git a/war/src/main/js/components/notifications/index.js b/src/main/js/components/notifications/index.js similarity index 100% rename from war/src/main/js/components/notifications/index.js rename to src/main/js/components/notifications/index.js diff --git a/war/src/main/js/components/row-selection-controller/index.js b/src/main/js/components/row-selection-controller/index.js similarity index 100% rename from war/src/main/js/components/row-selection-controller/index.js rename to src/main/js/components/row-selection-controller/index.js diff --git a/war/src/main/js/components/search-bar/index.js b/src/main/js/components/search-bar/index.js similarity index 100% rename from war/src/main/js/components/search-bar/index.js rename to src/main/js/components/search-bar/index.js diff --git a/war/src/main/js/components/stop-button-link/index.js b/src/main/js/components/stop-button-link/index.js similarity index 100% rename from war/src/main/js/components/stop-button-link/index.js rename to src/main/js/components/stop-button-link/index.js diff --git a/war/src/main/js/components/tooltips/index.js b/src/main/js/components/tooltips/index.js similarity index 100% rename from war/src/main/js/components/tooltips/index.js rename to src/main/js/components/tooltips/index.js diff --git a/war/src/main/js/handlebars-helpers/id.js b/src/main/js/handlebars-helpers/id.js similarity index 100% rename from war/src/main/js/handlebars-helpers/id.js rename to src/main/js/handlebars-helpers/id.js diff --git a/war/src/main/js/handlebars-helpers/ifeq.js b/src/main/js/handlebars-helpers/ifeq.js similarity index 100% rename from war/src/main/js/handlebars-helpers/ifeq.js rename to src/main/js/handlebars-helpers/ifeq.js diff --git a/war/src/main/js/handlebars-helpers/ifneq.js b/src/main/js/handlebars-helpers/ifneq.js similarity index 100% rename from war/src/main/js/handlebars-helpers/ifneq.js rename to src/main/js/handlebars-helpers/ifneq.js diff --git a/war/src/main/js/handlebars-helpers/in-array.js b/src/main/js/handlebars-helpers/in-array.js similarity index 100% rename from war/src/main/js/handlebars-helpers/in-array.js rename to src/main/js/handlebars-helpers/in-array.js diff --git a/war/src/main/js/handlebars-helpers/replace.js b/src/main/js/handlebars-helpers/replace.js similarity index 100% rename from war/src/main/js/handlebars-helpers/replace.js rename to src/main/js/handlebars-helpers/replace.js diff --git a/war/src/main/js/keyboard-shortcuts.js b/src/main/js/keyboard-shortcuts.js similarity index 100% rename from war/src/main/js/keyboard-shortcuts.js rename to src/main/js/keyboard-shortcuts.js diff --git a/war/src/main/js/pages/cloud-set/index.js b/src/main/js/pages/cloud-set/index.js similarity index 100% rename from war/src/main/js/pages/cloud-set/index.js rename to src/main/js/pages/cloud-set/index.js diff --git a/war/src/main/js/pages/cloud-set/index.scss b/src/main/js/pages/cloud-set/index.scss similarity index 100% rename from war/src/main/js/pages/cloud-set/index.scss rename to src/main/js/pages/cloud-set/index.scss diff --git a/war/src/main/js/pages/computer-set/index.js b/src/main/js/pages/computer-set/index.js similarity index 100% rename from war/src/main/js/pages/computer-set/index.js rename to src/main/js/pages/computer-set/index.js diff --git a/war/src/main/js/pages/dashboard/index.js b/src/main/js/pages/dashboard/index.js similarity index 100% rename from war/src/main/js/pages/dashboard/index.js rename to src/main/js/pages/dashboard/index.js diff --git a/war/src/main/js/pages/manage-jenkins/index.js b/src/main/js/pages/manage-jenkins/index.js similarity index 100% rename from war/src/main/js/pages/manage-jenkins/index.js rename to src/main/js/pages/manage-jenkins/index.js diff --git a/war/src/main/js/pages/manage-jenkins/system-information/index.js b/src/main/js/pages/manage-jenkins/system-information/index.js similarity index 100% rename from war/src/main/js/pages/manage-jenkins/system-information/index.js rename to src/main/js/pages/manage-jenkins/system-information/index.js diff --git a/war/src/main/js/pages/project/builds-card.js b/src/main/js/pages/project/builds-card.js similarity index 100% rename from war/src/main/js/pages/project/builds-card.js rename to src/main/js/pages/project/builds-card.js diff --git a/war/src/main/js/pages/project/builds-card.types.js b/src/main/js/pages/project/builds-card.types.js similarity index 100% rename from war/src/main/js/pages/project/builds-card.types.js rename to src/main/js/pages/project/builds-card.types.js diff --git a/war/src/main/js/pages/register/index.js b/src/main/js/pages/register/index.js similarity index 100% rename from war/src/main/js/pages/register/index.js rename to src/main/js/pages/register/index.js diff --git a/war/src/main/js/plugin-manager-ui.js b/src/main/js/plugin-manager-ui.js similarity index 100% rename from war/src/main/js/plugin-manager-ui.js rename to src/main/js/plugin-manager-ui.js diff --git a/war/src/main/js/plugin-setup-wizard/bootstrap-detached.js b/src/main/js/plugin-setup-wizard/bootstrap-detached.js similarity index 100% rename from war/src/main/js/plugin-setup-wizard/bootstrap-detached.js rename to src/main/js/plugin-setup-wizard/bootstrap-detached.js diff --git a/war/src/main/js/pluginSetupWizard.js b/src/main/js/pluginSetupWizard.js similarity index 100% rename from war/src/main/js/pluginSetupWizard.js rename to src/main/js/pluginSetupWizard.js diff --git a/war/src/main/js/pluginSetupWizardGui.js b/src/main/js/pluginSetupWizardGui.js similarity index 100% rename from war/src/main/js/pluginSetupWizardGui.js rename to src/main/js/pluginSetupWizardGui.js diff --git a/war/src/main/js/section-to-sidebar-items.js b/src/main/js/section-to-sidebar-items.js similarity index 100% rename from war/src/main/js/section-to-sidebar-items.js rename to src/main/js/section-to-sidebar-items.js diff --git a/war/src/main/js/section-to-tabs.js b/src/main/js/section-to-tabs.js similarity index 100% rename from war/src/main/js/section-to-tabs.js rename to src/main/js/section-to-tabs.js diff --git a/war/src/main/js/sortable-drag-drop.js b/src/main/js/sortable-drag-drop.js similarity index 100% rename from war/src/main/js/sortable-drag-drop.js rename to src/main/js/sortable-drag-drop.js diff --git a/war/src/main/js/templates/configureInstance.hbs b/src/main/js/templates/configureInstance.hbs similarity index 100% rename from war/src/main/js/templates/configureInstance.hbs rename to src/main/js/templates/configureInstance.hbs diff --git a/war/src/main/js/templates/errorPanel.hbs b/src/main/js/templates/errorPanel.hbs similarity index 100% rename from war/src/main/js/templates/errorPanel.hbs rename to src/main/js/templates/errorPanel.hbs diff --git a/war/src/main/js/templates/firstUserPanel.hbs b/src/main/js/templates/firstUserPanel.hbs similarity index 100% rename from war/src/main/js/templates/firstUserPanel.hbs rename to src/main/js/templates/firstUserPanel.hbs diff --git a/war/src/main/js/templates/incompleteInstallationPanel.hbs b/src/main/js/templates/incompleteInstallationPanel.hbs similarity index 100% rename from war/src/main/js/templates/incompleteInstallationPanel.hbs rename to src/main/js/templates/incompleteInstallationPanel.hbs diff --git a/war/src/main/js/templates/loadingPanel.hbs b/src/main/js/templates/loadingPanel.hbs similarity index 100% rename from war/src/main/js/templates/loadingPanel.hbs rename to src/main/js/templates/loadingPanel.hbs diff --git a/war/src/main/js/templates/offlinePanel.hbs b/src/main/js/templates/offlinePanel.hbs similarity index 100% rename from war/src/main/js/templates/offlinePanel.hbs rename to src/main/js/templates/offlinePanel.hbs diff --git a/war/src/main/js/templates/plugin-manager/available.hbs b/src/main/js/templates/plugin-manager/available.hbs similarity index 100% rename from war/src/main/js/templates/plugin-manager/available.hbs rename to src/main/js/templates/plugin-manager/available.hbs diff --git a/war/src/main/js/templates/pluginSelectList.hbs b/src/main/js/templates/pluginSelectList.hbs similarity index 100% rename from war/src/main/js/templates/pluginSelectList.hbs rename to src/main/js/templates/pluginSelectList.hbs diff --git a/war/src/main/js/templates/pluginSelectionPanel.hbs b/src/main/js/templates/pluginSelectionPanel.hbs similarity index 100% rename from war/src/main/js/templates/pluginSelectionPanel.hbs rename to src/main/js/templates/pluginSelectionPanel.hbs diff --git a/war/src/main/js/templates/pluginSetupWizard.hbs b/src/main/js/templates/pluginSetupWizard.hbs similarity index 100% rename from war/src/main/js/templates/pluginSetupWizard.hbs rename to src/main/js/templates/pluginSetupWizard.hbs diff --git a/war/src/main/js/templates/progressPanel.hbs b/src/main/js/templates/progressPanel.hbs similarity index 100% rename from war/src/main/js/templates/progressPanel.hbs rename to src/main/js/templates/progressPanel.hbs diff --git a/war/src/main/js/templates/proxyConfigPanel.hbs b/src/main/js/templates/proxyConfigPanel.hbs similarity index 100% rename from war/src/main/js/templates/proxyConfigPanel.hbs rename to src/main/js/templates/proxyConfigPanel.hbs diff --git a/war/src/main/js/templates/setupCompletePanel.hbs b/src/main/js/templates/setupCompletePanel.hbs similarity index 100% rename from war/src/main/js/templates/setupCompletePanel.hbs rename to src/main/js/templates/setupCompletePanel.hbs diff --git a/war/src/main/js/templates/successPanel.hbs b/src/main/js/templates/successPanel.hbs similarity index 100% rename from war/src/main/js/templates/successPanel.hbs rename to src/main/js/templates/successPanel.hbs diff --git a/war/src/main/js/templates/welcomePanel.hbs b/src/main/js/templates/welcomePanel.hbs similarity index 100% rename from war/src/main/js/templates/welcomePanel.hbs rename to src/main/js/templates/welcomePanel.hbs diff --git a/war/src/main/js/util/behavior-shim.js b/src/main/js/util/behavior-shim.js similarity index 100% rename from war/src/main/js/util/behavior-shim.js rename to src/main/js/util/behavior-shim.js diff --git a/war/src/main/js/util/dom.js b/src/main/js/util/dom.js similarity index 100% rename from war/src/main/js/util/dom.js rename to src/main/js/util/dom.js diff --git a/war/src/main/js/util/i18n.js b/src/main/js/util/i18n.js similarity index 100% rename from war/src/main/js/util/i18n.js rename to src/main/js/util/i18n.js diff --git a/war/src/main/js/util/jenkins.js b/src/main/js/util/jenkins.js similarity index 100% rename from war/src/main/js/util/jenkins.js rename to src/main/js/util/jenkins.js diff --git a/war/src/main/js/util/jenkinsLocalStorage.js b/src/main/js/util/jenkinsLocalStorage.js similarity index 100% rename from war/src/main/js/util/jenkinsLocalStorage.js rename to src/main/js/util/jenkinsLocalStorage.js diff --git a/war/src/main/js/util/jquery-ext.js b/src/main/js/util/jquery-ext.js similarity index 100% rename from war/src/main/js/util/jquery-ext.js rename to src/main/js/util/jquery-ext.js diff --git a/war/src/main/js/util/keyboard.js b/src/main/js/util/keyboard.js similarity index 100% rename from war/src/main/js/util/keyboard.js rename to src/main/js/util/keyboard.js diff --git a/war/src/main/js/util/localStorage.js b/src/main/js/util/localStorage.js similarity index 100% rename from war/src/main/js/util/localStorage.js rename to src/main/js/util/localStorage.js diff --git a/war/src/main/js/util/page.js b/src/main/js/util/page.js similarity index 100% rename from war/src/main/js/util/page.js rename to src/main/js/util/page.js diff --git a/war/src/main/js/util/path.js b/src/main/js/util/path.js similarity index 100% rename from war/src/main/js/util/path.js rename to src/main/js/util/path.js diff --git a/war/src/main/js/util/security.js b/src/main/js/util/security.js similarity index 100% rename from war/src/main/js/util/security.js rename to src/main/js/util/security.js diff --git a/war/src/main/js/util/symbols.js b/src/main/js/util/symbols.js similarity index 100% rename from war/src/main/js/util/symbols.js rename to src/main/js/util/symbols.js diff --git a/war/src/main/js/widgets/add/addform.scss b/src/main/js/widgets/add/addform.scss similarity index 100% rename from war/src/main/js/widgets/add/addform.scss rename to src/main/js/widgets/add/addform.scss diff --git a/war/src/main/scss/_bootstrap.scss b/src/main/scss/_bootstrap.scss similarity index 100% rename from war/src/main/scss/_bootstrap.scss rename to src/main/scss/_bootstrap.scss diff --git a/war/src/main/scss/abstracts/_colors.scss b/src/main/scss/abstracts/_colors.scss similarity index 100% rename from war/src/main/scss/abstracts/_colors.scss rename to src/main/scss/abstracts/_colors.scss diff --git a/war/src/main/scss/abstracts/_index.scss b/src/main/scss/abstracts/_index.scss similarity index 100% rename from war/src/main/scss/abstracts/_index.scss rename to src/main/scss/abstracts/_index.scss diff --git a/war/src/main/scss/abstracts/_mixins.scss b/src/main/scss/abstracts/_mixins.scss similarity index 100% rename from war/src/main/scss/abstracts/_mixins.scss rename to src/main/scss/abstracts/_mixins.scss diff --git a/war/src/main/scss/abstracts/_theme.scss b/src/main/scss/abstracts/_theme.scss similarity index 100% rename from war/src/main/scss/abstracts/_theme.scss rename to src/main/scss/abstracts/_theme.scss diff --git a/war/src/main/scss/base/_breakpoints.scss b/src/main/scss/base/_breakpoints.scss similarity index 100% rename from war/src/main/scss/base/_breakpoints.scss rename to src/main/scss/base/_breakpoints.scss diff --git a/war/src/main/scss/base/_core.scss b/src/main/scss/base/_core.scss similarity index 100% rename from war/src/main/scss/base/_core.scss rename to src/main/scss/base/_core.scss diff --git a/war/src/main/scss/base/_display.scss b/src/main/scss/base/_display.scss similarity index 100% rename from war/src/main/scss/base/_display.scss rename to src/main/scss/base/_display.scss diff --git a/war/src/main/scss/base/_index.scss b/src/main/scss/base/_index.scss similarity index 100% rename from war/src/main/scss/base/_index.scss rename to src/main/scss/base/_index.scss diff --git a/war/src/main/scss/base/_layout-commons.scss b/src/main/scss/base/_layout-commons.scss similarity index 100% rename from war/src/main/scss/base/_layout-commons.scss rename to src/main/scss/base/_layout-commons.scss diff --git a/war/src/main/scss/base/_spacing.scss b/src/main/scss/base/_spacing.scss similarity index 100% rename from war/src/main/scss/base/_spacing.scss rename to src/main/scss/base/_spacing.scss diff --git a/war/src/main/scss/base/_style.scss b/src/main/scss/base/_style.scss similarity index 100% rename from war/src/main/scss/base/_style.scss rename to src/main/scss/base/_style.scss diff --git a/war/src/main/scss/base/_typography.scss b/src/main/scss/base/_typography.scss similarity index 100% rename from war/src/main/scss/base/_typography.scss rename to src/main/scss/base/_typography.scss diff --git a/war/src/main/scss/base/_visibility-utils.scss b/src/main/scss/base/_visibility-utils.scss similarity index 100% rename from war/src/main/scss/base/_visibility-utils.scss rename to src/main/scss/base/_visibility-utils.scss diff --git a/war/src/main/scss/base/_yui-compatibility.scss b/src/main/scss/base/_yui-compatibility.scss similarity index 100% rename from war/src/main/scss/base/_yui-compatibility.scss rename to src/main/scss/base/_yui-compatibility.scss diff --git a/war/src/main/scss/components/_alert.scss b/src/main/scss/components/_alert.scss similarity index 100% rename from war/src/main/scss/components/_alert.scss rename to src/main/scss/components/_alert.scss diff --git a/war/src/main/scss/components/_app-bar.scss b/src/main/scss/components/_app-bar.scss similarity index 100% rename from war/src/main/scss/components/_app-bar.scss rename to src/main/scss/components/_app-bar.scss diff --git a/war/src/main/scss/components/_badges.scss b/src/main/scss/components/_badges.scss similarity index 100% rename from war/src/main/scss/components/_badges.scss rename to src/main/scss/components/_badges.scss diff --git a/war/src/main/scss/components/_breadcrumbs.scss b/src/main/scss/components/_breadcrumbs.scss similarity index 100% rename from war/src/main/scss/components/_breadcrumbs.scss rename to src/main/scss/components/_breadcrumbs.scss diff --git a/war/src/main/scss/components/_buttons-deprecated.scss b/src/main/scss/components/_buttons-deprecated.scss similarity index 100% rename from war/src/main/scss/components/_buttons-deprecated.scss rename to src/main/scss/components/_buttons-deprecated.scss diff --git a/war/src/main/scss/components/_buttons.scss b/src/main/scss/components/_buttons.scss similarity index 100% rename from war/src/main/scss/components/_buttons.scss rename to src/main/scss/components/_buttons.scss diff --git a/war/src/main/scss/components/_cards.scss b/src/main/scss/components/_cards.scss similarity index 100% rename from war/src/main/scss/components/_cards.scss rename to src/main/scss/components/_cards.scss diff --git a/war/src/main/scss/components/_content-blocks.scss b/src/main/scss/components/_content-blocks.scss similarity index 100% rename from war/src/main/scss/components/_content-blocks.scss rename to src/main/scss/components/_content-blocks.scss diff --git a/war/src/main/scss/components/_dialogs.scss b/src/main/scss/components/_dialogs.scss similarity index 100% rename from war/src/main/scss/components/_dialogs.scss rename to src/main/scss/components/_dialogs.scss diff --git a/war/src/main/scss/components/_dropdowns.scss b/src/main/scss/components/_dropdowns.scss similarity index 100% rename from war/src/main/scss/components/_dropdowns.scss rename to src/main/scss/components/_dropdowns.scss diff --git a/war/src/main/scss/components/_icons.scss b/src/main/scss/components/_icons.scss similarity index 100% rename from war/src/main/scss/components/_icons.scss rename to src/main/scss/components/_icons.scss diff --git a/war/src/main/scss/components/_index.scss b/src/main/scss/components/_index.scss similarity index 100% rename from war/src/main/scss/components/_index.scss rename to src/main/scss/components/_index.scss diff --git a/war/src/main/scss/components/_notice.scss b/src/main/scss/components/_notice.scss similarity index 100% rename from war/src/main/scss/components/_notice.scss rename to src/main/scss/components/_notice.scss diff --git a/war/src/main/scss/components/_notifications.scss b/src/main/scss/components/_notifications.scss similarity index 100% rename from war/src/main/scss/components/_notifications.scss rename to src/main/scss/components/_notifications.scss diff --git a/war/src/main/scss/components/_page-footer.scss b/src/main/scss/components/_page-footer.scss similarity index 100% rename from war/src/main/scss/components/_page-footer.scss rename to src/main/scss/components/_page-footer.scss diff --git a/war/src/main/scss/components/_page-header.scss b/src/main/scss/components/_page-header.scss similarity index 100% rename from war/src/main/scss/components/_page-header.scss rename to src/main/scss/components/_page-header.scss diff --git a/war/src/main/scss/components/_panes-and-bigtable.scss b/src/main/scss/components/_panes-and-bigtable.scss similarity index 100% rename from war/src/main/scss/components/_panes-and-bigtable.scss rename to src/main/scss/components/_panes-and-bigtable.scss diff --git a/war/src/main/scss/components/_progress-animation.scss b/src/main/scss/components/_progress-animation.scss similarity index 100% rename from war/src/main/scss/components/_progress-animation.scss rename to src/main/scss/components/_progress-animation.scss diff --git a/war/src/main/scss/components/_progress-bar.scss b/src/main/scss/components/_progress-bar.scss similarity index 100% rename from war/src/main/scss/components/_progress-bar.scss rename to src/main/scss/components/_progress-bar.scss diff --git a/war/src/main/scss/components/_row-selection-controller.scss b/src/main/scss/components/_row-selection-controller.scss similarity index 100% rename from war/src/main/scss/components/_row-selection-controller.scss rename to src/main/scss/components/_row-selection-controller.scss diff --git a/war/src/main/scss/components/_section.scss b/src/main/scss/components/_section.scss similarity index 100% rename from war/src/main/scss/components/_section.scss rename to src/main/scss/components/_section.scss diff --git a/war/src/main/scss/components/_side-panel-tasks.scss b/src/main/scss/components/_side-panel-tasks.scss similarity index 100% rename from war/src/main/scss/components/_side-panel-tasks.scss rename to src/main/scss/components/_side-panel-tasks.scss diff --git a/war/src/main/scss/components/_side-panel-widgets.scss b/src/main/scss/components/_side-panel-widgets.scss similarity index 100% rename from war/src/main/scss/components/_side-panel-widgets.scss rename to src/main/scss/components/_side-panel-widgets.scss diff --git a/war/src/main/scss/components/_skip-link.scss b/src/main/scss/components/_skip-link.scss similarity index 100% rename from war/src/main/scss/components/_skip-link.scss rename to src/main/scss/components/_skip-link.scss diff --git a/war/src/main/scss/components/_spinner.scss b/src/main/scss/components/_spinner.scss similarity index 100% rename from war/src/main/scss/components/_spinner.scss rename to src/main/scss/components/_spinner.scss diff --git a/war/src/main/scss/components/_table.scss b/src/main/scss/components/_table.scss similarity index 100% rename from war/src/main/scss/components/_table.scss rename to src/main/scss/components/_table.scss diff --git a/war/src/main/scss/components/_tabs.scss b/src/main/scss/components/_tabs.scss similarity index 100% rename from war/src/main/scss/components/_tabs.scss rename to src/main/scss/components/_tabs.scss diff --git a/war/src/main/scss/components/_tooltips.scss b/src/main/scss/components/_tooltips.scss similarity index 100% rename from war/src/main/scss/components/_tooltips.scss rename to src/main/scss/components/_tooltips.scss diff --git a/war/src/main/scss/form/_checkbox.scss b/src/main/scss/form/_checkbox.scss similarity index 100% rename from war/src/main/scss/form/_checkbox.scss rename to src/main/scss/form/_checkbox.scss diff --git a/war/src/main/scss/form/_codemirror.scss b/src/main/scss/form/_codemirror.scss similarity index 100% rename from war/src/main/scss/form/_codemirror.scss rename to src/main/scss/form/_codemirror.scss diff --git a/war/src/main/scss/form/_file-upload.scss b/src/main/scss/form/_file-upload.scss similarity index 100% rename from war/src/main/scss/form/_file-upload.scss rename to src/main/scss/form/_file-upload.scss diff --git a/war/src/main/scss/form/_index.scss b/src/main/scss/form/_index.scss similarity index 100% rename from war/src/main/scss/form/_index.scss rename to src/main/scss/form/_index.scss diff --git a/war/src/main/scss/form/_input.scss b/src/main/scss/form/_input.scss similarity index 100% rename from war/src/main/scss/form/_input.scss rename to src/main/scss/form/_input.scss diff --git a/war/src/main/scss/form/_layout.scss b/src/main/scss/form/_layout.scss similarity index 100% rename from war/src/main/scss/form/_layout.scss rename to src/main/scss/form/_layout.scss diff --git a/war/src/main/scss/form/_radio.scss b/src/main/scss/form/_radio.scss similarity index 100% rename from war/src/main/scss/form/_radio.scss rename to src/main/scss/form/_radio.scss diff --git a/war/src/main/scss/form/_reorderable-list.scss b/src/main/scss/form/_reorderable-list.scss similarity index 100% rename from war/src/main/scss/form/_reorderable-list.scss rename to src/main/scss/form/_reorderable-list.scss diff --git a/war/src/main/scss/form/_search-bar.scss b/src/main/scss/form/_search-bar.scss similarity index 100% rename from war/src/main/scss/form/_search-bar.scss rename to src/main/scss/form/_search-bar.scss diff --git a/war/src/main/scss/form/_select.scss b/src/main/scss/form/_select.scss similarity index 100% rename from war/src/main/scss/form/_select.scss rename to src/main/scss/form/_select.scss diff --git a/war/src/main/scss/form/_textarea.scss b/src/main/scss/form/_textarea.scss similarity index 100% rename from war/src/main/scss/form/_textarea.scss rename to src/main/scss/form/_textarea.scss diff --git a/war/src/main/scss/form/_toggle-switch.scss b/src/main/scss/form/_toggle-switch.scss similarity index 100% rename from war/src/main/scss/form/_toggle-switch.scss rename to src/main/scss/form/_toggle-switch.scss diff --git a/war/src/main/scss/form/_validation.scss b/src/main/scss/form/_validation.scss similarity index 100% rename from war/src/main/scss/form/_validation.scss rename to src/main/scss/form/_validation.scss diff --git a/war/src/main/scss/pages/_about.scss b/src/main/scss/pages/_about.scss similarity index 100% rename from war/src/main/scss/pages/_about.scss rename to src/main/scss/pages/_about.scss diff --git a/war/src/main/scss/pages/_build.scss b/src/main/scss/pages/_build.scss similarity index 100% rename from war/src/main/scss/pages/_build.scss rename to src/main/scss/pages/_build.scss diff --git a/war/src/main/scss/pages/_dashboard.scss b/src/main/scss/pages/_dashboard.scss similarity index 100% rename from war/src/main/scss/pages/_dashboard.scss rename to src/main/scss/pages/_dashboard.scss diff --git a/war/src/main/scss/pages/_icon-legend.scss b/src/main/scss/pages/_icon-legend.scss similarity index 100% rename from war/src/main/scss/pages/_icon-legend.scss rename to src/main/scss/pages/_icon-legend.scss diff --git a/war/src/main/scss/pages/_index.scss b/src/main/scss/pages/_index.scss similarity index 100% rename from war/src/main/scss/pages/_index.scss rename to src/main/scss/pages/_index.scss diff --git a/war/src/main/scss/pages/_job.scss b/src/main/scss/pages/_job.scss similarity index 100% rename from war/src/main/scss/pages/_job.scss rename to src/main/scss/pages/_job.scss diff --git a/war/src/main/scss/pages/_manage-jenkins.scss b/src/main/scss/pages/_manage-jenkins.scss similarity index 100% rename from war/src/main/scss/pages/_manage-jenkins.scss rename to src/main/scss/pages/_manage-jenkins.scss diff --git a/war/src/main/scss/pages/_plugin-manager.scss b/src/main/scss/pages/_plugin-manager.scss similarity index 100% rename from war/src/main/scss/pages/_plugin-manager.scss rename to src/main/scss/pages/_plugin-manager.scss diff --git a/war/src/main/scss/pages/_setupWizardConfigureInstance.scss b/src/main/scss/pages/_setupWizardConfigureInstance.scss similarity index 100% rename from war/src/main/scss/pages/_setupWizardConfigureInstance.scss rename to src/main/scss/pages/_setupWizardConfigureInstance.scss diff --git a/war/src/main/scss/pages/_setupWizardFirstUser.scss b/src/main/scss/pages/_setupWizardFirstUser.scss similarity index 100% rename from war/src/main/scss/pages/_setupWizardFirstUser.scss rename to src/main/scss/pages/_setupWizardFirstUser.scss diff --git a/war/src/main/scss/pages/_sign-in-register.scss b/src/main/scss/pages/_sign-in-register.scss similarity index 100% rename from war/src/main/scss/pages/_sign-in-register.scss rename to src/main/scss/pages/_sign-in-register.scss diff --git a/war/src/main/scss/pluginSetupWizard.scss b/src/main/scss/pluginSetupWizard.scss similarity index 100% rename from war/src/main/scss/pluginSetupWizard.scss rename to src/main/scss/pluginSetupWizard.scss diff --git a/war/src/main/scss/simple-page.scss b/src/main/scss/simple-page.scss similarity index 100% rename from war/src/main/scss/simple-page.scss rename to src/main/scss/simple-page.scss diff --git a/war/src/main/scss/styles.scss b/src/main/scss/styles.scss similarity index 100% rename from war/src/main/scss/styles.scss rename to src/main/scss/styles.scss diff --git a/war/webpack.config.js b/webpack.config.js similarity index 97% rename from war/webpack.config.js rename to webpack.config.js index b9f012095f..579157b91e 100644 --- a/war/webpack.config.js +++ b/webpack.config.js @@ -57,7 +57,7 @@ module.exports = (env, argv) => ({ styles: [path.join(__dirname, "src/main/scss/styles.scss")], }, output: { - path: path.join(__dirname, "src/main/webapp/jsbundles"), + path: path.join(__dirname, "war/src/main/webapp/jsbundles"), }, devtool: argv.mode === "production" @@ -89,7 +89,7 @@ module.exports = (env, argv) => ({ options: { sourceMap: true, // ignore the URLS on the base styles as they are picked - // from the src/main/webapp/images dir + // from the war/src/main/webapp/images dir url: { filter: (url, resourcePath) => { return !resourcePath.includes("styles.scss");