diff --git a/config/eslint/bases/next.cjs b/config/eslint/bases/next.cjs index 1f0caa0d5f..fe9f09449b 100644 --- a/config/eslint/bases/next.cjs +++ b/config/eslint/bases/next.cjs @@ -13,7 +13,7 @@ module.exports = { { ts: 'never', tsx: 'never', - js: 'never', + js: 'always', jsx: 'never', json: 'always', scss: 'always', diff --git a/config/tsup.config.ts b/config/tsup.config.ts index 0d694a2cbe..028ca05de6 100644 --- a/config/tsup.config.ts +++ b/config/tsup.config.ts @@ -1,7 +1,7 @@ +/* eslint-disable unicorn/prefer-module,@typescript-eslint/no-shadow */ import fs from 'node:fs'; import path from 'node:path'; import { esbuildPluginImport } from '@linjiajian999/esbuild-plugin-import'; -import { esbuildPluginFilePathExtensions } from 'esbuild-plugin-file-path-extensions'; import { defineConfig } from 'tsup'; const PACKAGE_ROOT_PATH = process.cwd(); @@ -20,7 +20,6 @@ export default defineConfig((opts) => { sourcemap: true, clean: true, esbuildPlugins: [ - esbuildPluginFilePathExtensions({ esmExtension: 'js' }) as any, esbuildPluginImport([ { libraryName: 'lodash', @@ -38,5 +37,16 @@ export default defineConfig((opts) => { console.info('Build succeeded!'); }, silent: true, + // plugins: [ + // { + // name: 'add-mjs', + // setup(build: any) { + // build.onResolve({ filter: /.*/ }, (args: any) => { + // if (args.importer) + // return { path: args.path + '.mjs', external: true }; + // }); + // }, + // }, + // ], }; }); diff --git a/package.json b/package.json index 8b6655a910..488731bf22 100644 --- a/package.json +++ b/package.json @@ -124,7 +124,6 @@ "cross-env": "^7.0.3", "dotenv": "^16.3.1", "esbuild-plugin-babel": "0.2.3", - "esbuild-plugin-file-path-extensions": "^1.0.0", "eslint": "8.44.0", "eslint-config-next": "^13.4.9", "eslint-config-prettier": "^8.8.0", diff --git a/packages/code-block/src/decorateCodeLine.ts b/packages/code-block/src/decorateCodeLine.ts index 1d509d4072..cf2ffcabe7 100644 --- a/packages/code-block/src/decorateCodeLine.ts +++ b/packages/code-block/src/decorateCodeLine.ts @@ -10,53 +10,53 @@ import { // noinspection ES6UnusedImports import Prism, { languages, Token, tokenize } from 'prismjs'; -import 'prismjs/components/prism-antlr4'; -import 'prismjs/components/prism-bash'; -import 'prismjs/components/prism-c'; -import 'prismjs/components/prism-cmake'; -import 'prismjs/components/prism-coffeescript'; -import 'prismjs/components/prism-cpp'; -import 'prismjs/components/prism-csharp'; -import 'prismjs/components/prism-css'; -import 'prismjs/components/prism-dart'; -// import 'prismjs/components/prism-django'; -import 'prismjs/components/prism-docker'; -// import 'prismjs/components/prism-ejs'; -import 'prismjs/components/prism-erlang'; -import 'prismjs/components/prism-git'; -import 'prismjs/components/prism-go'; -import 'prismjs/components/prism-graphql'; -import 'prismjs/components/prism-groovy'; -import 'prismjs/components/prism-java'; -import 'prismjs/components/prism-javascript'; -import 'prismjs/components/prism-json'; -import 'prismjs/components/prism-jsx'; -import 'prismjs/components/prism-kotlin'; -import 'prismjs/components/prism-latex'; -import 'prismjs/components/prism-less'; -import 'prismjs/components/prism-lua'; -import 'prismjs/components/prism-makefile'; -import 'prismjs/components/prism-markdown'; -import 'prismjs/components/prism-matlab'; -import 'prismjs/components/prism-objectivec'; -import 'prismjs/components/prism-perl'; -// import 'prismjs/components/prism-php'; -import 'prismjs/components/prism-powershell'; -import 'prismjs/components/prism-properties'; -import 'prismjs/components/prism-protobuf'; -import 'prismjs/components/prism-python'; -import 'prismjs/components/prism-r'; -import 'prismjs/components/prism-ruby'; -import 'prismjs/components/prism-sass'; -import 'prismjs/components/prism-scala'; -import 'prismjs/components/prism-scheme'; -import 'prismjs/components/prism-scss'; -import 'prismjs/components/prism-sql'; -import 'prismjs/components/prism-swift'; -import 'prismjs/components/prism-tsx'; -import 'prismjs/components/prism-typescript'; -import 'prismjs/components/prism-wasm'; -import 'prismjs/components/prism-yaml'; +import 'prismjs/components/prism-antlr4.js'; +import 'prismjs/components/prism-bash.js'; +import 'prismjs/components/prism-c.js'; +import 'prismjs/components/prism-cmake.js'; +import 'prismjs/components/prism-coffeescript.js'; +import 'prismjs/components/prism-cpp.js'; +import 'prismjs/components/prism-csharp.js'; +import 'prismjs/components/prism-css.js'; +import 'prismjs/components/prism-dart.js'; +// import 'prismjs/components/prism-django.js'; +import 'prismjs/components/prism-docker.js'; +// import 'prismjs/components/prism-ejs.js'; +import 'prismjs/components/prism-erlang.js'; +import 'prismjs/components/prism-git.js'; +import 'prismjs/components/prism-go.js'; +import 'prismjs/components/prism-graphql.js'; +import 'prismjs/components/prism-groovy.js'; +import 'prismjs/components/prism-java.js'; +import 'prismjs/components/prism-javascript.js'; +import 'prismjs/components/prism-json.js'; +import 'prismjs/components/prism-jsx.js'; +import 'prismjs/components/prism-kotlin.js'; +import 'prismjs/components/prism-latex.js'; +import 'prismjs/components/prism-less.js'; +import 'prismjs/components/prism-lua.js'; +import 'prismjs/components/prism-makefile.js'; +import 'prismjs/components/prism-markdown.js'; +import 'prismjs/components/prism-matlab.js'; +import 'prismjs/components/prism-objectivec.js'; +import 'prismjs/components/prism-perl.js'; +// import 'prismjs/components/prism-php.js'; +import 'prismjs/components/prism-powershell.js'; +import 'prismjs/components/prism-properties.js'; +import 'prismjs/components/prism-protobuf.js'; +import 'prismjs/components/prism-python.js'; +import 'prismjs/components/prism-r.js'; +import 'prismjs/components/prism-ruby.js'; +import 'prismjs/components/prism-sass.js'; +import 'prismjs/components/prism-scala.js'; +import 'prismjs/components/prism-scheme.js'; +import 'prismjs/components/prism-scss.js'; +import 'prismjs/components/prism-sql.js'; +import 'prismjs/components/prism-swift.js'; +import 'prismjs/components/prism-tsx.js'; +import 'prismjs/components/prism-typescript.js'; +import 'prismjs/components/prism-wasm.js'; +import 'prismjs/components/prism-yaml.js'; import { Range } from 'slate'; diff --git a/yarn.lock b/yarn.lock index 6619260897..168dd7c43c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11209,13 +11209,6 @@ __metadata: languageName: node linkType: hard -"esbuild-plugin-file-path-extensions@npm:^1.0.0": - version: 1.0.0 - resolution: "esbuild-plugin-file-path-extensions@npm:1.0.0" - checksum: 7acae281f5df2d1a9e5d635d87276fa2ff8a34930362414f825dbd95bc70c177319fdaff0a6cc4e3bec9b03ca93f37213ad14461c400532552cac0dc80a67443 - languageName: node - linkType: hard - "esbuild@npm:0.17.x || 0.18.x": version: 0.18.11 resolution: "esbuild@npm:0.18.11" @@ -21175,7 +21168,6 @@ __metadata: cross-env: "npm:^7.0.3" dotenv: "npm:^16.3.1" esbuild-plugin-babel: "npm:0.2.3" - esbuild-plugin-file-path-extensions: "npm:^1.0.0" eslint: "npm:8.44.0" eslint-config-next: "npm:^13.4.9" eslint-config-prettier: "npm:^8.8.0"