Merge pull request #401 from atls/fix/code-servie

fix(code-service): null loader for d.ts
atls · Aug 21, 2024 · d25094b · d25094b
2 parents 69ec34f + 69b8d96
commit d25094b
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 900 deletions.
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/.yarn/cache/null-loader-npm-4.0.1-02276c1f77-eeb4c4dd2f.zip b/.yarn/cache/null-loader-npm-4.0.1-02276c1f77-eeb4c4dd2f.zip
diff --git a/.yarn/releases/yarn-4.2.2.cjs b/.yarn/releases/yarn-4.2.2.cjs
diff --git a/.yarn/releases/yarn.cjs b/.yarn/releases/yarn.cjs
diff --git a/.yarn/versions/19c05a3b.yml b/.yarn/versions/19c05a3b.yml
@@ -0,0 +1,4 @@
+releases:
+  "@atls/code-runtime": minor
+  "@atls/code-service": minor
+  "@atls/code-service-worker": minor
diff --git a/code/code-service-worker/src/service.worker.content.ts b/code/code-service-worker/src/service.worker.content.ts
diff --git a/code/code-service/src/webpack.config.ts b/code/code-service/src/webpack.config.ts
@@ -9,6 +9,7 @@ import { join }                    from 'node:path'
 import { webpack }                 from '@atls/code-runtime/webpack'
 import { tsLoaderPath }            from '@atls/code-runtime/webpack'
 import { nodeLoaderPath }          from '@atls/code-runtime/webpack'
+import { nullLoaderPath }          from '@atls/code-runtime/webpack'
 import tsconfig                    from '@atls/config-typescript'
 
 import { WebpackExternals }        from './webpack.externals.js'
@@ -78,6 +79,12 @@ export class WebpackConfig {
       devtool: environment === 'production' ? 'source-map' : 'eval-cheap-module-source-map',
       module: {
         rules: [
+          {
+            test: /\.d\.ts$/,
+            use: {
+              loader: nullLoaderPath,
+            },
+          },
           {
             test: /(^.?|\.[^d]|[^.]d|[^.][^d])\.tsx?$/,
             use: {
@@ -94,6 +101,7 @@ export class WebpackConfig {
           },
           { test: /\.(woff|woff2|eot|ttf|otf)$/i, type: 'asset/resource' },
           { test: /\.(png|svg|jpg|jpeg|gif)$/i, type: 'asset/resource' },
+          { test: /\.(md)$/i, type: 'asset/resource' },
           { test: /\.node$/, use: nodeLoaderPath },
         ],
       },

diff --git a/runtime/code-runtime/package.json b/runtime/code-runtime/package.json
@@ -32,6 +32,7 @@
     "@svgr/plugin-jsx": "8.1.0",
     "eslint": "8.57.0",
     "node-loader": "2.0.0",
+    "null-loader": "4.0.1",
     "ts-loader": "9.5.1",
     "typescript": "5.4.2",
     "webpack": "5.93.0"

diff --git a/runtime/code-runtime/src/webpack.ts b/runtime/code-runtime/src/webpack.ts
@@ -6,5 +6,6 @@ const require = createRequire(import.meta.url)
 
 const tsLoaderPath = require.resolve('ts-loader')
 const nodeLoaderPath = require.resolve('node-loader')
+const nullLoaderPath = require.resolve('null-loader')
 
-export { webpack, tsLoaderPath, nodeLoaderPath }
+export { webpack, tsLoaderPath, nodeLoaderPath, nullLoaderPath }
diff --git a/yarn.lock b/yarn.lock
@@ -570,6 +570,7 @@ __metadata:
     "@types/node": "npm:22.4.1"
     eslint: "npm:8.57.0"
     node-loader: "npm:2.0.0"
+    null-loader: "npm:4.0.1"
     ts-loader: "npm:9.5.1"
     typescript: "npm:5.4.2"
     webpack: "npm:5.93.0"
@@ -11644,6 +11645,18 @@ __metadata:
   languageName: node
   linkType: hard
 
+"null-loader@npm:4.0.1":
+  version: 4.0.1
+  resolution: "null-loader@npm:4.0.1"
+  dependencies:
+    loader-utils: "npm:^2.0.0"
+    schema-utils: "npm:^3.0.0"
+  peerDependencies:
+    webpack: ^4.0.0 || ^5.0.0
+  checksum: 10/eeb4c4dd2f8f41e46f5665e4500359109e95ec1028a178a60e0161984906572da7dd87644bcc3cb29f0125d77e2b2508fb4f3813cfb1c6604a15865beb4b987b
+  languageName: node
+  linkType: hard
+
 "object-assign@npm:^4.1.1":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
@@ -12874,7 +12887,7 @@ pem@dexus/pem:
   languageName: node
   linkType: hard
 
-"schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0":
+"schema-utils@npm:^3.0.0, schema-utils@npm:^3.1.1, schema-utils@npm:^3.2.0":
   version: 3.3.0
   resolution: "schema-utils@npm:3.3.0"
   dependencies: