Rename paths, use commonjs2 as build target

richardvenneman · Jul 11, 2016 · e63771b · e63771b
1 parent 624aa3c
commit e63771b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/karma.conf.js b/karma.conf.js
@@ -1,11 +1,11 @@
 var webpackConfig = require('./webpack.config');
 
 webpackConfig.output = {
-  entry: './lib/js/floatl.js',
+  entry: './src/js/floatl.js',
   output: {
     library: 'floatl',
     libraryTarget: 'umd',
-    filename: 'dist/js/floatl.js'
+    filename: 'lib/js/floatl.js'
   }
 };
 

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "floatl",
   "version": "0.3.0",
   "description": "A library agnostic, pragmatic implementation of the Float Label Pattern",
-  "main": "dist/js/floatl.js",
+  "main": "lib/js/floatl.js",
   "dependencies": {},
   "devDependencies": {
     "autoprefixer": "^6.3.7",
@@ -36,10 +36,10 @@
     "test": "karma start --single-run",
     "tdd": "karma start",
     "build:js": "webpack",
-    "build:css": "node-sass --output-style expanded lib/scss/floatl.scss | postcss -u autoprefixer --autoprefixer.browsers '> 3%, ie >= 8' > dist/css/floatl.css",
+    "build:css": "node-sass --output-style expanded src/scss/floatl.scss lib/css/floatl.css && postcss -u autoprefixer -b '> 3%, ie >= 8' lib/css/floatl.css -d lib/css",
     "build": "npm run build:js && npm run build:css",
-    "watch:js": "onchange 'lib/js/*.js' -- npm run build:js",
-    "watch:css": "onchange 'lib/scss/*.scss' -- npm run build:css"
+    "watch:js": "onchange 'src/js/*.js' -- npm run build:js",
+    "watch:css": "onchange 'src/scss/*.scss' -- npm run build:css"
   },
   "repository": {
     "type": "git",

diff --git a/test/floatlTest.js b/test/floatlTest.js
@@ -1,4 +1,4 @@
-import Floatl from '../lib/js/floatl.js';
+import Floatl from '../src/js/floatl.js';
 
 const focusedClass = 'floatl--focused';
 const activeClass = 'floatl--active';

diff --git a/test/utilsTest.js b/test/utilsTest.js
@@ -1,5 +1,5 @@
-import { getElement, addClass, removeClass } from '../lib/js/utils.js';
-import { addEventListener } from '../lib/js/utils.js';
+import { getElement, addClass, removeClass } from '../src/js/utils.js';
+import { addEventListener } from '../src/js/utils.js';
 
 describe('getElement', () => {
   beforeEach(function() {

diff --git a/webpack.config.js b/webpack.config.js
@@ -1,19 +1,19 @@
 module.exports = {
   entry: {
-    index: './lib/js/index.js'
+    index: './src/js/index.js'
   },
 
   devtool: '#inline-source-map',
 
   output: {
-    path: './dist/js',
+    path: './lib/js',
     filename: 'floatl.js',
     library: 'Floatl',
-    libraryTarget: 'var'
+    libraryTarget: 'commonjs2'
   },
 
   resolve: {
-    moduleDirectories: ['lib/js']
+    moduleDirectories: ['src/js']
   },
 
   module: {