Webpack (#9)

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

extensions/akismet/.gitattributes

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

extensions/akismet/.gitignore

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

extensions/akismet/.travis.yml

@@ -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_e7a10ca5c05c_key
+        -i $encrypted_e7a10ca5c05c_iv

extensions/akismet/bootstrap.php

@@ -15,11 +15,11 @@ use Illuminate\Contracts\Events\Dispatcher;
 
 return [
     (new Extend\Assets('forum'))
-        ->asset(__DIR__.'/js/forum/dist/extension.js')
+        ->js(__DIR__.'/js/dist/forum.js'),
-        ->bootstrapper('flarum/akismet/main'),
+
     (new Extend\Assets('admin'))
-        ->asset(__DIR__.'/js/admin/dist/extension.js')
+        ->js(__DIR__.'/js/dist/admin.js'),
-        ->bootstrapper('flarum/akismet/main'),
+
     function (Dispatcher $events) {
         $events->subscribe(Listener\FilterNewPosts::class);
     },

extensions/akismet/js/admin.js

@@ -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/admin';

extensions/akismet/js/admin/Gulpfile.js

@@ -1,7 +0,0 @@
-var gulp = require('flarum-gulp');
-
-gulp({
-  modules: {
-    'flarum/akismet': 'src/**/*.js'
-  }
-});

extensions/akismet/js/admin/dist/extension.js

@@ -1,73 +0,0 @@
-'use strict';
-
-System.register('flarum/akismet/components/AkismetSettingsModal', ['flarum/components/SettingsModal'], function (_export, _context) {
-  "use strict";
-
-  var SettingsModal, AkismetSettingsModal;
-  return {
-    setters: [function (_flarumComponentsSettingsModal) {
-      SettingsModal = _flarumComponentsSettingsModal.default;
-    }],
-    execute: function () {
-      AkismetSettingsModal = function (_SettingsModal) {
-        babelHelpers.inherits(AkismetSettingsModal, _SettingsModal);
-
-        function AkismetSettingsModal() {
-          babelHelpers.classCallCheck(this, AkismetSettingsModal);
-          return babelHelpers.possibleConstructorReturn(this, (AkismetSettingsModal.__proto__ || Object.getPrototypeOf(AkismetSettingsModal)).apply(this, arguments));
-        }
-
-        babelHelpers.createClass(AkismetSettingsModal, [{
-          key: 'className',
-          value: function className() {
-            return 'AkismetSettingsModal Modal--small';
-          }
-        }, {
-          key: 'title',
-          value: function title() {
-            return app.translator.trans('flarum-akismet.admin.akismet_settings.title');
-          }
-        }, {
-          key: 'form',
-          value: function form() {
-            return [m(
-              'div',
-              { className: 'Form-group' },
-              m(
-                'label',
-                null,
-                app.translator.trans('flarum-akismet.admin.akismet_settings.api_key_label')
-              ),
-              m('input', { className: 'FormControl', bidi: this.setting('flarum-akismet.api_key') })
-            )];
-          }
-        }]);
-        return AkismetSettingsModal;
-      }(SettingsModal);
-
-      _export('default', AkismetSettingsModal);
-    }
-  };
-});;
-'use strict';
-
-System.register('flarum/akismet/main', ['flarum/app', 'flarum/akismet/components/AkismetSettingsModal'], function (_export, _context) {
-  "use strict";
-
-  var app, AkismetSettingsModal;
-  return {
-    setters: [function (_flarumApp) {
-      app = _flarumApp.default;
-    }, function (_flarumAkismetComponentsAkismetSettingsModal) {
-      AkismetSettingsModal = _flarumAkismetComponentsAkismetSettingsModal.default;
-    }],
-    execute: function () {
-
-      app.initializers.add('flarum-akismet', function () {
-        app.extensionSettings['flarum-akismet'] = function () {
-          return app.modal.show(new AkismetSettingsModal());
-        };
-      });
-    }
-  };
-});

extensions/akismet/js/admin/package.json

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

extensions/akismet/js/forum.js

@@ -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';

extensions/akismet/js/forum/Gulpfile.js

@@ -1,7 +0,0 @@
-var gulp = require('flarum-gulp');
-
-gulp({
-  modules: {
-    'flarum/akismet': 'src/**/*.js'
-  }
-});

extensions/akismet/js/forum/dist/extension.js

@@ -1,43 +0,0 @@
-'use strict';
-
-System.register('flarum/akismet/main', ['flarum/extend', 'flarum/app', 'flarum/utils/PostControls', 'flarum/components/CommentPost'], function (_export, _context) {
-  "use strict";
-
-  var extend, override, app, PostControls, CommentPost;
-  return {
-    setters: [function (_flarumExtend) {
-      extend = _flarumExtend.extend;
-      override = _flarumExtend.override;
-    }, function (_flarumApp) {
-      app = _flarumApp.default;
-    }, function (_flarumUtilsPostControls) {
-      PostControls = _flarumUtilsPostControls.default;
-    }, function (_flarumComponentsCommentPost) {
-      CommentPost = _flarumComponentsCommentPost.default;
-    }],
-    execute: function () {
-
-      app.initializers.add('flarum-akismet', function () {
-        extend(PostControls, 'destructiveControls', function (items, post) {
-          if (items.has('approve')) {
-            var flags = post.flags();
-
-            if (flags && flags.some(function (flag) {
-              return flag.type() === 'akismet';
-            })) {
-              items.get('approve').props.children = app.translator.trans('flarum-akismet.forum.post.not_spam_button');
-            }
-          }
-        });
-
-        override(CommentPost.prototype, 'flagReason', function (original, flag) {
-          if (flag.type() === 'akismet') {
-            return app.translator.trans('flarum-akismet.forum.post.akismet_flagged_text');
-          }
-
-          return original(flag);
-        });
-      }, -20); // run after the approval extension
-    }
-  };
-});

extensions/akismet/js/forum/package.json

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

extensions/akismet/js/package.json

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

extensions/akismet/js/src/admin/index.js

@@ -1,6 +1,6 @@
 import app from 'flarum/app';
 
-import AkismetSettingsModal from 'flarum/akismet/components/AkismetSettingsModal';
+import AkismetSettingsModal from './components/AkismetSettingsModal';
 
 app.initializers.add('flarum-akismet', () => {
   app.extensionSettings['flarum-akismet'] = () => app.modal.show(new AkismetSettingsModal());

extensions/akismet/js/webpack.config.js

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

extensions/akismet/scripts/compile.sh

@@ -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