Skip to content

Commit

Permalink
feat: use type: module
Browse files Browse the repository at this point in the history
  • Loading branch information
nolimits4web committed Aug 3, 2021
1 parent 526edb3 commit e8d89f2
Show file tree
Hide file tree
Showing 8 changed files with 64 additions and 46 deletions.
19 changes: 0 additions & 19 deletions package/angular/package.json

This file was deleted.

57 changes: 53 additions & 4 deletions package/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,59 @@
"name": "swiper",
"version": "6.8.1",
"description": "Most modern mobile touch slider and framework with hardware accelerated transitions",
"main": "swiper.cjs.js",
"jsnext:main": "swiper.esm.js",
"module": "swiper.esm.js",
"typings": "swiper.d.ts",
"type": "module",
"exports": {
".": "./swiper.esm.js",
"./core/": "./swiper.esm.js",
"./bundle/": "./swiper-bundle.esm.js",
"./css/": "./swiper-bundle.css",
"./less/": "./swiper.less",
"./less/a11y": "./modules/a11y/a11y.less",
"./less/autoplay": "./modules/autoplay/autoplay.less",
"./less/controller": "./modules/controller/controller.less",
"./less/effect-coverflow": "./modules/effect-coverflow/effect-coverflow.less",
"./less/effect-cube": "./modules/effect-cube/effect-cube.less",
"./less/effect-fade": "./modules/effect-fade/effect-fade.less",
"./less/effect-flip": "./modules/effect-flip/effect-flip.less",
"./less/free-mode": "./modules/free-mode/free-mode.less",
"./less/hash-navigation": "./modules/hash-navigation/hash-navigation.less",
"./less/history": "./modules/history/history.less",
"./less/keyboard": "./modules/keyboard/keyboard.less",
"./less/lazy": "./modules/lazy/lazy.less",
"./less/mousewheel": "./modules/mousewheel/mousewheel.less",
"./less/navigation": "./modules/navigation/navigation.less",
"./less/pagination": "./modules/pagination/pagination.less",
"./less/parallax": "./modules/parallax/parallax.less",
"./less/scrollbar": "./modules/scrollbar/scrollbar.less",
"./less/thumbs": "./modules/thumbs/thumbs.less",
"./less/virtual": "./modules/virtual/virtual.less",
"./less/zoom": "./modules/zoom/zoom.less",
"./scss/": "./swiper.scss",
"./scss/a11y": "./modules/a11y/a11y.scss",
"./scss/autoplay": "./modules/autoplay/autoplay.scss",
"./scss/controller": "./modules/controller/controller.scss",
"./scss/effect-coverflow": "./modules/effect-coverflow/effect-coverflow.scss",
"./scss/effect-cube": "./modules/effect-cube/effect-cube.scss",
"./scss/effect-fade": "./modules/effect-fade/effect-fade.scss",
"./scss/effect-flip": "./modules/effect-flip/effect-flip.scss",
"./scss/free-mode": "./modules/free-mode/free-mode.scss",
"./scss/hash-navigation": "./modules/hash-navigation/hash-navigation.scss",
"./scss/history": "./modules/history/history.scss",
"./scss/keyboard": "./modules/keyboard/keyboard.scss",
"./scss/lazy": "./modules/lazy/lazy.scss",
"./scss/mousewheel": "./modules/mousewheel/mousewheel.scss",
"./scss/navigation": "./modules/navigation/navigation.scss",
"./scss/pagination": "./modules/pagination/pagination.scss",
"./scss/parallax": "./modules/parallax/parallax.scss",
"./scss/scrollbar": "./modules/scrollbar/scrollbar.scss",
"./scss/thumbs": "./modules/thumbs/thumbs.scss",
"./scss/virtual": "./modules/virtual/virtual.scss",
"./scss/zoom": "./modules/zoom/zoom.scss",
"./react/": "./react/swiper-react.js",
"./vue/": "./vue/swiper-vue.js",
"./svelte/": "./svelte/swiper-svelte.js"
},
"sideEffects": [
"*.less",
"*.scss",
Expand Down Expand Up @@ -68,4 +117,4 @@
"dom7": "^3.0.0",
"ssr-window": "^3.0.0"
}
}
}
10 changes: 1 addition & 9 deletions scripts/build-js-bundle.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ async function buildBundle(components, format, browser, cb) {
'//IMPORT_COMPONENTS': components
.map(
(component) =>
`import ${component.capitalized} from './modules/${component.name}/${component.name}';`,
`import ${component.capitalized} from './modules/${component.name}/${component.name}.js';`,
)
.join('\n'),
'//INSTALL_COMPONENTS': components
Expand All @@ -56,14 +56,6 @@ async function buildBundle(components, format, browser, cb) {
}),
)
.then(async (bundle) => {
if (!browser && format === 'esm') {
// Fix imports
const modularContent = fs
.readFileSync(`./${output}/${filename}.js`, 'utf-8')
.replace(/require\('\.\//g, `require('./${format}/`)
.replace(/from '\.\//g, `from './${format}/`);
fs.writeFileSync(`./${output}/${filename}.js`, modularContent);
}
if (env === 'development' || !browser) {
if (cb) cb();
return;
Expand Down
10 changes: 3 additions & 7 deletions scripts/build-js-core.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ async function buildCore(components) {
const filename = `swiper.esm`;
const outputDir = env === 'development' ? 'build' : 'package';
let coreContent = '';
coreContent += `export { default as Swiper, default } from './core/core-class';\n`;
coreContent += `export { default as Swiper, default } from './core/core-class.js';\n`;
coreContent += components
.map(
(component) =>
`export { default as ${component.capitalized} } from './modules/${component.name}/${component.name}';`,
`export { default as ${component.capitalized} } from './modules/${component.name}/${component.name}.js';`,
)
.join('\n');

Expand All @@ -25,15 +25,13 @@ async function buildCore(components) {

// Babel
const ignore = [
'"src/angular/**/*.js"',
'"src/react/**/*.js"',
'"src/*-react.js"',
'"src/swiper-react.js"',
'"src/vue/**/*.js"',
'"src/*-vue.js"',
'"src/swiper-vue.js"',
'"src/svelte/**/*.js"',
'"src/*-svelte.js"',
'"src/swiper-svelte.js"',
];
await exec.promise(
`npx cross-env npx babel src --out-dir ${outputDir} --ignore ${ignore.join(',')}`,
Expand All @@ -51,8 +49,6 @@ async function buildCore(components) {
}

async function build() {
const env = process.env.NODE_ENV || 'development';
const outputDir = env === 'development' ? 'build' : 'package';
const components = [];
config.components.forEach((name) => {
// eslint-disable-next-line
Expand Down
4 changes: 2 additions & 2 deletions scripts/build-svelte.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ module.exports = async (outputDir) => {
);

// Fix import paths
let fileContent = await fs.readFile(`./${outputDir}/swiper-svelte.js`, 'utf-8');
let fileContent = await fs.readFile(`./${outputDir}/svelte/swiper-svelte.js`, 'utf-8');
fileContent = `${bannerSvelte}\n${fileContent}`;
fs.writeFileSync(`./${outputDir}/swiper-svelte.js`, fileContent);
fs.writeFileSync(`./${outputDir}/svelte/swiper-svelte.js`, fileContent);

/* DON'T TRANSFORM SVELTE FILES
// Transform svelte files
Expand Down
4 changes: 2 additions & 2 deletions scripts/build-vue.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ module.exports = async (outputDir) => {
);

// Fix import paths
let fileContent = await fs.readFile(`./${outputDir}/swiper-vue.js`, 'utf-8');
let fileContent = await fs.readFile(`./${outputDir}/vue/swiper-vue.js`, 'utf-8');
fileContent = `${bannerVue}\n${fileContent}`;
await fs.writeFile(`./${outputDir}/swiper-vue.js`, fileContent);
await fs.writeFile(`./${outputDir}/vue/swiper-vue.js`, fileContent);
};
4 changes: 2 additions & 2 deletions scripts/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const buildReact = require('./build-react');
const buildVue = require('./build-vue');
const buildSvelte = require('./build-svelte');
const buildStyles = require('./build-styles');
const buildAngular = require('./build-angular');
// const buildAngular = require('./build-angular');
const outputCheckSize = require('./check-size');
const setEnv = require('./utils/env');

Expand Down Expand Up @@ -61,7 +61,7 @@ class Build {
.add('react', buildReact)
.add('vue', buildVue)
.add('svelte', buildSvelte)
.add('angular', buildAngular)
// .add('angular', buildAngular)
.add('styles', () => buildStyles(build.outputDir))
.run();
})();
2 changes: 1 addition & 1 deletion src/swiper.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// Swiper Class
import Swiper from './core/core-class';
import Swiper from './core/core-class.js';

//IMPORT_COMPONENTS

Expand Down

0 comments on commit e8d89f2

Please sign in to comment.