rooty/fab-manager
1
0
Fork 0
mirror of https://github.com/LaCasemate/fab-manager.git synced 2025-01-18 07:52:23 +01:00
Code Issues Releases Activity

fix loading ui-tour with webpack

Browse Source
This commit is contained in:
Sylvain 2020-10-07 10:25:27 +02:00
parent ac4dcfd5fd
commit c30e096e53
6 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/frontend/packs/application.js.erb
View File

@ -68,7 +68,7 @@ import 'angular-hotkeys/build/hotkeys';
import 'hone/dist/hone'; import 'hone/dist/hone';
import 'tether/dist/js/tether'; import 'tether/dist/js/tether';
import 'angular-bind-html-compile/angular-bind-html-compile'; import 'angular-bind-html-compile/angular-bind-html-compile';
import 'angular-ui-tour/app/angular-ui-tour'; import 'angular-ui-tour/dist/angular-ui-tour';
import '@fortawesome/fontawesome-free'; import '@fortawesome/fontawesome-free';
import '@fortawesome/fontawesome-free/js/v4-shims'; import '@fortawesome/fontawesome-free/js/v4-shims';

2
app/views/application/index.html.erb
View File

@ -1,5 +1,5 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="<%= I18n.locale %>" ng-app="application" class="app"> <html lang="<%= I18n.locale %>" ng-app="application" class="app" ng-strict-di>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">

4
config/webpack/environment.js
View File

@ -8,15 +8,12 @@ const jsErb = require('./loaders/js_erb');
const sass = require('./loaders/sass'); const sass = require('./loaders/sass');
const sassErb = require('./loaders/sass_erb'); const sassErb = require('./loaders/sass_erb');
const html = require('./loaders/html'); const html = require('./loaders/html');
const uiTour = require('./loaders/ui-tour');
environment.plugins.prepend('Provide', new webpack.ProvidePlugin({ environment.plugins.prepend('Provide', new webpack.ProvidePlugin({
$: 'jquery', $: 'jquery',
jQuery: 'jquery', jQuery: 'jquery',
'window.jQuery': 'jquery', 'window.jQuery': 'jquery',
_: 'lodash', _: 'lodash',
Hone: 'hone',
Tether: 'tether',
Holder: 'holderjs', Holder: 'holderjs',
'window.CodeMirror': 'codemirror', 'window.CodeMirror': 'codemirror',
MediumEditor: 'medium-editor', MediumEditor: 'medium-editor',
@ -31,7 +28,6 @@ environment.loaders.prepend('sass-erb', sassErb);
environment.loaders.prepend('js', js); environment.loaders.prepend('js', js);
environment.loaders.append('html', html); environment.loaders.append('html', html);
environment.loaders.append('sass', sass); environment.loaders.append('sass', sass);
environment.loaders.append('uiTour', uiTour);
environment.splitChunks(); environment.splitChunks();

1
config/webpack/loaders/html.js
View File

@ -8,7 +8,6 @@ module.exports = {
loader: 'ngtemplate-loader', loader: 'ngtemplate-loader',
options: { options: {
relativeTo: path.join(__dirname, '../../../app/frontend/templates'), relativeTo: path.join(__dirname, '../../../app/frontend/templates'),
prefix: './app/frontend/templates',
requireAngular: true requireAngular: true
} }
}, },

17
config/webpack/loaders/ui-tour.js
View File

@ -1,17 +0,0 @@
const path = require('path');
module.exports = {
test: /angular-ui-tour\/.*\.html$/i,
use: [
{
loader: 'ngtemplate-loader',
options: {
relativeTo: path.join(__dirname, '../../../node_modules/angular-ui-tour/app/templates'),
requireAngular: true
}
},
{
loader: 'html-loader'
}
]
};

2
yarn.lock
View File

@ -1362,7 +1362,7 @@ angular-ui-codemirror@^0.3.0:
"angular-ui-tour@https://github.com/sleede/angular-ui-tour.git#master": "angular-ui-tour@https://github.com/sleede/angular-ui-tour.git#master":
version "0.9.4" version "0.9.4"
resolved "https://github.com/sleede/angular-ui-tour.git#b53bbdb2149bc62f2f29f7095232618677470869" resolved "https://github.com/sleede/angular-ui-tour.git#e0be65fd3356e859dbde7e83e7ff2b7cfd693d79"
dependencies: dependencies:
angular ">=1.5" angular ">=1.5"
angular-bind-html-compile "https://github.com/incuna/angular-bind-html-compile.git#1.4.1" angular-bind-html-compile "https://github.com/incuna/angular-bind-html-compile.git#1.4.1"