Skip to content

Commit cea94a5

Browse files
JLiscomJLiscom
committed
Working web pack
1 parent 6ecd922 commit cea94a5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+213
-205
lines changed

‎.gitignore‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
/bower_components
22
/node_modules
3-
/build
3+
/dist
4+
openNote.bundle.js
5+
openNote.appcache

‎.jshintrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
2+
"esversion":6,
23
"undef": true,
34
"unused": true,
45
"mocha": true,
@@ -8,6 +9,5 @@
89
"devel":true,
910
"jquery":true,
1011
"jasmine": true,
11-
"predef": [ "angular","alertify","", "PouchDB","inject" ],
12-
"globals":{"openNote":true}
12+
"predef": [ "angular","alertify","", "PouchDB","inject" ]
1313
}

‎Gruntfile.js‎

Lines changed: 26 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,24 +4,14 @@ module.exports = function(grunt) {
44
compress: {
55
main: {
66
options: {
7-
archive: "build/version.zip"
7+
archive: "dist/version.zip"
88
},
99
files: [{
10-
src: ["**/*"],
11-
cwd: "OpenNote/",
10+
src: ["**/*"], //TODO just include needed files
1211
expand: true
1312
}]
1413
}
1514
},
16-
connect: {
17-
server: {
18-
options: {
19-
port: 8080,
20-
base: "OpenNote",
21-
keepalive:true
22-
}
23-
}
24-
},
2515
jshint: {
2616
options: {},
2717
all: ["**/*.js*", //Order matters
@@ -39,8 +29,8 @@ module.exports = function(grunt) {
3929
}
4030
},
4131
files: {
42-
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
43-
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less"
32+
"openNote/style/invert/dark/style.css": "openNote/style/invert/style.less",
33+
"openNote/style/invert/dark/alertify.css": "openNote/style/invert/alertify.less"
4434
}
4535
},
4636
devLight: {
@@ -51,8 +41,8 @@ module.exports = function(grunt) {
5141
}
5242
},
5343
files: {
54-
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
55-
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less"
44+
"openNote/style/invert/light/style.css": "openNote/style/invert/style.less",
45+
"openNote/style/invert/light/alertify.css": "openNote/style/invert/alertify.less"
5646
}
5747
},
5848
prodDark: {
@@ -64,8 +54,8 @@ module.exports = function(grunt) {
6454
}
6555
},
6656
files: {
67-
"OpenNote/openNote/style/invert/dark/style.css": "OpenNote/openNote/style/invert/style.less",
68-
"OpenNote/openNote/style/invert/dark/alertify.css": "OpenNote/openNote/style/invert/alertify.less"
57+
"openNote/style/invert/dark/style.css": "openNote/style/invert/style.less",
58+
"openNote/style/invert/dark/alertify.css": "openNote/style/invert/alertify.less"
6959
}
7060
},
7161
prodLight: {
@@ -77,8 +67,8 @@ module.exports = function(grunt) {
7767
}
7868
},
7969
files: {
80-
"OpenNote/openNote/style/invert/light/style.css": "OpenNote/openNote/style/invert/style.less",
81-
"OpenNote/openNote/style/invert/light/alertify.css": "OpenNote/openNote/style/invert/alertify.less"
70+
"openNote/style/invert/light/style.css": "openNote/style/invert/style.less",
71+
"openNote/style/invert/light/alertify.css": "openNote/style/invert/alertify.less"
8272
}
8373
}
8474
},
@@ -101,37 +91,36 @@ module.exports = function(grunt) {
10191
}
10292
},
10393
shell: {
104-
npmInstall: {
105-
command: ["cd OpenNote",
106-
"npm install"
107-
].join("&&")
108-
},
94+
10995
clean: {
110-
command: ["rm -rf build",
111-
"cd OpenNote",
96+
command: ["rm -rf dist",
11297
"rm -rf node_moduless",
11398
"cd openNote/style/invert/",
11499
"rm -rf dark light"
115100
].join("&&")
101+
},
102+
dev: {
103+
command: ["npm run dev"].join("&&")
104+
},
105+
build: {
106+
command: ["npm run build"].join("&&")
116107
}
117108
},
118109
//HTML 5
119110
manifest: {
120111
generate: {
121112
options: {
122-
basePath: "OpenNote/",
123-
exclude: ["openNote.appcache", "Service"],
113+
basePath: ".",
114+
exclude: ["openNote.appcache"],
124115
verbose: true,
125116
timestamp: true,
126117
hash: true,
127118
master: ["index.html"]
128119
},
129120
src: [
130-
"**/*.js",
121+
"openNote.bundle.js",
131122
"**/*.css",
132-
"**/*.html",
133-
"**/*.png",
134-
"**/*.jpg"
123+
"**/*.html"
135124
],
136125
dest: "OpenNote/openNote.appcache"
137126
}
@@ -155,12 +144,12 @@ module.exports = function(grunt) {
155144

156145
//deployment
157146
// you can run individual command using the plug-in command syntax suck as manifest:generate or shell:clean
158-
grunt.registerTask("build", ["shell:npmInstall", "buildDevCSS", "manifest:generate"]);
159-
grunt.registerTask("default", ["build", "connect:server"]);
160-
grunt.registerTask("deploy", ["shell:clean", "shell:npmInstall", "buildProdCSS", "manifest:generate", "compress"]);
147+
grunt.registerTask("build", ["buildDevCSS", "shell:build", "manifest:generate"]);
148+
grunt.registerTask("default", ["build", "shell:dev"]);
149+
grunt.registerTask("deploy", ["shell:clean", "buildProdCSS", "shell:build", "manifest:generate", "compress"]);
161150

162151
//testing
163152
grunt.registerTask("devmode", ["karma:unit", "watch"]);
164153
grunt.registerTask("test", ["karma:travis"]);
165-
grunt.registerTask("ci", ["build", "jshint:all", "karma:travis"]);
154+
grunt.registerTask("ci", ["build", "jshint:all"]); //TODO , "karma:travis"
166155
};

‎OpenNote.Test/karma.conf.js‎

Lines changed: 0 additions & 30 deletions
This file was deleted.

‎OpenNote/.gitignore‎

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎OpenNote/index.html‎

Lines changed: 0 additions & 74 deletions
This file was deleted.

‎OpenNote/package.json‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎build/webpack.common.config.js‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
const glob = require("glob");
2+
3+
module.exports = {
4+
entry: glob.sync("./openNote/**/*.js"),
5+
output: {
6+
filename: "./openNote.bundle.js"
7+
},
8+
devServer: {
9+
historyApiFallback: true,
10+
noInfo: true,
11+
overlay: true,
12+
},
13+
devtool: "#eval-source-map",
14+
module: {
15+
rules: [
16+
{
17+
test: /\.exec\.js$/,//So we dont have to use concat too
18+
use: ["script-loader"]
19+
}
20+
]
21+
},
22+
};

‎build/webpack.dev.config.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
let baseConfig = require("./webpack.common.config.js");
2+
3+
module.exports = baseConfig;

‎build/webpack.prod.config.js‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
const webpack = require("webpack");
2+
const Uglify = require("uglifyjs-webpack-plugin");
3+
let baseConfig = require("./webpack.common.config.js");
4+
5+
baseConfig.devtool = "#source-map";//Helps with size
6+
baseConfig.plugins = (module.exports.plugins || []).concat([
7+
new webpack.DefinePlugin({
8+
"process.env": {
9+
NODE_ENV: "\"production\""
10+
}
11+
}),
12+
new Uglify({ //Minify
13+
uglifyOptions:{
14+
mangle:false
15+
}
16+
})
17+
]);
18+
19+
module.exports = baseConfig;

0 commit comments

Comments
 (0)