Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganize frontend files and tooling #10168

Merged
merged 4 commits into from
Feb 7, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .eslintignore

This file was deleted.

3 changes: 3 additions & 0 deletions .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ extends:
- eslint-config-airbnb-base
- eslint:recommended

ignorePatterns:
- /web_src/js/vendor

parserOptions:
ecmaVersion: 2020

Expand Down
4 changes: 4 additions & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
extends: stylelint-config-standard

ignoreFiles:
- web_src/less/vendor/**/*

rules:
at-rule-empty-line-before: null
block-closing-brace-empty-line-before: null
color-hex-length: null
comment-empty-line-before: null
Expand Down
5 changes: 3 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ LDFLAGS := $(LDFLAGS) -X "main.MakeVersion=$(MAKE_VERSION)" -X "main.Version=$(G
PACKAGES ?= $(filter-out code.gitea.io/gitea/integrations/migration-test,$(filter-out code.gitea.io/gitea/integrations,$(shell GO111MODULE=on $(GO) list -mod=vendor ./... | grep -v /vendor/)))

GO_SOURCES ?= $(shell find . -name "*.go" -type f)
WEBPACK_SOURCES ?= $(shell find web_src/js web_src/css web_src/less -type f)
WEBPACK_SOURCES ?= $(shell find web_src/js web_src/less -type f)
WEBPACK_CONFIGS := webpack.config.js .eslintrc .stylelintrc

WEBPACK_DEST := public/js/index.js public/css/index.css
BINDATA_DEST := modules/public/bindata.go modules/options/bindata.go modules/templates/bindata.go
Expand Down Expand Up @@ -517,7 +518,7 @@ $(FOMANTIC_EVIDENCE): semantic.json $(FOMANTIC_SOURCES) | node_modules
.PHONY: webpack
webpack: node-check $(WEBPACK_DEST)

$(WEBPACK_DEST): $(WEBPACK_SOURCES) webpack.config.js | node_modules
$(WEBPACK_DEST): $(WEBPACK_SOURCES) $(WEBPACK_CONFIGS) | node_modules
npx eslint web_src/js webpack.config.js
npx stylelint web_src/less
npx webpack --hide-modules --display-entrypoints=false
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
$(async () => {
export default async function initGitGraph() {
const graphCanvas = document.getElementById('graph-canvas');
if (!graphCanvas) return;

const { default: gitGraph } = await import(/* webpackChunkName: "gitgraph" */'./gitGraph.js');
const { default: gitGraph } = await import(/* webpackChunkName: "gitgraph" */'../vendor/gitGraph.js');

const graphList = [];
$('#graph-raw-list li span.node-relation').each(function () {
graphList.push($(this).text());
});

gitGraph(graphCanvas, graphList);
});
}
6 changes: 4 additions & 2 deletions web_src/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,11 @@
import 'jquery.are-you-sure';
import './publicPath.js';
import './polyfills.js';
import './gitGraphLoader.js';
import './semanticDropdown.js';
import './vendor/semanticDropdown.js';

import initContextPopups from './features/contextPopup.js';
import initHighlight from './features/highlight.js';
import initGitGraph from './features/gitGraph.js';

import ActivityTopAuthors from './components/ActivityTopAuthors.vue';

Expand Down Expand Up @@ -2578,6 +2579,7 @@ $(document).ready(async () => {
initRepoStatusChecker();
initTemplateSearch();
initContextPopups(suburl);
initGitGraph();

// Repo clone url.
if ($('#repo-clone-url').length > 0) {
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
5 changes: 3 additions & 2 deletions web_src/less/index.less
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
@import "~highlight.js/styles/github.css";
@import "./vendor/gitGraph.css";

@import "_tribute";
@import "_emojify";
@import "_base";
Expand All @@ -13,5 +16,3 @@
@import "_admin";
@import "_explore";
@import "_review";
@import "~highlight.js/styles/github.css";
@import "../css/gitGraph.css";
File renamed without changes.
2 changes: 1 addition & 1 deletion webpack.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = {
resolve(__dirname, 'web_src/less/index.less'),
],
swagger: [
resolve(__dirname, 'web_src/js/swagger.js'),
resolve(__dirname, 'web_src/js/standalone/swagger.js'),
],
jquery: [
resolve(__dirname, 'web_src/js/jquery.js'),
Expand Down