Merge pull request #586 from sebgroup/develop

release the build changes to use node 15 and npm 7
seb-oss · Apr 22, 2021 · 60203b8 · 60203b8
2 parents 4a0c793 + 964b7e2
commit 60203b8
Show file tree

Hide file tree

Showing 11 changed files with 56,386 additions and 40,969 deletions.
diff --git a/.github/workflows/build-check.yml b/.github/workflows/build-check.yml
@@ -7,16 +7,14 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: [ '12', '14' ]
+        node: [ '15' ]
     name: Node ${{ matrix.node }}
     steps:
       - uses: actions/checkout@v2
       - name: Setup node
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node }}
-      - name: Install npm@6
-        run: npm i npm@6 # to use workspace
       - name: Installing dependencies
         run: npm ci
       - name: Testing

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
@@ -54,7 +54,7 @@ jobs:
       - name: Setup Node 🏗️
         uses: actions/setup-node@v2
         with:
-          node-version: 14.x
+          node-version: 15.x
 
       - name: Installing dependencies ⏳
         run: npm ci
@@ -90,7 +90,7 @@ jobs:
       - name: Setup Node 🏗️
         uses: actions/setup-node@v2
         with:
-          node-version: 14.x
+          node-version: 15.x
       - name: Installing dependencies ⏳
         run: npm ci
       - name: Building docs 🔨

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Setup node
         uses: actions/setup-node@v2
         with:
-          node-version: 14.x
+          node-version: 15.x
 
       - name: Installing dependencies
         run: npm ci

diff --git a/docs/gatsby-config.js b/docs/gatsby-config.js
@@ -20,13 +20,6 @@ module.exports = {
                 icon: "src/assets/images/icon.png",
             },
         },
-        {
-            resolve: "gatsby-plugin-tsconfig-paths",
-            options: {
-                configFile: `${__dirname}/tsconfig.json`,
-                silent: true,
-            },
-        },
         {
             resolve: "gatsby-plugin-react-svg",
             options: {
@@ -35,5 +28,11 @@ module.exports = {
                 },
             },
         },
+        {
+            resolve: `gatsby-plugin-polyfill-io`,
+            options: {
+                features: [`String.prototype.codePointAt`, `fetch`],
+            },
+        },
     ],
 };
diff --git a/docs/gatsby-node.js b/docs/gatsby-node.js
@@ -0,0 +1,23 @@
+const TsconfigPathsPlugin = require("tsconfig-paths-webpack-plugin");
+
+exports.onCreateWebpackConfig = ({ actions, getConfig }) => {
+    const config = getConfig();
+    const miniCssExtractPlugin = config.plugins.find((plugin) => plugin.constructor.name === "MiniCssExtractPlugin");
+    if (miniCssExtractPlugin) {
+        miniCssExtractPlugin.options.ignoreOrder = true;
+    }
+    actions.setWebpackConfig({
+        resolve: {
+            plugins: [
+                new TsconfigPathsPlugin({
+                    configFile: `${__dirname}/tsconfig.json`,
+                    silent: true,
+                }),
+            ],
+            fallback: {
+                os: require.resolve("os-browserify/browser"),
+                path: require.resolve("path-browserify"),
+            },
+        },
+    });
+};
diff --git a/docs/package-lock.json b/docs/package-lock.json
diff --git a/docs/package.json b/docs/package.json
@@ -14,23 +14,31 @@
     },
     "license": "Apache-2.0",
     "dependencies": {
+        "@sebgroup/frontend-tools": "^2.0.2",
         "browser-typescript-parser": "^2.6.7",
-        "gatsby": "^2.26.1",
-        "gatsby-plugin-manifest": "^2.9.1",
-        "gatsby-plugin-offline": "^3.7.1",
-        "gatsby-plugin-react-helmet": "^3.7.0",
+        "classnames": "^2.2.6",
+        "gatsby": "^3.2.1",
+        "gatsby-plugin-manifest": "^3.2.0",
+        "gatsby-plugin-offline": "^4.2.0",
+        "gatsby-plugin-polyfill-io": "^1.1.0",
+        "gatsby-plugin-react-helmet": "^4.2.0",
         "gatsby-plugin-react-svg": "^3.0.0",
-        "gatsby-plugin-sass": "^2.8.0",
-        "gatsby-plugin-sitemap": "^2.9.0",
-        "gatsby-plugin-tsconfig-paths": "^1.0.2",
+        "gatsby-plugin-sass": "^4.2.0",
+        "gatsby-plugin-sitemap": "^3.2.0",
         "lorem-ipsum": "^2.0.3",
         "react-helmet": "^6.1.0",
-        "react-syntax-highlighter": "^15.4.3",
-        "classnames": "^2.2.6",
-        "@sebgroup/frontend-tools": "^2.0.2"
+        "react-syntax-highlighter": "^15.4.3"
     },
     "devDependencies": {
         "@types/react-helmet": "^6.1.0",
-        "dotenv": "^8.2.0"
+        "dotenv": "^8.2.0",
+        "os-browserify": "^0.3.0",
+        "path-browserify": "^1.0.1",
+        "tsconfig-paths-webpack-plugin": "^3.5.1"
+    },
+    "resolutions": {
+        "graphql": "^15.4.0",
+        "graphql-compose": "^7.25.0",
+        "webpack": "^5.24.2"
     }
 }
diff --git a/docs/src/utils/api-parser.ts b/docs/src/utils/api-parser.ts
@@ -27,6 +27,10 @@ interface RegexMapper<T = any> {
     index: string;
 }
 
+interface DefaultFileImport {
+    default: string;
+}
+
 export class APIExtractService {
     constructor() {}
     tsParser: TypescriptParser = new TypescriptParser();
@@ -183,11 +187,11 @@ export class APIExtractService {
      * @param importedTypeFileUrls array of imported types file source
      * @returns promise of list of API section
      */
-    parseSourceFile(source: string, importedTypeFileUrls: Array<any>): Promise<Array<ApiSection>> {
-        const description: APIInput = APIExtractService.extractDescription(source);
-        return this.tsParser.parseSource(source).then(async (res: ParsedFile) => {
+    parseSourceFile(source: DefaultFileImport, importedTypeFileUrls: Array<any>): Promise<Array<ApiSection>> {
+        const description: APIInput = APIExtractService.extractDescription(source.default);
+        return this.tsParser.parseSource(source.default).then(async (res: ParsedFile) => {
             const importedInterfaces = await this.extractImportedTypesInterfaces(importedTypeFileUrls);
-            return this.parse(res, source, importedInterfaces, description);
+            return this.parse(res, source.default, importedInterfaces, description);
         });
     }
 
@@ -240,10 +244,10 @@ export class APIExtractService {
      * @return list of list of parsed types/ interfaces
      */
     async extractImportedTypesInterfaces(imports: Array<any>): Promise<Array<Array<ParsedPropertyDeclartion>>> {
-        const test = imports.map((item: any) => {
-            const rawSource: string = item;
-            return this.tsParser.parseSource(rawSource).then((parsedFile: ParsedFile) => {
-                return this.parseTypesInterfaces(this.extractTypesInterfaces(parsedFile, rawSource), "").interfaces;
+        const test = imports.map((item: DefaultFileImport) => {
+            const rawSource: DefaultFileImport = item;
+            return this.tsParser.parseSource(rawSource.default).then((parsedFile: ParsedFile) => {
+                return this.parseTypesInterfaces(this.extractTypesInterfaces(parsedFile, rawSource.default), "").interfaces;
             });
         });
         return await Promise.all(test);