1
0
mirror of https://github.com/flarum/core.git synced 2025-08-06 08:27:42 +02:00
See https://github.com/flarum/core/pull/1367

* Replace gulp with webpack and npm scripts for JS compilation
* Set up Travis CI to commit compiled JS
* Restructure `js` directory; only one instance of npm, forum/admin are "submodules"
* Restructure `less` directory
This commit is contained in:
Toby Zerner
2018-06-20 13:35:08 +09:30
committed by GitHub
parent 22885b7796
commit b7346f39ad
19 changed files with 4752 additions and 2611 deletions

Binary file not shown.

View File

@@ -2,4 +2,4 @@
.gitignore export-ignore
.travis.yml export-ignore
js/*/dist/*.js -diff
js/dist/* -diff

View File

@@ -2,5 +2,5 @@
composer.phar
.DS_Store
Thumbs.db
bower_components
node_modules
node_modules
js/dist/*

View File

@@ -0,0 +1,15 @@
language: minimal
sudo: false
cache:
directories:
- $HOME/.npm
jobs:
include:
- stage: build
if: branch = master AND type = push
script: curl -s https://raw.githubusercontent.com/flarum/core/master/.travis/build.sh | bash -s -
-k $encrypted_79a3dcff46b9_key
-i $encrypted_79a3dcff46b9_iv

View File

@@ -14,9 +14,9 @@ use s9e\TextFormatter\Configurator;
return [
(new Extend\Assets('forum'))
->asset(__DIR__.'/js/forum/dist/extension.js')
->asset(__DIR__.'/less/forum/extension.less')
->bootstrapper('flarum/emoji/main'),
->js(__DIR__.'/js/dist/forum.js')
->asset(__DIR__.'/less/forum.less'),
new Extend\FormatterConfiguration(function (Configurator $config) {
$config->Emoji->useEmojiOne();
$config->Emoji->omitImageSize();

View File

@@ -0,0 +1,10 @@
/*
* This file is part of Flarum.
*
* (c) Toby Zerner <toby.zerner@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
export * from './src/forum';

View File

@@ -1,10 +0,0 @@
var gulp = require('flarum-gulp');
gulp({
modules: {
'flarum/emoji': 'src/**/*.js'
},
files: [
'bower_components/textarea-caret-position/index.js'
]
});

View File

@@ -1,6 +0,0 @@
{
"name": "flarum-emoji",
"devDependencies": {
"textarea-caret-position": "~3.0.0"
}
}

File diff suppressed because it is too large Load Diff

View File

@@ -1,7 +0,0 @@
{
"private": true,
"devDependencies": {
"gulp": "^3.9.1",
"flarum-gulp": "^0.2.0"
}
}

4700
extensions/emoji/js/package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@@ -0,0 +1,14 @@
{
"name": "@flarum/flarum-ext-emoji",
"version": "0.0.0",
"dependencies": {
"flarum-webpack-config": "^0.1.0-beta.8",
"textarea-caret": "^3.1.0",
"webpack": "^4.0.0",
"webpack-cli": "^3.0.7"
},
"scripts": {
"build": "webpack --mode production --progress",
"watch": "webpack --mode development --watch"
}
}

View File

@@ -1,11 +1,11 @@
/*global getCaretCoordinates*/
import getCaretCoordinates from 'textarea-caret';
import { extend } from 'flarum/extend';
import ComposerBody from 'flarum/components/ComposerBody';
import emojiMap from 'flarum/emoji/helpers/emojiMap';
import emojiMap from './helpers/emojiMap';
import KeyboardNavigatable from 'flarum/utils/KeyboardNavigatable';
import AutocompleteDropdown from 'flarum/emoji/components/AutocompleteDropdown';
import AutocompleteDropdown from './components/AutocompleteDropdown';
export default function addComposerAutocomplete() {

View File

@@ -2,7 +2,7 @@ import { override } from 'flarum/extend';
import app from 'flarum/app';
import Post from 'flarum/models/Post';
import addComposerAutocomplete from 'flarum/emoji/addComposerAutocomplete';
import addComposerAutocomplete from './addComposerAutocomplete';
app.initializers.add('flarum-emoji', () => {
// After typing ':' in the composer, show a dropdown suggesting a bunch of

View File

@@ -0,0 +1,3 @@
const config = require('flarum-webpack-config');
module.exports = config();

View File

@@ -1,27 +0,0 @@
#!/usr/bin/env bash
# This script compiles the extension so that it can be used in a Flarum
# installation. It should be run from the root directory of the extension.
base=$PWD
cd "${base}/js"
if [ -f bower.json ]; then
bower install
fi
for app in forum admin; do
cd "${base}/js"
if [ -d $app ]; then
cd $app
if [ -f bower.json ]; then
bower install
fi
npm install
gulp --production
fi
done