@vixoniccom/module-packager 2.7.0-test.9 → 2.8.1-dev.0

package/CHANGELOG.md

@@ -2,85 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
-## [2.7.0-test.9](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.7.0-test.8...v2.7.0-test.9) (2022-07-15)
+### [2.8.1-dev.0](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.6.3-dev.0...v2.8.1-dev.0) (2022-07-18)
 
+### [2.6.3-dev.0](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.6.2...v2.6.3-dev.0) (2022-07-13)
 
-### Bug Fixes
-
-* **release:** __dirname was removed ([cad88bb](https://gitlab.com/mandomedio/vixonic/module-packager/commit/cad88bba27d41590fdecab04dddf511dc9fb1df1))
-
-## [2.7.0-test.8](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.7.0-test.7...v2.7.0-test.8) (2022-07-15)
-
-
-### Bug Fixes
-
-* **release:** exclude variable was updated ([6eca779](https://gitlab.com/mandomedio/vixonic/module-packager/commit/6eca7795b42e32e84afeffe74a98bb7e4b970dd1))
-
-## [2.7.0-test.7](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.7.0-test.6...v2.7.0-test.7) (2022-07-15)
-
-
-### Bug Fixes
-
-* **Release:** revert __dirname changes ([bb25fe1](https://gitlab.com/mandomedio/vixonic/module-packager/commit/bb25fe10ed9a9368c145530aecdc91f539877a26))
-
-## [2.7.0-test.6](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.7.0-test.5...v2.7.0-test.6) (2022-07-15)
-
-
-### Bug Fixes
-
-* **release:** contentBase porperty was removed ([8b364cc](https://gitlab.com/mandomedio/vixonic/module-packager/commit/8b364cc84298210491844856564ada198c356561))
-
-## [2.7.0-test.5](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.7.0-test.4...v2.7.0-test.5) (2022-07-15)
-
-
-### Bug Fixes
-
-* **Release:** default value of  config in options variable was reverted ([9c75fac](https://gitlab.com/mandomedio/vixonic/module-packager/commit/9c75fac9c189bfe5a7857c9a5f68ef50dcc3cc6b))
-
-## [2.7.0-test.4](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.7.0-test.3...v2.7.0-test.4) (2022-07-15)
-
-
-### Bug Fixes
-
-* **release:** __dirname was added to path resolves and joins ([7312c9a](https://gitlab.com/mandomedio/vixonic/module-packager/commit/7312c9a316c4039dd63c979754d97733c6159a90))
-
-## [2.7.0-test.3](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.7.0-test.2...v2.7.0-test.3) (2022-07-15)
-
-## [2.7.0-test.2](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.7.0-test.1...v2.7.0-test.2) (2022-07-15)
-
-
-### Bug Fixes
-
-* **Release:** ts-node and ts-loader versions were changed ([e108c3f](https://gitlab.com/mandomedio/vixonic/module-packager/commit/e108c3f4e1983ed59d932cfc5db0754a6500088a))
-
-## [2.7.0-test.1](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.7.0-test.0...v2.7.0-test.1) (2022-07-15)
-
-
-### Bug Fixes
-
-* **release:** loaders module was changed by rules in webpack config ([5de2994](https://gitlab.com/mandomedio/vixonic/module-packager/commit/5de29944e6f1bb7e634bf9d6c1a0acb5b7c10ae5))
-
-## [2.7.0-test.0](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.7.0-dev.2...v2.7.0-test.0) (2022-07-15)
-
-## [2.7.0-dev.2](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.7.0-dev.1...v2.7.0-dev.2) (2022-07-15)
-
-
-### Features
-
-* **release:** awesome-typescript-loader was replaced by ts-loader ([f0829ec](https://gitlab.com/mandomedio/vixonic/module-packager/commit/f0829ecd7640232be95ea029bd415ca9bfb83e10))
-
-## [2.7.0-dev.1](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.6.2...v2.7.0-dev.1) (2022-07-15)
-
-
-### Features
-
-* **release:** a new vixoniccom/modules was added to the project ([d2cb117](https://gitlab.com/mandomedio/vixonic/module-packager/commit/d2cb117eb368391a1c4307602fd18741655943c6))
-
-## [2.7.0-dev.0](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.6.1...v2.7.0-dev.0) (2022-06-16)
-
-### Features
-
-* **release:** a new vixoniccom/modules was added to the project ([0f4e503](https://gitlab.com/mandomedio/vixonic/module-packager/commit/0f4e50326d8c8e2582347f690705bc4ecb619c5a))
 ### [2.6.2](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.6.1...v2.6.2) (2022-06-24)
 
 
@@ -117,6 +42,8 @@ All notable changes to this project will be documented in this file. See [standa
 
 ### Bug Fixes
 
+* **Release:** typescript was upgrated to the last version - 4.7.3 ([43fb1e3](https://gitlab.com/mandomedio/vixonic/module-packager/commit/43fb1e375e9c3ffb8e79384ab67cb74957d9ea8a))
+
 ### [2.6.1](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.6.1-dev.0...v2.6.1) (2022-05-16)
 
 ### [2.6.1-dev.0](https://gitlab.com/mandomedio/vixonic/module-packager/compare/v2.6.0...v2.6.1-dev.0) (2022-04-07)

package/main.js

@@ -114,7 +114,7 @@ function zip (callback) {
 
 function watch () {
   var server = new WebpackDevServer(webpack(require(options.config)(options)), {
-    static: path.join(__dirname, options.src, '..')
+    contentBase: path.join(__dirname, options.src, '..')
   })
   server.listen(options.port)
 

package/package.json

@@ -52,8 +52,9 @@
   },
   "dependencies": {
     "@vixoniccom/module-controller": "^1.2.2",
-    "@vixoniccom/modules": "^2.14.0",
+    "@vixoniccom/modules": "^2.15.1-dev.0",
     "archiver": "^5.3.0",
+    "awesome-typescript-loader": "^4.0.1",
     "babel-core": "^6.14.0",
     "babel-loader": "^6.2.5",
     "babel-polyfill": "^6.26.0",
@@ -75,12 +76,11 @@
     "raw-loader": "^0.5.1",
     "sass-loader": "^4.0.2",
     "style-loader": "^0.13.1",
-    "ts-loader": "^8.2.0",
-    "ts-node": "^10.9.1",
+    "ts-node": "^10.8.1",
     "typescript": "^4.7.3",
     "uglifyjs-webpack-plugin": "^1.3.0",
-    "webpack": "^4.46.0",
-    "webpack-dev-server": "^4.9.3"
+    "webpack": "^3.12.0",
+    "webpack-dev-server": "^2.11.5"
   },
   "directories": {},
   "dist": {
@@ -95,7 +95,6 @@
     }
   ],
   "name": "@vixoniccom/module-packager",
-  "optionalDependencies": {},
   "readme": "ERROR: No README data found!",
   "scripts": {
     "start": "electron",
@@ -104,7 +103,7 @@
     "prerelease-test": "standard-version --prerelease test",
     "release": "standard-version"
   },
-  "version": "2.7.0-test.9",
+  "version": "2.8.1-dev.0",
   "devDependencies": {
     "standard-version": "^9.3.1"
   }

package/webpack.config.js

@@ -14,16 +14,14 @@ module.exports = (options) => {
     options.externals = [...(options.externals || []), 'electron']
   }
 
-  // let tsconfigPath = fs.existsSync(path.join(options.src, '..', 'tsconfig.json')) ? path.join(options.src, '..', 'tsconfig.json') : path.join(__dirname, 'tsconfig.json')
-  // const typescriptPath = path.join(options.src, '..', 'node_modules', 'typescript', '/')
-  // const typescript = fs.existsSync(typescriptPath) ? path.join(__dirname, path.relative(__dirname, typescriptPath), '/') : 'typescript'
+  let tsconfigPath = fs.existsSync(path.join(options.src, '..', 'tsconfig.json')) ? path.join(options.src, '..', 'tsconfig.json') : path.join(__dirname, 'tsconfig.json')
+  const typescriptPath = path.join(options.src, '..', 'node_modules', 'typescript', '/')
+  const typescript = fs.existsSync(typescriptPath) ? path.join(__dirname, path.relative(__dirname, typescriptPath), '/') : 'typescript'
 
   let exclude = options.mode === 'watch'
     ? [path.join(options.src, 'static'), path.join(options.src, 'test')]
     : [path.resolve(options.src, 'static'), path.resolve(options.src, 'test')]
 
-  console.log('exclude ', exclude)
-  console.log('Options: ', options, options.src)
   let config = {
     context: __dirname,
     entry: ['babel-polyfill', path.resolve(options.src, 'main')],
@@ -46,7 +44,7 @@ module.exports = (options) => {
       ]
     },
     module: {
-      rules: [
+      loaders: [
         {
           test: /\.json$/,
           exclude: exclude,
@@ -56,14 +54,16 @@ module.exports = (options) => {
           test: /\.(j|t)sx?$/,
           include: [path.resolve(options.src)],
           exclude: exclude,
-          rules: [
+          loaders: [
             {
               loader: 'babel-loader?babelrc=false&extends=' + path.join(__dirname, '/.babelrc')
             },
             {
-              loader: 'ts-loader',
+              loader: 'awesome-typescript-loader',
               options: {
-                transpileOnly: options.transpileOnly
+                configFileName: tsconfigPath,
+                transpileOnly: options.transpileOnly,
+                compiler: typescript
               }
             }
           ]
@@ -89,7 +89,7 @@ module.exports = (options) => {
         }
       ]
     },
-    externals: (_context, request, callback) => {
+    externals: (context, request, callback) => {
       if (_.indexOf(options.externals, request) !== -1) {
         if (options.mode !== 'watch' || request === 'electron') {
           return callback(null, "require('" + request + "')")
@@ -129,7 +129,7 @@ module.exports = (options) => {
     config.output.publicPath = `http://localhost:${options.port}/`
     config.devtool = 'source-map'
     config.devServer = {
-      static: path.resolve(options.src),
+      contentBase: path.resolve(options.src),
       publicPath: `http://localhost:${options.port}/`,
       inline: true
     }