@fmsim/builder 1.0.83 → 2.0.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fmsim/builder",
-  "version": "1.0.83",
+  "version": "2.0.0-beta.2",
   "description": "Layout View 어플리케이션 빌드를 위해 구성된 모듈입니다.",
   "main": "index.js",
   "author": "Hearty Oh <heartyoh@hatiolab.com>",
@@ -83,5 +83,5 @@
     "webpack-dev-server": "^5.2.0",
     "workbox-webpack-plugin": "^7.0.0"
   },
-  "gitHead": "352dae0fcb83f36a277e3f00f5463018ab0749ea"
+  "gitHead": "7060921dd4d60b781b7bc6951728ff7775cecfa9"
 }

package/webpack-plugins/theme-override-plugin.js

@@ -20,9 +20,9 @@ class ThemeOverridePlugin {
     compiler.hooks.entryOption.tap({ name: 'ThemeOverridePlugin' }, (context, entry) => {
       var appname = AppPackage.name
 
-      var { chunk = 'theme', themeFolder = path.join('client', 'themes') } = this.options
+      var { chunk = 'theme', themeFolder = 'themes' } = this.options
 
-      var reversedModuleNames = [...orderedModuleNames, appname].reverse()
+      var reversedModuleNames = [...orderedModuleNames].reverse()
       var themeFiles = {}
 
       /* 최상위 모듈부터 복사한다. 하위 모듈에서는 중복 여부에 따라 복사여부를 결정한다. */
@@ -32,18 +32,22 @@ class ThemeOverridePlugin {
         } else {
           var modulePath = path.dirname(require.resolve(`${m}/package.json`))
         }
+        var packageJson = require(path.join(modulePath, 'package.json'))
+        var browser = packageJson.browser
 
-        var sourcePath = path.join(modulePath, themeFolder)
+        if (browser) {
+          var sourcePath = path.dirname(path.join(modulePath, browser))
 
-        var files = glob.sync(path.join(sourcePath, '*.?(sass|scss|css)'))
+          var files = glob.sync(path.join(sourcePath, themeFolder, '*.?(sass|scss|css)'))
 
-        files.forEach(filepath => {
-          let filename = path.basename(filepath)
+          files.forEach(filepath => {
+            let filename = path.basename(filepath)
 
-          if (!themeFiles[filename]) {
-            themeFiles[filename] = filepath
-          }
-        })
+            if (!themeFiles[filename]) {
+              themeFiles[filename] = filepath
+            }
+          })
+        }
       })
 
       entry[chunk] = {

package/webpack.config.dev.js

@@ -1,3 +1,8 @@
+process.on('uncaughtException', error => {
+  console.error('Uncaught Exception:', error.stack)
+  process.exit(1)
+})
+
 const path = require('path')
 const fs = require('fs')
 const webpack = require('webpack')
@@ -5,7 +10,6 @@ const HTMLWebpackPlugin = require('html-webpack-plugin')
 const CopyWebpackPlugin = require('copy-webpack-plugin')
 const I18nBundlerPlugin = require('./webpack-plugins/i18n-bundler-plugin')
 const FolderOverridePlugin = require('./webpack-plugins/folder-override-plugin')
-const WorkboxWebpackPlugin = require('workbox-webpack-plugin')
 const MiniCssExtractPlugin = require('mini-css-extract-plugin')
 const ThemeOverridePlugin = require('./webpack-plugins/theme-override-plugin')
 const EntryBuilder = require('./controller/entries-builder')
@@ -65,12 +69,7 @@ try {
 }
 
 let entries = Object.assign({}, EntryBuilder(), {
-  main: [
-    path.resolve(ShellModulePath, 'client', 'index.js'),
-    '@hatiolab/webpack-hot-client/client?path=/__webpack_hmr&timeout=20000&reload=true'
-  ],
-  'headless-scene-components': [path.resolve(ShellModulePath, '.', 'client', 'scene', 'scene-components.js')],
-  'scene-viewer': [path.resolve(ShellModulePath, '.', 'client', 'scene', 'scene-viewer.js')]
+  main: [path.resolve(ShellModulePath, 'client', 'index.ts')]
 })
 
 module.exports = {
@@ -83,17 +82,15 @@ module.exports = {
         AppPackage.name == '@hatiolab/things-scene' ? path.resolve(appRootPath, 'src', 'index.js') : appRootPath
     },
     extensions: ['.ts', '.js', '.jsx', '.tsx', '.json'],
+    extensionAlias: {
+      '.js': ['.ts', '.js']
+    },
     modules: [NodeModulePath]
   },
   resolveLoader: {
     modules: [path.resolve(BuilderModulePath, 'web-loaders'), NodeModulePath]
   },
-  externals:
-    AppPackage.name == '@hatiolab/things-scene'
-      ? {}
-      : {
-          '@hatiolab/things-scene': 'scene'
-        },
+  externals: {},
   output: {
     path: OUTPUT_PATH,
     filename: 'fmsim/[name].js',
@@ -187,20 +184,16 @@ module.exports = {
   plugins: [
     new ThemeOverridePlugin({
       chunk: 'theme',
-      themeFolder: path.join('client', 'themes')
+      themeFolder: 'themes'
     }),
     new HTMLWebpackPlugin({
       template: TemplatePath,
-      /*
-      Allows to control how chunks should be sorted before they are included to the HTML.
-      Allowed values are 'none' | 'auto' | 'dependency' | 'manual' | {Function}
-      */
       chunksSortMode: 'none',
       chunks: ['main', 'theme']
     }),
     new MiniCssExtractPlugin({
       filename: '[name].css',
-      chunkFilename: '[name].[hash].css',
+      chunkFilename: '[name].[chunkhash].css',
       ignoreOrder: false
     }),
     new CopyWebpackPlugin({
@@ -210,33 +203,24 @@ module.exports = {
           to: OUTPUT_PATH + '/fmsim',
           context: NodeModuleParentPath
         },
-        {
-          from: 'node_modules/@material-design-icons/font/*',
-          to: OUTPUT_PATH + '/fmsim',
-          context: NodeModuleParentPath
-        },
         {
           from: 'node_modules/@fontsource/roboto/**/*',
           to: OUTPUT_PATH + '/fmsim',
           context: NodeModuleParentPath
         },
         {
-          from: 'node_modules/pretendard/**/*',
+          from: 'node_modules/@webcomponents/**/*',
           to: OUTPUT_PATH + '/fmsim',
           context: NodeModuleParentPath
         },
         {
-          from: 'node_modules/@webcomponents/webcomponentsjs/*',
-          to: OUTPUT_PATH + '/fmsim',
-          context: NodeModuleParentPath
-        },
-        {
-          from: 'node_modules/web-animations-js/web-animations-next.min.js*',
+          from: 'node_modules/@hatiolab/things-scene/*.js*',
           to: OUTPUT_PATH + '/fmsim',
+          noErrorOnMissing: true,
           context: NodeModuleParentPath
         },
         {
-          from: 'node_modules/@hatiolab/things-scene/*.js*',
+          from: 'node_modules/three/**/*',
           to: OUTPUT_PATH + '/fmsim',
           noErrorOnMissing: true,
           context: NodeModuleParentPath
@@ -261,12 +245,6 @@ module.exports = {
     new I18nBundlerPlugin({
       output: 'translations'
     }),
-    new WorkboxWebpackPlugin.InjectManifest({
-      swSrc: path.resolve(ShellModulePath, 'client/serviceworker/sw-src.js'),
-      swDest: 'service-worker.js',
-      maximumFileSizeToCacheInBytes: 50000000,
-      exclude: [/^helps\//, /headless/, /openapi/] // exclude help files, headless files
-    }),
     new webpack.DefinePlugin({
       'process.env': {
         'NODE-ENV': JSON.stringify('development'),
@@ -278,7 +256,11 @@ module.exports = {
         'APP-DESCRIPTION': JSON.stringify(AppPackage.description),
         'APP-TAGLINE': JSON.stringify(AppPackage.tagline)
       }
-    })
+    }),
+    new NodePolyfillPlugin()
   ],
-  devtool: 'source-map'
+  devtool: 'source-map',
+  watchOptions: {
+    ignored: /node_modules\/(?!@hatiolab|@operato|@things-factory)/
+  }
 }

package/webpack.config.js

@@ -67,9 +67,7 @@ try {
 debug('Index.html TemplatePath', TemplatePath)
 
 let entries = Object.assign({}, EntryBuilder(), {
-  main: path.resolve(ShellModulePath, 'client', 'index.js'),
-  'headless-scene-components': [path.resolve(ShellModulePath, '.', 'client', 'scene', 'scene-components.js')],
-  'scene-viewer': [path.resolve(ShellModulePath, '.', 'client', 'scene', 'scene-viewer.js')]
+  main: path.resolve(ShellModulePath, 'client', 'index.ts')
 })
 
 module.exports = {
@@ -79,20 +77,19 @@ module.exports = {
     aliasFields: ['browser'],
     alias: {
       [AppPackage.name]:
-        AppPackage.name == '@hatiolab/things-scene' ? path.resolve(appRootPath, 'src', 'index.js') : appRootPath
+        AppPackage.name == '@hatiolab/things-scene' ? path.resolve(appRootPath, 'dist', 'index.js') : appRootPath
     },
     extensions: ['.ts', '.js', '.jsx', '.tsx', '.json'],
+    extensionAlias: {
+      '.js': ['.ts', '.js'],
+      '.jsx': ['.tsx', '.jsx']
+    },
     modules: [NodeModulePath]
   },
   resolveLoader: {
     modules: [path.resolve(BuilderModulePath, 'web-loaders'), NodeModulePath]
   },
-  externals:
-    AppPackage.name == '@hatiolab/things-scene'
-      ? {}
-      : {
-          '@hatiolab/things-scene': 'scene'
-        },
+  externals: {},
   output: {
     path: OUTPUT_PATH,
     filename: 'fmsim/[name].js',
@@ -210,6 +207,7 @@ module.exports = {
         {
           from: 'node_modules/@material-design-icons/font/*',
           to: OUTPUT_PATH + '/fmsim',
+          noErrorOnMissing: true,
           context: NodeModuleParentPath
         },
         {
@@ -230,6 +228,7 @@ module.exports = {
         {
           from: 'node_modules/web-animations-js/web-animations-next.min.js*',
           to: OUTPUT_PATH + '/fmsim',
+          noErrorOnMissing: true,
           context: NodeModuleParentPath
         },
         {