upgrade build system, clean up folder struct

0xF48 · Mar 22, 2018 · b1ee1b1 · b1ee1b1
1 parent 7f76e69
commit b1ee1b1
Show file tree

Hide file tree

Showing 27 changed files with 84 additions and 88 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1 @@
-site/* binary
+dist/**.* binary
diff --git a/README.md b/README.md
@@ -1,6 +1,7 @@
-* implement prepend
+<p align="center"><a href="http://arxii.github.io/preact-grid" alt="logo"><img src="/assets/logo.png" /></a></p>
+# Pre Alpha
 * implement stickies
 * comment and clean code
-* cover all code in tests
+* tests
 * readme
-* site with docs
+* site with docs / examples
diff --git a/site/favicon.ico → assets/favicon.ico b/site/favicon.ico → assets/favicon.ico
diff --git a/site/github.svg → assets/github.svg b/site/github.svg → assets/github.svg
diff --git a/site/grid-logo.png → assets/grid-logo.png b/site/grid-logo.png → assets/grid-logo.png
diff --git a/dist/lib.js b/dist/lib.js
diff --git a/dist/lib.js.map b/dist/lib.js.map
diff --git a/site/main.js → dist/site.js b/site/main.js → dist/site.js
diff --git a/site/main.js.map → dist/site.js.map b/site/main.js.map → dist/site.js.map
diff --git a/dist/test.js b/dist/test.js
diff --git a/dist/test.js.map b/dist/test.js.map
diff --git a/index.html b/index.html
@@ -1,21 +1,26 @@
+<!-- <head>
+	<title>💠 Preact Tile Grid</title>
+	<meta charset="utf-8">
+	<meta content='width=device-width, initial-scale=1.0' name='viewport' />
+	<meta content="Preact-Grid" property="og:site_name">
+	<meta content="arxii/preact-grid" property="og:title">
+	<meta content="https://github.com/arxii/preact-grid" property="og:url">
+	<meta content="💠 Preact Tile Grid" property="og:description">
+	<link rel="icon" type="image/x-icon" class="js-site-favicon" href="./assets/favicon.ico">
+	<script async src="./dist/site.js"></script>
+</head>
+<body>
+</body>
+ -->
+
 <head>
-	<title>Preact Infinity Grid 💠</title>
+	<title>Grid Test 💠</title>
 	<meta charset="utf-8">
-	<link async rel="stylesheet" href="./site/normalize.css">
 	<meta content='width=device-width, initial-scale=1.0' name='viewport' />
 	<meta name="viewport" content="width=device-width">
-	<link rel="search" type="application/opensearchdescription+xml" href="/opensearch.xml" title="GitHub">
-	<link rel="fluid-icon" href="https://github.com/fluidicon.png" title="Preact Slide">
-	<meta property="fb:app_id" content="1401488693436528">
-	<meta content="https://avatars2.githubusercontent.com/u/3401121?s=400&amp;v=4" property="og:image">
-	<meta content="Preact-Slide" property="og:site_name">
-	<meta content="arxii/preact-slide" property="og:title">
-	<meta content="https://github.com/arxii/preact-slide" property="og:url">
-	<meta content="preact-slide - 📏 Preact Universal Layout Component" property="og:description">
-	<link rel="icon" type="image/x-icon" class="js-site-favicon" href="./site/favicon.ico">
-	<link async rel="stylesheet" href="https://fonts.googleapis.com/icon?family=Material+Icons">
-	<link href="https://fonts.googleapis.com/css?family=Open+Sans|Merienda" rel="stylesheet">
-	<script async src="./site/main.js"></script>
+	<meta content="preact-grid" property="og:description">
+	<script async src="./dist/test.js"></script>
 </head>
 <body>
 </body>
+
diff --git a/index.js b/index.js
diff --git a/package.json b/package.json
@@ -1,16 +1,16 @@
 {
   "name": "preact-grid",
-  "version": "0.1.0",
-  "description": "Preact Infinite Scrolling Tetris Grid",
+  "version": "0.0.1",
+  "description": "💠 Preact Infinite Scrolling Tile Grid",
   "main": "index.js",
   "repository": {
     "type": "git",
     "url": "git+ssh://[email protected]/arxii/preact-grid.git"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "dev": "webpack-dev-server --mode development --progress --config ./test/test.config.js",
-    "prod": "webpack --mode production --progress --config ./test/test.config.js && webpack --mode production --progress --config ./site.config.js"
+    "dev": "webpack-dev-server --mode development --progress --config ./scripts/dev.config.js",
+    "prod": "webpack --mode production --progress --config ./scripts/dev.config.js && webpack --mode production --progress --config ./scripts/lib.config.js"
   },
   "author": "arxii",
   "license": "ISC",

diff --git a/test/test.config.js → scripts/dev.config.js b/test/test.config.js → scripts/dev.config.js
@@ -1,32 +1,33 @@
 var webpack = require("webpack");
+var path = require('path');
 // const MinifyPlugin = require("babel-minify-webpack-plugin");
-console.log(__dirname)
 var cfg = {
   devtool: 'source-map',
   module: {
     rules: [
       { test: /\.coffee$/, use: "coffee-loader"},
-      { test: /\.glsl$/, use: "glsl-template-loader" },
-      { test: /\.(xml|html|txt|md)$/, loader: "raw-loader" },
+      { test: /\.(xml|html|txt|md|glsl)$/, loader: "raw-loader" },
       { test: /\.(less)$/, use: ['style-loader','css-loader','less-loader'] },
+      { test: /\.(css)$/, use: ['style-loader','css-loader'] },
       { test: /\.(woff|woff2|eot|ttf|svg)$/,loader: 'url-loader?limit=65000' }
     ]
   },
   entry: {
-    test: "./test/test.coffee",
+    site: path.join(__dirname,'..','/source/site.coffee'),
+    test: path.join(__dirname,'..','/source/test.coffee')
   },
   resolve: {
     // "modules": [__dirname+"/node_modules"],
   },
   output: {
-    path: __dirname,
-    publicPath: '/',
+    path: path.join(__dirname,'..','/dist/'),
+    publicPath: '/dist/',
     filename: "[name].js"
   },
   devServer: {
     port: 3005,
-    publicPath: '/',
-    contentBase: __dirname
+    publicPath: '/dist/',
+    contentBase: path.join(__dirname,'..')
   }
 }
 module.exports = cfg;
diff --git a/scripts/lib.config.js b/scripts/lib.config.js
@@ -0,0 +1,25 @@
+var webpack = require("webpack");
+var path = require('path');
+var fs = require('fs');
+var cfg = {
+	devtool: 'source-map',
+	module: {
+		rules: [
+			{ test: /\.coffee$/, use: "coffee-loader"},
+			{ test: /\.(xml|html|txt|md)$/, loader: "raw-loader" },
+			{ test: /\.(less)$/, use: ['style-loader','css-loader','less-loader'] },
+			{ test: /\.(css)$/, use: ['style-loader','css-loader'] },
+			{ test: /\.(woff|woff2|eot|ttf|svg)$/,loader: 'url-loader?limit=65000' }
+		]
+	},
+	entry: {
+		lib: "./source/lib.coffee",
+	},
+	output: {
+		path: path.join(__dirname,"..","/dist/"),
+		filename: "lib.js",
+		library: 'PreactGrid',
+		libraryTarget: 'umd'
+	}
+}
+module.exports = cfg;
diff --git a/site.config.js b/site.config.js
diff --git a/source/lib.coffee b/source/lib.coffee
@@ -0,0 +1,2 @@
+module.exports.Grid = require './Grid.coffee'
+module.exports.GridItem = require './GridItem.coffee' 
diff --git a/site/normalize.css → source/normalize.css b/site/normalize.css → source/normalize.css
diff --git a/test/random.json → source/random.json b/test/random.json → source/random.json
diff --git a/test/stock-photo-1.jpg → source/stock-photo-1.jpg b/test/stock-photo-1.jpg → source/stock-photo-1.jpg
diff --git a/test/test.coffee → source/test.coffee b/test/test.coffee → source/test.coffee
@@ -2,7 +2,7 @@
 require './test.less'
 Slide = require 'preact-slide'
 {MinMaxScrollEvent} = require 'preact-scroll-events'
-{Grid,GridItem} = require '../index'
+{Grid,GridItem} = require './lib.coffee'
 LoadIcon = require '../source/SquareLoaderIcon.coffee'
 DIM = 80
 window.log = console.log.bind(console)

diff --git a/test/test.less → source/test.less b/test/test.less → source/test.less
diff --git a/test.html b/test.html
@@ -0,0 +1,10 @@
+<head>
+	<title>Grid Test 💠</title>
+	<meta charset="utf-8">
+	<meta content='width=device-width, initial-scale=1.0' name='viewport' />
+	<meta name="viewport" content="width=device-width">
+	<meta content="preact-grid" property="og:description">
+	<script async src="./dist/test.js"></script>
+</head>
+<body>
+</body>
diff --git a/test/index.html b/test/index.html
diff --git a/test/test.js b/test/test.js
diff --git a/test/test.js.map b/test/test.js.map