Thanks to visit codestin.com
Credit goes to github.com

Skip to content
This repository was archived by the owner on Aug 12, 2019. It is now read-only.

Commit 4623804

Browse files
committed
updated marionette
1 parent d60c106 commit 4623804

File tree

7 files changed

+21
-18
lines changed

7 files changed

+21
-18
lines changed
File renamed without changes.

marionette-v3.1.0/index.html renamed to marionette-v3.3.1/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html lang="en">
33
<head>
44
<meta charset="utf-8"/>
5-
<title>Marionette-v3.1.0</title>
5+
<title>Marionette-v3.3.1</title>
66
<link href="/css/currentStyle.css" rel="stylesheet"/>
77
</head>
88
<body>
@@ -11,7 +11,7 @@
1111
<div class="jumbotron">
1212
<div class="row">
1313
<div class="col-md-6">
14-
<h1>Marionette-v3.1.0</h1>
14+
<h1>Marionette-v3.3.1</h1>
1515
</div>
1616
<div class="col-md-6">
1717
<div class="row">

marionette-v3.1.0/package.json renamed to marionette-v3.3.1/package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,20 @@
44
"description": "Marionette v3.1.0 demo",
55
"main": "index.js",
66
"scripts": {
7-
"build-dev": "webpack -w -d -c webpack.config.js",
8-
"build-prod": "webpack -p -c webpack.config.js"
7+
"build-dev": "webpack -w -d",
8+
"build-prod": "webpack -p"
99
},
1010
"devDependencies": {
11-
"babel-core": "6.10.4",
12-
"babel-loader": "6.2.4",
13-
"babel-preset-es2015": "6.9.0",
14-
"webpack": "1.13.1"
11+
"babel-core": "6.24.1",
12+
"babel-loader": "7.0.0",
13+
"babel-preset-es2015": "6.24.1",
14+
"webpack": "2.5.1"
1515
},
1616
"dependencies": {
1717
"backbone": "1.3.3",
18-
"backbone.marionette": "3.1.0",
18+
"backbone.marionette": "3.3.1",
1919
"backbone.radio": "2.0.0",
20-
"jquery": "3.1.1",
20+
"jquery": "3.2.1",
2121
"underscore": "1.8.3"
2222
}
2323
}
File renamed without changes.

marionette-v3.1.0/webpack.config.js renamed to marionette-v3.3.1/webpack.config.js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
11
'use strict';
2+
var path = require('path')
23

34
var cache = {};
45
var loaders = [
56
{
67
test: /\.js$/,
7-
loader: 'babel-loader'
8+
loader: 'babel-loader',
9+
exclude: /node_modules/
810
},
911
{
1012
test: /\.css$/,
1113
loader: 'style-loader!css-loader'
1214
}
1315
];
1416
var extensions = [
15-
'', '.js', '.jsx', '.es6.js'
17+
'.js', '.jsx', '.es6.js'
1618
];
1719

1820
module.exports = [{
@@ -24,15 +26,16 @@ module.exports = [{
2426
main: './src/Main.js',
2527
},
2628
output: {
27-
path: './dist',
29+
path: path.resolve(__dirname, "dist"),
2830
filename: '[name].js'
2931
},
3032
resolve: {
31-
extensions: extensions,
32-
root: [
33+
modules: [
3334
__dirname,
34-
__dirname + '/src'
35+
path.resolve(__dirname, "src"),
36+
"node_modules"
3537
],
38+
extensions: extensions,
3639
alias: {
3740
}
3841
}

webdriver-ts/src/common.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ export let frameworks = [
5656
f("kivi-v1.0.0-rc2", false),
5757
f("knockout-v3.4.1", false),
5858
f("marko-v4.2.0", false),
59-
f("marionette-v3.1.0", false),
59+
f("marionette-v3.3.1", false),
6060
f("mithril-v0.2.5", false),
6161
f("mithril-v1.1.1", false),
6262
f("nx-v1.0.0-beta.1.1.0-keyed", false),

webdriver-ts/table.html

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)