Subpackages

.babelrc

@@ -8,7 +8,7 @@
         }]
     ],
     "plugins": [
-        ["module-resolver",  { "root": ["./src"] } ],
+        ["module-resolver",  { "root": ["./packages/Main/src"] } ],
         ["babel-plugin-inline-import", {
             "extensions": [
                 ".json",

.eslintignore

@@ -1,6 +1,6 @@
 examples/libs/
 examples/layers/
-src/ThreeExtended/
+packages/Main/src/ThreeExtended/
 test/hooks.js
 dist/
 node_modules/

.eslintrc.cjs

@@ -1,3 +1,5 @@
+const path = require('path');
+
 module.exports = {
     root: true,
     extends: [
@@ -14,7 +16,7 @@ module.exports = {
     settings: {
         'import/resolver': {
             webpack: {
-                config: './webpack.config.cjs',
+                config: path.resolve(__dirname, './webpack.config.cjs'),
             },
         },
     },

.github/workflows/integration.yml

@@ -9,13 +9,23 @@ on:
       - master
   workflow_dispatch: {}
 
-
 jobs:
 
+  test-repo:
+    name: test repo name ++
+    if: ${{ github.repository_owner == 'gchoqueux' }}
+    runs-on: ubuntu-latest
+    steps:
+      # Use specific Node.js version
+      - uses: actions/checkout@v3
+      - name: name repo
+        run: echo 'gchoqueux repository'
+
   # Build bundle, doc and check linter
   build:
     name: Build bundle, check Linter and generate documentation
     runs-on: ubuntu-latest
+    needs: test-repo
     steps:
 
       # Use specific Node.js version
@@ -55,7 +65,7 @@ jobs:
         with:
             name: dist-itowns
             path: |
-                dist/**/*.js
+                packages/Main/dist/**/*.js
                 examples
                 buildDocs
 
@@ -79,8 +89,15 @@ jobs:
   # Unit and coverage tests
   unit-and-coverage-tests:
     name: Unit and coverage tests
-    needs: build
+    needs: [build, check-commit-message]
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - package: "@itowns_gc/geodesy"
+            path: "Geodesy"
+          - package: "itowns_gc"
+            path: "Main"
     steps:
 
       # Use specific Node.js version
@@ -95,21 +112,39 @@ jobs:
       - name: Install packages
         run: npm ci
 
-      - name: Run unit tests
-        run: npm run test-with-coverage_lcov
+      # Transpile
+      - name: transpile packages
+        run: npm run transpile
 
-      # Code coverage
-      - name: Coveralls
-        if: ${{ success() }}
-        uses: coverallsapp/github-action@master
+      - name: Test ${{ matrix.package }}
+        run: npm run test-with-coverage_lcov --workspace ${{ matrix.package}}
+      - name: Coveralls Parallel
+        uses: coverallsapp/github-action@v2
         with:
+          format: lcov
+          base-path: ./packages/${{ matrix.path }}
+          path-to-lcov: ./packages/${{ matrix.path }}/coverage/lcov.info
           github-token: ${{ secrets.GITHUB_TOKEN }}
+          flag-name: run-${{ matrix.package }}
+          parallel: true
+
+  # Final Code coverage
+  finish-coverage:
+    name: finish parallel test unit
+    needs: unit-and-coverage-tests
+    runs-on: ubuntu-latest
+    steps:
+    - name: Close parallel build
+      uses: coverallsapp/github-action@v2
+      with:
+        parallel-finished: true
+        github-token: ${{ secrets.GITHUB_TOKEN }}
 
 
   # Functional tests
   functional-tests:
     name: Functional tests
-    needs: build
+    needs: [build, check-commit-message]
     runs-on: ubuntu-latest
     steps:
 
@@ -139,7 +174,7 @@ jobs:
   publish:
     name: Publish NPM package
     if: ${{ github.ref == 'refs/heads/master' }}
-    needs: [unit-and-coverage-tests, functional-tests, check-commit-message]
+    needs: [finish-coverage, functional-tests]
     runs-on: ubuntu-latest
     permissions:
         # id-token: write permission is required for npm provenance:
@@ -183,9 +218,10 @@ jobs:
 
       - name: publish itowns@next npm package
         if: ${{ !startsWith(github.event.head_commit.message, 'release v' ) }}
+        # replace origin/master by origin
         run: |
           git checkout next
-          git merge master
+          git merge origin/master
           npm run publish-next
           git push
         env:
@@ -196,7 +232,7 @@ jobs:
   deploy:
     name: Deploy to itowns.github.io
     if: ${{ github.ref == 'refs/heads/master' }}
-    needs: [unit-and-coverage-tests, functional-tests, check-commit-message]
+    needs: [unit-and-coverage-tests, functional-tests]
     runs-on: ubuntu-latest
     steps:
 
@@ -212,7 +248,7 @@ jobs:
           mkdir -p itowns/dist
           mkdir -p itowns/potree/build
           mkdir -p itowns/potree/libs
-          cp -R dist/*.js itowns/dist/
+          cp -R packages/Main/dist/*.js itowns/dist
           cp -R examples itowns/
           cp -R buildDocs itowns/docs
 
@@ -231,7 +267,7 @@ jobs:
         uses: peaceiris/actions-gh-pages@v3
         with:
           deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-          external_repository: iTowns/itowns.github.io
+          external_repository: gchoqueux/itowns.github.io
           publish_dir: ./itowns
           destination_dir: ./itowns
           publish_branch: master
@@ -246,7 +282,7 @@ jobs:
         uses: peaceiris/actions-gh-pages@v3
         with:
           deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
-          external_repository: iTowns/itowns.github.io
+          external_repository: gchoqueux/itowns.github.io
           publish_dir: ./itowns
           destination_dir: ./itowns/dev
           publish_branch: master
@@ -257,7 +293,7 @@ jobs:
   release:
     name: Release GitHub
     if: ${{ github.ref == 'refs/heads/master' && startsWith( github.event.head_commit.message, 'release v' ) }}
-    needs: [unit-and-coverage-tests, functional-tests, check-commit-message]
+    needs: [unit-and-coverage-tests, functional-tests]
     runs-on: ubuntu-latest
     steps:
 

.gitignore

@@ -3,12 +3,12 @@
 # See https://help.github.com/articles/ignoring-files/ for how to configure your environment.
 # See https://github.com/github/gitignore/tree/master/Global for a list of global ignore rules.
 
-/node_modules/
-/dist/
+**/node_modules/
+**/dist/
 /potree/
 potree
-/lib/
+**/lib/
 /docs/out/
-coverage
+**/coverage
 .nyc_output/
-/src/ThreeExtended/
+**/src/ThreeExtended/

Gruntfile.cjs

@@ -4,11 +4,21 @@ module.exports = (grunt) => {
         pkg: grunt.file.readJSON('package.json'),
         bump: {
             options: {
-                files: ['package.json', 'package-lock.json', 'src/Main.js'],
+                files: ['package.json', 'package-lock.json', 'packages/Main/src/Main.js',
+                    // 'packages/**/package.json'
+                    'packages/Main/package.json',
+                    'packages/Geodesy/package.json',
+                    'packages/Gui/package.json',
+                ],
                 updateConfigs: [],
                 commit: true,
                 commitMessage: 'release v%VERSION%',
-                commitFiles: ['package.json', 'package-lock.json', 'src/Main.js'],
+                commitFiles: ['package.json', 'package-lock.json',
+                    // 'packages/**/package.json'
+                    'packages/Main/package.json',
+                    'packages/Geodesy/package.json',
+                    'packages/Gui/package.json',
+                ],
                 createTag: false,
                 tagName: 'v%VERSION%',
                 tagMessage: 'Release %VERSION%.',

config/concurrently.mjs

@@ -0,0 +1,12 @@
+import concurrently from 'concurrently';
+
+import fs from 'fs';
+
+const pck = JSON.parse(fs.readFileSync('package.json', 'utf8'));
+const script = process.argv[2];
+
+concurrently(pck.workspaces.map(workspace => ({
+    command: `npm run ${script} -w ${workspace} --if-present`,
+    name: `${workspace}`,
+})));
+

config/prepare.mjs

@@ -1,8 +1,5 @@
 import chalk from 'chalk';
-import copyfiles from 'copyfiles';
-// const chalk = require('chalk');
 import { execSync } from 'child_process';
-import threeExamples from './threeExamples.mjs';
 
 
 
@@ -33,12 +30,3 @@ const npmVersion = execSync('npm --version', {
 if (npmVersion) {
     console.log(chalk.green('Npm version :', npmVersion), '\n');
 }
-
-
-
-// Copy and patch THREE Examples Files
-const paths = threeExamples.filesExamples.map(f => f.replace('./', './node_modules/three/examples/jsm/'));
-
-paths.push(threeExamples.patchedPath);
-
-copyfiles(paths, { up: 4 }, () => {});

docs/config.json

@@ -187,8 +187,9 @@
         }
     },
     "source": {
-        "include": [ "src", "examples/js/plugins" ],
-        "exclude": [ "src/ThreeExtended" ]
+        "include": [ "examples/js/plugins", "packages" ],
+        "exclude": [ "src/ThreeExtended" ],
+        "excludePattern": "(^|\\/|\\\\)lib"
     },
     "plugins": ["plugins/markdown"]
 }

examples/3dtiles_25d.html

@@ -10,9 +10,9 @@
     </head>
     <body>
         <div id="viewerDiv" class="viewer"></div>
-        <script src="../dist/itowns.js"></script>
+        <script src="../packages/Main/dist/itowns.js"></script>
         <script src="js/GUI/LoadingScreen.js"></script>
-        <script src="../dist/debug.js"></script>
+        <script src="../packages/Main/dist/debug.js"></script>
         <script src="js/GUI/GuiTools.js"></script>
         <script src="js/3dTilesHelper.js"></script>
         <script type="text/javascript">

examples/3dtiles_basic.html

@@ -16,9 +16,9 @@
             <div id="featureInfo"></div>
         </div>
         <script src="js/GUI/GuiTools.js"></script>
-        <script src="../dist/itowns.js"></script>
+        <script src="../packages/Main/dist/itowns.js"></script>
         <script src="js/GUI/LoadingScreen.js"></script>
-        <script src="../dist/debug.js"></script>
+        <script src="../packages/Main/dist/debug.js"></script>
         <script src="js/3dTilesHelper.js"></script>
         <script type="text/javascript">
             /* global itowns,document,GuiTools*/

examples/3dtiles_batch_table.html

@@ -16,9 +16,9 @@
             <div id="featureInfo"></div>
         </div>
         <script src="js/GUI/GuiTools.js"></script>
-        <script src="../dist/itowns.js"></script>
+        <script src="../packages/Main/dist/itowns.js"></script>
         <script src="js/GUI/LoadingScreen.js"></script>
-        <script src="../dist/debug.js"></script>
+        <script src="../packages/Main/dist/debug.js"></script>
         <script src="js/3dTilesHelper.js"></script>
         <script type="text/javascript">
             // Note: The following positions and camera parameters have been

examples/3dtiles_ion.html

@@ -32,7 +32,7 @@
         <div id="viewerDiv"></div>
 
         <!-- Import iTowns source code -->
-        <script src="../dist/itowns.js"></script>
+        <script src="../packages/Main/dist/itowns.js"></script>
         <!-- Import iTowns LoadingScreen plugin -->
         <script src="js/GUI/LoadingScreen.js"></script>
 

examples/3dtiles_pointcloud.html

@@ -20,9 +20,9 @@
         </div>
         <div id="viewerDiv"></div>
         <script src="js/GUI/GuiTools.js"></script>
-        <script src="../dist/itowns.js"></script>
+        <script src="../packages/Main/dist/itowns.js"></script>
         <script src="js/GUI/LoadingScreen.js"></script>
-        <script src="../dist/debug.js"></script>
+        <script src="../packages/Main/dist/debug.js"></script>
         <script src="js/3dTilesHelper.js"></script>
         <script type="text/javascript">
             /* global itowns,document,GuiTools*/

examples/customColorLayerEffect.html

@@ -12,9 +12,9 @@
     <body>
         <div id="viewerDiv"></div>
         <div id="miniDiv"></div>
-        <script src="../dist/itowns.js"></script>
+        <script src="../packages/Main/dist/itowns.js"></script>
         <script src="js/GUI/LoadingScreen.js"></script>
-        <script src="../dist/debug.js"></script>
+        <script src="../packages/Main/dist/debug.js"></script>
         <script src="js/GUI/GuiTools.js"></script>
         <script type="text/javascript">
             // # Orthographic viewer

examples/effects_postprocessing.html

@@ -11,7 +11,7 @@
     </head>
     <body>
         <div id="viewerDiv"></div>
-        <script src="../dist/itowns.js"></script>
+        <script src="../packages/Main/dist/itowns.js"></script>
         <script src="js/GUI/LoadingScreen.js"></script>
         <!-- from https://github.com/mrdoob/three.js/blob/master/examples/js/shaders/DotScreenShader.js -->
         <script type="x-shader/x-vertex" id="vertexshader">

examples/effects_split.html

@@ -33,8 +33,8 @@
         <div id="viewerDiv"></div>
         <div id="splitSlider"></div>
         <script src="js/GUI/GuiTools.js"></script>
-        <script src="../dist/itowns.js"></script>
-        <script src="../dist/debug.js"></script>
+        <script src="../packages/Main/dist/itowns.js"></script>
+        <script src="../packages/Main/dist/debug.js"></script>
         <script src="js/GUI/LoadingScreen.js"></script>
         <script type="text/javascript">
             // # Simple Globe viewer

examples/effects_stereo.html

@@ -16,9 +16,9 @@
         </div>
         </div>
         <script src="js/GUI/GuiTools.js"></script>
-        <script src="../dist/itowns.js"></script>
+        <script src="../packages/Main/dist/itowns.js"></script>
         <script src="js/GUI/LoadingScreen.js"></script>
-        <script src="../dist/debug.js"></script>
+        <script src="../packages/Main/dist/debug.js"></script>
 
         <script type="importmap">
             {

examples/entwine_3d_loader.html

@@ -27,9 +27,9 @@
         <div id="viewerDiv">
         </div>
 
-        <script src="../dist/itowns.js"></script>
+        <script src="../packages/Main/dist/itowns.js"></script>
         <script src="js/GUI/LoadingScreen.js"></script>
-        <script src="../dist/debug.js"></script>
+        <script src="../packages/Main/dist/debug.js"></script>
         <script type="text/javascript">
             var debugGui = new dat.GUI();
             var viewerDiv = document.getElementById('viewerDiv');