upgrade to webpack 4

kotapeter · Aug 17, 2019 · 54b0d02 · 54b0d02
1 parent 4d5d64e
commit 54b0d02
Show file tree

Hide file tree

Showing 20 changed files with 286 additions and 269 deletions.
diff --git a/.babelrc b/.babelrc
@@ -1,6 +1,7 @@
 {
   "presets": [
-    ["es2015", { "modules": false }],
-    "stage-2"
+    [
+      "@babel/preset-env"
+    ]
   ]
-}
+}
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 defaults: &defaults
   working_directory: ~/workspace
   docker:
-    - image: circleci/node:7.10
+    - image: circleci/node:10.16.3
 
 jobs:
   build:

diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,16 @@
+# http://editorconfig.org
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[Makefile]
+indent_style = tab
diff --git a/.eslintrc b/.eslintrc
@@ -1,16 +1,49 @@
 {
-  "parserOptions": {
-    "ecmaVersion": 2017,
-    "sourceType": "module"
-  },
-  "extends": "standard",
-  "env": {
-    "browser": true
-  },
-  "plugins": [
-    "vue"
-  ],
-  "settings": {
-    "import/extensions": [".js", ".vue", ".less"]
-  }
+    "env": {
+        "browser": true,
+        "es6": true,
+        "node": true
+    },
+    "extends": [
+        "plugin:vue/essential",
+        "standard"
+    ],
+    "globals": {
+        "Atomics": "readonly",
+        "SharedArrayBuffer": "readonly"
+    },
+    "parserOptions": {
+        "ecmaVersion": 2018,
+        "sourceType": "module"
+    },
+    "plugins": [
+        "vue"
+    ],
+    "rules": {
+        "quotes": [
+            "error",
+            "single"
+        ],
+        "indent": [
+            "error",
+            2
+        ],
+        "vue/script-indent": [
+            "error",
+            2,
+            {
+                "baseIndent": 1
+            }
+        ]
+    },
+    "overrides": [
+        {
+            "files": [
+                "*.vue"
+            ],
+            "rules": {
+                "indent": "off"
+            }
+        }
+    ]
 }
diff --git a/.npmignore b/.npmignore
@@ -1,9 +1,8 @@
 /docs
 /node_modules
 /webpack
-.babelrc
+.editorconfig
 .eslintignore
 .eslintrc
-index.html
 .npmignore
-*.tgz
+*.tgz
diff --git a/README.md b/README.md
@@ -41,7 +41,7 @@ Once installed, it can be used in a template as simply as:
 | datetime (model)   | Date/String   |                     | Time picker model.                                                                     |
 | disabled           | Boolean       | false               | Input is disabled.                                                                     |
 | label              | string        |                     | Sets input label.                                                                      |
-| width              | Number        | 320                 | The width of the content.                                                              |
+| width              | Number        | 340                 | The width of the content.                                                              |
 | format             | string        | YYYY-MM-DD HH:mm:ss | Defines the format of a datetime displayed in field.                                   |
 | timePickerFormat   | string        | 24hr                | Defines the format of a time displayed in picker. Available options are ampm and 24hr. |
 | locale             | string        | en-us               | Sets the locale. Accepts a string with a BCP 47 language tag.                          |

diff --git a/index.html b/index.html
diff --git a/package.json b/package.json
@@ -1,12 +1,11 @@
 {
   "name": "vuetify-datetime-picker",
-  "version": "1.0.13",
+  "version": "1.1.0",
   "description": "DatetimePicker component for Vuetify.js.",
   "main": "dist/index.js",
   "scripts": {
-    "dev": "node_modules/.bin/webpack-dev-server --config webpack/dev.js",
-    "doc": "node_modules/.bin/webpack -p --config webpack/doc.js --progress --profile --colors",
-    "build": "node_modules/.bin/webpack -p --config webpack/build.js --progress --profile --colors",
+    "dev": "webpack-dev-server --config webpack/webpack.dev.config.js",
+    "build": "webpack --config webpack/webpack.build.config.js --progress --profile --colors",
     "deploy": "npm run build && npm publish --registry https://registry.npmjs.org/"
   },
   "author": "Darren Fang <idarrenfang@gmail.com>",
@@ -16,40 +15,37 @@
     "url": "git+https://github.com/darrenfang/vuetify-datetime-picker"
   },
   "devDependencies": {
-    "@fortawesome/fontawesome-free": "^5.6.3",
-    "babel-core": "^6.24.1",
-    "babel-loader": "^7.0.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-stage-2": "^6.24.1",
-    "clean-webpack-plugin": "^0.1.16",
-    "css-loader": "^0.28.1",
-    "eslint": "^3.19.0",
-    "eslint-config-standard": "^10.2.1",
-    "eslint-config-vue": "^2.0.2",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-import": "^2.2.0",
-    "eslint-plugin-node": "^4.2.2",
-    "eslint-plugin-promise": "^3.5.0",
-    "eslint-plugin-standard": "^3.0.1",
-    "eslint-plugin-vue": "^2.0.1",
-    "extract-text-webpack-plugin": "^2.1.0",
-    "file-loader": "^0.11.1",
-    "html-webpack-plugin": "^2.28.0",
-    "less": "^2.7.2",
-    "less-loader": "^4.0.3",
+    "@babel/core": "^7.5.5",
+    "@babel/preset-env": "^7.5.5",
+    "@fortawesome/fontawesome-free": "^5.10.1",
+    "babel-loader": "^8.0.6",
+    "clean-webpack-plugin": "^3.0.0",
+    "css-loader": "^3.2.0",
+    "eslint": "^6.1.0",
+    "eslint-config-standard": "^13.0.1",
+    "eslint-loader": "^2.2.1",
+    "eslint-plugin-import": "^2.18.2",
+    "eslint-plugin-node": "^9.1.0",
+    "eslint-plugin-promise": "^4.2.1",
+    "eslint-plugin-standard": "^4.0.0",
+    "eslint-plugin-vue": "^5.2.3",
+    "file-loader": "^4.2.0",
+    "html-webpack-plugin": "^3.2.0",
+    "less-loader": "^5.0.0",
     "stylus": "^0.54.5",
     "stylus-loader": "^3.0.2",
-    "url-loader": "^0.5.8",
-    "vue-loader": "^12.0.2",
-    "vue-style-loader": "^4.1.0",
-    "vue-template-compiler": "^2.3.0",
-    "webpack": "^2.4.1",
-    "webpack-dev-server": "^2.4.5",
-    "webpack-merge": "^4.1.0"
+    "url-loader": "^2.1.0",
+    "vue-loader": "^15.7.1",
+    "vue-style-loader": "^4.1.2",
+    "vue-template-compiler": "^2.6.10",
+    "webpack": "^4.39.2",
+    "webpack-cli": "^3.3.6",
+    "webpack-dev-server": "^3.8.0",
+    "webpack-merge": "^4.2.1"
   },
   "dependencies": {
-    "moment": "^2.22.2",
-    "vue": "^2.3.0",
-    "vuetify": "^1.1.4"
+    "moment": "^2.24.0",
+    "vue": "^2.6.10",
+    "vuetify": "^1.5.17"
   }
 }