2.0.3

Author: ukrbublik

.gitignore

@@ -4,6 +4,7 @@ package-lock.json
 .idea
 yarn.lock
 build
+lib
 examples/*.ttf
 examples/*.svg
 examples/*.eot

CHANGELOG.md

@@ -1,4 +1,6 @@
 # Changelog
+- 2.0.3
+ - Fixed import
 - 2.0.2
  - Fix for TS
 - 2.0.1

CONFIG.adoc

@@ -194,7 +194,7 @@ const myConfig = {
 [source,javascript]
 ----
 import en_US from 'antd/lib/locale-provider/en_US';
-import AntdWidgets from 'react-awesome-query-builder/components/widgets/antd';
+import AntdWidgets from 'react-awesome-query-builder/lib/components/widgets/antd';
 import {Widgets} from 'react-awesome-query-builder';
 const { VanillaFieldSelect } = Widgets;
 const { FieldCascader, FieldDropdown } = AntdWidgets;
@@ -448,7 +448,7 @@ See https://github.com/ukrbublik/react-awesome-query-builder/tree/master/example
 [source,javascript]
 ----
 import {Widgets} from 'react-awesome-query-builder';
-import AntdWidgets from 'react-awesome-query-builder/components/widgets/antd';
+import AntdWidgets from 'react-awesome-query-builder/lib/components/widgets/antd';
 const {
     TextWidget,
     NumberWidget,

README.md

@@ -46,14 +46,14 @@ Also see [`examples/demo`](https://github.com/ukrbublik/react-awesome-query-buil
 **v2 Migration:** 
 From v2.0 antd is now optional (peer) dependency.  
 If you want to use AntDesign widgets, please use `AntdConfig` as base for your config:  
-`import AntdConfig from 'react-awesome-query-builder/config/antd';`  
+`import AntdConfig from 'react-awesome-query-builder/lib/config/antd';`  
 If you want to use another UI, don't import `config/antd` and `css/antd.less`.  
 You can use `BasicConfig` for simple UI.  
 
 ```javascript
 import React, {Component} from 'react';
 import {Query, Builder, BasicConfig, Utils as QbUtils} from 'react-awesome-query-builder';
-import AntdConfig from 'react-awesome-query-builder/config/antd';
+import AntdConfig from 'react-awesome-query-builder/lib/config/antd';
 import 'react-awesome-query-builder/css/antd.less';
 // or import "antd/dist/antd.css";
 import 'react-awesome-query-builder/css/styles.scss';
@@ -228,7 +228,7 @@ Then open localhost:3001 in a browser.
 Scripts:
 - `npm run examples` - Builds with webpack the examples and runs a dev-server on localhost:3001.
 - `npm run build-examples` - Builds with webpack the examples. Output path: `examples`
-- `npm run build-npm` - Builds a npm module. Output path: `build/npm`
+- `npm run build-npm` - Builds a npm module. Output path: `lib`
 
 The repo sticks in general to the [Airbnb JavaScript Style Guide](https://github.com/airbnb/javascript).
 

examples/demo/config.tsx

@@ -6,8 +6,8 @@ import {
     Operators, Widgets, Fields, Config, Types, Conjunctions, Settings, LocaleSettings, OperatorProximity, Funcs,
 } from 'react-awesome-query-builder';
 
-import AntdConfig from 'react-awesome-query-builder/config/antd';
-import AntdWidgets from 'react-awesome-query-builder/components/widgets/antd';
+import AntdConfig from 'react-awesome-query-builder/lib/config/antd';
+import AntdWidgets from 'react-awesome-query-builder/lib/components/widgets/antd';
 const {
     FieldSelect,
     FieldDropdown,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-awesome-query-builder",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "User-friendly query builder for React. Demo: https://ukrbublik.github.io/react-awesome-query-builder",
   "keywords": [
     "reactjs",
@@ -12,7 +12,7 @@
     "antdesign"
   ],
   "main1": "modules",
-  "main": "build/npm/lib",
+  "main": "lib",
   "types": "modules/index.d.ts",
   "browserify1": {
     "transform": [

sandbox/package.json

@@ -19,7 +19,7 @@
   "dependencies": {
     "react": "^16.4.1",
     "react-dom": "^16.4.1",
-    "react-awesome-query-builder": "^2.0.2",
+    "react-awesome-query-builder": "^2.0.3",
     "react-scripts": "3.0.1",
     "antd": "^4.1.2"
   },

sandbox/src/demo/config.js renamed to sandbox/src/demo/config.jsx

@@ -3,8 +3,8 @@ import merge from 'lodash/merge';
 import { Widgets, Operators, BasicConfig } from 'react-awesome-query-builder';
 import en_US from 'antd/lib/locale-provider/en_US';
 import ru_RU from 'antd/lib/locale-provider/ru_RU';
-import AntdConfig from 'react-awesome-query-builder/config/antd';
-import AntdWidgets from 'react-awesome-query-builder/components/widgets/antd';
+import AntdConfig from 'react-awesome-query-builder/lib/config/antd';
+import AntdWidgets from 'react-awesome-query-builder/lib/components/widgets/antd';
 const {
     FieldSelect,
     FieldDropdown,

scripts/build-npm.sh

@@ -1,7 +1,3 @@
-rm -rf build/npm
-babel -d build/npm/lib ./modules
-cp README.md build/npm
-cp CONFIG.adoc build/npm
-find build/npm/lib -type d -name __tests__ | xargs rm -rf
-node -p 'p=require("./package");p.main="lib";p.scripts=p.devDependencies=undefined;JSON.stringify(p,null,2)' > build/npm/package.json
-
+rm -rf lib
+babel -d lib ./modules
+find lib -type d -name __tests__ | xargs rm -rf