fix(Build): Correcting webpack config

visjs · Oct 12, 2023 · aa8a47b · aa8a47b
1 parent c1a91c8
commit aa8a47b
Show file tree

Hide file tree

Showing 48 changed files with 20 additions and 4,969 deletions.
diff --git a/.config/webpack.common.js b/.config/webpack.common.js
@@ -31,7 +31,7 @@ module.exports = {
         test: /\.(png|jpe?g|gif|svg|woff|woff2|ttf|eot|ico)$/,
         loader: 'file-loader',
         options: {
-          name: 'assets/[name].[hash].[ext]',
+          name: 'assets/[name].[fullhash].[ext]',
         },
       },
       {
@@ -64,7 +64,9 @@ module.exports = {
       template: helpers.root('demo', 'index.html'),
     }),
 
-    new CopyWebpackPlugin([{ from: helpers.root('demo', 'assets'), to: 'assets' }]),
+    new CopyWebpackPlugin({ patterns: [
+      { from: helpers.root('demo', 'assets'), to: 'assets' }
+    ]}),
 
     new AngularCompilerPlugin({
       tsConfigPath: './tsconfig.json',

diff --git a/.config/webpack.github.js b/.config/webpack.github.js
@@ -1,13 +1,13 @@
-var webpackMerge = require('webpack-merge');
-var commonConfig = require('./webpack.prod.js');
-var helpers = require('./helpers');
+const { merge } = require('webpack-merge');
+const commonConfig = require('./webpack.prod.js');
+const helpers = require('./helpers');
 
-module.exports = webpackMerge(commonConfig, {
+module.exports = merge(commonConfig, {
+  mode: 'production',
   output: {
     path: helpers.root('docs'),
     publicPath: 'https://visjs.github.io/ngx-vis',
-    filename: '[name].[hash].js',
-    chunkFilename: '[id].[hash].chunk.js',
-    mode: 'production'
+    filename: '[name].[fullhash].js',
+    chunkFilename: '[id].[fullhash].chunk.js',
   }
 });
diff --git a/.config/webpack.prod.js b/.config/webpack.prod.js
@@ -12,16 +12,16 @@ module.exports = webpackMerge(commonConfig, {
   output: {
     path: helpers.root('dist'),
     publicPath: './',
-    filename: '[name].[hash].js',
-    chunkFilename: '[id].[hash].chunk.js'
+    filename: '[name].[fullhash].js',
+    chunkFilename: '[id].[fullhash].chunk.js'
   },
 
   plugins: [
     new webpack.NoEmitOnErrorsPlugin(),
     new MiniCssExtractPlugin({
       // Options similar to the same options in webpackOptions.output
       // both options are optional
-      filename: "[name].[hash].css",
+      filename: "[name].[fullhash].css",
       chunkFilename: "[id].css"
     }),
     new webpack.DefinePlugin({

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,7 +23,7 @@ jobs:
     - name: npm install, build and test
       run: |
         npm install
-        npm run build
+        npm run build:all
         npm run test
 
   deploy:

diff --git a/demo/assets/img/network/acceptDeleteIcon.png → ...sets/css/img/network/acceptDeleteIcon.png b/demo/assets/img/network/acceptDeleteIcon.png → ...sets/css/img/network/acceptDeleteIcon.png
diff --git a/demo/assets/img/network/addNodeIcon.png → demo/assets/css/img/network/addNodeIcon.png b/demo/assets/img/network/addNodeIcon.png → demo/assets/css/img/network/addNodeIcon.png
diff --git a/demo/assets/img/network/backIcon.png → demo/assets/css/img/network/backIcon.png b/demo/assets/img/network/backIcon.png → demo/assets/css/img/network/backIcon.png
diff --git a/demo/assets/img/network/connectIcon.png → demo/assets/css/img/network/connectIcon.png b/demo/assets/img/network/connectIcon.png → demo/assets/css/img/network/connectIcon.png
diff --git a/demo/assets/img/network/cross.png → demo/assets/css/img/network/cross.png b/demo/assets/img/network/cross.png → demo/assets/css/img/network/cross.png
diff --git a/demo/assets/img/network/cross2.png → demo/assets/css/img/network/cross2.png b/demo/assets/img/network/cross2.png → demo/assets/css/img/network/cross2.png
diff --git a/demo/assets/img/network/deleteIcon.png → demo/assets/css/img/network/deleteIcon.png b/demo/assets/img/network/deleteIcon.png → demo/assets/css/img/network/deleteIcon.png
diff --git a/demo/assets/img/network/downArrow.png → demo/assets/css/img/network/downArrow.png b/demo/assets/img/network/downArrow.png → demo/assets/css/img/network/downArrow.png
diff --git a/demo/assets/img/network/editIcon.png → demo/assets/css/img/network/editIcon.png b/demo/assets/img/network/editIcon.png → demo/assets/css/img/network/editIcon.png
diff --git a/demo/assets/img/network/leftArrow.png → demo/assets/css/img/network/leftArrow.png b/demo/assets/img/network/leftArrow.png → demo/assets/css/img/network/leftArrow.png
diff --git a/demo/assets/img/network/minus.png → demo/assets/css/img/network/minus.png b/demo/assets/img/network/minus.png → demo/assets/css/img/network/minus.png
diff --git a/demo/assets/img/network/plus.png → demo/assets/css/img/network/plus.png b/demo/assets/img/network/plus.png → demo/assets/css/img/network/plus.png
diff --git a/demo/assets/img/network/rightArrow.png → demo/assets/css/img/network/rightArrow.png b/demo/assets/img/network/rightArrow.png → demo/assets/css/img/network/rightArrow.png
diff --git a/demo/assets/img/network/upArrow.png → demo/assets/css/img/network/upArrow.png b/demo/assets/img/network/upArrow.png → demo/assets/css/img/network/upArrow.png
diff --git a/demo/assets/img/network/zoomExtends.png → demo/assets/css/img/network/zoomExtends.png b/demo/assets/img/network/zoomExtends.png → demo/assets/css/img/network/zoomExtends.png
diff --git a/demo/assets/img/timeline/delete.png → demo/assets/css/img/timeline/delete.png b/demo/assets/img/timeline/delete.png → demo/assets/css/img/timeline/delete.png
diff --git a/demo/demo.module.ts b/demo/demo.module.ts
@@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms';
 import { BrowserModule } from '@angular/platform-browser';
 import { RouterModule } from '@angular/router';
 
-import { VisModule } from '../dist';
+import { VisModule } from '../distfesm2022/ngxvis.mjs';
 import { DemoComponent } from './demo.component';
 import { HomeComponent } from './home/home.component';
 import { VisNetworkExampleComponent } from './network/network-example.component';

diff --git a/docs/app.0bf66760cb611397ebd2.js b/docs/app.0bf66760cb611397ebd2.js
diff --git a/docs/app.0bf66760cb611397ebd2.js.map b/docs/app.0bf66760cb611397ebd2.js.map
diff --git a/docs/assets/css/example.css b/docs/assets/css/example.css
diff --git a/docs/assets/css/vis.min.css b/docs/assets/css/vis.min.css
diff --git a/docs/assets/img/network/acceptDeleteIcon.png b/docs/assets/img/network/acceptDeleteIcon.png
diff --git a/docs/assets/img/network/addNodeIcon.png b/docs/assets/img/network/addNodeIcon.png
diff --git a/docs/assets/img/network/backIcon.png b/docs/assets/img/network/backIcon.png
diff --git a/docs/assets/img/network/connectIcon.png b/docs/assets/img/network/connectIcon.png
diff --git a/docs/assets/img/network/cross.png b/docs/assets/img/network/cross.png
diff --git a/docs/assets/img/network/cross2.png b/docs/assets/img/network/cross2.png
diff --git a/docs/assets/img/network/deleteIcon.png b/docs/assets/img/network/deleteIcon.png
diff --git a/docs/assets/img/network/downArrow.png b/docs/assets/img/network/downArrow.png
diff --git a/docs/assets/img/network/editIcon.png b/docs/assets/img/network/editIcon.png
diff --git a/docs/assets/img/network/leftArrow.png b/docs/assets/img/network/leftArrow.png
diff --git a/docs/assets/img/network/minus.png b/docs/assets/img/network/minus.png
diff --git a/docs/assets/img/network/plus.png b/docs/assets/img/network/plus.png
diff --git a/docs/assets/img/network/rightArrow.png b/docs/assets/img/network/rightArrow.png
diff --git a/docs/assets/img/network/upArrow.png b/docs/assets/img/network/upArrow.png
diff --git a/docs/assets/img/network/zoomExtends.png b/docs/assets/img/network/zoomExtends.png
diff --git a/docs/assets/img/timeline/delete.png b/docs/assets/img/timeline/delete.png
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/polyfills.0bf66760cb611397ebd2.js b/docs/polyfills.0bf66760cb611397ebd2.js
diff --git a/docs/polyfills.0bf66760cb611397ebd2.js.map b/docs/polyfills.0bf66760cb611397ebd2.js.map
diff --git a/docs/vendor.0bf66760cb611397ebd2.js b/docs/vendor.0bf66760cb611397ebd2.js
diff --git a/docs/vendor.0bf66760cb611397ebd2.js.map b/docs/vendor.0bf66760cb611397ebd2.js.map
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -88,11 +88,11 @@
   "copy-webpack-plugin": "^11.0.0",
   "cpy-cli": "^4.2.0",
   "cross-env": "^7.0.0",
-  "css-loader": "^3.2.1",
+  "css-loader": "^3.6.0",
   "es6-promise": "^4.1.0",
   "es6-shim": "^0.35.3",
   "eslint": "^8.40.0",
-  "file-loader": "^5.0.2",
+  "file-loader": "^5.1.0",
   "gitignore-to-glob": "^0.3.0",
   "html-loader": "^4.2.0",
   "html-webpack-plugin": "^5.5.1",